[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/29] hw/mips/fulong2e: use isa_superio_init()
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH 08/29] hw/mips/fulong2e: use isa_superio_init() |
Date: |
Sun, 7 Jan 2018 23:45:37 -0300 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/mips/mips_fulong2e.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 8660d078c8..2f4cc5d05e 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -23,13 +23,10 @@
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/dma/i8257.h"
-#include "hw/char/serial.h"
-#include "hw/char/parallel.h"
-#include "hw/block/fdc.h"
+#include "hw/isa/superio.h"
#include "net/net.h"
#include "hw/boards.h"
#include "hw/i2c/smbus.h"
-#include "sysemu/block-backend.h"
#include "hw/block/flash.h"
#include "hw/mips/mips.h"
#include "hw/mips/cpudevs.h"
@@ -44,7 +41,6 @@
#include "hw/isa/vt82c686.h"
#include "hw/timer/mc146818rtc.h"
#include "hw/timer/i8254.h"
-#include "hw/input/i8042.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
#include "sysemu/qtest.h"
@@ -366,13 +362,10 @@ static void mips_fulong2e_init(MachineState *machine)
i8257_dma_init(isa_bus, 0);
/* Super I/O */
- isa_create_simple(isa_bus, TYPE_I8042);
+ isa_superio_init(isa_bus, MAX_SERIAL_PORTS, 1, 0);
mc146818_rtc_init(isa_bus, 2000, NULL);
- serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS);
- parallel_hds_isa_init(isa_bus, 1);
-
/* Sound card */
audio_init(pci_bus);
/* Network card */
--
2.15.1
- [Qemu-devel] [RFC PATCH 00/29] remove i386/pc dependency: generic SuperIO, PIIX cleanup, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 01/29] hw/acpi: add mem/nvdimm.h dependency, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 02/29] pci/pci_host: move generic definitions out of i386/pc.h, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 03/29] hw/isa: extract parallel-isa specific code, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 04/29] hw/dma/i8257: rename DMA_init() to i8257_dma_init(), Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 06/29] hw/isa: add a generic isa_superio_init(), Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 05/29] hw/input/i8042: extract declarations from i386/pc.h into input/i8042.h, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 07/29] hw/i386/pc: use isa_superio_init(), Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 08/29] hw/mips/fulong2e: use isa_superio_init(),
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH 09/29] hw/mips/malta: code movement, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 10/29] hw/mips/malta: add fdc37m81x_init() which uses isa_superio_init(), Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 11/29] mc146818rtc: always register rtc to rtc list, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 12/29] piix4: rename some variables in realize function, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 13/29] piix4: convert reset function to QOM, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 14/29] piix4: add Reset Control Register, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 15/29] piix4: add a i8259 interrupt controller as specified in datasheet, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [RFC PATCH 16/29] Revert "irq: introduce qemu_irq_proxy()", Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 17/29] piix: move piix4 declaration into new southbridge/i82371_piix.h, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 18/29] piix4: add a i8257 dma controller as specified in datasheet, Philippe Mathieu-Daudé, 2018/01/07