[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 26/32] hw/pci-host/piix: Move RCR_IOPORT register definition
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 26/32] hw/pci-host/piix: Move RCR_IOPORT register definition |
Date: |
Tue, 15 Oct 2019 18:26:59 +0200 |
From: Philippe Mathieu-Daudé <address@hidden>
The RCR_IOPORT register belongs to the PIIX chipset.
Move the definition to "piix.h".
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/pci-host/piix.c | 1 +
include/hw/i386/pc.h | 6 ------
include/hw/southbridge/piix.h | 6 ++++++
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index 3292703de7..3770575c1a 100644
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -27,6 +27,7 @@
#include "hw/irq.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
+#include "hw/southbridge/piix.h"
#include "hw/qdev-properties.h"
#include "hw/isa/isa.h"
#include "hw/sysbus.h"
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 183326d9fe..1c20b96571 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -257,12 +257,6 @@ typedef struct PCII440FXState PCII440FXState;
#define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX"
-/*
- * Reset Control Register: PCI-accessible ISA-Compatible Register at address
- * 0xcf9, provided by the PCI/ISA bridge (PIIX3 PCI function 0, 8086:7000).
- */
-#define RCR_IOPORT 0xcf9
-
PCIBus *i440fx_init(const char *host_type, const char *pci_type,
PCII440FXState **pi440fx_state, int *piix_devfn,
ISABus **isa_bus, qemu_irq *pic,
diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h
index add352456b..79ebe0089b 100644
--- a/include/hw/southbridge/piix.h
+++ b/include/hw/southbridge/piix.h
@@ -18,6 +18,12 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t
smb_io_base,
qemu_irq sci_irq, qemu_irq smi_irq,
int smm_enabled, DeviceState **piix4_pm);
+/*
+ * Reset Control Register: PCI-accessible ISA-Compatible Register at address
+ * 0xcf9, provided by the PCI/ISA bridge (PIIX3 PCI function 0, 8086:7000).
+ */
+#define RCR_IOPORT 0xcf9
+
extern PCIDevice *piix4_dev;
DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus,
--
2.21.0
[PATCH 22/32] hw/i386/pc: Move gsi_state creation code, Philippe Mathieu-Daudé, 2019/10/15
[PATCH 23/32] hw/i386/pc: Extract pc_i8259_create(), Philippe Mathieu-Daudé, 2019/10/15
[PATCH 24/32] hw/i386/pc: Remove kvm_i386.h include, Philippe Mathieu-Daudé, 2019/10/15
[PATCH 25/32] hw/pci-host/piix: Extract piix3_create(), Philippe Mathieu-Daudé, 2019/10/15
[PATCH 26/32] hw/pci-host/piix: Move RCR_IOPORT register definition,
Philippe Mathieu-Daudé <=
[PATCH 27/32] hw/pci-host/piix: Define and use the PIIX IRQ Route Control Registers, Philippe Mathieu-Daudé, 2019/10/15
[PATCH 28/32] hw/pci-host/piix: Move i440FX declarations to hw/pci-host/i440fx.h, Philippe Mathieu-Daudé, 2019/10/15
[PATCH 29/32] hw/pci-host/piix: Fix code style issues, Philippe Mathieu-Daudé, 2019/10/15