[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [COMMIT b399963] qdev/isa: make pc use qdev for i8042 set
From: |
Anthony Liguori |
Subject: |
[Qemu-commits] [COMMIT b399963] qdev/isa: make pc use qdev for i8042 setup. |
Date: |
Mon, 10 Aug 2009 21:48:12 -0000 |
From: Gerd Hoffmann <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Message-Id:
diff --git a/hw/pc.c b/hw/pc.c
index 6e5669c..cc6e7e8 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1116,6 +1116,7 @@ static void pc_init1(ram_addr_t ram_size,
int bios_size, isa_bios_size, oprom_area_size;
PCIBus *pci_bus;
PCIDevice *pci_dev;
+ ISADevice *isa_dev;
int piix3_devfn = -1;
CPUState *env;
qemu_irq *cpu_irq;
@@ -1362,7 +1363,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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [COMMIT b399963] qdev/isa: make pc use qdev for i8042 setup.,
Anthony Liguori <=