aboutsummaryrefslogtreecommitdiff
path: root/hw/mips/jazz.c
diff options
context:
space:
mode:
Diffstat (limited to 'hw/mips/jazz.c')
-rw-r--r--hw/mips/jazz.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
index 1eb8bd5018..6aefe9a61b 100644
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -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));