aboutsummaryrefslogtreecommitdiff
path: root/sys/i4b
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2002-06-13 06:04:28 +0000
committerBrooks Davis <brooks@FreeBSD.org>2002-06-13 06:04:28 +0000
commit22afbb6bb09671ed76b2a8a7c1e9831f286b3bcb (patch)
treed6f58f94bb7315da3ad95ba7c58090042654a850 /sys/i4b
parent5e55dc17fbb09a213879d7b02924bf44f71e0830 (diff)
downloadsrc-22afbb6bb09671ed76b2a8a7c1e9831f286b3bcb.tar.gz
src-22afbb6bb09671ed76b2a8a7c1e9831f286b3bcb.zip
Remote pci.h/NPCI usage from i4b code.
Approved by: hm
Notes
Notes: svn path=/head/; revision=98155
Diffstat (limited to 'sys/i4b')
-rw-r--r--sys/i4b/capi/iavc/iavc_card.c1
-rw-r--r--sys/i4b/capi/iavc/iavc_lli.c1
-rw-r--r--sys/i4b/capi/iavc/iavc_pci.c3
-rw-r--r--sys/i4b/layer1/ifpi/i4b_ifpi_isac.c3
-rw-r--r--sys/i4b/layer1/ifpi/i4b_ifpi_l1.c3
-rw-r--r--sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c3
-rw-r--r--sys/i4b/layer1/ifpi/i4b_ifpi_pci.c3
-rw-r--r--sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c3
-rw-r--r--sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c3
-rw-r--r--sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c3
-rw-r--r--sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c3
-rw-r--r--sys/i4b/layer1/isic/i4b_elsa_qs1p.c5
-rw-r--r--sys/i4b/layer1/itjc/i4b_itjc_isac.c1
-rw-r--r--sys/i4b/layer1/itjc/i4b_itjc_l1.c3
-rw-r--r--sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c3
-rw-r--r--sys/i4b/layer1/itjc/i4b_itjc_pci.c1
-rw-r--r--sys/i4b/layer1/iwic/i4b_iwic_bchan.c3
-rw-r--r--sys/i4b/layer1/iwic/i4b_iwic_dchan.c5
-rw-r--r--sys/i4b/layer1/iwic/i4b_iwic_fsm.c3
-rw-r--r--sys/i4b/layer1/iwic/i4b_iwic_l1if.c3
-rw-r--r--sys/i4b/layer1/iwic/i4b_iwic_pci.c3
21 files changed, 19 insertions, 40 deletions
diff --git a/sys/i4b/capi/iavc/iavc_card.c b/sys/i4b/capi/iavc/iavc_card.c
index 831dc6870424..70bb66fd03f0 100644
--- a/sys/i4b/capi/iavc/iavc_card.c
+++ b/sys/i4b/capi/iavc/iavc_card.c
@@ -30,7 +30,6 @@
#include "iavc.h"
#include "i4bcapi.h"
-#include "pci.h"
#if (NIAVC > 0) && (NI4BCAPI > 0)
diff --git a/sys/i4b/capi/iavc/iavc_lli.c b/sys/i4b/capi/iavc/iavc_lli.c
index c7455b25171b..26af86a492c7 100644
--- a/sys/i4b/capi/iavc/iavc_lli.c
+++ b/sys/i4b/capi/iavc/iavc_lli.c
@@ -30,7 +30,6 @@
#include "iavc.h"
#include "i4bcapi.h"
-#include "pci.h"
#if (NIAVC > 0) && (NI4BCAPI > 0)
diff --git a/sys/i4b/capi/iavc/iavc_pci.c b/sys/i4b/capi/iavc/iavc_pci.c
index 4f922fe69cdb..8162f98d3a08 100644
--- a/sys/i4b/capi/iavc/iavc_pci.c
+++ b/sys/i4b/capi/iavc/iavc_pci.c
@@ -30,9 +30,8 @@
#include "iavc.h"
#include "i4bcapi.h"
-#include "pci.h"
-#if (NIAVC > 0) && (NI4BCAPI > 0) && (NPCI > 0)
+#if (NIAVC > 0) && (NI4BCAPI > 0)
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
index 168506daba10..a9dd71908c42 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
@@ -36,9 +36,8 @@
*---------------------------------------------------------------------------*/
#include "ifpi.h"
-#include "pci.h"
-#if (NIFPI > 0) && (NPCI > 0)
+#if (NIFPI > 0)
#include "opt_i4b.h"
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c b/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
index 3d417a35fb95..b384e45f1d42 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
@@ -36,9 +36,8 @@
*---------------------------------------------------------------------------*/
#include "ifpi.h"
-#include "pci.h"
-#if (NIFPI > 0) && (NPCI > 0)
+#if (NIFPI > 0)
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
index 274ab9896906..dd2e65095e69 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
@@ -36,9 +36,8 @@
*---------------------------------------------------------------------------*/
#include "ifpi.h"
-#include "pci.h"
-#if (NIFPI > 0) && (NPCI > 0)
+#if (NIFPI > 0)
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
index 5be982d0b5b7..a26f3eb59d4e 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
@@ -43,9 +43,8 @@
#include "ifpi.h"
#include "opt_i4b.h"
-#include "pci.h"
-#if (NIFPI > 0) && (NPCI > 0)
+#if (NIFPI > 0)
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
index 288acf2738be..8c1bcd08d179 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
@@ -36,9 +36,8 @@
*---------------------------------------------------------------------------*/
#include "ifpi2.h"
-#include "pci.h"
-#if (NIFPI2 > 0) && (NPCI > 0)
+#if (NIFPI2 > 0)
#include "opt_i4b.h"
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
index 671e4eb520f0..251cda7ea3a7 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
@@ -36,9 +36,8 @@
*---------------------------------------------------------------------------*/
#include "ifpi2.h"
-#include "pci.h"
-#if (NIFPI2 > 0) && (NPCI > 0)
+#if (NIFPI2 > 0)
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
index 399d4137782c..2cfdc2173da5 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
@@ -35,9 +35,8 @@
*---------------------------------------------------------------------------*/
#include "ifpi2.h"
-#include "pci.h"
-#if (NIFPI2 > 0) && (NPCI > 0)
+#if (NIFPI2 > 0)
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
index d1b79ae49028..1adf4af4b01c 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
@@ -42,9 +42,8 @@
#include "ifpi2.h"
#include "opt_i4b.h"
-#include "pci.h"
-#if (NIFPI2 > 0) && (NPCI > 0)
+#if (NIFPI2 > 0)
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
index 88caee710a7e..85169d99c046 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
@@ -37,9 +37,8 @@
#include "isic.h"
#include "opt_i4b.h"
-#include "pci.h"
-#if (NISIC > 0) && (NPCI > 0) && defined(ELSA_QS1PCI)
+#if (NISIC > 0) && defined(ELSA_QS1PCI)
#include <sys/param.h>
#include <sys/kernel.h>
@@ -350,4 +349,4 @@ eqs1p_pci_attach(device_t dev)
return(0);
}
-#endif /* (NISIC > 0) && (NPCI > 0) && defined(ELSA_QS1PCI) */
+#endif /* (NISIC > 0) && && defined(ELSA_QS1PCI) */
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_isac.c b/sys/i4b/layer1/itjc/i4b_itjc_isac.c
index d0d80c6e2653..8ff79cb3b24c 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_isac.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_isac.c
@@ -34,7 +34,6 @@
*---------------------------------------------------------------------------*/
#include "itjc.h"
-#include "pci.h"
#if (NITJC > 0)
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_l1.c b/sys/i4b/layer1/itjc/i4b_itjc_l1.c
index 6952caf67c23..76b8ef57fbf8 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_l1.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_l1.c
@@ -34,9 +34,8 @@
*---------------------------------------------------------------------------*/
#include "itjc.h"
-#include "pci.h"
-#if (NITJC > 0) && (NPCI > 0)
+#if (NITJC > 0)
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c b/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
index 2bc902a3341e..afb1bc65c442 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
@@ -34,9 +34,8 @@
*---------------------------------------------------------------------------*/
#include "itjc.h"
-#include "pci.h"
-#if (NITJC > 0) && (NPCI > 0)
+#if (NITJC > 0)
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_pci.c b/sys/i4b/layer1/itjc/i4b_itjc_pci.c
index ffbfce20b314..ad5d45ba278a 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_pci.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_pci.c
@@ -41,7 +41,6 @@
#include "itjc.h"
#include "opt_i4b.h"
-#include "pci.h"
#if (NITJC > 0)
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
index 510025e42bfd..2b5ac66da352 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
@@ -37,9 +37,8 @@
#include "iwic.h"
#include "opt_i4b.h"
-#include "pci.h"
-#if (NIWIC > 0) && (NPCI > 0)
+#if (NIWIC > 0)
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_dchan.c b/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
index d33dc295c15a..68cede6d4ba2 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
@@ -35,9 +35,8 @@
#include "iwic.h"
#include "opt_i4b.h"
-#include "pci.h"
-#if (NIWIC > 0) && (NPCI > 0)
+#if (NIWIC > 0)
#include <sys/param.h>
#include <sys/systm.h>
@@ -470,4 +469,4 @@ iwic_dchan_transmit(struct iwic_softc *sc)
IWIC_WRITE(sc, D_CMDR, cmd);
}
-#endif /* (NIWIC > 0) && (NPCI > 0) */
+#endif /* (NIWIC > 0) */
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_fsm.c b/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
index b093907beae3..79faa2973095 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
@@ -35,9 +35,8 @@
#include "iwic.h"
#include "opt_i4b.h"
-#include "pci.h"
-#if (NIWIC > 0) && (NPCI > 0)
+#if (NIWIC > 0)
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_l1if.c b/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
index 2b654e3e2a95..359502f1bcda 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
@@ -35,9 +35,8 @@
#include "iwic.h"
#include "opt_i4b.h"
-#include "pci.h"
-#if (NIWIC > 0) && (NPCI > 0)
+#if (NIWIC > 0)
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_pci.c b/sys/i4b/layer1/iwic/i4b_iwic_pci.c
index 7f92fdb49dd8..175295c8e581 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_pci.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_pci.c
@@ -35,9 +35,8 @@
#include "iwic.h"
#include "opt_i4b.h"
-#include "pci.h"
-#if (NIWIC > 0) && (NPCI > 0)
+#if (NIWIC > 0)
#include <sys/param.h>
#include <sys/kernel.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 00:11:07 +0000