diff options
| author | Warner Losh <imp@FreeBSD.org> | 2003-08-22 05:54:52 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2003-08-22 05:54:52 +0000 |
| commit | 4fbd232c8640bb1d58dca36e50df7c1c8eb4ca72 (patch) | |
| tree | 633ff3cbdbfdb63210ca731968f72ea813a82ed7 | |
| parent | 3c5a69f7d0cda4d5da3e70514357a4a4989ceb03 (diff) | |
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.
Notes
Notes:
svn path=/head/; revision=119277
36 files changed, 87 insertions, 67 deletions
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c index 1719972b7df0..6b10b85979d9 100644 --- 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> diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c index c0ed43667c02..77bd27bfde6b 100644 --- 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> diff --git a/sys/dev/aic7xxx/aic79xx_osm.h b/sys/dev/aic7xxx/aic79xx_osm.h index 681c10d9ed56..80a0b8c323fd 100644 --- 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> diff --git a/sys/dev/aic7xxx/aic7xxx_osm.h b/sys/dev/aic7xxx/aic7xxx_osm.h index 952a6057cf2c..9fbb905ea1d6 100644 --- 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> diff --git a/sys/dev/amd/amd.c b/sys/dev/amd/amd.c index dd025a1678f9..d601ebc866f8 100644 --- 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 diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c index 29e0a301d8f8..dd24e97243e6 100644 --- 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> diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c index d9dca7612f34..6ff94ae7dcf2 100644 --- 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> diff --git a/sys/dev/an/if_an_pci.c b/sys/dev/an/if_an_pci.c index 2ec7057484ae..5fe7901fc45f 100644 --- 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> diff --git a/sys/dev/ar/if_ar_pci.c b/sys/dev/ar/if_ar_pci.c index 07a9edf55278..1af13cdf3f07 100644 --- 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> diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c index 1a60f5478cec..4ca3a967b9a0 100644 --- 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 diff --git a/sys/dev/ata/ata-chipset.c b/sys/dev/ata/ata-chipset.c index d731265e59c8..add97eacd93a 100644 --- 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> diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c index a2f108eb1759..4dfff5adc695 100644 --- 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> diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c index 7027da7a981c..4a40ae2515a4 100644 --- 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> diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index 838ba2b053c4..8b6d05fc017a 100644 --- 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> diff --git a/sys/dev/bktr/bktr_audio.c b/sys/dev/bktr/bktr_audio.c index b94889161428..3821b8a87936 100644 --- 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 */ diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c index c61e4e26ec0b..fdae22ef8c9b 100644 --- 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 */ diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c index b95c534e1f62..0d0065876295 100644 --- 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 diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c index 7ed0988ec9ab..2075eeabda12 100644 --- 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 */ diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c index 8451ae9f71dc..1a7a80777604 100644 --- 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; diff --git a/sys/dev/bktr/bktr_tuner.c b/sys/dev/bktr/bktr_tuner.c index 999766c0fa68..5f3b15ca7bd0 100644 --- 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) diff --git a/sys/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c index 2e1002035c4b..96692009be97 100644 --- 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> diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c index bdfabfe8901c..fe83f2935fc5 100644 --- 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> diff --git a/sys/dev/digi/digi_pci.c b/sys/dev/digi/digi_pci.c index 14d036072ae2..182835bef635 100644 --- 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> diff --git a/sys/dev/dpt/dpt_pci.c b/sys/dev/dpt/dpt_pci.c index 4da3d805caab..de6f76f2b511 100644 --- 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> diff --git a/sys/dev/drm/drm_os_freebsd.h b/sys/dev/drm/drm_os_freebsd.h index 745b4e71c5e4..bfcdce97b35d 100644 --- 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> diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c index ee8067b654e7..e83b03a230e5 100644 --- 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> diff --git a/sys/dev/em/if_em.h b/sys/dev/em/if_em.h index ca85fbb30777..7ed3ef3fd81b 100644 --- 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> diff --git a/sys/dev/em/if_em_osdep.h b/sys/dev/em/if_em_osdep.h index 0bd806efd507..5c010ec25ec9 100644 --- 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") diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c index 7be080415c58..43b8f068c7bf 100644 --- 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> diff --git a/sys/dev/fatm/if_fatm.c b/sys/dev/fatm/if_fatm.c index f21ee9729584..15ef591b2ff0 100644 --- 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> diff --git a/sys/dev/fb/boot_font.c b/sys/dev/fb/boot_font.c index db82efcc4a06..66167ba199b8 100644 --- 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> diff --git a/sys/dev/fb/gfb.c b/sys/dev/fb/gfb.c index 4e031692ee29..4667dac260ad 100644 --- 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> diff --git a/sys/dev/fb/s3_pci.c b/sys/dev/fb/s3_pci.c index 69549db99adf..7ad2071e8447 100644 --- 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> diff --git a/sys/dev/fb/tga.c b/sys/dev/fb/tga.c index a5a56c029401..8ad6bb5b66bf 100644 --- 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> diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c index 513343ae97ee..0d3630a76e54 100644 --- 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> diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index 2b08b86db4d4..5b846662b2e8 100644 --- 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> |