Header rearrangement.

I want to get to the point where any header in include/ reflects a
standard user-level header (e.g. a POSIX header), while everything that's
specific to gPXE lives in include/gpxe/.  Headers that reflect a Linux
header (e.g. if_ether.h) should also be in include/gpxe/, with the same
name as the Linux header and, preferably, the same names used for the
definitions.

34 files changed, 34 insertions, 34 deletions

diff --git a/src/drivers/bus/pci.c b/src/drivers/bus/pci.c
index 02286b7cf..6352e56b5 100644
--- a/src/drivers/bus/pci.c
+++ b/src/drivers/bus/pci.c
@@ -2,7 +2,7 @@
 #include "string.h"
 #include "console.h"
 #include "nic.h"
-#include "pci.h"
+#include <gpxe/pci.h>
 
 /*
  * pci_io.c may know how many buses we have, in which case it can
diff --git a/src/drivers/net/3c595.c b/src/drivers/net/3c595.c
index ab10bc9d6..b6f531d15 100644
--- a/src/drivers/net/3c595.c
+++ b/src/drivers/net/3c595.c
@@ -27,7 +27,7 @@
 
 #include "etherboot.h"
 #include "nic.h"
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "3c595.h"
 #include "timer.h"
 
diff --git a/src/drivers/net/3c90x.c b/src/drivers/net/3c90x.c
index c544381c7..54dcc40d9 100644
--- a/src/drivers/net/3c90x.c
+++ b/src/drivers/net/3c90x.c
@@ -39,7 +39,7 @@
 
 #include "etherboot.h"
 #include "nic.h"
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "timer.h"
 
 static struct nic_operations a3c90x_operations;
diff --git a/src/drivers/net/amd8111e.c b/src/drivers/net/amd8111e.c
index 611cbc854..e3b93dc5b 100644
--- a/src/drivers/net/amd8111e.c
+++ b/src/drivers/net/amd8111e.c
@@ -31,7 +31,7 @@
 #include "etherboot.h"
 #include "nic.h"
 #include "mii.h"
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "timer.h"
 #include "string.h"
 #include "stdint.h"
diff --git a/src/drivers/net/davicom.c b/src/drivers/net/davicom.c
index d087e29e7..0f1a78cc0 100644
--- a/src/drivers/net/davicom.c
+++ b/src/drivers/net/davicom.c
@@ -43,7 +43,7 @@
 
 #include "etherboot.h"
 #include "nic.h"
-#include "pci.h"
+#include <gpxe/pci.h>
 
 #undef DAVICOM_DEBUG
 #undef DAVICOM_DEBUG_WHERE
diff --git a/src/drivers/net/dmfe.c b/src/drivers/net/dmfe.c
index e1ff44ec5..4cfb69bd6 100644
--- a/src/drivers/net/dmfe.c
+++ b/src/drivers/net/dmfe.c
@@ -41,7 +41,7 @@
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "timer.h"
 
 /* #define EDEBUG 1 */
diff --git a/src/drivers/net/e1000.c b/src/drivers/net/e1000.c
index 2eb6b333a..a13a7271d 100644
--- a/src/drivers/net/e1000.c
+++ b/src/drivers/net/e1000.c
@@ -52,7 +52,7 @@ Drivers are port from Intel's Linux driver e1000-4.3.15
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "timer.h"
 
 typedef unsigned char *dma_addr_t;
diff --git a/src/drivers/net/eepro100.c b/src/drivers/net/eepro100.c
index d97b1b187..27576a615 100644
--- a/src/drivers/net/eepro100.c
+++ b/src/drivers/net/eepro100.c
@@ -105,7 +105,7 @@
 
 #include "etherboot.h"
 #include "nic.h"
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "timer.h"
 
 static int ioaddr;
