mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2025-01-11 17:04:19 +01:00
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.
This commit is contained in:
parent
6c3bdd6dee
commit
77e6a3b2dd
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=119280
@ -56,8 +56,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>
|
||||
|
@ -63,8 +63,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/mii/mii.h>
|
||||
#include <dev/mii/miivar.h>
|
||||
|
@ -73,8 +73,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>
|
||||
#include <dev/hatm/if_hatmconf.h>
|
||||
|
@ -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>
|
||||
#include <dev/hatm/if_hatmconf.h>
|
||||
|
@ -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>
|
||||
#include <dev/hatm/if_hatmconf.h>
|
||||
|
@ -69,8 +69,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>
|
||||
#include <dev/hatm/if_hatmconf.h>
|
||||
|
@ -70,8 +70,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>
|
||||
#include <dev/hatm/if_hatmconf.h>
|
||||
|
@ -37,8 +37,8 @@
|
||||
#ifndef _ENI_ENI_H
|
||||
#define _ENI_ENI_H
|
||||
|
||||
#include <pci/pcireg.h>
|
||||
#include <pci/pcivar.h>
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
|
||||
/*
|
||||
* Physical device name - used to configure HARP devices
|
||||
|
@ -55,7 +55,7 @@
|
||||
#include <netatm/atm_stack.h>
|
||||
#include <netatm/atm_pcb.h>
|
||||
#include <netatm/atm_var.h>
|
||||
#include <pci/pcivar.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/hfa/fore.h>
|
||||
#include <dev/hfa/fore_aali.h>
|
||||
#include <dev/hfa/fore_slave.h>
|
||||
|
@ -54,7 +54,7 @@
|
||||
#include <netatm/atm_stack.h>
|
||||
#include <netatm/atm_pcb.h>
|
||||
#include <netatm/atm_var.h>
|
||||
#include <pci/pcivar.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/hfa/fore.h>
|
||||
#include <dev/hfa/fore_aali.h>
|
||||
#include <dev/hfa/fore_slave.h>
|
||||
|
@ -50,7 +50,7 @@
|
||||
#include <netatm/atm_stack.h>
|
||||
#include <netatm/atm_pcb.h>
|
||||
#include <netatm/atm_var.h>
|
||||
#include <pci/pcivar.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/hfa/fore.h>
|
||||
#include <dev/hfa/fore_aali.h>
|
||||
#include <dev/hfa/fore_slave.h>
|
||||
|
@ -51,7 +51,7 @@
|
||||
#include <netatm/atm_stack.h>
|
||||
#include <netatm/atm_pcb.h>
|
||||
#include <netatm/atm_var.h>
|
||||
#include <pci/pcivar.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/hfa/fore.h>
|
||||
#include <dev/hfa/fore_aali.h>
|
||||
#include <dev/hfa/fore_slave.h>
|
||||
|
@ -54,7 +54,7 @@
|
||||
#include <netatm/atm_stack.h>
|
||||
#include <netatm/atm_pcb.h>
|
||||
#include <netatm/atm_var.h>
|
||||
#include <pci/pcivar.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/hfa/fore.h>
|
||||
#include <dev/hfa/fore_aali.h>
|
||||
#include <dev/hfa/fore_slave.h>
|
||||
|
@ -45,7 +45,7 @@
|
||||
#include <netatm/atm_sys.h>
|
||||
#include <netatm/atm_cm.h>
|
||||
#include <netatm/atm_if.h>
|
||||
#include <pci/pcivar.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/hfa/fore.h>
|
||||
#include <dev/hfa/fore_aali.h>
|
||||
#include <dev/hfa/fore_slave.h>
|
||||
|
@ -57,8 +57,8 @@
|
||||
#include <netatm/atm_stack.h>
|
||||
#include <netatm/atm_pcb.h>
|
||||
#include <netatm/atm_var.h>
|
||||
#include <pci/pcireg.h>
|
||||
#include <pci/pcivar.h>
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/hfa/fore.h>
|
||||
#include <dev/hfa/fore_aali.h>
|
||||
#include <dev/hfa/fore_slave.h>
|
||||
|
@ -55,7 +55,7 @@
|
||||
#include <netatm/atm_stack.h>
|
||||
#include <netatm/atm_pcb.h>
|
||||
#include <netatm/atm_var.h>
|
||||
#include <pci/pcivar.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/hfa/fore.h>
|
||||
#include <dev/hfa/fore_aali.h>
|
||||
#include <dev/hfa/fore_slave.h>
|
||||
|
@ -55,7 +55,7 @@
|
||||
#include <netatm/atm_stack.h>
|
||||
#include <netatm/atm_pcb.h>
|
||||
#include <netatm/atm_var.h>
|
||||
#include <pci/pcivar.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/hfa/fore.h>
|
||||
#include <dev/hfa/fore_aali.h>
|
||||
#include <dev/hfa/fore_slave.h>
|
||||
|
@ -52,7 +52,7 @@
|
||||
#include <netatm/atm_stack.h>
|
||||
#include <netatm/atm_pcb.h>
|
||||
#include <netatm/atm_var.h>
|
||||
#include <pci/pcivar.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/hfa/fore.h>
|
||||
#include <dev/hfa/fore_aali.h>
|
||||
#include <dev/hfa/fore_slave.h>
|
||||
|
@ -50,7 +50,7 @@
|
||||
#include <netatm/atm_stack.h>
|
||||
#include <netatm/atm_pcb.h>
|
||||
#include <netatm/atm_var.h>
|
||||
#include <pci/pcivar.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/hfa/fore.h>
|
||||
#include <dev/hfa/fore_aali.h>
|
||||
#include <dev/hfa/fore_slave.h>
|
||||
|
@ -53,7 +53,7 @@
|
||||
#include <netatm/atm_stack.h>
|
||||
#include <netatm/atm_pcb.h>
|
||||
#include <netatm/atm_var.h>
|
||||
#include <pci/pcivar.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/hfa/fore.h>
|
||||
#include <dev/hfa/fore_aali.h>
|
||||
#include <dev/hfa/fore_slave.h>
|
||||
|
@ -51,7 +51,7 @@
|
||||
#include <netatm/atm_stack.h>
|
||||
#include <netatm/atm_pcb.h>
|
||||
#include <netatm/atm_var.h>
|
||||
#include <pci/pcivar.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/hfa/fore.h>
|
||||
#include <dev/hfa/fore_aali.h>
|
||||
#include <dev/hfa/fore_slave.h>
|
||||
|
@ -69,8 +69,8 @@
|
||||
#include <opencrypto/cryptodev.h>
|
||||
#include <sys/random.h>
|
||||
|
||||
#include <pci/pcivar.h>
|
||||
#include <pci/pcireg.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/pci/pcireg.h>
|
||||
|
||||
#ifdef HIFN_RNDTEST
|
||||
#include <dev/rndtest/rndtest.h>
|
||||
|
@ -56,8 +56,8 @@
|
||||
#include <mii/mii.h>
|
||||
#include <mii/miivar.h>
|
||||
|
||||
#include <pci/pcivar.h>
|
||||
#include <pci/pcireg.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/pci/pcireg.h>
|
||||
|
||||
#include <hme/if_hmereg.h>
|
||||
#include <hme/if_hmevar.h>
|
||||
|
@ -57,8 +57,8 @@
|
||||
#include <sys/rman.h>
|
||||
#include <machine/resource.h>
|
||||
|
||||
#include <pci/pcivar.h>
|
||||
#include <pci/pcireg.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/pci/pcireg.h>
|
||||
|
||||
#include <dev/smbus/smbconf.h>
|
||||
|
||||
|
@ -40,8 +40,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 <geom/geom_disk.h>
|
||||
|
||||
|
@ -38,7 +38,7 @@
|
||||
* TODO:
|
||||
*/
|
||||
|
||||
#ident "$Id: iir_pci.c 1.1 2001/05/22 20:14:12 achim Exp $"
|
||||
#ident "$Id: iir_pci.c,v 1.8 2003/07/01 15:51:58 scottl Exp $"
|
||||
|
||||
/* #include "opt_iir.h" */
|
||||
|
||||
@ -58,8 +58,8 @@
|
||||
#include <machine/clock.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>
|
||||
|
||||
|
@ -45,8 +45,8 @@
|
||||
#include <sys/rman.h>
|
||||
#include <machine/resource.h>
|
||||
|
||||
#include <pci/pcireg.h>
|
||||
#include <pci/pcivar.h>
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
|
||||
/*
|
||||
* IPS CONSTANTS
|
||||
|
@ -46,8 +46,8 @@
|
||||
#include <sys/rman.h>
|
||||
#include <machine/resource.h>
|
||||
|
||||
#include <pci/pcireg.h>
|
||||
#include <pci/pcivar.h>
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
|
||||
#define IPS_MAX_IO_SIZE 0x10000
|
||||
|
||||
|
@ -33,8 +33,8 @@
|
||||
#include <sys/module.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>
|
||||
|
Loading…
Reference in New Issue
Block a user