SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lasips2: rename LASIPS2Port parent pointer to lasips2

Browse Source 
This makes it clearer that the pointer is a reference to the LASIPS2 container
device rather than an implied part of the QOM hierarchy.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Tested-by: Helge Deller <deller@gmx.de>
Acked-by: Helge Deller <deller@gmx.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20220712215251.7944-30-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Mark Cave-Ayland 2022-07-12 22:52:40 +01:00
parent 212a300303
commit 01f6c54626
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/input/lasips2.c
View File

@ -222,7 +222,7 @@ static uint64_t lasips2_reg_read(void *opaque, hwaddr addr, unsigned size)
}
}
if (port->parent->int_status) {
if (port->lasips2->int_status) {
ret |= LASIPS2_STATUS_CMPINTR;
}
break;
@ -368,7 +368,7 @@ static void lasips2_kbd_port_init(Object *obj)
memory_region_init_io(&lp->reg, obj, &lasips2_reg_ops, lp, "lasips2-kbd",
0x100);
lp->id = 0;
lp->parent = container_of(s, LASIPS2State, kbd_port);
lp->lasips2 = container_of(s, LASIPS2State, kbd_port);
}
static void lasips2_kbd_port_class_init(ObjectClass *klass, void *data)
@ -405,7 +405,7 @@ static void lasips2_mouse_port_init(Object *obj)
memory_region_init_io(&lp->reg, obj, &lasips2_reg_ops, lp, "lasips2-mouse",
0x100);
lp->id = 1;
lp->parent = container_of(s, LASIPS2State, mouse_port);
lp->lasips2 = container_of(s, LASIPS2State, mouse_port);
}
static void lasips2_mouse_port_class_init(ObjectClass *klass, void *data)

2
include/hw/input/lasips2.h
View File

@ -37,7 +37,7 @@ typedef struct LASIPS2State LASIPS2State;
struct LASIPS2Port {
DeviceState parent_obj;
LASIPS2State *parent;
LASIPS2State *lasips2;
MemoryRegion reg;
PS2State *ps2dev;
uint8_t id;