aboutsummaryrefslogtreecommitdiff
path: root/hw/mips_r4k.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-09-10 11:43:34 +0200
committermalc <av1474@comtv.ru>2009-09-10 19:48:01 +0400
commit11d23c352d941eb1412d1c78e4735a442fbbb10b (patch)
treed221e1f60a06dbf3f20bc12fcc721075f3a3e4de /hw/mips_r4k.c
parent9453c5bc2634fdbdd05450034c21a58806d366a4 (diff)
qdev/isa: finish pckbd conversion
drop old init path and switch remaining users to isa_create_simple(). Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/mips_r4k.c')
-rw-r--r--hw/mips_r4k.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index aacb256dcc..ae265a0bd7 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -241,6 +241,8 @@ void mips_r4k_init (ram_addr_t ram_size,
/* The PIC is attached to the MIPS CPU INT0 pin */
i8259 = i8259_init(env->irq[2]);
+ isa_bus_new(NULL);
+ isa_bus_irqs(i8259);
rtc_state = rtc_init(0x70, i8259[8], 2000);
@@ -276,7 +278,7 @@ void mips_r4k_init (ram_addr_t ram_size,
hd[MAX_IDE_DEVS * i],
hd[MAX_IDE_DEVS * i + 1]);
- i8042_init(i8259[1], i8259[12], 0x60);
+ isa_create_simple("i8042");
}
static QEMUMachine mips_machine = {