[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/15] piix4: add a i8042 keyboard/mouse controller
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH 10/15] piix4: add a i8042 keyboard/mouse controller as specified in datasheet |
Date: |
Sat, 16 Dec 2017 10:02:23 +0100 |
Remove i8042 instanciated in malta board, to not have it twice.
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/isa/piix4.c | 3 +++
hw/mips/mips_malta.c | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index c215bee1ff..cf134b01ee 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -165,6 +165,9 @@ static void piix4_realize(PCIDevice *pci, Error **errp)
/* DMA */
DMA_init(isa_bus, 0);
+ /* Super I/O */
+ isa_create_simple(isa_bus, "i8042");
+
piix4_dev = pci;
qemu_register_reset(piix4_reset, s);
}
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 5a087fa75d..78049ccf86 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1203,9 +1203,6 @@ void mips_malta_init(MachineState *machine)
smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size);
g_free(smbus_eeprom_buf);
- /* Super I/O */
- isa_create_simple(isa_bus, "i8042");
-
rtc_init(isa_bus, 2000, NULL);
serial_hds_isa_init(isa_bus, 0, 2);
parallel_hds_isa_init(isa_bus, 1);
--
2.11.0
- [Qemu-devel] [PATCH 00/15] piix4: cleanup and improvements, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 10/15] piix4: add a i8042 keyboard/mouse controller as specified in datasheet,
Hervé Poussineau <=
- [Qemu-devel] [PATCH 02/15] serial/parallel: move object structures to header file, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 08/15] piix4: add a i8257 dma controller as specified in datasheet, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 03/15] mc146818rtc: move structure to header file, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 01/15] fdc: move object structures to header file, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 13/15] piix4: add a speaker as specified in datasheet, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 11/15] piix4: add a floppy controller, 1 parallel port and 2 serial ports, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 07/15] piix4: add a i8259 interrupt controller as specified in datasheet, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 06/15] piix4: add Reset Control Register, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 15/15] piix4: we can now instanciate a PIIX4 with -device, Hervé Poussineau, 2017/12/16
- [Qemu-devel] [PATCH 12/15] piix4: add a mc146818rtc controller as specified in datasheet, Hervé Poussineau, 2017/12/16