summaryrefslogtreecommitdiffstats
path: root/sys/i4b/layer1/isic
diff options
context:
space:
mode:
Diffstat (limited to 'sys/i4b/layer1/isic')
-rw-r--r--sys/i4b/layer1/isic/i4b_asuscom_ipac.c5
-rw-r--r--sys/i4b/layer1/isic/i4b_avm_a1.c5
-rw-r--r--sys/i4b/layer1/isic/i4b_bchan.c6
-rw-r--r--sys/i4b/layer1/isic/i4b_ctx_s0P.c5
-rw-r--r--sys/i4b/layer1/isic/i4b_diva.c5
-rw-r--r--sys/i4b/layer1/isic/i4b_drn_ngo.c5
-rw-r--r--sys/i4b/layer1/isic/i4b_dynalink.c5
-rw-r--r--sys/i4b/layer1/isic/i4b_elsa_pcc16.c5
-rw-r--r--sys/i4b/layer1/isic/i4b_elsa_qs1i.c5
-rw-r--r--sys/i4b/layer1/isic/i4b_elsa_qs1p.c5
-rw-r--r--sys/i4b/layer1/isic/i4b_hscx.c6
-rw-r--r--sys/i4b/layer1/isic/i4b_isac.c6
-rw-r--r--sys/i4b/layer1/isic/i4b_isic.c6
-rw-r--r--sys/i4b/layer1/isic/i4b_isic_isa.c4
-rw-r--r--sys/i4b/layer1/isic/i4b_isic_pnp.c4
-rw-r--r--sys/i4b/layer1/isic/i4b_itk_ix1.c5
-rw-r--r--sys/i4b/layer1/isic/i4b_l1.c6
-rw-r--r--sys/i4b/layer1/isic/i4b_l1fsm.c7
-rw-r--r--sys/i4b/layer1/isic/i4b_siemens_isurf.c5
-rw-r--r--sys/i4b/layer1/isic/i4b_sws.c5
-rw-r--r--sys/i4b/layer1/isic/i4b_tel_s016.c6
-rw-r--r--sys/i4b/layer1/isic/i4b_tel_s0163.c6
-rw-r--r--sys/i4b/layer1/isic/i4b_tel_s08.c6
-rw-r--r--sys/i4b/layer1/isic/i4b_usr_sti.c5
24 files changed, 34 insertions, 94 deletions
diff --git a/sys/i4b/layer1/isic/i4b_asuscom_ipac.c b/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
index 9d440b3..cf01aae 100644
--- a/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
+++ b/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
@@ -46,10 +46,9 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
#include "opt_i4b.h"
-#if (NISIC > 0) && defined (ASUSCOM_IPAC)
+#if defined (ASUSCOM_IPAC)
#include <sys/param.h>
#include <sys/systm.h>
@@ -230,4 +229,4 @@ isic_attach_asi(device_t dev)
return(0);
}
-#endif /* (NISIC > 0) && defined (ASUSCOM_IPAC) */
+#endif /* defined (ASUSCOM_IPAC) */
diff --git a/sys/i4b/layer1/isic/i4b_avm_a1.c b/sys/i4b/layer1/isic/i4b_avm_a1.c
index 3fbfafb..6e747c8 100644
--- a/sys/i4b/layer1/isic/i4b_avm_a1.c
+++ b/sys/i4b/layer1/isic/i4b_avm_a1.c
@@ -41,10 +41,9 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
#include "opt_i4b.h"
-#if NISIC > 0 && defined(AVM_A1)
+#if defined(AVM_A1)
#include <sys/param.h>
#include <sys/systm.h>
@@ -407,4 +406,4 @@ isic_attach_avma1(device_t dev)
return(0);
}
-#endif /* NISIC > 0 && defined(AVM_A1) */
+#endif /* defined(AVM_A1) */
diff --git a/sys/i4b/layer1/isic/i4b_bchan.c b/sys/i4b/layer1/isic/i4b_bchan.c
index 580e9a9..39d2847 100644
--- a/sys/i4b/layer1/isic/i4b_bchan.c
+++ b/sys/i4b/layer1/isic/i4b_bchan.c
@@ -33,10 +33,6 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
-
-#if NISIC > 0
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
@@ -399,5 +395,3 @@ isic_init_linktab(struct l1_softc *sc)
/* used by HDLC data transfers, i.e. ipr and isp drivers */
lt->rx_mbuf = &chan->in_mbuf;
}
-
-#endif /* NISIC > 0 */
diff --git a/sys/i4b/layer1/isic/i4b_ctx_s0P.c b/sys/i4b/layer1/isic/i4b_ctx_s0P.c
index 5e0f210..96ad4c6 100644
--- a/sys/i4b/layer1/isic/i4b_ctx_s0P.c
+++ b/sys/i4b/layer1/isic/i4b_ctx_s0P.c
@@ -40,10 +40,9 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
#include "opt_i4b.h"
-#if (NISIC > 0) && (defined(CRTX_S0_P) || defined(TEL_S0_16_3_P) || defined(COMPAQ_M610))
+#if (defined(CRTX_S0_P) || defined(TEL_S0_16_3_P) || defined(COMPAQ_M610))
#include <sys/param.h>
#include <sys/systm.h>
@@ -312,5 +311,5 @@ isic_attach_Cs0P(device_t dev)
return 0;
}
-#endif /* (NISIC > 0) && (defined(CRTX_S0_P) || defined(TEL_S0_16_3_P) || defined(COMPAQ_M610)) */
+#endif /* (defined(CRTX_S0_P) || defined(TEL_S0_16_3_P) || defined(COMPAQ_M610)) */
diff --git a/sys/i4b/layer1/isic/i4b_diva.c b/sys/i4b/layer1/isic/i4b_diva.c
index 0177961..811e091 100644
--- a/sys/i4b/layer1/isic/i4b_diva.c
+++ b/sys/i4b/layer1/isic/i4b_diva.c
@@ -33,10 +33,9 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
#include "opt_i4b.h"
-#if NISIC > 0 && defined EICON_DIVA
+#if defined EICON_DIVA
#include <sys/param.h>
#include <sys/systm.h>
@@ -395,4 +394,4 @@ isic_attach_diva(device_t dev)
return(0);
}
-#endif /* NISIC > 0 && defined EICON_DIVA */
+#endif /* defined EICON_DIVA */
diff --git a/sys/i4b/layer1/isic/i4b_drn_ngo.c b/sys/i4b/layer1/isic/i4b_drn_ngo.c
index ae9b589..0cb4cfa 100644
--- a/sys/i4b/layer1/isic/i4b_drn_ngo.c
+++ b/sys/i4b/layer1/isic/i4b_drn_ngo.c
@@ -33,10 +33,9 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
#include "opt_i4b.h"
-#if (NISIC > 0) && defined(DRN_NGO)
+#if defined(DRN_NGO)
#include <sys/param.h>
#include <sys/systm.h>
@@ -257,4 +256,4 @@ isic_attach_drnngo(device_t dev)
return (0);
}
-#endif /* (NISIC > 0) && defined(DRN_NGO) */
+#endif /* defined(DRN_NGO) */
diff --git a/sys/i4b/layer1/isic/i4b_dynalink.c b/sys/i4b/layer1/isic/i4b_dynalink.c
index 3ed0aea..fc40124 100644
--- a/sys/i4b/layer1/isic/i4b_dynalink.c
+++ b/sys/i4b/layer1/isic/i4b_dynalink.c
@@ -67,10 +67,9 @@
This driver might also work for Asuscom cards.
*/
-#include "isic.h"
#include "opt_i4b.h"
-#if (NISIC > 0) && defined(DYNALINK)
+#if defined(DYNALINK)
#include <sys/param.h>
#include <sys/systm.h>
@@ -230,4 +229,4 @@ isic_attach_Dyn(device_t dev)
return 0;
}
-#endif /* (NISIC > 0) && defined(DYNALINK) */
+#endif /* defined(DYNALINK) */
diff --git a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
index f7fb3d5..0d2521a 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
@@ -33,10 +33,9 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
#include "opt_i4b.h"
-#if (NISIC > 0) && defined(ELSA_PCC16)
+#if defined(ELSA_PCC16)
#include <sys/param.h>
#include <sys/systm.h>
@@ -388,4 +387,4 @@ isic_attach_Epcc16(device_t dev)
return 0;
}
-#endif /* (NISIC > 0) && defined(ELSA_PCC16) */
+#endif /* defined(ELSA_PCC16) */
diff --git a/sys/i4b/layer1/isic/i4b_elsa_qs1i.c b/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
index 9b184e9..b6980fc 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
@@ -33,10 +33,9 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
#include "opt_i4b.h"
-#if (NISIC > 0) && defined(ELSA_QS1ISA)
+#if defined(ELSA_QS1ISA)
#include <sys/param.h>
#include <sys/systm.h>
@@ -234,4 +233,4 @@ isic_attach_Eqs1pi(device_t dev)
return 0;
}
-#endif /* (NISIC > 0) && defined(ELSA_QS1ISA) */
+#endif /* defined(ELSA_QS1ISA) */
diff --git a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
index 85169d9..03bd9a4 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
@@ -35,10 +35,9 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
#include "opt_i4b.h"
-#if (NISIC > 0) && defined(ELSA_QS1PCI)
+#if defined(ELSA_QS1PCI)
#include <sys/param.h>
#include <sys/kernel.h>
@@ -349,4 +348,4 @@ eqs1p_pci_attach(device_t dev)
return(0);
}
-#endif /* (NISIC > 0) && && defined(ELSA_QS1PCI) */
+#endif /* defined(ELSA_QS1PCI) */
diff --git a/sys/i4b/layer1/isic/i4b_hscx.c b/sys/i4b/layer1/isic/i4b_hscx.c
index 03eb3c4..30dd0bd 100644
--- a/sys/i4b/layer1/isic/i4b_hscx.c
+++ b/sys/i4b/layer1/isic/i4b_hscx.c
@@ -33,10 +33,6 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
-
-#if NISIC > 0
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
@@ -649,5 +645,3 @@ isic_hscx_waitxfw(struct l1_softc *sc, int h_chan)
NDBGL1(L1_H_XFRERR, "HSCX wait for XFW time: %d uS", (WAITTO-timeout)*50);
}
}
-
-#endif /* NISIC > 0 */
diff --git a/sys/i4b/layer1/isic/i4b_isac.c b/sys/i4b/layer1/isic/i4b_isac.c
index f66aaa0..1bdf331 100644
--- a/sys/i4b/layer1/isic/i4b_isac.c
+++ b/sys/i4b/layer1/isic/i4b_isac.c
@@ -33,10 +33,6 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
-
-#if NISIC > 0
-
#include "opt_i4b.h"
#include <sys/param.h>
@@ -656,5 +652,3 @@ isic_isac_init(struct l1_softc *sc)
return(0);
}
-
-#endif /* NISIC > 0 */
diff --git a/sys/i4b/layer1/isic/i4b_isic.c b/sys/i4b/layer1/isic/i4b_isic.c
index 751c568..56fe733 100644
--- a/sys/i4b/layer1/isic/i4b_isic.c
+++ b/sys/i4b/layer1/isic/i4b_isic.c
@@ -33,11 +33,8 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
#include "opt_i4b.h"
-#if NISIC > 0
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/socket.h>
@@ -494,6 +491,3 @@ isic_detach_common(device_t dev)
}
}
}
-
-#endif /* NISIC > 0 */
-
diff --git a/sys/i4b/layer1/isic/i4b_isic_isa.c b/sys/i4b/layer1/isic/i4b_isic_isa.c
index 87c9f04..2f60c22 100644
--- a/sys/i4b/layer1/isic/i4b_isic_isa.c
+++ b/sys/i4b/layer1/isic/i4b_isic_isa.c
@@ -33,11 +33,8 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
#include "opt_i4b.h"
-#if NISIC > 0
-
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
@@ -206,4 +203,3 @@ isic_isa_attach(device_t dev)
return(ret);
}
-#endif /* NISIC > 0 */
diff --git a/sys/i4b/layer1/isic/i4b_isic_pnp.c b/sys/i4b/layer1/isic/i4b_isic_pnp.c
index f5e1bcc..dc6c70c 100644
--- a/sys/i4b/layer1/isic/i4b_isic_pnp.c
+++ b/sys/i4b/layer1/isic/i4b_isic_pnp.c
@@ -43,11 +43,8 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
#include "opt_i4b.h"
-#if (NISIC > 0)
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -327,4 +324,3 @@ isic_pnp_attach(device_t dev)
return 0;
}
}
-#endif /* (NISIC > 0) */
diff --git a/sys/i4b/layer1/isic/i4b_itk_ix1.c b/sys/i4b/layer1/isic/i4b_itk_ix1.c
index cccee81..6158b2b 100644
--- a/sys/i4b/layer1/isic/i4b_itk_ix1.c
+++ b/sys/i4b/layer1/isic/i4b_itk_ix1.c
@@ -60,10 +60,9 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
#include "opt_i4b.h"
-#if NISIC > 0 && defined(ITKIX1)
+#if defined(ITKIX1)
#include <sys/param.h>
#include <sys/systm.h>
@@ -394,4 +393,4 @@ isic_attach_itkix1(device_t dev)
return 0;
}
-#endif /* ITKIX1 */
+#endif /* defined(ITKIX1) */
diff --git a/sys/i4b/layer1/isic/i4b_l1.c b/sys/i4b/layer1/isic/i4b_l1.c
index d68a480..623b2ef 100644
--- a/sys/i4b/layer1/isic/i4b_l1.c
+++ b/sys/i4b/layer1/isic/i4b_l1.c
@@ -33,10 +33,6 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
-
-#if NISIC > 0
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
@@ -250,5 +246,3 @@ isic_mph_command_req(int unit, int command, void *parm)
return(0);
}
-
-#endif /* NISIC > 0 */
diff --git a/sys/i4b/layer1/isic/i4b_l1fsm.c b/sys/i4b/layer1/isic/i4b_l1fsm.c
index 11c261d..5c64996 100644
--- a/sys/i4b/layer1/isic/i4b_l1fsm.c
+++ b/sys/i4b/layer1/isic/i4b_l1fsm.c
@@ -33,10 +33,6 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
-
-#if NISIC > 0
-
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
@@ -507,6 +503,3 @@ isic_printstate(struct l1_softc *sc)
return((char *) state_text[sc->sc_I430state]);
}
#endif
-
-#endif /* NISIC > 0 */
-
diff --git a/sys/i4b/layer1/isic/i4b_siemens_isurf.c b/sys/i4b/layer1/isic/i4b_siemens_isurf.c
index d846d43..4f1e746 100644
--- a/sys/i4b/layer1/isic/i4b_siemens_isurf.c
+++ b/sys/i4b/layer1/isic/i4b_siemens_isurf.c
@@ -42,10 +42,9 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
#include "opt_i4b.h"
-#if NISIC > 0 && defined(SIEMENS_ISURF2)
+#if defined(SIEMENS_ISURF2)
#include <sys/param.h>
#include <sys/systm.h>
@@ -227,4 +226,4 @@ isic_attach_siemens_isurf(device_t dev)
return(0);
}
-#endif /* NISIC > 0 && defined(SIEMENS_ISURF2) */
+#endif /* defined(SIEMENS_ISURF2) */
diff --git a/sys/i4b/layer1/isic/i4b_sws.c b/sys/i4b/layer1/isic/i4b_sws.c
index cfe9372..e239660 100644
--- a/sys/i4b/layer1/isic/i4b_sws.c
+++ b/sys/i4b/layer1/isic/i4b_sws.c
@@ -50,10 +50,9 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
#include "opt_i4b.h"
-#if defined (SEDLBAUER) && NISIC > 0
+#if defined (SEDLBAUER)
#define SWS_RESON 0 /* reset on */
#define SWS_RESOFF 1 /* reset off */
@@ -209,4 +208,4 @@ isic_attach_sws(device_t dev)
return(0);
}
-#endif /* defined(SEDLBAUER) && NISIC > 0 */
+#endif /* defined(SEDLBAUER) */
diff --git a/sys/i4b/layer1/isic/i4b_tel_s016.c b/sys/i4b/layer1/isic/i4b_tel_s016.c
index 4e2b67f..b84da2c 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s016.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s016.c
@@ -43,10 +43,9 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
#include "opt_i4b.h"
-#if NISIC > 0 && defined(TEL_S0_16)
+#if defined(TEL_S0_16)
#include <sys/param.h>
#include <sys/systm.h>
@@ -367,4 +366,5 @@ isic_attach_s016(device_t dev)
return 0;
}
-#endif /* ISIC > 0 */
+
+#endif /* defined(TEL_S0_16) */
diff --git a/sys/i4b/layer1/isic/i4b_tel_s0163.c b/sys/i4b/layer1/isic/i4b_tel_s0163.c
index 150306d..6a567b7 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s0163.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s0163.c
@@ -43,10 +43,9 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
#include "opt_i4b.h"
-#if NISIC > 0 && defined(TEL_S0_16_3)
+#if defined(TEL_S0_16_3)
#include <sys/param.h>
#include <sys/systm.h>
@@ -371,5 +370,4 @@ isic_attach_s0163(device_t dev)
return (0);
}
-#endif /* ISIC > 0 */
-
+#endif /* defined(TEL_S0_16_3) */
diff --git a/sys/i4b/layer1/isic/i4b_tel_s08.c b/sys/i4b/layer1/isic/i4b_tel_s08.c
index d1d69b2..a789e66 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s08.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s08.c
@@ -43,10 +43,9 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
#include "opt_i4b.h"
-#if NISIC > 0 && defined(TEL_S0_8)
+#if defined(TEL_S0_8)
#include <sys/param.h>
#include <sys/systm.h>
@@ -300,4 +299,5 @@ isic_attach_s08(device_t dev)
return 0;
}
-#endif /* ISIC > 0 */
+
+#endif /* defined(TEL_S0_8) */
diff --git a/sys/i4b/layer1/isic/i4b_usr_sti.c b/sys/i4b/layer1/isic/i4b_usr_sti.c
index 4a3a0e0..cd15948 100644
--- a/sys/i4b/layer1/isic/i4b_usr_sti.c
+++ b/sys/i4b/layer1/isic/i4b_usr_sti.c
@@ -33,10 +33,9 @@
*
*---------------------------------------------------------------------------*/
-#include "isic.h"
#include "opt_i4b.h"
-#if (NISIC > 0) && defined(USR_STI)
+#if defined(USR_STI)
#include <sys/param.h>
#include <sys/systm.h>
@@ -495,4 +494,4 @@ isic_attach_usrtai(device_t dev)
return (0);
}
-#endif /* ISIC > 0 */
+#endif /* defined(USR_STI) */
OpenPOWER on IntegriCloud