summaryrefslogtreecommitdiffstats
path: root/src/arch
diff options
context:
space:
mode:
authorMichael Brown2006-04-24 17:42:49 +0200
committerMichael Brown2006-04-24 17:42:49 +0200
commit824d6ffa7f3d52ce165419356bfe28eaaf36a81b (patch)
treec00a6a1cf46de5248259afd51fe64147e4b311d0 /src/arch
parentNetwork API now allows for multiple network devices (although the (diff)
downloadipxe-824d6ffa7f3d52ce165419356bfe28eaaf36a81b.tar.gz
ipxe-824d6ffa7f3d52ce165419356bfe28eaaf36a81b.tar.xz
ipxe-824d6ffa7f3d52ce165419356bfe28eaaf36a81b.zip
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.
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/i386/core/pci_io.c2
-rw-r--r--src/arch/i386/drivers/net/undi.c2
-rw-r--r--src/arch/i386/include/relocate.h2
-rw-r--r--src/arch/i386/prefix/select_pci.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/arch/i386/core/pci_io.c b/src/arch/i386/core/pci_io.c
index 28d9cbdd2..cfb31ad90 100644
--- a/src/arch/i386/core/pci_io.c
+++ b/src/arch/i386/core/pci_io.c
@@ -12,7 +12,7 @@
*/
#include "etherboot.h"
#include "init.h"
-#include "pci.h"
+#include <gpxe/pci.h>
#include "pci_io.h"
#ifdef KEEP_IT_REAL
#include "realmode.h"
diff --git a/src/arch/i386/drivers/net/undi.c b/src/arch/i386/drivers/net/undi.c
index 38edf303b..f0956e92d 100644
--- a/src/arch/i386/drivers/net/undi.c
+++ b/src/arch/i386/drivers/net/undi.c
@@ -33,7 +33,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>
/* UNDI and PXE defines. Includes pxe.h. */
#include "undi.h"
/* 8259 PIC defines */
diff --git a/src/arch/i386/include/relocate.h b/src/arch/i386/include/relocate.h
index 5e482bd61..5e87c6932 100644
--- a/src/arch/i386/include/relocate.h
+++ b/src/arch/i386/include/relocate.h
@@ -4,7 +4,7 @@
/* relocate() is conceptually impossible with KEEP_IT_REAL */
#ifndef KEEP_IT_REAL
-#include "tables.h"
+#include <gpxe/tables.h>
/* An entry in the post-relocation function table */
struct post_reloc_fn {
diff --git a/src/arch/i386/prefix/select_pci.c b/src/arch/i386/prefix/select_pci.c
index e143b992a..691b461c3 100644
--- a/src/arch/i386/prefix/select_pci.c
+++ b/src/arch/i386/prefix/select_pci.c
@@ -1,5 +1,5 @@
#include "dev.h"
-#include "pci.h"
+#include <gpxe/pci.h>
#include "registers.h"
/*