Prefer new location of pci include files (which have only been in the

tree for two or more years now), except in a few places where there's code to be compatible with older versions of FreeBSD.
svn path=/head/; revision=119277
2003-08-22 05:54:52 +00:00 · 2003-08-22 05:54:52 +00:00 · 4fbd232c86 · 2020-12-20 02:59:44 +00:00
commit 4fbd232c86
parent 3c5a69f7d0
36 changed files with 87 additions and 67 deletions
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@ -72,8 +72,8 @@
 #include <sys/bus.h>
 #include <sys/rman.h>

-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>

 #include <dev/advansys/advansys.h>

--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@ -49,8 +49,8 @@

 #include <sys/rman.h>

-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>

 #include <cam/cam.h>
 #include <cam/scsi/scsi_all.h>
--- a/sys/dev/aic7xxx/aic79xx_osm.h
+++ b/sys/dev/aic7xxx/aic79xx_osm.h
@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#20 $
+ * $Id: aic79xx_osm.h,v 1.11 2003/07/01 15:51:52 scottl Exp $
 *
 * $FreeBSD$
 */
@ -61,8 +61,13 @@

 #include <sys/rman.h>

+#if __FreeBSD_version >= 500000
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#else
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
+#endif

 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
--- a/sys/dev/aic7xxx/aic7xxx_osm.h
+++ b/sys/dev/aic7xxx/aic7xxx_osm.h
@ -29,7 +29,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- * $Id: aic7xxx_osm.h,v 1.22 2003/06/10 03:25:24 gibbs Exp $
+ * $Id: aic7xxx_osm.h,v 1.23 2003/07/01 15:51:52 scottl Exp $
 *
 * $FreeBSD$
 */
@ -69,8 +69,13 @@
 #include <sys/rman.h>

 #if NPCI > 0
+#if __FreeBSD_version < 500000
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
+#else
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#endif
 #endif

 #include <cam/cam.h>
--- a/sys/dev/amd/amd.c
+++ b/sys/dev/amd/amd.c
@ -76,8 +76,8 @@
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>

-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 #include <dev/amd/amd.h>

 #define PCI_DEVICE_ID_AMD53C974 	0x20201022ul
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@ -76,8 +76,8 @@
 #include <machine/resource.h>
 #include <sys/rman.h>

-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>

 #include <dev/amr/amrio.h>
 #include <dev/amr/amrreg.h>
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.c
@ -70,8 +70,8 @@
 #include <machine/resource.h>
 #include <sys/rman.h>

-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>

 #include <dev/amr/amrio.h>
 #include <dev/amr/amrreg.h>
--- a/sys/dev/an/if_an_pci.c
+++ b/sys/dev/an/if_an_pci.c
@ -80,8 +80,8 @@ __FBSDID("$FreeBSD$");
 #include <net/if_dl.h>
 #include <net/if_media.h>

-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>

 #include <dev/an/if_aironet_ieee.h>
 #include <dev/an/if_anreg.h>
--- a/sys/dev/ar/if_ar_pci.c
+++ b/sys/dev/ar/if_ar_pci.c
@ -40,8 +40,8 @@
 #include <machine/bus_memio.h>
 #include <sys/rman.h>

-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>

 #include <dev/ic/hd64570.h>
 #include <dev/ar/if_arregs.h>
