[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 27/55] pckbd: alter i8042_mm_init() to return a I8042_MMIO device
From: |
Mark Cave-Ayland |
Subject: |
[PULL 27/55] pckbd: alter i8042_mm_init() to return a I8042_MMIO device |
Date: |
Sun, 26 Jun 2022 18:45:03 +0100 |
This exposes the I8042_MMIO device to the caller to allow the register memory
region to be mapped outside of i8042_mm_init().
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-28-mark.cave-ayland@ilande.co.uk>
---
hw/input/pckbd.c | 8 +++++---
include/hw/input/i8042.h | 6 +++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index b8623d2f9a..702dab056c 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -708,9 +708,9 @@ static void i8042_mmio_class_init(ObjectClass *klass, void
*data)
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
}
-void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
- MemoryRegion *region, ram_addr_t size,
- hwaddr mask)
+MMIOKBDState *i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
+ MemoryRegion *region, ram_addr_t size,
+ hwaddr mask)
{
DeviceState *dev;
KBDState *s;
@@ -730,6 +730,8 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s);
s->mouse = ps2_mouse_init(kbd_update_aux_irq, s);
+
+ return I8042_MMIO(dev);
}
static const TypeInfo i8042_mmio_info = {
diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h
index 59d695a9dd..d05cd33e3c 100644
--- a/include/hw/input/i8042.h
+++ b/include/hw/input/i8042.h
@@ -64,9 +64,9 @@ struct MMIOKBDState {
#define I8042_A20_LINE "a20"
-void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
- MemoryRegion *region, ram_addr_t size,
- hwaddr mask);
+MMIOKBDState *i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
+ MemoryRegion *region, ram_addr_t size,
+ hwaddr mask);
void i8042_isa_mouse_fake_event(ISAKBDState *isa);
void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out);
--
2.30.2
- [PULL 14/55] pl050: checkpatch fixes, (continued)
- [PULL 14/55] pl050: checkpatch fixes, Mark Cave-Ayland, 2022/06/26
- [PULL 15/55] pl050: split pl050_update_irq() into separate pl050_set_irq() and pl050_update_irq() functions, Mark Cave-Ayland, 2022/06/26
- [PULL 17/55] lasips2: rename ps2dev_update_irq() to lasips2_port_set_irq(), Mark Cave-Ayland, 2022/06/26
- [PULL 16/55] lasips2: spacing fixes, Mark Cave-Ayland, 2022/06/26
- [PULL 20/55] pckbd: move ISAKBDState from pckbd.c to i8042.h, Mark Cave-Ayland, 2022/06/26
- [PULL 19/55] pckbd: move KBDState from pckbd.c to i8042.h, Mark Cave-Ayland, 2022/06/26
- [PULL 18/55] pckbd: checkpatch fixes, Mark Cave-Ayland, 2022/06/26
- [PULL 21/55] pckbd: introduce new I8042_MMIO QOM type, Mark Cave-Ayland, 2022/06/26
- [PULL 24/55] pckbd: add size qdev property to I8042_MMIO device, Mark Cave-Ayland, 2022/06/26
- [PULL 25/55] pckbd: implement i8042_mmio_realize() function, Mark Cave-Ayland, 2022/06/26
- [PULL 27/55] pckbd: alter i8042_mm_init() to return a I8042_MMIO device,
Mark Cave-Ayland <=
- [PULL 23/55] pckbd: add mask qdev property to I8042_MMIO device, Mark Cave-Ayland, 2022/06/26
- [PULL 22/55] pckbd: implement i8042_mmio_reset() for I8042_MMIO device, Mark Cave-Ayland, 2022/06/26
- [PULL 29/55] pckbd: more vmstate_register() from i8042_mm_init() to i8042_mmio_realize(), Mark Cave-Ayland, 2022/06/26
- [PULL 28/55] pckbd: move mapping of I8042_MMIO registers to MIPS magnum machine, Mark Cave-Ayland, 2022/06/26
- [PULL 26/55] pckbd: implement i8042_mmio_init() function, Mark Cave-Ayland, 2022/06/26
- [PULL 30/55] pckbd: move ps2_kbd_init() and ps2_mouse_init() to i8042_mmio_realize(), Mark Cave-Ayland, 2022/06/26
- [PULL 32/55] ps2: use ps2_raise_irq() instead of calling update_irq() directly, Mark Cave-Ayland, 2022/06/26
- [PULL 31/55] ps2: make ps2_raise_irq() function static, Mark Cave-Ayland, 2022/06/26
- [PULL 33/55] ps2: introduce ps2_lower_irq() instead of calling update_irq() directly, Mark Cave-Ayland, 2022/06/26
- [PULL 34/55] ps2: add gpio for output IRQ and optionally use it in ps2_raise_irq() and ps2_lower_irq(), Mark Cave-Ayland, 2022/06/26