d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ahhrggg. Put the test for the compat shims AFTER the file that includes

Browse Source 
them.

Pointed out by: bde
This commit is contained in:
Warner Losh 2000-03-27 20:24:02 +00:00
parent b9d308bed2
commit d0d3b8345b
17 changed files with 67 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/amd/amd.c
View File

@ -50,10 +50,6 @@
/* #define AMD_DEBUG0 */
/* #define AMD_DEBUG_SCSI_PHASE */
#ifndef COMPAT_OLDPCI
#error "The amd device requires the old pci compatibility shims"
#endif
#include <sys/param.h>
#include <sys/systm.h>
@ -83,6 +79,10 @@
#include <pci/amd.h>
#ifndef COMPAT_OLDPCI
#error "The amd device requires the old pci compatibility shims"
#endif
#define PCI_DEVICE_ID_AMD53C974 0x20201022ul
#define PCI_BASE_ADDR0 0x10

8
sys/dev/ar/if_ar_pci.c
View File

@ -29,10 +29,6 @@
* $FreeBSD$
*/
#ifndef COMPAT_OLDPCI
#error "The ar device requires the old pci compatibility shims"
#endif
#include "ar.h"
#include <sys/param.h>
@ -42,6 +38,10 @@
#include <pci/pcivar.h>
#ifndef COMPAT_OLDPCI
#error "The ar device requires the old pci compatibility shims"
#endif
/*
* The must match with the real functions in if_ar.c
*/

8
sys/dev/cy/cy_pci.c
View File

@ -33,10 +33,6 @@
#include "opt_cy_pci_fastintr.h"
#ifndef COMPAT_OLDPCI
#error "The cy device requires the old pci compatibility shims"
#endif
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@ -51,6 +47,10 @@
#include <i386/isa/intr_machdep.h>
#endif
#ifndef COMPAT_OLDPCI
#error "The cy device requires the old pci compatibility shims"
#endif
static const char *cy_probe __P((pcici_t, pcidi_t));
static void cy_attach __P((pcici_t, int));

8
sys/dev/en/if_en_pci.c
View File

@ -45,10 +45,6 @@
* thanks to Matt Thomas for figuring out FreeBSD vs NetBSD vs etc.. diffs.
*/
#ifndef COMPAT_OLDPCI
#error "The en device requires the old pci compatibility shims"
#endif
#include "en.h"
#include <sys/param.h>
@ -70,6 +66,10 @@
#include <dev/en/midwayreg.h>
#include <dev/en/midwayvar.h>
#ifndef COMPAT_OLDPCI
#error "The en device requires the old pci compatibility shims"
#endif
/*
* prototypes

8
sys/dev/lnc/if_lnc_pci.c
View File

@ -20,10 +20,6 @@
* $FreeBSD$
*/
#ifndef COMPAT_OLDPCI
#error "The lnc device requires the old pci compatibility shims"
#endif
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
@ -33,6 +29,10 @@
#include "lnc.h"
#ifndef COMPAT_OLDPCI
#error "The lnc device requires the old pci compatibility shims"
#endif
#define PCI_DEVICE_ID_PCNet_PCI 0x20001022
#define PCI_DEVICE_ID_PCHome_PCI 0x20011022

8
sys/dev/sr/if_sr_pci.c
View File

@ -30,10 +30,6 @@
* $FreeBSD$
*/
#ifndef COMPAT_OLDPCI
#error "The sr device requires the old pci compatibility shims"
#endif
#include "sr.h"
#include <sys/param.h>
@ -43,6 +39,10 @@
#include <pci/pcivar.h>
#ifndef COMPAT_OLDPCI
#error "The sr device requires the old pci compatibility shims"
#endif
#ifndef BUGGY
#define BUGGY 0
#endif

8
sys/pci/alpm.c
View File

@ -27,10 +27,6 @@
*
*/
#ifndef COMPAT_OLDPCI
#error "The alpm device requires the old pci compatibility shims"
#endif
/*
* Power Management support for the Acer M15x3 chipsets
*/
@ -59,6 +55,10 @@
#include "alpm.h"
#ifndef COMPAT_OLDPCI
#error "The alpm device requires the old pci compatibility shims"
#endif
#define ALPM_DEBUG(x) if (alpm_debug) (x)
#ifdef DEBUG

8
sys/pci/amd.c
View File

@ -50,10 +50,6 @@
/* #define AMD_DEBUG0 */
/* #define AMD_DEBUG_SCSI_PHASE */
#ifndef COMPAT_OLDPCI
#error "The amd device requires the old pci compatibility shims"
#endif
#include <sys/param.h>
#include <sys/systm.h>
@ -83,6 +79,10 @@
#include <pci/amd.h>
#ifndef COMPAT_OLDPCI
#error "The amd device requires the old pci compatibility shims"
#endif
#define PCI_DEVICE_ID_AMD53C974 0x20201022ul
#define PCI_BASE_ADDR0 0x10

8
sys/pci/cy_pci.c
View File

