update to i4b version 0.95.04

1 files changed, 87 insertions, 84 deletions

diff --git a/sys/i4b/layer2/i4b_l2fsm.c b/sys/i4b/layer2/i4b_l2fsm.c
index 9c6d513..51912ab 100644
--- a/sys/i4b/layer2/i4b_l2fsm.c
+++ b/sys/i4b/layer2/i4b_l2fsm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 2000 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,11 +27,11 @@
  *	i4b_l2fsm.c - layer 2 FSM
  *	-------------------------
  *
- *	$Id: i4b_l2fsm.c,v 1.17 1999/12/13 21:25:27 hm Exp $ 
+ *	$Id: i4b_l2fsm.c,v 1.22 2000/08/24 11:48:58 hm Exp $ 
  *
  * $FreeBSD$
  *
- *      last edit-date: [Mon Dec 13 22:03:36 1999]
+ *      last edit-date: [Tue May 30 15:48:20 2000]
  *
  *---------------------------------------------------------------------------*/
 
@@ -43,17 +43,16 @@
 #if NI4BQ921 > 0
 
 #include <sys/param.h>
-
-#if defined(__FreeBSD__)
-#else
-#include <sys/ioctl.h>
-#endif
-
+#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <net/if.h>
 
+#if defined(__NetBSD__) && __NetBSD_Version__ >= 104230000
+#include <sys/callout.h>
+#endif
+
 #ifdef __FreeBSD__
 #include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
@@ -71,8 +70,9 @@
 #include <i4b/layer2/i4b_l2.h>
 #include <i4b/layer2/i4b_l2fsm.h>
 
-l2_softc_t l2_softc[ISIC_MAXUNIT];
+l2_softc_t l2_softc[MAXL1UNITS];
 
+#if DO_I4B_DEBUG
 static char *l2state_text[N_STATES] = {
 	"ST_TEI_UNAS",
 	"ST_ASG_AW_TEI",
@@ -111,6 +111,7 @@ static char *l2event_text[N_EVENTS] = {
 	"EV_RXFRMR",
 	"Illegal Event"
 };
+#endif
 
 static void F_TU01 __P((l2_softc_t *));
 static void F_TU03 __P((l2_softc_t *));
@@ -193,7 +194,7 @@ static void F_NCNA __P((l2_softc_t *));
 static void
 F_ILL(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_ERR, "F_ILL", ("FSM function F_ILL executing\n"));
+	NDBGL2(L2_F_ERR, "FSM function F_ILL executing");
 }
 
 /*---------------------------------------------------------------------------*
@@ -202,7 +203,7 @@ F_ILL(l2_softc_t *l2sc)
 static void
 F_NCNA(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_NCNA", ("FSM function F_NCNA executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_NCNA executing");
 }
 
 /*---------------------------------------------------------------------------*
@@ -261,10 +262,10 @@ void i4b_next_l2state(l2_softc_t *l2sc, int event)
 	
 	if(newstate != ST_SUBSET)
 	{	/* state function does NOT set new state */
-		DBGL2(L2_F_MSG, "i4b_next_l2state", ("FSM event [%s]: [%s/%d => %s/%d]\n",
+		NDBGL2(L2_F_MSG, "FSM event [%s]: [%s/%d => %s/%d]",
 				l2event_text[event],
                                 l2state_text[currstate], currstate,
-                                l2state_text[newstate], newstate));
+                                l2state_text[newstate], newstate);
         }
 
 	/* execute state transition function */
@@ -272,9 +273,9 @@ void i4b_next_l2state(l2_softc_t *l2sc, int event)
 
 	if(newstate == ST_SUBSET)
 	{	/* state function DOES set new state */
-		DBGL2(L2_F_MSG, "i4b_next_l2state", ("FSM S-event [%s]: [%s => %s]\n", l2event_text[event],
+		NDBGL2(L2_F_MSG, "FSM S-event [%s]: [%s => %s]", l2event_text[event],
                                            l2state_text[currstate],
-                                           l2state_text[l2sc->Q921_state]));
+                                           l2state_text[l2sc->Q921_state]);
         }
         
 	/* check for illegal new state */
