@@ -762,22 +762,6 @@ static void i8042_mmio_class_init(ObjectClass *klass, void *data)
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
}
-MMIOKBDState *i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
- ram_addr_t size, hwaddr mask)
-{
- DeviceState *dev;
-
- dev = qdev_new(TYPE_I8042_MMIO);
- qdev_prop_set_uint64(dev, "mask", mask);
- qdev_prop_set_uint32(dev, "size", size);
- sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
-
- qdev_connect_gpio_out(dev, I8042_KBD_IRQ, kbd_irq);
- qdev_connect_gpio_out(dev, I8042_MOUSE_IRQ, mouse_irq);
-
- return I8042_MMIO(dev);
-}
-
static const TypeInfo i8042_mmio_info = {
.name = TYPE_I8042_MMIO,
.parent = TYPE_SYS_BUS_DEVICE,
@@ -361,9 +361,16 @@ static void mips_jazz_init(MachineState *machine,
memory_region_add_subregion(address_space, 0x80004000, rtc);
/* Keyboard (i8042) */
- i8042 = i8042_mm_init(qdev_get_gpio_in(rc4030, 6),
- qdev_get_gpio_in(rc4030, 7),
- 0x1000, 0x1);
+ i8042 = I8042_MMIO(qdev_new(TYPE_I8042_MMIO));
+ qdev_prop_set_uint64(DEVICE(i8042), "mask", 1);
+ qdev_prop_set_uint32(DEVICE(i8042), "size", 0x1000);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(i8042), &error_fatal);
+
+ qdev_connect_gpio_out(DEVICE(i8042), I8042_KBD_IRQ,
+ qdev_get_gpio_in(rc4030, 6));
+ qdev_connect_gpio_out(DEVICE(i8042), I8042_MOUSE_IRQ,
+ qdev_get_gpio_in(rc4030, 7));
+
memory_region_add_subregion(address_space, 0x80005000,
sysbus_mmio_get_region(SYS_BUS_DEVICE(i8042),
0));
@@ -88,8 +88,6 @@ struct MMIOKBDState {
#define I8042_A20_LINE "a20"
-MMIOKBDState *i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
- 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);
This legacy function is only used during the initialisation of the MIPS magnum machine, so inline its functionality directly into mips_jazz_init() and then remove it. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/input/pckbd.c | 16 ---------------- hw/mips/jazz.c | 13 ++++++++++--- include/hw/input/i8042.h | 2 -- 3 files changed, 10 insertions(+), 21 deletions(-)