[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/4] qdev/isa: make pc use qdev for i8042 setup.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 4/4] qdev/isa: make pc use qdev for i8042 setup. |
Date: |
Thu, 9 Jul 2009 15:02:40 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/pc.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index ecb618d..51e2768 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1095,6 +1095,7 @@ static void pc_init1(ram_addr_t ram_size,
int bios_size, isa_bios_size, oprom_area_size;
PCIBus *pci_bus;
DeviceState *qdev;
+ ISADevice *isa_dev;
int piix3_devfn = -1;
CPUState *env;
qemu_irq *cpu_irq;
@@ -1344,7 +1345,9 @@ static void pc_init1(ram_addr_t ram_size,
}
}
- i8042_init(i8259[1], i8259[12], 0x60);
+ isa_dev = isa_create_simple("i8042", 0x60, 0x64);
+ isa_connect_irq(isa_dev, 0, i8259[1]);
+ isa_connect_irq(isa_dev, 1, i8259[12]);
DMA_init(0);
#ifdef HAS_AUDIO
audio_init(pci_enabled ? pci_bus : NULL, i8259);
--
1.6.2.5