pci: Split low-level pci code from higher-level 'struct pci_device' code

Split pci.c into pci.c and pcidevice.c.  The low-level code that
interacts directly with the PCI devices remains in pci.c, while
functions dealing with the higher level pci_device cache move to
pcidevice.c.  Only pci.c is needed in 16bit mode.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

7 files changed, 11 insertions, 6 deletions

diff --git a/src/fw/acpi.c b/src/fw/acpi.c
index b805b44f..8bc2ca6b 100644
--- a/src/fw/acpi.c
+++ b/src/fw/acpi.c
@@ -10,7 +10,7 @@
 #include "config.h" // CONFIG_*
 #include "dev-q35.h"
 #include "dev-piix.h"
-#include "hw/pci.h" // pci_find_init_device
+#include "hw/pcidevice.h" // pci_find_init_device
 #include "hw/pci_ids.h" // PCI_VENDOR_ID_INTEL
 #include "hw/pci_regs.h" // PCI_INTERRUPT_LINE
 #include "malloc.h" // free
diff --git a/src/fw/coreboot.c b/src/fw/coreboot.c
index 4fe12928..4957b80d 100644
--- a/src/fw/coreboot.c
+++ b/src/fw/coreboot.c
@@ -8,7 +8,7 @@
 #include "byteorder.h" // be32_to_cpu
 #include "config.h" // CONFIG_*
 #include "e820map.h" // e820_add
-#include "hw/pci.h" // pci_probe_devices
+#include "hw/pcidevice.h" // pci_probe_devices
 #include "lzmadecode.h" // LzmaDecode
 #include "malloc.h" // free
 #include "output.h" // dprintf
diff --git a/src/fw/csm.c b/src/fw/csm.c
index b01f181f..03b4bb81 100644
--- a/src/fw/csm.c
+++ b/src/fw/csm.c
@@ -8,7 +8,8 @@
 #include "config.h" // CONFIG_*
 #include "e820map.h" // e820_add
 #include "farptr.h" // MAKE_FLATPTR
-#include "hw/pci.h" // pci_probe_devices
+#include "hw/pci.h" // pci_to_bdf
+#include "hw/pcidevice.h" // pci_probe_devices
 #include "hw/pic.h" // pic_irqmask_read
 #include "malloc.h" // malloc_csm_preinit
 #include "memmap.h" // SYMBOL
diff --git a/src/fw/mptable.c b/src/fw/mptable.c
index 8e01e004..47385cc5 100644
--- a/src/fw/mptable.c
+++ b/src/fw/mptable.c
@@ -7,8 +7,9 @@
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
 #include "config.h" // CONFIG_*
-#include "hw/pci.h"
-#include "hw/pci_regs.h"
+#include "hw/pci.h" // pci_bdf_to_bus
+#include "hw/pcidevice.h" // foreachpci
+#include "hw/pci_regs.h" // PCI_INTERRUPT_PIN
 #include "malloc.h" // free
 #include "output.h" // dprintf
 #include "romfile.h" // romfile_loadint
diff --git a/src/fw/paravirt.c b/src/fw/paravirt.c
index 3fae13a8..8ed43807 100644
--- a/src/fw/paravirt.c
+++ b/src/fw/paravirt.c
@@ -11,7 +11,8 @@
 #include "byteorder.h" // be32_to_cpu
 #include "config.h" // CONFIG_QEMU
 #include "e820map.h" // e820_add
-#include "hw/pci.h" // create_pirtable
+#include "hw/pci.h" // pci_config_readw
+#include "hw/pcidevice.h" // pci_probe_devices
 #include "hw/pci_regs.h" // PCI_DEVICE_ID
 #include "hw/rtc.h" // CMOS_*
 #include "malloc.h" // malloc_tmp
diff --git a/src/fw/pciinit.c b/src/fw/pciinit.c
index ead2c1a3..0ed5dfbb 100644
--- a/src/fw/pciinit.c
+++ b/src/fw/pciinit.c
@@ -12,6 +12,7 @@
 #include "e820map.h" // e820_add
 #include "hw/ata.h" // PORT_ATA1_CMD_BASE
 #include "hw/pci.h" // pci_config_readl
+#include "hw/pcidevice.h" // pci_probe_devices
 #include "hw/pci_ids.h" // PCI_VENDOR_ID_INTEL
 #include "hw/pci_regs.h" // PCI_COMMAND
 #include "list.h" // struct hlist_node
diff --git a/src/fw/smm.c b/src/fw/smm.c
index 8f042ee4..95f6ba7d 100644
--- a/src/fw/smm.c
+++ b/src/fw/smm.c
@@ -9,6 +9,7 @@
 #include "dev-q35.h"
 #include "dev-piix.h"
 #include "hw/pci.h" // pci_config_writel
+#include "hw/pcidevice.h" // pci_find_device
 #include "hw/pci_ids.h" // PCI_VENDOR_ID_INTEL
 #include "hw/pci_regs.h" // PCI_DEVICE_ID
 #include "output.h" // dprintf