diff options
| author | Mark Cave-Ayland | 2022-06-24 15:40:43 +0200 |
|---|---|---|
| committer | Mark Cave-Ayland | 2022-06-26 19:40:12 +0200 |
| commit | 01d924dce88f6d43a0be36c0e626f058e68a9ea4 (patch) | |
| tree | 6aab3941c174e1ed2503a71ea0dad13bc533bccb /hw/input | |
| parent | pckbd: alter i8042_mm_init() to return a I8042_MMIO device (diff) | |
| download | qemu-01d924dce88f6d43a0be36c0e626f058e68a9ea4.tar.gz qemu-01d924dce88f6d43a0be36c0e626f058e68a9ea4.tar.xz qemu-01d924dce88f6d43a0be36c0e626f058e68a9ea4.zip | |
pckbd: move mapping of I8042_MMIO registers to MIPS magnum machine
Now that the register memory region is exposed as a SysBus memory region, move
the mapping of the I8042_MMIO registers from i8042_mm_init() to the MIPS magnum
machine (which is its only user).
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-29-mark.cave-ayland@ilande.co.uk>
Diffstat (limited to 'hw/input')
| -rw-r--r-- | hw/input/pckbd.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 702dab056c..8708595eed 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -709,8 +709,7 @@ static void i8042_mmio_class_init(ObjectClass *klass, void *data) } MMIOKBDState *i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, - MemoryRegion *region, ram_addr_t size, - hwaddr mask) + ram_addr_t size, hwaddr mask) { DeviceState *dev; KBDState *s; @@ -726,8 +725,6 @@ MMIOKBDState *i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, vmstate_register(NULL, 0, &vmstate_kbd, s); - region = &I8042_MMIO(dev)->region; - s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s); s->mouse = ps2_mouse_init(kbd_update_aux_irq, s); |