update the i4b kernel part to i4b release 0.71.00

12 files changed, 42 insertions, 38 deletions

diff --git a/sys/i4b/layer2/i4b_iframe.c b/sys/i4b/layer2/i4b_iframe.c
index c5e38d8..887f828 100644
--- a/sys/i4b/layer2/i4b_iframe.c
+++ b/sys/i4b/layer2/i4b_iframe.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,9 +27,9 @@
  *	i4b_iframe.c - i frame handling routines
  *	------------------------------------------
  *
- *	$Id: i4b_iframe.c,v 1.15 1998/12/05 18:05:06 hm Exp $ 
+ *	$Id: i4b_iframe.c,v 1.16 1999/02/14 09:45:00 hm Exp $ 
  *
- *      last edit-date: [Sat Dec  5 18:26:16 1998]
+ *      last edit-date: [Sun Feb 14 10:31:19 1999]
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/layer2/i4b_l2.c b/sys/i4b/layer2/i4b_l2.c
index 5cdc1c7..875fabb 100644
--- a/sys/i4b/layer2/i4b_l2.c
+++ b/sys/i4b/layer2/i4b_l2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,9 +27,9 @@
  *      i4b_l2.c - ISDN layer 2 (Q.921)
  *	-------------------------------
  *
- *	$Id: i4b_l2.c,v 1.23 1998/12/05 18:05:08 hm Exp $ 
+ *	$Id: i4b_l2.c,v 1.24 1999/02/14 09:45:00 hm Exp $ 
  *
- *      last edit-date: [Sat Dec  5 18:27:00 1998]
+ *      last edit-date: [Sun Feb 14 10:31:25 1999]
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/layer2/i4b_l2.h b/sys/i4b/layer2/i4b_l2.h
index ab1dfd7..dd63f43 100644
--- a/sys/i4b/layer2/i4b_l2.h
+++ b/sys/i4b/layer2/i4b_l2.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,9 +27,9 @@
  *	i4b_l2.h - ISDN layer 2 (Q.921) definitions
  *	---------------------------------------------
  *
- *	$Id: i4b_l2.h,v 1.14 1998/12/05 18:05:09 hm Exp $ 
+ *	$Id: i4b_l2.h,v 1.15 1999/02/14 09:45:00 hm Exp $ 
  *
- *      last edit-date: [Sat Dec  5 18:27:13 1998]
+ *      last edit-date: [Sun Feb 14 10:31:31 1999]
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/layer2/i4b_l2fsm.c b/sys/i4b/layer2/i4b_l2fsm.c
index 113167c..dbbe0ca 100644
--- a/sys/i4b/layer2/i4b_l2fsm.c
+++ b/sys/i4b/layer2/i4b_l2fsm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,9 +27,9 @@
  *	i4b_l2fsm.c - layer 2 FSM
  *	-------------------------
  *
- *	$Id: i4b_l2fsm.c,v 1.13 1998/12/05 18:05:11 hm Exp $ 
+ *	$Id: i4b_l2fsm.c,v 1.14 1999/02/14 09:45:00 hm Exp $ 
  *
- *      last edit-date: [Sat Dec  5 18:28:15 1998]
+ *      last edit-date: [Sun Feb 14 10:31:37 1999]
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/layer2/i4b_l2fsm.h b/sys/i4b/layer2/i4b_l2fsm.h
index 8f51068..00b82d6 100644
--- a/sys/i4b/layer2/i4b_l2fsm.h
+++ b/sys/i4b/layer2/i4b_l2fsm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,9 +27,9 @@
  *      i4b_l2fsm.h - layer 2 FSM
  *      -------------------------
  *
- *	$Id: i4b_l2fsm.h,v 1.3 1998/12/05 18:05:13 hm Exp $ 
+ *	$Id: i4b_l2fsm.h,v 1.4 1999/02/14 09:45:00 hm Exp $ 
  *
- *      last edit-date: [Sat Dec  5 18:28:39 1998]
+ *      last edit-date: [Sun Feb 14 10:31:43 1999]
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/layer2/i4b_l2timer.c b/sys/i4b/layer2/i4b_l2timer.c
index 3b45e807..b9ae4a1 100644
--- a/sys/i4b/layer2/i4b_l2timer.c
+++ b/sys/i4b/layer2/i4b_l2timer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,9 +27,9 @@
  *	i4b_l2timer.c - layer 2 timer handling
  *	--------------------------------------
  *
- *	$Id: i4b_l2timer.c,v 1.12 1998/12/05 18:05:15 hm Exp $ 
+ *	$Id: i4b_l2timer.c,v 1.13 1999/02/14 09:45:00 hm Exp $ 
  *
- *      last edit-date: [Sat Dec  5 18:29:13 1998]
+ *      last edit-date: [Sun Feb 14 10:31:48 1999]
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/layer2/i4b_lme.c b/sys/i4b/layer2/i4b_lme.c
index b179e94..8c5059e 100644
--- a/sys/i4b/layer2/i4b_lme.c
+++ b/sys/i4b/layer2/i4b_lme.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,9 +27,9 @@
  *	i4b_lme.c - layer management entity
  *	-------------------------------------
  *
- *	$Id: i4b_lme.c,v 1.8 1998/12/05 18:05:19 hm Exp $ 
+ *	$Id: i4b_lme.c,v 1.9 1999/02/14 09:45:00 hm Exp $ 
  *