@@ -282,9 +283,9 @@ void i4b_next_l2state(l2_softc_t *l2sc, int event)
 	if(newstate == ST_ILL)
 	{
 		newstate = currstate;
-		DBGL2(L2_F_ERR, "i4b_next_l2state", ("FSM illegal state, state = %s, event = %s!\n",
+		NDBGL2(L2_F_ERR, "FSM illegal state, state = %s, event = %s!",
                                 l2state_text[currstate],
-				l2event_text[event]));
+				l2event_text[event]);
 	}
 
 	/* check if state machine function has to set new state */
@@ -294,7 +295,7 @@ void i4b_next_l2state(l2_softc_t *l2sc, int event)
 
 	if(l2sc->postfsmfunc != NULL)
 	{
-		DBGL2(L2_F_MSG, "i4b_next_l2state", ("FSM executing postfsmfunc!\n"));
+		NDBGL2(L2_F_MSG, "FSM executing postfsmfunc!");
 		/* try to avoid an endless loop */
 		savpostfsmfunc = l2sc->postfsmfunc;
 		l2sc->postfsmfunc = NULL;
@@ -302,6 +303,7 @@ void i4b_next_l2state(l2_softc_t *l2sc, int event)
         }
 }
 
+#if DO_I4B_DEBUG
 /*---------------------------------------------------------------------------*
  *	return pointer to current state description
  *---------------------------------------------------------------------------*/	
@@ -309,6 +311,7 @@ char *i4b_print_l2state(l2_softc_t *l2sc)
 {
 	return((char *) l2state_text[l2sc->Q921_state]);
 }
+#endif
 
 /*---------------------------------------------------------------------------*
  *	FSM state ST_TEI_UNAS event dl establish request
@@ -316,7 +319,7 @@ char *i4b_print_l2state(l2_softc_t *l2sc)
 static void
 F_TU01(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TU01", ("FSM function F_TU01 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TU01 executing");
 	i4b_mdl_assign_ind(l2sc);
 }
 
@@ -326,7 +329,7 @@ F_TU01(l2_softc_t *l2sc)
 static void
 F_TU03(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TU03", ("FSM function F_TU03 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TU03 executing");
 }
 
 /*---------------------------------------------------------------------------*
@@ -335,7 +338,7 @@ F_TU03(l2_softc_t *l2sc)
 static void
 F_TA03(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TA03", ("FSM function F_TA03 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TA03 executing");
 }
 
 /*---------------------------------------------------------------------------*
@@ -344,7 +347,7 @@ F_TA03(l2_softc_t *l2sc)
 static void
 F_TA04(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TA04", ("FSM function F_TA04 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TA04 executing");
 }
 
 /*---------------------------------------------------------------------------*
@@ -353,7 +356,7 @@ F_TA04(l2_softc_t *l2sc)
 static void
 F_TA05(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TA05", ("FSM function F_TA05 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TA05 executing");
 }
 
 /*---------------------------------------------------------------------------*
@@ -362,7 +365,7 @@ F_TA05(l2_softc_t *l2sc)
 static void
 F_TE03(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TE03", ("FSM function F_TE03 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TE03 executing");
 	i4b_establish_data_link(l2sc);
 	l2sc->l3initiated = 1;
 }
@@ -373,7 +376,7 @@ F_TE03(l2_softc_t *l2sc)
 static void
 F_TE04(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TE04", ("FSM function F_TE04 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TE04 executing");
 	l2sc->postfsmarg = l2sc->unit;
 	l2sc->postfsmfunc = DL_Rel_Ind_A;
 }
@@ -384,7 +387,7 @@ F_TE04(l2_softc_t *l2sc)
 static void
 F_TE05(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TE05", ("FSM function F_TE05 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TE05 executing");
 	l2sc->postfsmarg = l2sc->unit;
 	l2sc->postfsmfunc = DL_Rel_Ind_A;
 }
@@ -395,7 +398,7 @@ F_TE05(l2_softc_t *l2sc)
 static void
 F_T01(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_T01", ("FSM function F_T01 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_T01 executing");
 	i4b_establish_data_link(l2sc);
 	l2sc->l3initiated = 1;
 }
@@ -406,7 +409,7 @@ F_T01(l2_softc_t *l2sc)
 static void
 F_T05(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_T05", ("FSM function F_T05 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_T05 executing");
 }
 
 /*---------------------------------------------------------------------------*
@@ -415,7 +418,7 @@ F_T05(l2_softc_t *l2sc)
 static void
 F_T06(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_T06", ("FSM function F_T06 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_T06 executing");
 /*XXX*/	i4b_mdl_assign_ind(l2sc);
 }
 
