diff options
24 files changed, 48 insertions, 69 deletions
diff --git a/sys/conf/files b/sys/conf/files index 76de69e..ee017e5 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 f3bf1bb..8744e1f 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 20de2f1..c3f3d13 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 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 <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 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 <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 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 <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 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 <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 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 <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 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 <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 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 <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 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 <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 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 <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 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 <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 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 <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 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 <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 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 <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 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 <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 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 <sys/param.h> #include <sys/kernel.h> |