@ -33,10 +33,6 @@
#include "opt_cy_pci_fastintr.h"
#ifndef COMPAT_OLDPCI
#error "The cy device requires the old pci compatibility shims"
#endif
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@ -51,6 +47,10 @@
#include <i386/isa/intr_machdep.h>
#endif
#ifndef COMPAT_OLDPCI
#error "The cy device requires the old pci compatibility shims"
#endif
static const char *cy_probe __P((pcici_t, pcidi_t));
static void cy_attach __P((pcici_t, int));

8
sys/pci/if_ar_p.c
View File

@ -29,10 +29,6 @@
* $FreeBSD$
*/
#ifndef COMPAT_OLDPCI
#error "The ar device requires the old pci compatibility shims"
#endif
#include "ar.h"
#include <sys/param.h>
@ -42,6 +38,10 @@
#include <pci/pcivar.h>
#ifndef COMPAT_OLDPCI
#error "The ar device requires the old pci compatibility shims"
#endif
/*
* The must match with the real functions in if_ar.c
*/

8
sys/pci/if_en_pci.c
View File

@ -45,10 +45,6 @@
* thanks to Matt Thomas for figuring out FreeBSD vs NetBSD vs etc.. diffs.
*/
#ifndef COMPAT_OLDPCI
#error "The en device requires the old pci compatibility shims"
#endif
#include "en.h"
#include <sys/param.h>
@ -70,6 +66,10 @@
#include <dev/en/midwayreg.h>
#include <dev/en/midwayvar.h>
#ifndef COMPAT_OLDPCI
#error "The en device requires the old pci compatibility shims"
#endif
/*
* prototypes

8
sys/pci/if_lnc_p.c
View File

@ -20,10 +20,6 @@
* $FreeBSD$
*/
#ifndef COMPAT_OLDPCI
#error "The lnc device requires the old pci compatibility shims"
#endif
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
@ -33,6 +29,10 @@
#include "lnc.h"
#ifndef COMPAT_OLDPCI
#error "The lnc device requires the old pci compatibility shims"
#endif
#define PCI_DEVICE_ID_PCNet_PCI 0x20001022
#define PCI_DEVICE_ID_PCHome_PCI 0x20011022

8
sys/pci/if_mn.c
View File

@ -24,10 +24,6 @@
* $FreeBSD$
*/
#ifndef COMPAT_OLDPCI
#error "The mn device requires the old pci compatibility shims"
#endif
/*
* Stuff to describe the MUNIC32X and FALC54 chips.
*/
@ -59,6 +55,10 @@
#include <netgraph/ng_sample.h>
#include <netgraph/netgraph.h>
#ifndef COMPAT_OLDPCI
#error "The mn device requires the old pci compatibility shims"
#endif
static int mn_maxlatency = 1000;
SYSCTL_INT(_debug, OID_AUTO, mn_maxlatency, CTLFLAG_RW,
&mn_maxlatency, 0,

8
sys/pci/if_sr_p.c
View File

@ -30,10 +30,6 @@
* $FreeBSD$
*/
#ifndef COMPAT_OLDPCI
#error "The sr device requires the old pci compatibility shims"
#endif
#include "sr.h"
#include <sys/param.h>
@ -43,6 +39,10 @@
#include <pci/pcivar.h>
#ifndef COMPAT_OLDPCI
#error "The sr device requires the old pci compatibility shims"
#endif
#ifndef BUGGY
#define BUGGY 0
#endif

7
sys/pci/meteor.c
View File

@ -145,10 +145,6 @@
future version of this driver.
*/
#ifndef COMPAT_OLDPCI
#error "The meteor device requires the old pci compatibility shims"
#endif
#include "meteor.h"
#include "opt_meteor.h"
@ -175,6 +171,9 @@
#include <machine/ioctl_meteor.h>
#include <pci/meteor_reg.h>
#ifndef COMPAT_OLDPCI
#error "The meteor device requires the old pci compatibility shims"
#endif
static void meteor_intr __P((void *arg));

8
sys/pci/ncr.c
View File

@ -39,10 +39,6 @@
***************************************************************************
*/
#ifndef COMPAT_OLDPCI
#error "The ncr device requires the old pci compatibility shims"
#endif
#define NCR_DATE "pl30 98/1/1"
#define NCR_VERSION (2)
@ -205,6 +201,10 @@
#include <cam/scsi/scsi_all.h>
#include <cam/scsi/scsi_message.h>
#ifndef COMPAT_OLDPCI
#error "The ncr device requires the old pci compatibility shims"
#endif
/*==========================================================
**
** Debugging tags

8
sys/pci/simos.c
View File

@ -26,10 +26,6 @@
* $FreeBSD$
*/
#ifndef COMPAT_OLDPCI
#error "The simos device requires the old pci compatibility shims"
#endif
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
@ -56,6 +52,10 @@
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#ifndef COMPAT_OLDPCI
#error "The simos device requires the old pci compatibility shims"
#endif
#include <machine/alpha_cpu.h>
struct simos_softc {