Per conversations in -current, add #error to these drivers when you don't

have the right compatibility shims enabled.  ISA drivers to follow later.

18 files changed, 72 insertions, 0 deletions

diff --git a/sys/dev/amd/amd.c b/sys/dev/amd/amd.c
index decdfc3..3d172f3 100644
--- a/sys/dev/amd/amd.c
+++ b/sys/dev/amd/amd.c
@@ -50,6 +50,10 @@
 /* #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>
diff --git a/sys/dev/ar/if_ar_pci.c b/sys/dev/ar/if_ar_pci.c
index 800e63d..9643412 100644
--- a/sys/dev/ar/if_ar_pci.c
+++ b/sys/dev/ar/if_ar_pci.c
@@ -29,6 +29,10 @@
  * $FreeBSD$
  */
 
+#ifndef COMPAT_OLDPCI
+#error "The ar device requires the old pci compatibility shims"
+#endif
+
 #include "ar.h"
 
 #include <sys/param.h>
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c
index 71e1695..e52e554 100644
--- a/sys/dev/cy/cy_pci.c
+++ b/sys/dev/cy/cy_pci.c
@@ -33,6 +33,10 @@
 
 #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>
diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c
index a72a292..5212499 100644
--- a/sys/dev/en/if_en_pci.c
+++ b/sys/dev/en/if_en_pci.c
@@ -45,6 +45,10 @@
  * 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>
diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c
index 33c7212..19a2a07 100644
--- a/sys/dev/lnc/if_lnc_pci.c
+++ b/sys/dev/lnc/if_lnc_pci.c
@@ -20,6 +20,10 @@
  * $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>
diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
index 04d0db8..50ddb7f 100644
--- a/sys/dev/sr/if_sr_pci.c
+++ b/sys/dev/sr/if_sr_pci.c
@@ -30,6 +30,10 @@
  * $FreeBSD$
  */
 
+#ifndef COMPAT_OLDPCI
+#error "The sr device requires the old pci compatibility shims"
+#endif
+
 #include "sr.h"
 
 #include <sys/param.h>
diff --git a/sys/pci/adw_pci.c b/sys/pci/adw_pci.c
index 10eda81..97269df 100644
--- a/sys/pci/adw_pci.c
+++ b/sys/pci/adw_pci.c
@@ -31,6 +31,10 @@
  * $FreeBSD$
  */
 
+#ifndef COMPAT_OLDPCI
+#error "The adw device requires the old pci compatibility shims"
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/pci/alpm.c b/sys/pci/alpm.c
index 358a032..7ed28d5 100644
--- a/sys/pci/alpm.c
+++ b/sys/pci/alpm.c
@@ -27,6 +27,10 @@
  *
  */
 
+#ifndef COMPAT_OLDPCI
+#error "The alpm device requires the old pci compatibility shims"
+#endif
+
 /*
  * Power Management support for the Acer M15x3 chipsets
  */
diff --git a/sys/pci/amd.c b/sys/pci/amd.c
index decdfc3..3d172f3 100644
--- a/sys/pci/amd.c
+++ b/sys/pci/amd.c
@@ -50,6 +50,10 @@
 /* #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>
diff --git a/sys/pci/cy_pci.c b/sys/pci/cy_pci.c
index 71e1695..e52e554 100644
--- a/sys/pci/cy_pci.c
+++ b/sys/pci/cy_pci.c
@@ -33,6 +33,10 @@
 
 #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>
diff --git a/sys/pci/if_ar_p.c b/sys/pci/if_ar_p.c
index 800e63d..9643412 100644
--- a/sys/pci/if_ar_p.c
+++ b/sys/pci/if_ar_p.c
@@ -29,6 +29,10 @@
  * $FreeBSD$
  */
 
+#ifndef COMPAT_OLDPCI
+#error "The ar device requires the old pci compatibility shims"
+#endif
+
 #include "ar.h"
 
 #include <sys/param.h>
diff --git a/sys/pci/if_en_pci.c b/sys/pci/if_en_pci.c
index a72a292..5212499 100644
--- a/sys/pci/if_en_pci.c
+++ b/sys/pci/if_en_pci.c
@@ -45,6 +45,10 @@
  * 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>
diff --git a/sys/pci/if_lnc_p.c b/sys/pci/if_lnc_p.c
index 33c7212..19a2a07 100644
--- a/sys/pci/if_lnc_p.c
+++ b/sys/pci/if_lnc_p.c
@@ -20,6 +20,10 @@
  * $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>
diff --git a/sys/pci/if_mn.c b/sys/pci/if_mn.c
index c7af95f..5796eb3 100644
--- a/sys/pci/if_mn.c
+++ b/sys/pci/if_mn.c
@@ -24,6 +24,10 @@
  * $FreeBSD$
  */
 
+#ifndef COMPAT_OLDPCI
+#error "The mn device requires the old pci compatibility shims"
+#endif
+
 /*
  * Stuff to describe the MUNIC32X and FALC54 chips.
  */
diff --git a/sys/pci/if_sr_p.c b/sys/pci/if_sr_p.c
index 04d0db8..50ddb7f 100644
--- a/sys/pci/if_sr_p.c
+++ b/sys/pci/if_sr_p.c
@@ -30,6 +30,10 @@
  * $FreeBSD$
  */
 
+#ifndef COMPAT_OLDPCI
+#error "The sr device requires the old pci compatibility shims"
+#endif
+
 #include "sr.h"
 
 #include <sys/param.h>
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index de0deea..68359ee 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -145,6 +145,10 @@
 			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"
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index ad258f1..a8f5ddb 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -39,6 +39,10 @@
 ***************************************************************************
 */
 
+#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)
diff --git a/sys/pci/simos.c b/sys/pci/simos.c
index 2a9a706..1afb432 100644
--- a/sys/pci/simos.c
+++ b/sys/pci/simos.c
@@ -26,6 +26,10 @@
  * $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>