diff --git a/src/drivers/net/epic100.c b/src/drivers/net/epic100.c
index 574f094be..babcf6b32 100644
--- a/src/drivers/net/epic100.c
+++ b/src/drivers/net/epic100.c
@@ -5,7 +5,7 @@
 #define LINUX_OUT_MACROS
 
 #include "etherboot.h"
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "nic.h"
 #include "timer.h"
 #include "console.h"
diff --git a/src/drivers/net/etherfabric.c b/src/drivers/net/etherfabric.c
index bd64cf5e2..05239d688 100644
--- a/src/drivers/net/etherfabric.c
+++ b/src/drivers/net/etherfabric.c
@@ -18,7 +18,7 @@
 
 #include "etherboot.h"
 #include "nic.h"
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "timer.h"
 #define dma_addr_t unsigned long
 #include "etherfabric.h"
diff --git a/src/drivers/net/forcedeth.c b/src/drivers/net/forcedeth.c
index 637738362..08ddbcd9b 100644
--- a/src/drivers/net/forcedeth.c
+++ b/src/drivers/net/forcedeth.c
@@ -48,7 +48,7 @@
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include "pci.h"
+#include <gpxe/pci.h>
 /* Include timer support functions */
 #include "timer.h"
 #include "mii.h"
diff --git a/src/drivers/net/mlx_ipoib/ib_mt23108.c b/src/drivers/net/mlx_ipoib/ib_mt23108.c
index 0291f46c0..ca3abb10d 100644
--- a/src/drivers/net/mlx_ipoib/ib_mt23108.c
+++ b/src/drivers/net/mlx_ipoib/ib_mt23108.c
@@ -21,7 +21,7 @@
 
 #include "mt23108.h"
 #include "ib_driver.h"
