From d16dfb140a2d4802b6a8b370ba697126d8bfd7c1 Mon Sep 17 00:00:00 2001 From: brooks Date: Thu, 13 Jun 2002 06:04:28 +0000 Subject: Remote pci.h/NPCI usage from i4b code. Approved by: hm --- sys/i4b/capi/iavc/iavc_card.c | 1 - sys/i4b/capi/iavc/iavc_lli.c | 1 - sys/i4b/capi/iavc/iavc_pci.c | 3 +-- sys/i4b/layer1/ifpi/i4b_ifpi_isac.c | 3 +-- sys/i4b/layer1/ifpi/i4b_ifpi_l1.c | 3 +-- sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c | 3 +-- sys/i4b/layer1/ifpi/i4b_ifpi_pci.c | 3 +-- sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c | 3 +-- sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c | 3 +-- sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c | 3 +-- sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c | 3 +-- sys/i4b/layer1/isic/i4b_elsa_qs1p.c | 5 ++--- sys/i4b/layer1/itjc/i4b_itjc_isac.c | 1 - sys/i4b/layer1/itjc/i4b_itjc_l1.c | 3 +-- sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c | 3 +-- sys/i4b/layer1/itjc/i4b_itjc_pci.c | 1 - sys/i4b/layer1/iwic/i4b_iwic_bchan.c | 3 +-- sys/i4b/layer1/iwic/i4b_iwic_dchan.c | 5 ++--- sys/i4b/layer1/iwic/i4b_iwic_fsm.c | 3 +-- sys/i4b/layer1/iwic/i4b_iwic_l1if.c | 3 +-- sys/i4b/layer1/iwic/i4b_iwic_pci.c | 3 +-- 21 files changed, 19 insertions(+), 40 deletions(-) (limited to 'sys/i4b') diff --git a/sys/i4b/capi/iavc/iavc_card.c b/sys/i4b/capi/iavc/iavc_card.c index 831dc68..70bb66f 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 c7455b2..26af86a 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 4f922fe..8162f98 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 #include diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c index 168506d..a9dd719 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 3d417a3..b384e45 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 #include diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c index 274ab98..dd2e650 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 #include diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c index 5be982d..a26f3eb 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 #include diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c index 288acf2..8c1bcd0 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 671e4eb..251cda7 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 #include diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c index 399d413..2cfdc21 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 #include diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c index d1b79ae..1adf4af 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 #include diff --git a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c index 88caee7..85169d9 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 #include @@ -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 d0d80c6..8ff79cb 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 6952caf..76b8ef5 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 #include diff --git a/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c b/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c index 2bc902a..afb1bc6 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 #include diff --git a/sys/i4b/layer1/itjc/i4b_itjc_pci.c b/sys/i4b/layer1/itjc/i4b_itjc_pci.c index ffbfce2..ad5d45b 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 510025e..2b5ac66 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 #include diff --git a/sys/i4b/layer1/iwic/i4b_iwic_dchan.c b/sys/i4b/layer1/iwic/i4b_iwic_dchan.c index d33dc29..68cede6 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 #include @@ -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 b093907..79faa29 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 #include diff --git a/sys/i4b/layer1/iwic/i4b_iwic_l1if.c b/sys/i4b/layer1/iwic/i4b_iwic_l1if.c index 2b654e3..359502f 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 #include diff --git a/sys/i4b/layer1/iwic/i4b_iwic_pci.c b/sys/i4b/layer1/iwic/i4b_iwic_pci.c index 7f92fdb..175295c 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 #include -- cgit v1.1