From 7e820aaa1e36baef633f6d156d6a026a76fa4c48 Mon Sep 17 00:00:00 2001
From: Mike Smith <msmith@FreeBSD.org>
Date: Fri, 8 Dec 2000 22:26:48 +0000
Subject: [PATCH] Next-phase PCI system update; move PCI core code to sys/dev
 and update header include path to include sys/dev to avoid massive #include
 updates.

---
 sys/conf/Makefile.alpha   |  2 +-
 sys/conf/Makefile.i386    |  2 +-
 sys/conf/Makefile.powerpc |  2 +-
 sys/conf/files            | 13 +++++++++----
 sys/conf/kmod.mk          |  7 ++++---
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index 5115e0b6012d..af83dca9ae41 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -38,7 +38,7 @@ SIZE?=		size
 OBJCOPY?=	objcopy
 
 COPTFLAGS?=-O
-INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S
+INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S -I$S/dev
 # This hack is to allow kernel compiles to succeed on machines w/out srcdist
 .if exists($S/../include)
 INCLUDES+= -I$S/../include
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index cb0809c2824d..47764bd315ce 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -38,7 +38,7 @@ SIZE?=		size
 OBJCOPY?=	objcopy
 
 COPTFLAGS?=-O
-INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S
+INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S -I$S/dev
 # This hack is to allow kernel compiles to succeed on machines w/out srcdist
 .if exists($S/../include)
 INCLUDES+= -I$S/../include
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index cb0809c2824d..47764bd315ce 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -38,7 +38,7 @@ SIZE?=		size
 OBJCOPY?=	objcopy
 
 COPTFLAGS?=-O
-INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S
+INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S -I$S/dev
 # This hack is to allow kernel compiles to succeed on machines w/out srcdist
 .if exists($S/../include)
 INCLUDES+= -I$S/../include
diff --git a/sys/conf/files b/sys/conf/files
index b025e87047fa..0e59e3e5cc8c 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -368,6 +368,15 @@ dev/pccard/pccard_cis.c	optional pccard
 dev/pccard/pccard_cis_quirks.c optional pccard
 dev/pccard/power_if.m	optional pccbb
 dev/pccard/power_if.m	optional pccard
+dev/pci/eisa_pci.c	optional pci eisa
+dev/pci/fixup_pci.c	optional pci
+dev/pci/ignore_pci.c	optional pci
+dev/pci/isa_pci.c	optional pci isa
+dev/pci/pci.c		count pci
+dev/pci/pci_if.m	optional pci
+dev/pci/pci_pci.c	optional pci
+dev/pci/pcib_if.m	optional pci
+dev/pci/vga_pci.c	optional pci
 dev/pcic/i82365.c	optional pcic pccard
 dev/pcic/i82365_isa.c	optional pcic pccard
 dev/pdq/if_fea.c	optional fea eisa
@@ -1088,13 +1097,9 @@ pci/meteor.c		count meteor pci
 pci/ncr.c		optional ncr
 pci/ohci_pci.c		optional ohci
 dev/pccbb/pccbb.c	optional pccbb
-pci/pci.c		count pci
 pci/pci_compat.c	optional pci compat_oldpci \
 	warning "Old PCI driver compatability shims present."
 pci/pcic_p.c		optional pcic pci card
-pci/pcisupport.c	optional pci
-pci/pci_if.m		optional pci
-pci/pcib_if.m		optional pci
 pci/simos.c		optional simos
 pci/uhci_pci.c		optional uhci
 pci/xrpu.c		optional xrpu
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index e0cd6f234236..23ddd50bfe8f 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -100,7 +100,7 @@ CFLAGS+=	-nostdinc -I- ${INCLMAGIC} ${_ICFLAGS}
 # Add -I paths for system headers.  Individual KLD makefiles don't
 # need any -I paths for this.  Similar defaults for .PATH can't be
 # set because there are no standard paths for non-headers.
-CFLAGS+=	-I. -I@
+CFLAGS+=	-I. -I@ -I@/dev
 
 # Add a -I path to standard headers like <stddef.h>.  Use a relative
 # path to src/include if possible.  If the @ symlink hasn't been built
@@ -259,8 +259,9 @@ ${_src}:
 
 MFILES?= kern/bus_if.m kern/device_if.m dev/iicbus/iicbb_if.m \
     dev/iicbus/iicbus_if.m isa/isa_if.m dev/mii/miibus_if.m \
-    dev/pccard/card_if.m dev/pccard/power_if.m pci/pci_if.m pci/pcib_if.m \
-    dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m dev/usb/usb_if.m
+    dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \
+    dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \
+    dev/usb/usb_if.m
 
 .for _srcsrc in ${MFILES}
 .for _ext in c h