-#include "pci.h"
+#include <gpxe/pci.h>
 
 struct device_buffers_st {
 	union recv_wqe_u mads_qp_rcv_queue[NUM_MADS_RCV_WQES]
diff --git a/src/drivers/net/mlx_ipoib/ib_mt25218.c b/src/drivers/net/mlx_ipoib/ib_mt25218.c
index 11b25d491..f16577f1e 100644
--- a/src/drivers/net/mlx_ipoib/ib_mt25218.c
+++ b/src/drivers/net/mlx_ipoib/ib_mt25218.c
@@ -21,7 +21,7 @@
 
 #include "mt25218.h"
 #include "ib_driver.h"
-#include "pci.h"
+#include <gpxe/pci.h>
 
 #define MOD_INC(counter, max_count) (counter) = ((counter)+1) & ((max_count) - 1)
 
diff --git a/src/drivers/net/mlx_ipoib/mt23108.c b/src/drivers/net/mlx_ipoib/mt23108.c
index 157995d75..06d63f39c 100644
--- a/src/drivers/net/mlx_ipoib/mt23108.c
+++ b/src/drivers/net/mlx_ipoib/mt23108.c
@@ -15,7 +15,7 @@ Skeleton NIC driver for Etherboot
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include "pci.h"
+#include <gpxe/pci.h>
 /* to get the ISA support functions, if this is an ISA NIC */
 #include "isa.h"
 
diff --git a/src/drivers/net/mlx_ipoib/mt25218.c b/src/drivers/net/mlx_ipoib/mt25218.c
index 7866bf607..38b32dc5b 100644
--- a/src/drivers/net/mlx_ipoib/mt25218.c
+++ b/src/drivers/net/mlx_ipoib/mt25218.c
@@ -15,7 +15,7 @@ Skeleton NIC driver for Etherboot
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include "pci.h"
+#include <gpxe/pci.h>
 /* to get the ISA support functions, if this is an ISA NIC */
 #include "isa.h"
 
diff --git a/src/drivers/net/mtd80x.c b/src/drivers/net/mtd80x.c
index c7754a94f..21db5640e 100644
--- a/src/drivers/net/mtd80x.c
+++ b/src/drivers/net/mtd80x.c
@@ -28,7 +28,7 @@
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include "pci.h"
+#include <gpxe/pci.h>
 
 /* Condensed operations for readability. */
 #define virt_to_le32desc(addr)  cpu_to_le32(virt_to_bus(addr))
diff --git a/src/drivers/net/natsemi.c b/src/drivers/net/natsemi.c
index e8f6d81c1..951195f1b 100644
--- a/src/drivers/net/natsemi.c
+++ b/src/drivers/net/natsemi.c
@@ -55,7 +55,7 @@
 
 #include "etherboot.h"
 #include "nic.h"
-#include "pci.h"
+#include <gpxe/pci.h>
 
 /* defines */
 
diff --git a/src/drivers/net/ns83820.c b/src/drivers/net/ns83820.c
index df9eec5a2..30bf0c1c6 100755
--- a/src/drivers/net/ns83820.c
+++ b/src/drivers/net/ns83820.c
@@ -40,7 +40,7 @@
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include "pci.h"
+#include <gpxe/pci.h>
 
 #if ARCH == ia64		/* Support 64-bit addressing */
 #define USE_64BIT_ADDR
diff --git a/src/drivers/net/ns8390.c b/src/drivers/net/ns8390.c
index 6a9501142..134e52ab6 100644
--- a/src/drivers/net/ns8390.c
+++ b/src/drivers/net/ns8390.c
@@ -33,7 +33,7 @@ SMC8416 PIO support added by Andrew Bettison (andrewb@zip.com.au) on 4/3/02
 #include "nic.h"
 #include "ns8390.h"
 #ifdef	INCLUDE_NS8390
-#include "pci.h"
+#include <gpxe/pci.h>
 #else
 #include "isa.h"
 #endif
diff --git a/src/drivers/net/pcnet32.c b/src/drivers/net/pcnet32.c
index 569912eed..74fea5a98 100644
--- a/src/drivers/net/pcnet32.c
+++ b/src/drivers/net/pcnet32.c
@@ -44,7 +44,7 @@
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include "pci.h"
+#include <gpxe/pci.h>
 /* Include the time functions */
 #include "timer.h"
 #include "mii.h"
diff --git a/src/drivers/net/prism2.c b/src/drivers/net/prism2.c
index 64cce88e1..7ad390fff 100644
--- a/src/drivers/net/prism2.c
+++ b/src/drivers/net/prism2.c
@@ -18,7 +18,7 @@ $Id$
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include "pci.h"
+#include <gpxe/pci.h>
 
 /*
  * Hard-coded SSID
diff --git a/src/drivers/net/prism2_pci.c b/src/drivers/net/prism2_pci.c
index 19ab74a06..f0dd9f124 100644
--- a/src/drivers/net/prism2_pci.c
+++ b/src/drivers/net/prism2_pci.c
@@ -14,7 +14,7 @@ $Id$
  * your option) any later version.
  */
 
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "nic.h"
 
 #define WLAN_HOSTIF WLAN_PCI
diff --git a/src/drivers/net/prism2_plx.c b/src/drivers/net/prism2_plx.c
index bf6fb6266..64432c876 100644
--- a/src/drivers/net/prism2_plx.c
+++ b/src/drivers/net/prism2_plx.c
@@ -14,7 +14,7 @@ $Id$
  * your option) any later version.
  */
 
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "nic.h"
 
 #define WLAN_HOSTIF WLAN_PLX
diff --git a/src/drivers/net/r8169.c b/src/drivers/net/r8169.c
index af2ea06b6..c11b8271c 100644
--- a/src/drivers/net/r8169.c
+++ b/src/drivers/net/r8169.c
@@ -49,7 +49,7 @@
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "timer.h"
 
 #define drv_version "v1.6"
diff --git a/src/drivers/net/rtl8139.c b/src/drivers/net/rtl8139.c
index 10ca13654..9a155048c 100644
--- a/src/drivers/net/rtl8139.c
+++ b/src/drivers/net/rtl8139.c
@@ -64,7 +64,7 @@
 
 #include "etherboot.h"
 #include "nic.h"
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "timer.h"
 
 #define RTL_TIMEOUT (1*TICKS_PER_SEC)
