[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 09/16] piix4: add a i8254 pit controller as speci
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v4 09/16] piix4: add a i8254 pit controller as specified in datasheet |
Date: |
Sat, 6 Jan 2018 16:37:23 +0100 |
Remove i8254 instanciated in malta board, to not have it twice.
Acked-by: Michael S. Tsirkin <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/isa/piix4.c | 4 ++++
hw/mips/mips_malta.c | 3 ---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 38757d3ea2..3f59750e5a 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -29,6 +29,7 @@
#include "hw/pci/pci.h"
#include "hw/isa/isa.h"
#include "hw/sysbus.h"
+#include "hw/timer/i8254.h"
PCIDevice *piix4_dev;
@@ -162,6 +163,9 @@ static void piix4_realize(PCIDevice *pci_dev, Error **errp)
/* initialize ISA irqs */
isa_bus_irqs(isa_bus, s->isa);
+ /* initialize pit */
+ i8254_pit_init(isa_bus, 0x40, 0, NULL);
+
/* DMA */
DMA_init(isa_bus, 0);
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 647688c58a..afe13c684f 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -99,8 +99,6 @@ typedef struct {
qemu_irq i8259[16];
} MaltaState;
-static ISADevice *pit;
-
static struct _loaderparams {
int ram_size, ram_low_size;
const char *kernel_filename;
@@ -1204,7 +1202,6 @@ void mips_malta_init(MachineState *machine)
isa_get_irq(NULL, 9), NULL, 0, NULL);
smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size);
g_free(smbus_eeprom_buf);
- pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
/* Super I/O */
isa_create_simple(isa_bus, "i8042");
--
2.11.0
- [Qemu-devel] [PATCH v4 03/16] mc146818rtc: move structure to header file, (continued)
- [Qemu-devel] [PATCH v4 03/16] mc146818rtc: move structure to header file, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 02/16] serial/parallel: move object structures to header file, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 07/16] piix4: add a i8259 interrupt controller as specified in datasheet, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 10/16] piix4: add a i8042 keyboard/mouse controller as specified in datasheet, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 08/16] piix4: add a i8257 dma controller as specified in datasheet, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 01/16] fdc: move object structures to header file, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 05/16] piix4: rename some variables in realize function, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 09/16] piix4: add a i8254 pit controller as specified in datasheet,
Hervé Poussineau <=
- [Qemu-devel] [PATCH v4 04/16] mc146818rtc: always register rtc to rtc list, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 11/16] piix4: add a floppy controller, 1 parallel port and 2 serial ports, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 13/16] piix4: add a speaker as specified in datasheet, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 12/16] piix4: add a mc146818rtc controller as specified in datasheet, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 15/16] piix4: rename PIIX4 object to piix4-isa, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 14/16] piix4: convert reset function to QOM, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 16/16] piix4: we can now instanciate a PIIX4 with -device, Hervé Poussineau, 2018/01/06
- Re: [Qemu-devel] [PATCH v4 00/16] piix4: cleanup and improvements, Philippe Mathieu-Daudé, 2018/01/07