--- a/sys/dev/asr/asr.c
+++ b/sys/dev/asr/asr.c
@ -243,8 +243,8 @@ static dpt_sig_S ASR_sig = {
 #endif
 #include <machine/vmparam.h>

-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>

 #define	STATIC static
 #define	INLINE
--- a/sys/dev/ata/ata-chipset.c
+++ b/sys/dev/ata/ata-chipset.c
@ -39,8 +39,8 @@
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 #include <dev/ata/ata-all.h>
 #include <dev/ata/ata-pci.h>

--- a/sys/dev/ata/ata-dma.c
+++ b/sys/dev/ata/ata-dma.c
@ -37,7 +37,7 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/bus.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcivar.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <dev/ata/ata-all.h>
--- a/sys/dev/ata/ata-pci.c
+++ b/sys/dev/ata/ata-pci.c
@ -42,8 +42,8 @@
 #include <machine/md_var.h>
 #endif
 #include <sys/rman.h>
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 #include <dev/ata/ata-all.h>
 #include <dev/ata/ata-pci.h>

--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@ -103,8 +103,8 @@ __FBSDID("$FreeBSD$");
 #include "miidevs.h"
 #include <dev/mii/brgphyreg.h>

-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>

 #include <dev/bge/if_bgereg.h>

--- a/sys/dev/bktr/bktr_audio.c
+++ b/sys/dev/bktr/bktr_audio.c
@ -57,9 +57,10 @@

 #if (__FreeBSD_version < 500000)
 #include <machine/clock.h>              /* for DELAY */
-#endif
-
 #include <pci/pcivar.h>
+#else
+#include <dev/pci/pcivar.h>
+#endif

 #if (__FreeBSD_version >=300000)
 #include <machine/bus_memio.h>		/* for bus space */
--- a/sys/dev/bktr/bktr_card.c
+++ b/sys/dev/bktr/bktr_card.c
@ -57,9 +57,10 @@

 #if (__FreeBSD_version < 500000)
 #include <machine/clock.h>              /* for DELAY */
-#endif
-
 #include <pci/pcivar.h>
+#else
+#include <dev/pci/pcivar.h>
+#endif

 #if (__FreeBSD_version >=300000)
 #include <machine/bus_memio.h>	/* for bus space */
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@ -131,9 +131,11 @@
 #include <machine/clock.h>              /* for DELAY */
 #define	PROC_LOCK(p)
 #define	PROC_UNLOCK(p)
+#include <pci/pcivar.h>
+#else
+#include <dev/pci/pcivar.h>
 #endif

-#include <pci/pcivar.h>

 #if (__FreeBSD_version >=300000)
 #include <machine/bus_memio.h>	/* for bus space */
@ -223,7 +225,6 @@ bktr_name(bktr_ptr_t bktr)
 #endif /* __NetBSD__ || __OpenBSD__ */


-
 typedef u_char bool_t;

 #define BKTRPRI (PZERO+8)|PCATCH
--- a/sys/dev/bktr/bktr_i2c.c
+++ b/sys/dev/bktr/bktr_i2c.c
@ -51,6 +51,11 @@

 #if (__FreeBSD_version < 500000)
 #include <machine/clock.h>              /* for DELAY */
+#include <pci/pcivar.h>
+#include <pci/pcireg.h>
+#else
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 #endif

 #if (__FreeBSD_version >=300000)
@ -59,8 +64,6 @@
 #include <sys/bus.h>
 #endif

-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
 #include <machine/ioctl_meteor.h>
 #include <machine/ioctl_bt848.h>	/* extensions to ioctl_meteor.h */

--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@ -96,10 +96,12 @@

 #if (__FreeBSD_version < 500000)
 #include <machine/clock.h>              /* for DELAY */
-#endif
-
 #include <pci/pcivar.h>
 #include <pci/pcireg.h>
+#else
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#endif

 #include <sys/sysctl.h>
 int bt848_card = -1; 
--- a/sys/dev/bktr/bktr_tuner.c
+++ b/sys/dev/bktr/bktr_tuner.c
@ -54,10 +54,11 @@
 #endif

 #ifdef __FreeBSD__
-#include <pci/pcivar.h>
-
 #if (__FreeBSD_version < 500000)
 #include <machine/clock.h>              /* for DELAY */
+#include <pci/pcivar.h>
+#else
+#include <dev/pci/pcivar.h>
 #endif

 #if (__FreeBSD_version >=300000)
--- a/sys/dev/buslogic/bt_pci.c
+++ b/sys/dev/buslogic/bt_pci.c
@ -36,8 +36,8 @@
 #include <sys/mutex.h>
 #include <sys/bus.h>

-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>

 #include <machine/bus_memio.h>
 #include <machine/bus_pio.h>
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.c
@ -91,8 +91,8 @@
 #include <machine/resource.h>
 #include <sys/rman.h>

-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>

 #include <dev/ciss/cissreg.h>
 #include <dev/ciss/cissvar.h>
--- a/sys/dev/digi/digi_pci.c
+++ b/sys/dev/digi/digi_pci.c
@ -40,7 +40,7 @@
 #include <machine/resource.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcivar.h>

 #include <sys/digiio.h>
 #include <dev/digi/digireg.h>
--- a/sys/dev/dpt/dpt_pci.c
+++ b/sys/dev/dpt/dpt_pci.c
@ -43,8 +43,8 @@
 #include <machine/resource.h>
 #include <sys/rman.h>

-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>

 #include <cam/scsi/scsi_all.h>

--- a/sys/dev/drm/drm_os_freebsd.h
+++ b/sys/dev/drm/drm_os_freebsd.h
@ -61,10 +61,11 @@
 #include <sys/mman.h>
 #include <sys/rman.h>
 #include <sys/memrange.h>
-#include <pci/pcivar.h>
 #if __FreeBSD_version >= 500000
+#include <dev/pci/pcivar.h>
 #include <sys/selinfo.h>
 #else
+#include <pci/pcivar.h>
 #include <sys/select.h>
 #endif
 #include <sys/bus.h>
--- a/sys/dev/ed/if_ed_pci.c
+++ b/sys/dev/ed/if_ed_pci.c
@ -36,8 +36,8 @@
 #include <net/if_arp.h>
 #include <net/if_mib.h>

-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>

 #include <dev/ed/if_edvar.h>

--- a/sys/dev/em/if_em.h
+++ b/sys/dev/em/if_em.h
@ -69,8 +69,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <machine/clock.h>
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
 #include <sys/endian.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
--- a/sys/dev/em/if_em_osdep.h
+++ b/sys/dev/em/if_em_osdep.h
@ -51,8 +51,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <machine/clock.h>
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>


 #define ASSERT(x) if(!(x)) panic("EM: x")
--- a/sys/dev/en/if_en_pci.c
+++ b/sys/dev/en/if_en_pci.c
@ -63,8 +63,8 @@ __FBSDID("$FreeBSD$");
 #include <net/if_atm.h>
 #include <net/if_media.h>

-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>

 #include <dev/utopia/utopia.h>
 #include <dev/en/midwayreg.h>
--- a/sys/dev/fatm/if_fatm.c
+++ b/sys/dev/fatm/if_fatm.c
@ -67,8 +67,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>

 #include <dev/utopia/utopia.h>

--- a/sys/dev/fb/boot_font.c
+++ b/sys/dev/fb/boot_font.c
@ -72,8 +72,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/rman.h>

-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>

 #include <dev/fb/fbreg.h>
 #include <dev/fb/gfb.h>
--- a/sys/dev/fb/gfb.c
+++ b/sys/dev/fb/gfb.c
@ -80,8 +80,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/rman.h>

-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>

 #include <dev/fb/fbreg.h>
 #include <dev/fb/gfb.h>
--- a/sys/dev/fb/s3_pci.c
+++ b/sys/dev/fb/s3_pci.c
@ -52,8 +52,8 @@
 #include <sys/malloc.h>
 #include <sys/fbio.h>

-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>

 #include <machine/md_var.h>
 #include <machine/vm86.h>
--- a/sys/dev/fb/tga.c
+++ b/sys/dev/fb/tga.c
@ -85,8 +85,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/rman.h>

-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>

 #include <dev/fb/fbreg.h>
 #include <dev/syscons/syscons.h>
--- a/sys/dev/firewire/fwohci_pci.c
+++ b/sys/dev/firewire/fwohci_pci.c
@ -55,8 +55,8 @@
 #include <machine/clock.h>		/* for DELAY() */
 #endif

-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>

 #include <dev/firewire/firewire.h>
 #include <dev/firewire/firewirereg.h>
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@ -69,8 +69,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/in_cksum.h>
 #endif

-#include <pci/pcivar.h>
-#include <pci/pcireg.h>		/* for PCIM_CMD_xxx */
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>		/* for PCIM_CMD_xxx */

 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>