From d16dfb140a2d4802b6a8b370ba697126d8bfd7c1 Mon Sep 17 00:00:00 2001 From: brooks Date: Thu, 13 Jun 2002 06:04:28 +0000 Subject: [PATCH] Remote pci.h/NPCI usage from i4b code. Approved by: hm --- sys/conf/files | 2 +- sys/conf/files.i386 | 28 ++++++++++++------------- sys/conf/files.pc98 | 28 ++++++++++++------------- 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 +-- 24 files changed, 48 insertions(+), 69 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 76de69ed8e68..ee017e57e87d 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -774,7 +774,7 @@ i4b/capi/capi_msgs.c optional i4bcapi # # isdn4bsd AVM B1/T1 CAPI driver # -i4b/capi/iavc/iavc_pci.c count iavc +i4b/capi/iavc/iavc_pci.c count iavc pci i4b/capi/iavc/iavc_isa.c optional iavc i4b/capi/iavc/iavc_lli.c optional iavc i4b/capi/iavc/iavc_card.c optional iavc diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index f3bf1bbc01e5..8744e1fd873d 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -338,7 +338,7 @@ i4b/layer1/isic/i4b_ctx_s0P.c optional isic i4b/layer1/isic/i4b_drn_ngo.c optional isic i4b/layer1/isic/i4b_dynalink.c optional isic i4b/layer1/isic/i4b_elsa_qs1i.c optional isic -i4b/layer1/isic/i4b_elsa_qs1p.c optional isic +i4b/layer1/isic/i4b_elsa_qs1p.c optional isic pci i4b/layer1/isic/i4b_elsa_pcc16.c optional isic i4b/layer1/isic/i4b_hscx.c optional isic i4b/layer1/isic/i4b_isac.c optional isic @@ -358,25 +358,25 @@ i4b/layer1/isic/i4b_diva.c optional isic # # isdn4bsd, iwic # -i4b/layer1/iwic/i4b_iwic_pci.c count iwic -i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic -i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic -i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic -i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic +i4b/layer1/iwic/i4b_iwic_pci.c count iwic pci +i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic pci # # isdn4bsd, ifpi # -i4b/layer1/ifpi/i4b_ifpi_pci.c count ifpi -i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi +i4b/layer1/ifpi/i4b_ifpi_pci.c count ifpi pci +i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi pci +i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi pci +i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi pci # # isdn4bsd, ifpi2 # -i4b/layer1/ifpi2/i4b_ifpi2_pci.c count ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 +i4b/layer1/ifpi2/i4b_ifpi2_pci.c count ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 pci # # isdn4bsd, ifpnp # diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index 20de2f1c4075..c3f3d132e045 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -308,7 +308,7 @@ i4b/layer1/isic/i4b_ctx_s0P.c optional isic i4b/layer1/isic/i4b_drn_ngo.c optional isic i4b/layer1/isic/i4b_dynalink.c optional isic i4b/layer1/isic/i4b_elsa_qs1i.c optional isic -i4b/layer1/isic/i4b_elsa_qs1p.c optional isic +i4b/layer1/isic/i4b_elsa_qs1p.c optional isic pci i4b/layer1/isic/i4b_elsa_pcc16.c optional isic i4b/layer1/isic/i4b_hscx.c optional isic i4b/layer1/isic/i4b_isac.c optional isic @@ -328,25 +328,25 @@ i4b/layer1/isic/i4b_diva.c optional isic # # isdn4bsd, iwic # -i4b/layer1/iwic/i4b_iwic_pci.c count iwic -i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic -i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic -i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic -i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic +i4b/layer1/iwic/i4b_iwic_pci.c count iwic pci +i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic pci # # isdn4bsd, ifpi # -i4b/layer1/ifpi/i4b_ifpi_pci.c count ifpi -i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi +i4b/layer1/ifpi/i4b_ifpi_pci.c count ifpi pci +i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi pci +i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi pci +i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi pci # # isdn4bsd, ifpi2 # -i4b/layer1/ifpi2/i4b_ifpi2_pci.c count ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 +i4b/layer1/ifpi2/i4b_ifpi2_pci.c count ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 pci # # isdn4bsd, ifpnp # 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 #include 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 #include 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 #include 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 #include 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 #include 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 #include 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 #include 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 #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 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 #include 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 #include 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 #include 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 #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 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 #include 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 #include 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 #include