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:
Warner Losh 2003-08-22 07:08:17 +00:00
parent 38d8c9940b
commit 90cf0136c4
39 changed files with 77 additions and 77 deletions

View File

@ -60,8 +60,8 @@ __FBSDID("$FreeBSD$");
#include <sys/md5.h>
#include <sys/random.h>
#include <pci/pcivar.h>
#include <pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
#ifdef SAFE_RNDTEST
#include <dev/rndtest/rndtest.h>

View File

@ -43,8 +43,8 @@
#include <net/ethernet.h>
#include <net/if_arp.h>
#include <pci/pcivar.h>
#include <pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/sbni/if_sbnireg.h>
#include <dev/sbni/if_sbnivar.h>

View File

@ -52,8 +52,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/sbsh/if_sbshreg.h>

View File

@ -31,7 +31,7 @@
#include <dev/si/sireg.h>
#include <dev/si/sivar.h>
#include <pci/pcivar.h>
#include <dev/pci/pcivar.h>
static int
si_pci_probe(device_t dev)

View File

@ -37,8 +37,8 @@
#include <dev/sound/isa/sb.h>
#include <dev/sound/pci/als4000.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include "mixer_if.h"

View File

@ -34,8 +34,8 @@
#include <machine/bus.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
/***************************************************************************\

View File

@ -28,8 +28,8 @@
#include <dev/sound/pcm/ac97.h>
#include <dev/sound/pci/aureal.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
SND_DECLARE_FILE("$FreeBSD$");

View File

@ -44,8 +44,8 @@
#include <dev/sound/pci/cmireg.h>
#include <dev/sound/isa/sb.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <sys/sysctl.h>

View File

@ -32,8 +32,8 @@
#include <dev/sound/pcm/sound.h>
#include <dev/sound/pcm/ac97.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/sound/pci/cs4281.h>

View File

@ -43,8 +43,8 @@
#include <dev/sound/pci/csareg.h>
#include <dev/sound/pci/csavar.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <gnu/dev/sound/pci/csaimg.h>

View File

@ -31,8 +31,8 @@
#include <dev/sound/pci/csareg.h>
#include <machine/cpufunc.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
static devclass_t midi_devclass;

View File

@ -35,8 +35,8 @@
#include <dev/sound/pci/csareg.h>
#include <dev/sound/pci/csavar.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
SND_DECLARE_FILE("$FreeBSD$");

View File

@ -27,8 +27,8 @@
#include <dev/sound/pcm/sound.h>
#include <dev/sound/pcm/ac97.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/sound/pci/ds1.h>
#include <dev/sound/pci/ds1-fw.h>

View File

@ -28,8 +28,8 @@
#include <dev/sound/pcm/ac97.h>
#include <gnu/dev/sound/pci/emu10k1.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <sys/queue.h>
SND_DECLARE_FILE("$FreeBSD$");

View File

@ -52,8 +52,8 @@
#include <dev/sound/pcm/ac97.h>
#include <dev/sound/pci/es137x.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <sys/sysctl.h>

View File

@ -26,8 +26,8 @@
#include <dev/sound/pcm/sound.h>
#include <dev/sound/pcm/ac97.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
SND_DECLARE_FILE("$FreeBSD$");

View File

@ -29,8 +29,8 @@
#include <dev/sound/pcm/ac97.h>
#include <dev/sound/pci/ich.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
SND_DECLARE_FILE("$FreeBSD$");

View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: maestro.c,v 1.12 2000/09/06 03:32:34 taku Exp $
* $Id: maestro.c,v 1.18 2003/07/01 15:52:01 scottl Exp $
*/
/*
@ -46,8 +46,8 @@
#include <dev/sound/pcm/sound.h>
#include <dev/sound/pcm/ac97.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/sound/pci/maestro_reg.h>

View File

@ -55,8 +55,8 @@
#include <dev/sound/pcm/sound.h>
#include <dev/sound/pcm/ac97.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <gnu/dev/sound/pci/maestro3_reg.h>
#include <gnu/dev/sound/pci/maestro3_dsp.h>

View File

@ -31,8 +31,8 @@
#include <dev/sound/pci/neomagic.h>
#include <dev/sound/pci/neomagic-coeff.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
SND_DECLARE_FILE("$FreeBSD$");

View File

@ -25,8 +25,8 @@
#include <dev/sound/pcm/sound.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/sound/isa/sb.h>
#include <dev/sound/chip.h>

View File

@ -28,8 +28,8 @@
#include <dev/sound/pcm/ac97.h>
#include <dev/sound/pci/t4dwave.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
SND_DECLARE_FILE("$FreeBSD$");

View File

@ -38,8 +38,8 @@
#include <dev/sound/pcm/sound.h>
#include <dev/sound/pcm/ac97.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <sys/sysctl.h>
#include <dev/sound/pci/via8233.h>

View File

@ -27,8 +27,8 @@
#include <dev/sound/pcm/sound.h>
#include <dev/sound/pcm/ac97.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <sys/sysctl.h>
#include <dev/sound/pci/via82c686.h>

View File

@ -31,8 +31,8 @@
#include <dev/sound/pcm/sound.h>
#include <dev/sound/pci/vibes.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include "mixer_if.h"

View File

@ -42,7 +42,7 @@
#include <machine/bus_memio.h>
#include <sys/rman.h>
#include <pci/pcivar.h>
#include <dev/pci/pcivar.h>
#include <machine/md_var.h>
#include <dev/ic/hd64570.h>

View File

@ -52,8 +52,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_low.h>
#include <cam/scsi/scsi_low_pisa.h>

View File

@ -98,8 +98,8 @@
#include <sys/proc.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#ifdef FreeBSD_Bus_Space_Abstraction
#include <machine/bus_memio.h>

View File

@ -55,8 +55,8 @@
#include <sys/systm.h>
#include <sys/uio.h>
#include <pci/pcivar.h>
#include <pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <vm/vm.h>
#include <vm/vm_kern.h>

View File

@ -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/tga.h>

View File

@ -79,8 +79,8 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/pmap.h>
#include <pci/pcivar.h>
#include <pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <machine/resource.h>
#include <machine/bus_pio.h>
#include <machine/bus.h>

View File

@ -53,8 +53,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>
/*
* These macros allows us to build a version of the driver which can

View File

@ -66,8 +66,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/mii/mii.h>
#include <dev/mii/miivar.h>

View File

@ -73,8 +73,8 @@
#include <sys/md5.h>
#include <sys/random.h>
#include <pci/pcivar.h>
#include <pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
/* grr, #defines for gratuitous incompatibility in queue.h */
#define SIMPLEQ_HEAD STAILQ_HEAD

View File

@ -66,8 +66,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/usb/usb.h>
#include <dev/usb/usbdi.h>

View File

@ -61,8 +61,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/usb/usb.h>
#include <dev/usb/usbdi.h>

View File

@ -63,8 +63,8 @@
#include <sys/rman.h>
#endif
#include <pci/pcivar.h>
#include <pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>

View File

@ -43,8 +43,8 @@
#include <sys/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/vx/if_vxreg.h>

View File

@ -52,8 +52,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 <net/if.h>
#include <net/if_arp.h>