pci: Move the pci.h header file out of libpayload and into depthcharge.
Change-Id: I1cf5cf589004a680752882e5fb12168f1ca192ad
diff --git a/src/drivers/blockdev/ahci.h b/src/drivers/blockdev/ahci.h
index 0779c7e..8894f23 100644
--- a/src/drivers/blockdev/ahci.h
+++ b/src/drivers/blockdev/ahci.h
@@ -25,10 +25,10 @@
#ifndef __DRIVERS_BLOCKDEV_AHCI_H__
#define __DRIVERS_BLOCKDEV_AHCI_H__
-#include <pci.h>
#include <stdint.h>
#include "drivers/blockdev/blockdev.h"
+#include "drivers/bus/pci/pci.h"
#define AHCI_PCI_BAR 0x24
#define AHCI_MAX_SG 56 /* hardware max is 64K */
diff --git a/src/drivers/blockdev/pci_sdhci.c b/src/drivers/blockdev/pci_sdhci.c
index 36c2e3c..bc94ea1 100644
--- a/src/drivers/blockdev/pci_sdhci.c
+++ b/src/drivers/blockdev/pci_sdhci.c
@@ -20,11 +20,11 @@
* MA 02111-1307 USA
*/
-#include <pci.h>
#include <stdio.h>
#include "base/xalloc.h"
#include "drivers/blockdev/sdhci.h"
+#include "drivers/bus/pci/pci.h"
typedef struct {
SdhciHost sdhci_host;
diff --git a/src/drivers/blockdev/sdhci.c b/src/drivers/blockdev/sdhci.c
index 4033499..6e55399 100644
--- a/src/drivers/blockdev/sdhci.c
+++ b/src/drivers/blockdev/sdhci.c
@@ -24,13 +24,13 @@
* Murray.Jensen@cmst.csiro.au, 27-Jan-01.
*/
-#include <pci.h>
#include <stdio.h>
#include "base/time.h"
#include "base/xalloc.h"
#include "drivers/blockdev/blockdev.h"
#include "drivers/blockdev/sdhci.h"
+#include "drivers/bus/pci/pci.h"
static void sdhci_reset(SdhciHost *host, uint8_t mask)
{
diff --git a/src/drivers/blockdev/sdhci.h b/src/drivers/blockdev/sdhci.h
index 8d07c9f..c4742b1 100644
--- a/src/drivers/blockdev/sdhci.h
+++ b/src/drivers/blockdev/sdhci.h
@@ -26,11 +26,11 @@
#ifndef __DRIVERS_BLOCKDEV_SDHCI_H__
#define __DRIVERS_BLOCKDEV_SDHCI_H__
-#include <pci.h>
#include <stdint.h>
#include "base/io.h"
#include "drivers/blockdev/mmc.h"
+#include "drivers/bus/pci/pci.h"
/*
* Controller registers
diff --git a/src/drivers/board/auron/board.c b/src/drivers/board/auron/board.c
index ae0f4cc..59bbd8d 100644
--- a/src/drivers/board/auron/board.c
+++ b/src/drivers/board/auron/board.c
@@ -20,14 +20,13 @@
* MA 02111-1307 USA
*/
-#include <pci.h>
-
#include "base/init_funcs.h"
#include "base/list.h"
#include "drivers/blockdev/ahci.h"
#include "drivers/blockdev/blockdev.h"
#include "drivers/board/board.h"
#include "drivers/board/board_helpers.h"
+#include "drivers/bus/pci/pci.h"
#include "drivers/display/framebuffer.h"
#include "drivers/ec/cros/lpc.h"
#include "drivers/framebuffer/fwdb.h"
diff --git a/src/drivers/board/bolt/board.c b/src/drivers/board/bolt/board.c
index c59881f..00cc550 100644
--- a/src/drivers/board/bolt/board.c
+++ b/src/drivers/board/bolt/board.c
@@ -20,14 +20,13 @@
* MA 02111-1307 USA
*/
-#include <pci.h>
-
#include "base/init_funcs.h"
#include "base/list.h"
#include "drivers/blockdev/ahci.h"
#include "drivers/blockdev/blockdev.h"
#include "drivers/board/board.h"
#include "drivers/board/board_helpers.h"
+#include "drivers/bus/pci/pci.h"
#include "drivers/display/framebuffer.h"
#include "drivers/ec/cros/lpc.h"
#include "drivers/framebuffer/fwdb.h"
diff --git a/src/drivers/board/falco/board.c b/src/drivers/board/falco/board.c
index 74c38f9..4b9fa00 100644
--- a/src/drivers/board/falco/board.c
+++ b/src/drivers/board/falco/board.c
@@ -20,14 +20,13 @@
* MA 02111-1307 USA
*/
-#include <pci.h>
-
#include "base/init_funcs.h"
#include "base/list.h"
#include "drivers/blockdev/ahci.h"
#include "drivers/blockdev/blockdev.h"
#include "drivers/board/board.h"
#include "drivers/board/board_helpers.h"
+#include "drivers/bus/pci/pci.h"
#include "drivers/display/framebuffer.h"
#include "drivers/ec/cros/lpc.h"
#include "drivers/framebuffer/fwdb.h"
diff --git a/src/drivers/board/glados/board.c b/src/drivers/board/glados/board.c
index b7b1798..3d84e66 100644
--- a/src/drivers/board/glados/board.c
+++ b/src/drivers/board/glados/board.c
@@ -21,7 +21,6 @@
* MA 02111-1307 USA
*/
-#include <pci.h>
#include <stdint.h>
#include "base/init_funcs.h"
@@ -32,6 +31,7 @@
#include "drivers/board/board_helpers.h"
#include "drivers/bus/i2c/designware.h"
#include "drivers/bus/i2c/i2c.h"
+#include "drivers/bus/pci/pci.h"
#include "drivers/display/framebuffer.h"
#include "drivers/ec/cros/lpc.h"
#include "drivers/framebuffer/fwdb.h"
diff --git a/src/drivers/board/jecht/board.c b/src/drivers/board/jecht/board.c
index 108bc33..b6bc372 100644
--- a/src/drivers/board/jecht/board.c
+++ b/src/drivers/board/jecht/board.c
@@ -20,14 +20,13 @@
* MA 02111-1307 USA
*/
-#include <pci.h>
-
#include "base/init_funcs.h"
#include "base/list.h"
#include "drivers/blockdev/ahci.h"
#include "drivers/blockdev/blockdev.h"
#include "drivers/board/board.h"
#include "drivers/board/board_helpers.h"
+#include "drivers/bus/pci/pci.h"
#include "drivers/display/framebuffer.h"
#include "drivers/framebuffer/fwdb.h"
#include "drivers/gpio/fwdb.h"
diff --git a/src/drivers/board/link/board.c b/src/drivers/board/link/board.c
index c59881f..00cc550 100644
--- a/src/drivers/board/link/board.c
+++ b/src/drivers/board/link/board.c
@@ -20,14 +20,13 @@
* MA 02111-1307 USA
*/
-#include <pci.h>
-
#include "base/init_funcs.h"
#include "base/list.h"
#include "drivers/blockdev/ahci.h"
#include "drivers/blockdev/blockdev.h"
#include "drivers/board/board.h"
#include "drivers/board/board_helpers.h"
+#include "drivers/bus/pci/pci.h"
#include "drivers/display/framebuffer.h"
#include "drivers/ec/cros/lpc.h"
#include "drivers/framebuffer/fwdb.h"
diff --git a/src/drivers/board/panther/board.c b/src/drivers/board/panther/board.c
index 076faae..5d1b054 100644
--- a/src/drivers/board/panther/board.c
+++ b/src/drivers/board/panther/board.c
@@ -20,14 +20,13 @@
* MA 02111-1307 USA
*/
-#include <pci.h>
-
#include "base/init_funcs.h"
#include "base/list.h"
#include "drivers/blockdev/ahci.h"
#include "drivers/blockdev/blockdev.h"
#include "drivers/board/board.h"
#include "drivers/board/board_helpers.h"
+#include "drivers/bus/pci/pci.h"
#include "drivers/display/framebuffer.h"
#include "drivers/framebuffer/fwdb.h"
#include "drivers/gpio/fwdb.h"
diff --git a/src/drivers/board/peppy/board.c b/src/drivers/board/peppy/board.c
index a6bda6c..f64a416 100644
--- a/src/drivers/board/peppy/board.c
+++ b/src/drivers/board/peppy/board.c
@@ -20,14 +20,13 @@
* MA 02111-1307 USA
*/
-#include <pci.h>
-
#include "base/init_funcs.h"
#include "base/list.h"
#include "drivers/blockdev/ahci.h"
#include "drivers/blockdev/blockdev.h"
#include "drivers/board/board.h"
#include "drivers/board/board_helpers.h"
+#include "drivers/bus/pci/pci.h"
#include "drivers/display/framebuffer.h"
#include "drivers/ec/cros/lpc.h"
#include "drivers/framebuffer/fwdb.h"
diff --git a/src/drivers/board/rambi/board.c b/src/drivers/board/rambi/board.c
index eee10cb..e47e077 100644
--- a/src/drivers/board/rambi/board.c
+++ b/src/drivers/board/rambi/board.c
@@ -20,8 +20,6 @@
* MA 02111-1307 USA
*/
-#include <pci.h>
-
#include "base/coreboot/sysinfo.h"
#include "base/die.h"
#include "base/init_funcs.h"
@@ -32,6 +30,7 @@
#include "drivers/board/rambi/device_nvs.h"
#include "drivers/bus/i2c/designware.h"
#include "drivers/bus/i2s/baytrail/max98090.h"
+#include "drivers/bus/pci/pci.h"
#include "drivers/display/framebuffer.h"
#include "drivers/ec/cros/lpc.h"
#include "drivers/framebuffer/fwdb.h"
diff --git a/src/drivers/board/samus/board.c b/src/drivers/board/samus/board.c
index 1bf1f66..49a7e6b 100644
--- a/src/drivers/board/samus/board.c
+++ b/src/drivers/board/samus/board.c
@@ -20,7 +20,6 @@
* MA 02111-1307 USA
*/
-#include <pci.h>
#include <stdint.h>
#include "base/coreboot/sysinfo.h"
@@ -38,6 +37,7 @@
#include "drivers/bus/i2s/broadwell/alc5677.h"
#include "drivers/bus/i2s/broadwell/broadwell.h"
#include "drivers/bus/i2s/i2s.h"
+#include "drivers/bus/pci/pci.h"
#include "drivers/display/framebuffer.h"
#include "drivers/framebuffer/intel_i915.h"
#include "drivers/ec/cros/lpc.h"
diff --git a/src/drivers/board/samus/vboot.c b/src/drivers/board/samus/vboot.c
index e26527e..05c01ca 100644
--- a/src/drivers/board/samus/vboot.c
+++ b/src/drivers/board/samus/vboot.c
@@ -20,12 +20,12 @@
* MA 02111-1307 USA
*/
-#include <pci.h>
#include <stdint.h>
#include "base/coreboot/sysinfo.h"
#include "drivers/board/board.h"
#include "drivers/board/board_helpers.h"
+#include "drivers/bus/pci/pci.h"
#include "drivers/gpio/fwdb.h"
#include "drivers/gpio/gpio.h"
#include "drivers/gpio/lynxpoint_lp.h"
diff --git a/src/drivers/board/slippy/board.c b/src/drivers/board/slippy/board.c
index 74c38f9..4b9fa00 100644
--- a/src/drivers/board/slippy/board.c
+++ b/src/drivers/board/slippy/board.c
@@ -20,14 +20,13 @@
* MA 02111-1307 USA
*/
-#include <pci.h>
-
#include "base/init_funcs.h"
#include "base/list.h"
#include "drivers/blockdev/ahci.h"
#include "drivers/blockdev/blockdev.h"
#include "drivers/board/board.h"
#include "drivers/board/board_helpers.h"
+#include "drivers/bus/pci/pci.h"
#include "drivers/display/framebuffer.h"
#include "drivers/ec/cros/lpc.h"
#include "drivers/framebuffer/fwdb.h"
diff --git a/src/drivers/board/strago/board.c b/src/drivers/board/strago/board.c
index 01d1836..a59436c 100755
--- a/src/drivers/board/strago/board.c
+++ b/src/drivers/board/strago/board.c
@@ -20,8 +20,6 @@
* MA 02111-1307 USA
*/
-#include <pci.h>
-
#include "base/coreboot/sysinfo.h"
#include "base/init_funcs.h"
#include "drivers/blockdev/blockdev.h"
@@ -31,6 +29,7 @@
#include "drivers/board/strago/device_nvs.h"
#include "drivers/bus/i2c/designware.h"
#include "drivers/bus/i2s/baytrail/max98090.h"
+#include "drivers/bus/pci/pci.h"
#include "drivers/display/framebuffer.h"
#include "drivers/ec/cros/lpc.h"
#include "drivers/framebuffer/fwdb.h"
diff --git a/src/drivers/bus/i2c/designware.h b/src/drivers/bus/i2c/designware.h
index fc0a738..90cc635 100644
--- a/src/drivers/bus/i2c/designware.h
+++ b/src/drivers/bus/i2c/designware.h
@@ -25,10 +25,10 @@
#ifndef __DRIVERS_BUS_I2C_DESIGNWARE_H__
#define __DRIVERS_BUS_I2C_DESIGNWARE_H__
-#include <pci.h>
#include <stdint.h>
#include "drivers/bus/i2c/i2c.h"
+#include "drivers/bus/pci/pci.h"
typedef struct DesignwareI2c
{
diff --git a/src/drivers/bus/i2c/designware_pci.c b/src/drivers/bus/i2c/designware_pci.c
index fa3b12c..aa29a65 100644
--- a/src/drivers/bus/i2c/designware_pci.c
+++ b/src/drivers/bus/i2c/designware_pci.c
@@ -15,10 +15,10 @@
* Foundation, Inc.
*/
-#include <pci.h>
#include <stdio.h>
#include "drivers/bus/i2c/designware.h"
+#include "drivers/bus/pci/pci.h"
/*
* new_pci_designware_i2c - Allocate new i2c bus on PCI device.
diff --git a/src/drivers/bus/i2s/baytrail/baytrail.h b/src/drivers/bus/i2s/baytrail/baytrail.h
index 40a0c50..e1d2021 100644
--- a/src/drivers/bus/i2s/baytrail/baytrail.h
+++ b/src/drivers/bus/i2s/baytrail/baytrail.h
@@ -19,9 +19,8 @@
#ifndef __DRIVERS_BUS_I2S_BAYTRAIL_BAYTRAIL_H__
#define __DRIVERS_BUS_I2S_BAYTRAIL_BAYTRAIL_H__
-#include <pci.h>
-
#include "drivers/bus/i2s/i2s.h"
+#include "drivers/bus/pci/pci.h"
/* Configuration-dependent setting enums. */
typedef enum {
diff --git a/src/libpayload/include/pci.h b/src/drivers/bus/pci/pci.h
similarity index 97%
rename from src/libpayload/include/pci.h
rename to src/drivers/bus/pci/pci.h
index 527db5f..8b07133 100644
--- a/src/libpayload/include/pci.h
+++ b/src/drivers/bus/pci/pci.h
@@ -27,8 +27,8 @@
* SUCH DAMAGE.
*/
-#ifndef _PCI_H
-#define _PCI_H
+#ifndef __DRIVERS_BUS_PCI_PCI_H__
+#define __DRIVERS_BUS_PCI_PCI_H__
#include <arch/types.h>
typedef uint32_t pcidev_t;
@@ -131,4 +131,4 @@
void pci_set_bus_master(pcidev_t dev);
-#endif
+#endif /* __DRIVERS_BUS_PCI_PCI_H__ */
diff --git a/src/drivers/framebuffer/intel_i915.h b/src/drivers/framebuffer/intel_i915.h
index be8bc34..1497640 100644
--- a/src/drivers/framebuffer/intel_i915.h
+++ b/src/drivers/framebuffer/intel_i915.h
@@ -23,8 +23,7 @@
#ifndef __DRIVERS_FRAMEBUFFER_INTEL_I915_H__
#define __DRIVERS_FRAMEBUFFER_INTEL_I915_H__
-#include <pci.h>
-
+#include "drivers/bus/pci/pci.h"
#include "drivers/framebuffer/framebuffer.h"
#include "drivers/gpio/gpio.h"
diff --git a/src/drivers/gpio/lynxpoint_lp.c b/src/drivers/gpio/lynxpoint_lp.c
index 65246fa..3768e94 100644
--- a/src/drivers/gpio/lynxpoint_lp.c
+++ b/src/drivers/gpio/lynxpoint_lp.c
@@ -21,7 +21,6 @@
*/
#include <assert.h>
-#include <pci.h>
#include <stdint.h>
#include "base/container_of.h"
@@ -29,6 +28,7 @@
#include "base/xalloc.h"
#include "drivers/gpio/gpio.h"
#include "drivers/gpio/lynxpoint_lp.h"
+#include "drivers/bus/pci/pci.h"
static inline uint16_t lp_gpio_conf0(unsigned num)
{
diff --git a/src/drivers/gpio/pch.c b/src/drivers/gpio/pch.c
index c96e23f..7f03fd0 100644
--- a/src/drivers/gpio/pch.c
+++ b/src/drivers/gpio/pch.c
@@ -30,12 +30,12 @@
*/
#include <assert.h>
-#include <pci.h>
#include <stdint.h>
#include "base/container_of.h"
#include "base/io.h"
#include "base/xalloc.h"
+#include "drivers/bus/pci/pci.h"
#include "drivers/gpio/gpio.h"
#include "drivers/gpio/pch.h"
diff --git a/src/drivers/power/pch.c b/src/drivers/power/pch.c
index 8292392..03533a3 100644
--- a/src/drivers/power/pch.c
+++ b/src/drivers/power/pch.c
@@ -20,11 +20,11 @@
* MA 02111-1307 USA
*/
-#include <pci.h>
#include <stdio.h>
#include <stdlib.h>
#include "base/io.h"
+#include "drivers/bus/pci/pci.h"
#include "drivers/power/pch.h"
#include "drivers/power/power.h"
diff --git a/src/drivers/sound/hda_codec.c b/src/drivers/sound/hda_codec.c
index d22ed31..bf68621 100644
--- a/src/drivers/sound/hda_codec.c
+++ b/src/drivers/sound/hda_codec.c
@@ -10,7 +10,6 @@
/* Implementation of per-board codec beeping */
-#include <pci.h>
#include <stdio.h>
#include "base/algorithm.h"
@@ -18,6 +17,7 @@
#include "base/io.h"
#include "base/time.h"
#include "base/xalloc.h"
+#include "drivers/bus/pci/pci.h"
#include "drivers/sound/hda_codec.h"
#define HDA_ICII_COMMAND_REG 0x60
diff --git a/src/libpayload/drivers/pci.c b/src/libpayload/drivers/pci.c
index 62c8446..e07ab71 100644
--- a/src/libpayload/drivers/pci.c
+++ b/src/libpayload/drivers/pci.c
@@ -26,10 +26,10 @@
* SUCH DAMAGE.
*/
-#include <pci.h>
#include <stdint.h>
#include "base/io.h"
+#include "drivers/bus/pci/pci.h"
uint8_t pci_read_config8(pcidev_t device, uint16_t reg)
{
diff --git a/src/libpayload/drivers/usb/ehci.h b/src/libpayload/drivers/usb/ehci.h
index 57d08de..c3e1c95 100644
--- a/src/libpayload/drivers/usb/ehci.h
+++ b/src/libpayload/drivers/usb/ehci.h
@@ -28,9 +28,10 @@
#ifndef __EHCI_H
#define __EHCI_H
-#include <pci.h>
#include <usb/usb.h>
+#include "drivers/bus/pci/pci.h"
+
UsbDevHc *ehci_pci_init (pcidev_t addr);
UsbDevHc *ehci_init (unsigned long physical_bar);
diff --git a/src/libpayload/drivers/usb/ohci.h b/src/libpayload/drivers/usb/ohci.h
index 3fcaee6..93c5cf6 100644
--- a/src/libpayload/drivers/usb/ohci.h
+++ b/src/libpayload/drivers/usb/ohci.h
@@ -28,9 +28,10 @@
#ifndef __OHCI_H
#define __OHCI_H
-#include <pci.h>
#include <usb/usb.h>
+#include "drivers/bus/pci/pci.h"
+
UsbDevHc *ohci_pci_init (pcidev_t addr);
UsbDevHc *ohci_init (unsigned long physical_bar);
diff --git a/src/libpayload/drivers/usb/uhci.h b/src/libpayload/drivers/usb/uhci.h
index 94ce7e9..72ee4d3 100644
--- a/src/libpayload/drivers/usb/uhci.h
+++ b/src/libpayload/drivers/usb/uhci.h
@@ -28,9 +28,10 @@
#ifndef __UHCI_H
#define __UHCI_H
-#include <pci.h>
#include <usb/usb.h>
+#include "drivers/bus/pci/pci.h"
+
UsbDevHc *uhci_pci_init (pcidev_t addr);
void uhci_rh_init (UsbDev *dev);
diff --git a/src/libpayload/drivers/usb/xhci.h b/src/libpayload/drivers/usb/xhci.h
index 53913b3..5a71187 100644
--- a/src/libpayload/drivers/usb/xhci.h
+++ b/src/libpayload/drivers/usb/xhci.h
@@ -28,9 +28,10 @@
#ifndef __XHCI_H
#define __XHCI_H
-#include <pci.h>
#include <usb/usb.h>
+#include "drivers/bus/pci/pci.h"
+
UsbDevHc *xhci_pci_init (pcidev_t addr);
UsbDevHc *xhci_init (unsigned long physical_bar);
diff --git a/src/libpayload/include/usb/usb.h b/src/libpayload/include/usb/usb.h
index 0589bc5..169666d 100644
--- a/src/libpayload/include/usb/usb.h
+++ b/src/libpayload/include/usb/usb.h
@@ -28,10 +28,11 @@
#ifndef __USB_H
#define __USB_H
-#include <pci.h>
#include <stddef.h>
#include <stdint.h>
+#include "drivers/bus/pci/pci.h"
+
typedef enum {
UsbHostToDevice = 0,
UsbDeviceToHost = 1
