patch-pre2.0.6 linux/drivers/isdn/teles/isdnl3.c

Next file: linux/drivers/isdn/teles/l3_1TR6.c
Previous file: linux/drivers/isdn/teles/isdnl2.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file pre2.0.5/linux/drivers/isdn/teles/isdnl3.c linux/drivers/isdn/teles/isdnl3.c
@@ -1,6 +1,16 @@
-/* $Id: isdnl3.c,v 1.2 1996/04/20 16:45:05 fritz Exp $
+/* $Id: isdnl3.c,v 1.5 1996/05/18 01:37:16 fritz Exp $
  *
  * $Log: isdnl3.c,v $
+ * Revision 1.5  1996/05/18 01:37:16  fritz
+ * Added spelling corrections and some minor changes
+ * to stay in sync with kernel.
+ *
+ * Revision 1.4  1996/05/17 03:46:16  fritz
+ * General cleanup.
+ *
+ * Revision 1.3  1996/04/30 21:57:53  isdn4dev
+ * remove some debugging code, improve callback   Karsten Keil
+ *
  * Revision 1.2  1996/04/20 16:45:05  fritz
  * Changed to report all incoming calls to Linklevel, not just those
  * with Service 7.
@@ -123,17 +133,9 @@
 		  *p++ = 0x90;	/* Packet-Mode 64kbps                      */
 		  break;
 	}
-/*
- * What about info2? Mapping to High-Layer-Compatibility?
- */
-
-#if 0				/* user-user not allowed in The Netherlands! */
-	*p++ = 0x7f;
-	*p++ = 0x2;
-	*p++ = 0x0;
-	*p++ = 66;
-#endif
-
+	/*
+	 * What about info2? Mapping to High-Layer-Compatibility?
+	 */
 	if (st->pa->calling[0] != '\0') {
 		*p++ = 0x6c;
 		*p++ = strlen(st->pa->calling) + 1;
@@ -308,15 +310,6 @@
 	newl3state(st, 0);
 }
 
-#ifdef DEFINED_BUT_NOT_USED
-static void
-l3s15(struct PStack *st, byte pr, void *arg)
-{
-	newl3state(st, 0);
-	st->l3.l3l4(st, CC_REJECT, NULL);
-}
-#endif
-
 static void
 l3s16(struct PStack *st, byte pr,
       void *arg)
@@ -475,11 +468,6 @@
 		ptr = DATAPTR(ibh);
 		ptr += st->l2.ihsize;
 		size = ibh->datasize - st->l2.ihsize;
-		if (DEBUG_1TR6 > 6) {
-			printk(KERN_INFO "isdnl3/l3up DL_DATA size=%d\n", size);
-			for (i = 0; i < size; i++)
-				printk(KERN_INFO "l3up data %x\n", ptr[i]);
-		}
 		mt = ptr[3];
 		switch (ptr[0]) {
 #ifdef P_1TR6
@@ -494,8 +482,8 @@
 			  if (i == datasl_1tr6t_len) {
 				  BufPoolRelease(ibh);
 				  if (DEBUG_1TR6 > 0)
-					  printk(KERN_INFO "isdnl3up unhandled 1tr6 state %d MT %s\n",
-						 st->l3.state, mt_trans(PROTO_DIS_N1, mt));
+					  printk(KERN_INFO "isdnl3up unhandled 1tr6 state %d MT %x\n",
+						 st->l3.state, mt);
 			  } else
 				  datastatelist_1tr6t[i].rout(st, pr, ibh);
 			  break;
@@ -507,6 +495,9 @@
 					  break;
 			  if (i == datasllen) {
 				  BufPoolRelease(ibh);
+				  if (DEBUG_1TR6 > 0)
+			  	  	printk(KERN_INFO "isdnl3up unhandled E-DSS1 state %d MT %x\n",
+				 		st->l3.state, mt);
 			  } else
 				  datastatelist[i].rout(st, pr, ibh);
 		}
@@ -514,11 +505,6 @@
 		ptr = DATAPTR(ibh);
 		ptr += st->l2.uihsize;
 		size = ibh->datasize - st->l2.uihsize;
-		if (DEBUG_1TR6 > 6) {
-			printk(KERN_INFO "isdnl3/l3up DL_UNIT_DATA size=%d\n", size);
-			for (i = 0; i < size; i++)
-				printk(KERN_INFO "l3up data %x\n", ptr[i]);
-		}
 		mt = ptr[3];
 		switch (ptr[0]) {
 #ifdef P_1TR6
@@ -532,8 +518,8 @@
 					  break;
 			  if (i == datasl_1tr6t_len) {
 				  if (DEBUG_1TR6 > 0) {
-					  printk(KERN_INFO "isdnl3up unhandled 1tr6 state %d MT %s\n"
-						 ,st->l3.state, mt_trans(PROTO_DIS_N1, mt));
+					  printk(KERN_INFO "isdnl3up unhandled 1tr6 state %d MT %x\n"
+						 ,st->l3.state, mt);
 				  }
 				  BufPoolRelease(ibh);
 			  } else
@@ -547,6 +533,9 @@
 					  break;
 			  if (i == datasllen) {
 				  BufPoolRelease(ibh);
+				  if (DEBUG_1TR6 > 0)
+			  	  	printk(KERN_INFO "isdnl3up unhandled E-DSS1 state %d MT %x\n",
+				 		st->l3.state, mt);
 			  } else
 				  datastatelist[i].rout(st, pr, ibh);
 		}
@@ -581,6 +570,9 @@
 			      (pr == downstatelist[i].primitive))
 				  break;
 		  if (i == downsllen) {
+			  if (DEBUG_1TR6 > 0) {
+				  printk(KERN_INFO "isdnl3down unhandled E-DSS1 state %d primitiv %x\n", st->l3.state, pr);
+			  }
 		  } else
 			  downstatelist[i].rout(st, pr, ibh);
 	}

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this