Clean up the i4b kernel part: remove unmaintained #if(def)s for NetBSD,

OpenBSD and BSD/OS and respective code, remove pre $FreeBSD CVS id's,
remove #if(def)s and respective code for FreeBSD versions < 5 .

3 files changed, 2 insertions, 9 deletions

diff --git a/sys/i4b/capi/iavc/iavc_isa.c b/sys/i4b/capi/iavc/iavc_isa.c
index b4cfaba..84b7cae 100644
--- a/sys/i4b/capi/iavc/iavc_isa.c
+++ b/sys/i4b/capi/iavc/iavc_isa.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 2001, 2002 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -224,10 +224,8 @@ iavc_isa_attach(device_t dev)
 	memset(&sc->sc_txq, 0, sizeof(struct ifqueue));
 	sc->sc_txq.ifq_maxlen = sc->sc_capi.sc_nbch * 4;
 
-#if defined (__FreeBSD__) && __FreeBSD__ > 4
         if(!mtx_initialized(&sc->sc_txq.ifq_mtx))
 		mtx_init(&sc->sc_txq.ifq_mtx, "i4b_ivac_isa", MTX_DEF);
-#endif
 
 	sc->sc_intr = FALSE;
 	sc->sc_state = IAVC_DOWN;
diff --git a/sys/i4b/capi/iavc/iavc_lli.c b/sys/i4b/capi/iavc/iavc_lli.c
index a8ffb5a..c7455b2 100644
--- a/sys/i4b/capi/iavc/iavc_lli.c
+++ b/sys/i4b/capi/iavc/iavc_lli.c
@@ -256,11 +256,8 @@ int iavc_send(capi_softc_t *capi_sc, struct mbuf *m)
     }
 
     if (_IF_QFULL(&sc->sc_txq)) {
-#if defined (__FreeBSD__) && __FreeBSD__ > 4
+
 	_IF_DROP(&sc->sc_txq);
-#else
-	IF_DROP(&sc->sc_txq);
-#endif
 
 	printf("iavc%d: tx overflow, message dropped\n", sc->sc_unit);
 
diff --git a/sys/i4b/capi/iavc/iavc_pci.c b/sys/i4b/capi/iavc/iavc_pci.c
index 12de906..c22be11 100644
--- a/sys/i4b/capi/iavc/iavc_pci.c
+++ b/sys/i4b/capi/iavc/iavc_pci.c
@@ -235,10 +235,8 @@ iavc_pci_attach(device_t dev)
     memset(&sc->sc_txq, 0, sizeof(struct ifqueue));
     sc->sc_txq.ifq_maxlen = sc->sc_capi.sc_nbch * 4;
 
-#if defined (__FreeBSD__) && __FreeBSD__ > 4
     if(!mtx_initialized(&sc->sc_txq.ifq_mtx))
 	    mtx_init(&sc->sc_txq.ifq_mtx, "i4b_ivac_pci", MTX_DEF);
-#endif
     
     sc->sc_intr = FALSE;
     sc->sc_state = IAVC_DOWN;