diff --git a/src/drivers/net/sis900.c b/src/drivers/net/sis900.c
index c2cb94e87..1a79b1d4f 100644
--- a/src/drivers/net/sis900.c
+++ b/src/drivers/net/sis900.c
@@ -45,7 +45,7 @@
 
 #include "etherboot.h"
 #include "nic.h"
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "timer.h"
 
 #include "sis900.h"
diff --git a/src/drivers/net/skel.c b/src/drivers/net/skel.c
index 5f5fd0ba8..e05239b63 100644
--- a/src/drivers/net/skel.c
+++ b/src/drivers/net/skel.c
@@ -15,7 +15,7 @@ Skeleton NIC driver for Etherboot
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* Drag in support for whichever bus(es) we want for this NIC */
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "isa.h"
 #include "eisa.h"
 #include "isapnp.h"
diff --git a/src/drivers/net/sundance.c b/src/drivers/net/sundance.c
index 701f922a4..9c660b9bf 100644
--- a/src/drivers/net/sundance.c
+++ b/src/drivers/net/sundance.c
@@ -45,7 +45,7 @@
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "timer.h"
 #include "mii.h"
 
diff --git a/src/drivers/net/tg3.c b/src/drivers/net/tg3.c
index ace2dfec6..cad3bdffc 100644
--- a/src/drivers/net/tg3.c
+++ b/src/drivers/net/tg3.c
@@ -14,7 +14,7 @@
 
 #include "etherboot.h"
 #include "nic.h"
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "timer.h"
 #include "string.h"
 #include "tg3.h"
diff --git a/src/drivers/net/tlan.c b/src/drivers/net/tlan.c
index 3c773b6a8..25d66d826 100644
--- a/src/drivers/net/tlan.c
+++ b/src/drivers/net/tlan.c
@@ -43,7 +43,7 @@
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "timer.h"
 #include "tlan.h"
 
diff --git a/src/drivers/net/tulip.c b/src/drivers/net/tulip.c
index 864e32af6..7ac02d7b2 100644
--- a/src/drivers/net/tulip.c
+++ b/src/drivers/net/tulip.c
@@ -108,7 +108,7 @@
 
 #include "etherboot.h"
 #include "nic.h"
-#include "pci.h"
+#include <gpxe/pci.h>
 
 /* User settable parameters */
 
diff --git a/src/drivers/net/via-rhine.c b/src/drivers/net/via-rhine.c
index 15e5ca9bc..e95d9323e 100644
--- a/src/drivers/net/via-rhine.c
+++ b/src/drivers/net/via-rhine.c
@@ -48,7 +48,7 @@ static const char *version = "rhine.c v1.0.2 2004-10-29\n";
 
 #include "etherboot.h"
 #include "nic.h"
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "timer.h"
 
 /* define all ioaddr */
diff --git a/src/drivers/net/via-velocity.c b/src/drivers/net/via-velocity.c
index 82751905c..c6a15e264 100644
--- a/src/drivers/net/via-velocity.c
+++ b/src/drivers/net/via-velocity.c
@@ -43,7 +43,7 @@
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include "pci.h"
+#include <gpxe/pci.h>
 
 
 #include "via-velocity.h"
diff --git a/src/drivers/net/w89c840.c b/src/drivers/net/w89c840.c
index c3f03f9f6..8d8a6ded7 100644
--- a/src/drivers/net/w89c840.c
+++ b/src/drivers/net/w89c840.c
@@ -79,7 +79,7 @@
 
 #include "etherboot.h"
 #include "nic.h"
-#include "pci.h"
+#include <gpxe/pci.h>
 #include "timer.h"
 
 static const char *w89c840_version = "driver Version 0.94 - December 12, 2003";