@@ -425,7 +428,7 @@ F_T06(l2_softc_t *l2sc)
 static void
 F_T07(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_T07", ("FSM function F_T07 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_T07 executing");
 
 /* XXX */
 #ifdef NOTDEF
@@ -461,7 +464,7 @@ F_T07(l2_softc_t *l2sc)
 static void
 F_T08(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_T08", ("FSM function F_T08 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_T08 executing");
 	MDL_Status_Ind(l2sc->unit, STI_L2STAT, LAYER_IDLE);
 	i4b_tx_ua(l2sc, l2sc->rxd_PF);
 }
@@ -472,7 +475,7 @@ F_T08(l2_softc_t *l2sc)
 static void
 F_T09(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_T09", ("FSM function F_T09 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_T09 executing");
 	i4b_mdl_error_ind(l2sc, "F_T09", MDL_ERR_C);
 	i4b_mdl_error_ind(l2sc, "F_T09", MDL_ERR_D);	
 }
@@ -483,7 +486,7 @@ F_T09(l2_softc_t *l2sc)
 static void
 F_T10(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_T10", ("FSM function F_T10 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_T10 executing");
 
 	if(l2sc->rxd_PF)
 	{
@@ -512,7 +515,7 @@ F_T10(l2_softc_t *l2sc)
 static void
 F_T13(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_T13", ("FSM function F_T13 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_T13 executing");
 	l2sc->postfsmarg = l2sc->unit;
 	l2sc->postfsmfunc = DL_Rel_Cnf_A;
 }
@@ -523,7 +526,7 @@ F_T13(l2_softc_t *l2sc)
 static void
 F_AE01(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_AE01", ("FSM function F_AE01 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_AE01 executing");
 
 	i4b_Dcleanifq(&l2sc->i_queue);
 	
@@ -536,7 +539,7 @@ F_AE01(l2_softc_t *l2sc)
 static void
 F_AE05(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_AE05", ("FSM function F_AE05 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_AE05 executing");
 
 	i4b_Dcleanifq(&l2sc->i_queue);	
 
@@ -552,7 +555,7 @@ F_AE05(l2_softc_t *l2sc)
 static void
 F_AE06(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_AE06", ("FSM function F_AE06 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_AE06 executing");
 
 	i4b_Dcleanifq(&l2sc->i_queue);	
 
@@ -570,7 +573,7 @@ F_AE06(l2_softc_t *l2sc)
 static void
 F_AE07(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_AE07", ("FSM function F_AE07 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_AE07 executing");
 	MDL_Status_Ind(l2sc->unit, STI_L2STAT, LAYER_ACTIVE);
 	i4b_tx_ua(l2sc, l2sc->rxd_PF);
 }
@@ -581,7 +584,7 @@ F_AE07(l2_softc_t *l2sc)
 static void
 F_AE08(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_AE08", ("FSM function F_AE08 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_AE08 executing");
 	i4b_tx_dm(l2sc, l2sc->rxd_PF);
 }
 
@@ -591,7 +594,7 @@ F_AE08(l2_softc_t *l2sc)
 static void
 F_AE09(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_AE09", ("FSM function F_AE09 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_AE09 executing");
 
 	if(l2sc->rxd_PF == 0)
 	{
@@ -635,7 +638,7 @@ F_AE09(l2_softc_t *l2sc)
 static void
 F_AE10(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_AE10", ("FSM function F_AE10 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_AE10 executing");
 
 	if(l2sc->rxd_PF == 0)
 	{
@@ -660,7 +663,7 @@ F_AE10(l2_softc_t *l2sc)
 static void
 F_AE11(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_AE11", ("FSM function F_AE11 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_AE11 executing");
 
 	if(l2sc->RC >= N200)
 	{
@@ -691,7 +694,7 @@ F_AE11(l2_softc_t *l2sc)
 static void
 F_AE12(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_AE12", ("FSM function F_AE12 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_AE12 executing");
 
 	if(l2sc->l3initiated == 0)
 	{
@@ -705,7 +708,7 @@ F_AE12(l2_softc_t *l2sc)
 static void
 F_AR05(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_AR05", ("FSM function F_AR05 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_AR05 executing");
 
 	l2sc->postfsmarg = l2sc->unit;
 	l2sc->postfsmfunc = DL_Rel_Cnf_A;
@@ -719,7 +722,7 @@ F_AR05(l2_softc_t *l2sc)
 static void
 F_AR06(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_AR06", ("FSM function F_AR06 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_AR06 executing");
 
 	l2sc->postfsmarg = l2sc->unit;
 	l2sc->postfsmfunc = DL_Rel_Cnf_A;
@@ -735,7 +738,7 @@ F_AR06(l2_softc_t *l2sc)
 static void
 F_AR07(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_AR07", ("FSM function F_AR07 executing\n"));	
+	NDBGL2(L2_F_MSG, "FSM function F_AR07 executing");	
 	i4b_tx_dm(l2sc, l2sc->rxd_PF);
 }
 
@@ -745,7 +748,7 @@ F_AR07(l2_softc_t *l2sc)
 static void
 F_AR08(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_AR08", ("FSM function F_AR08 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_AR08 executing");
 	MDL_Status_Ind(l2sc->unit, STI_L2STAT, LAYER_IDLE);
 	i4b_tx_ua(l2sc, l2sc->rxd_PF);	
 }
@@ -756,7 +759,7 @@ F_AR08(l2_softc_t *l2sc)
 static void
 F_AR09(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_AR09", ("FSM function F_AR09 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_AR09 executing");
 
 	if(l2sc->rxd_PF)
 	{
@@ -781,7 +784,7 @@ F_AR09(l2_softc_t *l2sc)
 static void
 F_AR10(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_AR10", ("FSM function F_AR10 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_AR10 executing");
 
 	if(l2sc->rxd_PF)
 	{
@@ -804,7 +807,7 @@ F_AR10(l2_softc_t *l2sc)
 static void
 F_AR11(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_AR11", ("FSM function F_AR11 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_AR11 executing");
 
 	if(l2sc->RC >= N200)
 	{
@@ -833,7 +836,7 @@ F_AR11(l2_softc_t *l2sc)
 static void
 F_MF01(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_MF01", ("FSM function F_MF01 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_MF01 executing");
 
 	i4b_Dcleanifq(&l2sc->i_queue);
 
@@ -848,7 +851,7 @@ F_MF01(l2_softc_t *l2sc)
 static void
 F_MF05(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_MF05", ("FSM function F_MF05 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_MF05 executing");
 
 	i4b_Dcleanifq(&l2sc->i_queue);
 	
@@ -865,7 +868,7 @@ F_MF05(l2_softc_t *l2sc)
 static void
 F_MF06(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_MF06", ("FSM function F_MF06 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_MF06 executing");
 
 	i4b_Dcleanifq(&l2sc->i_queue);
 	
@@ -884,7 +887,7 @@ F_MF06(l2_softc_t *l2sc)
 static void
 F_MF07(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_MF07", ("FSM function F_MF07 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_MF07 executing");
 
 	i4b_clear_exception_conditions(l2sc);
 
@@ -916,7 +919,7 @@ F_MF07(l2_softc_t *l2sc)
 static void
 F_MF08(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_MF08", ("FSM function F_MF08 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_MF08 executing");
 
 	i4b_Dcleanifq(&l2sc->i_queue);
 	MDL_Status_Ind(l2sc->unit, STI_L2STAT, LAYER_IDLE);
@@ -935,7 +938,7 @@ F_MF08(l2_softc_t *l2sc)
 static void
 F_MF09(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_MF09", ("FSM function F_MF09 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_MF09 executing");
 	if(l2sc->rxd_PF)
 		i4b_mdl_error_ind(l2sc, "F_MF09", MDL_ERR_C);
 	else
@@ -948,7 +951,7 @@ F_MF09(l2_softc_t *l2sc)
 static void
 F_MF10(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_MF10", ("FSM function F_MF10 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_MF10 executing");
 
 	if(l2sc->rxd_PF)
 	{
@@ -974,7 +977,7 @@ F_MF10(l2_softc_t *l2sc)
 static void
 F_MF11(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_MF11", ("FSM function F_MF11 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_MF11 executing");
 
 	l2sc->RC = 0;
 
@@ -989,7 +992,7 @@ F_MF11(l2_softc_t *l2sc)
 static void
 F_MF12(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_MF12", ("FSM function F_MF12 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_MF12 executing");
 
 	i4b_i_frame_queued_up(l2sc);
 }
@@ -1000,7 +1003,7 @@ F_MF12(l2_softc_t *l2sc)
 static void
 F_MF13(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_MF13", ("FSM function F_MF13 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_MF13 executing");
 
 	i4b_Dcleanifq(&l2sc->i_queue);
 
@@ -1018,7 +1021,7 @@ F_MF13(l2_softc_t *l2sc)
 static void
 F_MF14(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_MF14", ("FSM function F_MF14 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_MF14 executing");
 
 	i4b_transmit_enquire(l2sc);
 
@@ -1031,7 +1034,7 @@ F_MF14(l2_softc_t *l2sc)
 static void
 F_MF15(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_MF15", ("FSM function F_MF15 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_MF15 executing");
 
 	if(l2sc->own_busy == 0)
 	{
@@ -1049,7 +1052,7 @@ F_MF15(l2_softc_t *l2sc)
 static void
 F_MF16(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_MF16", ("FSM function F_MF16 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_MF16 executing");
 
 	if(l2sc->own_busy != 0)
 	{
@@ -1067,7 +1070,7 @@ F_MF16(l2_softc_t *l2sc)
 static void
 F_MF17(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_MF17", ("FSM function F_MF17 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_MF17 executing");
 
 	l2sc->peer_busy = 0;
 
@@ -1114,7 +1117,7 @@ F_MF17(l2_softc_t *l2sc)
 static void
 F_MF18(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_MF18", ("FSM function F_MF18 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_MF18 executing");
 
 	l2sc->peer_busy = 0;
 
@@ -1154,7 +1157,7 @@ F_MF18(l2_softc_t *l2sc)
 static void
 F_MF19(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_MF19", ("FSM function F_MF19 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_MF19 executing");
 
 	l2sc->peer_busy = 1;
 
@@ -1193,7 +1196,7 @@ F_MF19(l2_softc_t *l2sc)
 static void
 F_MF20(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_MF20", ("FSM function F_MF20 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_MF20 executing");
 
 	i4b_mdl_error_ind(l2sc, "F_MF20", MDL_ERR_K);
 
@@ -1208,7 +1211,7 @@ F_MF20(l2_softc_t *l2sc)
 static void
 F_TR01(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TR01", ("FSM function F_TR01 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TR01 executing");
 
 	i4b_Dcleanifq(&l2sc->i_queue);
 
@@ -1223,7 +1226,7 @@ F_TR01(l2_softc_t *l2sc)
 static void
 F_TR05(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TR05", ("FSM function F_TR05 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TR05 executing");
 
 	i4b_Dcleanifq(&l2sc->i_queue);	
 
@@ -1239,7 +1242,7 @@ F_TR05(l2_softc_t *l2sc)
 static void
 F_TR06(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TR06", ("FSM function F_TR06 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TR06 executing");
 
 	i4b_Dcleanifq(&l2sc->i_queue);
 
@@ -1257,7 +1260,7 @@ F_TR06(l2_softc_t *l2sc)
 static void
 F_TR07(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TR07", ("FSM function F_TR07 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TR07 executing");
 
 	i4b_clear_exception_conditions(l2sc);
 
@@ -1289,7 +1292,7 @@ F_TR07(l2_softc_t *l2sc)
 static void
 F_TR08(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TR08", ("FSM function F_TR08 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TR08 executing");
 
 	i4b_Dcleanifq(&l2sc->i_queue);		
 	MDL_Status_Ind(l2sc->unit, STI_L2STAT, LAYER_IDLE);
@@ -1307,7 +1310,7 @@ F_TR08(l2_softc_t *l2sc)
 static void
 F_TR09(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TR09", ("FSM function F_TR09 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TR09 executing");
 	if(l2sc->rxd_PF)
 		i4b_mdl_error_ind(l2sc, "F_TR09", MDL_ERR_C);
 	else
@@ -1320,7 +1323,7 @@ F_TR09(l2_softc_t *l2sc)
 static void
 F_TR10(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TR10", ("FSM function F_TR10 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TR10 executing");
 
 	if(l2sc->rxd_PF)
 	{
@@ -1342,7 +1345,7 @@ F_TR10(l2_softc_t *l2sc)
 static void
 F_TR11(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TR11", ("FSM function F_TR11 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TR11 executing");
 
 	if(l2sc->RC >= N200)
 	{
@@ -1370,7 +1373,7 @@ F_TR11(l2_softc_t *l2sc)
 static void
 F_TR12(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TR12", ("FSM function F_TR12 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TR12 executing");
 
 	i4b_i_frame_queued_up(l2sc);
 }
@@ -1381,7 +1384,7 @@ F_TR12(l2_softc_t *l2sc)
 static void
 F_TR13(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TR13", ("FSM function F_TR13 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TR13 executing");
 
 	i4b_Dcleanifq(&l2sc->i_queue);			
 
@@ -1398,7 +1401,7 @@ F_TR13(l2_softc_t *l2sc)
 static void
 F_TR15(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TR15", ("FSM function F_TR15 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TR15 executing");
 
 	if(l2sc->own_busy == 0)
 	{
@@ -1416,7 +1419,7 @@ F_TR15(l2_softc_t *l2sc)
 static void
 F_TR16(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TR16", ("FSM function F_TR16 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TR16 executing");
 
 	if(l2sc->own_busy != 0)
 	{
@@ -1434,7 +1437,7 @@ F_TR16(l2_softc_t *l2sc)
 static void
 F_TR17(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TR17", ("FSM function F_TR17 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TR17 executing");
 
 	l2sc->peer_busy = 0;
 
@@ -1485,7 +1488,7 @@ F_TR17(l2_softc_t *l2sc)
 static void
 F_TR18(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TR18", ("FSM function F_TR18 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TR18 executing");
 
 	l2sc->peer_busy = 0;
 
@@ -1536,7 +1539,7 @@ F_TR18(l2_softc_t *l2sc)
 static void
 F_TR19(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TR19", ("FSM function F_TR19 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TR19 executing");
 
 	l2sc->peer_busy = 0;
 
@@ -1586,7 +1589,7 @@ F_TR19(l2_softc_t *l2sc)
 static void
 F_TR20(l2_softc_t *l2sc)
 {
-	DBGL2(L2_F_MSG, "F_TR20", ("FSM function F_TR20 executing\n"));
+	NDBGL2(L2_F_MSG, "FSM function F_TR20 executing");
 
 	i4b_mdl_error_ind(l2sc, "F_TR20", MDL_ERR_K);