[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/12] qdev/isa: finish pckbd conversion
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 11/12] qdev/isa: finish pckbd conversion |
Date: |
Wed, 9 Sep 2009 16:45:46 +0200 |
drop old init path and switch remaining users to
isa_create_simple().
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/mips_r4k.c | 4 +++-
hw/pckbd.c | 22 ----------------------
hw/ppc_prep.c | 2 +-
3 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index aacb256..ae265a0 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 = {
diff --git a/hw/pckbd.c b/hw/pckbd.c
index 5acf4a6..3d573c2 100644
--- a/hw/pckbd.c
+++ b/hw/pckbd.c
@@ -362,28 +362,6 @@ static int kbd_load(QEMUFile* f, void* opaque, int
version_id)
return 0;
}
-void i8042_init(qemu_irq kbd_irq, qemu_irq mouse_irq, uint32_t io_base)
-{
- KBDState *s = &kbd_state;
-
- s->irq_kbd = kbd_irq;
- s->irq_mouse = mouse_irq;
-
- kbd_reset(s);
- register_savevm("pckbd", 0, 3, kbd_save, kbd_load, s);
- register_ioport_read(io_base, 1, 1, kbd_read_data, s);
- register_ioport_write(io_base, 1, 1, kbd_write_data, s);
- register_ioport_read(io_base + 4, 1, 1, kbd_read_status, s);
- register_ioport_write(io_base + 4, 1, 1, kbd_write_command, s);
-
- s->kbd = ps2_kbd_init(kbd_update_kbd_irq, s);
- s->mouse = ps2_mouse_init(kbd_update_aux_irq, s);
-#ifdef TARGET_I386
- vmmouse_init(s->mouse);
-#endif
- qemu_register_reset(kbd_reset, s);
-}
-
/* Memory mapped interface */
static uint32_t kbd_mm_readb (void *opaque, target_phys_addr_t addr)
{
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 994c965..0bab6d7 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -711,7 +711,7 @@ static void ppc_prep_init (ram_addr_t ram_size,
hd[2 * i],
hd[2 * i + 1]);
}
- i8042_init(i8259[1], i8259[12], 0x60);
+ isa_create_simple("i8042");
DMA_init(1);
// SB16_init();
--
1.6.2.5
- [Qemu-devel] [PATCH 00/12] qdev isa patches., Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 05/12] qdev: tag isabus-bridge as no-user, Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 02/12] isapc: pick a more sane default cpu for such old hardware., Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 01/12] isapc: Fix irq routing, Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 03/12] qdev: drop iobase properties from isa bus, Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 08/12] qdev/isa: convert cs4231a sound card, Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 06/12] qdev: add isa_create() function, Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 04/12] qdev: simplify isa irq assignments, Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 07/12] qdev/isa: convert soundblaster, Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 09/12] qdev/isa: convert gravis ultrasound, Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 11/12] qdev/isa: finish pckbd conversion,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 10/12] qdev/isa: convert ne2000, Gerd Hoffmann, 2009/09/09
- [Qemu-devel] [PATCH 12/12] qdev/isa: convert real time clock, Gerd Hoffmann, 2009/09/09
- Re: [Qemu-devel] [PATCH 00/12] qdev isa patches., Markus Armbruster, 2009/09/09