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 .

2 files changed, 5 insertions, 19 deletions

diff --git a/sys/i4b/layer1/isic/i4b_bchan.c b/sys/i4b/layer1/isic/i4b_bchan.c
index 2f520d80225c..f8b6f0db83df 100644
--- a/sys/i4b/layer1/isic/i4b_bchan.c
+++ b/sys/i4b/layer1/isic/i4b_bchan.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2001 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -29,7 +29,7 @@
  *
  * $FreeBSD$
  *
- *      last edit-date: [Wed Jan 24 09:07:12 2001]
+ *      last edit-date: [Sat Mar  9 16:00:56 2002]
  *
  *---------------------------------------------------------------------------*/
 
@@ -89,10 +89,8 @@ isic_bchannel_setup(int unit, int h_chan, int bprot, int activate)
 
 	chan->rx_queue.ifq_maxlen = IFQ_MAXLEN;
 
-#if defined (__FreeBSD__) && __FreeBSD__ > 4	
 	if(!mtx_initialized(&chan->rx_queue.ifq_mtx))
 		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_isic_rx", MTX_DEF);
-#endif
 
 	i4b_Bcleanifq(&chan->rx_queue);	/* clean rx queue */
 
@@ -108,10 +106,8 @@ isic_bchannel_setup(int unit, int h_chan, int bprot, int activate)
 
 	chan->tx_queue.ifq_maxlen = IFQ_MAXLEN;
 
-#if defined (__FreeBSD__) && __FreeBSD__ > 4	
 	if(!mtx_initialized(&chan->tx_queue.ifq_mtx))
 		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_isic_tx", MTX_DEF);
-#endif
 	
 	i4b_Bcleanifq(&chan->tx_queue);	/* clean tx queue */
 
diff --git a/sys/i4b/layer1/isic/i4b_hscx.c b/sys/i4b/layer1/isic/i4b_hscx.c
index cac4a13650b6..03eb3c46c363 100644
--- a/sys/i4b/layer1/isic/i4b_hscx.c
+++ b/sys/i4b/layer1/isic/i4b_hscx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2001 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -29,7 +29,7 @@
  *
  * $FreeBSD$
  *
- *      last edit-date: [Wed Jan 24 09:09:42 2001]
+ *      last edit-date: [Sat Mar  9 16:01:49 2002]
  *
  *---------------------------------------------------------------------------*/
 
@@ -267,18 +267,8 @@ isic_hscx_irq(register struct l1_softc *sc, u_char ista, int h_chan, u_char ex_i
 				if(!(i4b_l1_bchan_tel_silence(chan->in_mbuf->m_data, chan->in_mbuf->m_len)))
 					activity = ACT_RX;
 
-#if defined (__FreeBSD__) && __FreeBSD__ > 4
 				(void) IF_HANDOFF(&chan->rx_queue, chan->in_mbuf, NULL);
-#else
-				if(!(IF_QFULL(&chan->rx_queue)))
-				{
-					IF_ENQUEUE(&chan->rx_queue, chan->in_mbuf);
-				}
-				else
-				{
-					i4b_Bfreembuf(chan->in_mbuf);
-				}
-#endif
+
 				/* signal upper driver that data is available */
 
 				(*chan->isic_drvr_linktab->bch_rx_data_ready)(chan->isic_drvr_linktab->unit);