- *      last edit-date: [Sat Dec  5 18:29:25 1998]
+ *      last edit-date: [Sun Feb 14 10:31:55 1999]
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/layer2/i4b_mbuf.c b/sys/i4b/layer2/i4b_mbuf.c
index 6d085c3..9da6d40 100644
--- a/sys/i4b/layer2/i4b_mbuf.c
+++ b/sys/i4b/layer2/i4b_mbuf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,9 +27,9 @@
  *	i4b - mbuf handling support routines
  *	------------------------------------
  *
- *	$Id: i4b_mbuf.c,v 1.10 1998/12/05 18:05:20 hm Exp $ 
+ *	$Id: i4b_mbuf.c,v 1.11 1999/02/14 09:45:00 hm Exp $ 
  *
- *      last edit-date: [Sat Dec  5 18:29:44 1998]
+ *      last edit-date: [Sun Feb 14 10:32:00 1999]
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/layer2/i4b_sframe.c b/sys/i4b/layer2/i4b_sframe.c
index f8d14ba..220be26 100644
--- a/sys/i4b/layer2/i4b_sframe.c
+++ b/sys/i4b/layer2/i4b_sframe.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,9 +27,9 @@
  *	i4b_sframe.c - s frame handling routines
  *	----------------------------------------
  *
- *	$Id: i4b_sframe.c,v 1.8 1998/12/05 18:05:21 hm Exp $ 
+ *	$Id: i4b_sframe.c,v 1.9 1999/02/14 09:45:00 hm Exp $ 
  *
- *      last edit-date: [Sat Dec  5 18:30:02 1998]
+ *      last edit-date: [Sun Feb 14 10:32:06 1999]
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/layer2/i4b_tei.c b/sys/i4b/layer2/i4b_tei.c
index 5c5b7b8..3742dfd 100644
--- a/sys/i4b/layer2/i4b_tei.c
+++ b/sys/i4b/layer2/i4b_tei.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,9 +27,9 @@
  *	i4b_tei.c - tei handling procedures
  *	-----------------------------------
  *
- *	$Id: i4b_tei.c,v 1.13 1998/12/05 18:05:23 hm Exp $ 
+ *	$Id: i4b_tei.c,v 1.14 1999/02/14 09:45:00 hm Exp $ 
  *
- *      last edit-date: [Sat Dec  5 18:30:20 1998]
+ *      last edit-date: [Sun Feb 14 10:32:12 1999]
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/layer2/i4b_uframe.c b/sys/i4b/layer2/i4b_uframe.c
index 90e7912..1e8619d 100644
--- a/sys/i4b/layer2/i4b_uframe.c
+++ b/sys/i4b/layer2/i4b_uframe.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,9 +27,9 @@
  *	i4b_uframe.c - routines for handling U-frames
  *	-----------------------------------------------
  *
- *	$Id: i4b_uframe.c,v 1.6 1998/12/05 18:05:24 hm Exp $ 
+ *	$Id: i4b_uframe.c,v 1.7 1999/02/14 09:45:00 hm Exp $ 
  *
- *      last edit-date: [Sat Dec  5 18:30:33 1998]
+ *      last edit-date: [Sun Feb 14 10:32:17 1999]
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/layer2/i4b_util.c b/sys/i4b/layer2/i4b_util.c
index 9f8fe19..047e438 100644
--- a/sys/i4b/layer2/i4b_util.c
+++ b/sys/i4b/layer2/i4b_util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,9 +27,9 @@
  *	i4b_util.c - layer 2 utility routines
  *	-------------------------------------
  *
- *	$Id: i4b_util.c,v 1.15 1998/12/05 18:05:26 hm Exp $ 
+ *	$Id: i4b_util.c,v 1.17 1999/02/14 09:45:01 hm Exp $ 
  *
- *      last edit-date: [Sat Dec  5 18:31:10 1998]
+ *      last edit-date: [Sun Feb 14 10:32:23 1999]
  *
  *---------------------------------------------------------------------------*/
 
@@ -165,6 +165,8 @@ i4b_enquiry_response(l2_softc_t *l2sc)
 void
 i4b_invoke_retransmission(l2_softc_t *l2sc, int nr)
 {
+	int x = SPLI4B();
+
 	DBGL2(L2_ERROR, "i4b_invoke_retransmission", ("nr = %d\n", nr ));
 	
 	while(l2sc->vs != nr)
@@ -189,6 +191,8 @@ i4b_invoke_retransmission(l2_softc_t *l2sc, int nr)
 			
 		i4b_i_frame_queued_up(l2sc);
 	}
+
+	splx(x);
 }
 
 /*---------------------------------------------------------------------------*
@@ -258,13 +262,13 @@ i4b_rxd_ack(l2_softc_t *l2sc, int nr)
 	{
 		int s;
 		
+		s = SPLI4B();
+		
 		M128DEC(nr);
 
 		if(l2sc->ua_num != nr)
 			DBGL2(L2_ERROR, "i4b_rxd_ack", ("((N(R)-1)=%d) != (UA=%d) !!!\n", nr, l2sc->ua_num));
 			
-		s = SPLI4B();
-		
 		i4b_Dfreembuf(l2sc->ua_frame);
 		l2sc->ua_num = UA_EMPTY;