diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2022-06-24 14:40:58 +0100 |
|---|---|---|
| committer | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2022-06-26 18:40:12 +0100 |
| commit | 02bb59a0e082a4eb88b797c715ab722bebb95ad4 (patch) | |
| tree | 5e0ceb5f373af0557acf31f5b2d083ac1e22f1ca /hw | |
| parent | 6479296fe561cc3aacc3ee99adf02ca7d2120713 (diff) | |
| download | qemu-02bb59a0e082a4eb88b797c715ab722bebb95ad4.zip qemu-02bb59a0e082a4eb88b797c715ab722bebb95ad4.tar.gz qemu-02bb59a0e082a4eb88b797c715ab722bebb95ad4.tar.bz2 | |
lasips2: move initialisation of PS2 ports from lasi_initfn() to lasi_init()
This can be improved once the ps2_kbd_init() and ps2_mouse_init() functions have
been removed, but for now move the existing logic from lasi_initfn() to
lasi_init(). At the same time explicitly set keyboard port id to 0, even if it
isn't technically required.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20220624134109.881989-44-mark.cave-ayland@ilande.co.uk>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/input/lasips2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c index 84e7a1f..bd89c03 100644 --- a/hw/input/lasips2.c +++ b/hw/input/lasips2.c @@ -255,9 +255,6 @@ LASIPS2State *lasips2_initfn(hwaddr base, qemu_irq irq) s = LASIPS2(dev); s->irq = irq; - s->mouse.id = 1; - s->kbd.parent = s; - s->mouse.parent = s; vmstate_register(NULL, base, &vmstate_lasips2, s); @@ -271,6 +268,11 @@ static void lasips2_init(Object *obj) { LASIPS2State *s = LASIPS2(obj); + s->kbd.id = 0; + s->mouse.id = 1; + s->kbd.parent = s; + s->mouse.parent = s; + memory_region_init_io(&s->kbd.reg, obj, &lasips2_reg_ops, &s->kbd, "lasips2-kbd", 0x100); memory_region_init_io(&s->mouse.reg, obj, &lasips2_reg_ops, &s->mouse, |