Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5671e8c1 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

fddi: skfp: Use more common logging styles 



Several macros use non-standard styles where format and arguments
are not verified.  Convert these to a more typical fmt, ##__VA_ARGS__
use so format and arguments match as appropriate.

Miscellanea:

o Fix format and argument mismatches
o Realign and reindent misindented block
o Strip newlines from formats and add to macro defines
o Coalesce a few consecutive logging uses to more simple single uses

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5dbc6530

drivers/net/fddi/skfp/cfm.c

+10 −12
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ static const char ID_sccs[] = "@(#)cfm.c 2.18 98/10/06 (C) SK " ; 
#define ACTIONS_DONE()	(smc->mib.fddiSMTCF_State &= ~AFLAG)

#define ACTIONS(x)	(x|AFLAG)



#ifdef	DEBUG

/*

 * symbolic state names

 */
@@ -68,7 +67,6 @@ static const char * const cfm_states[] = { 
static const char * const cfm_events[] = {

	"NONE","CF_LOOP_A","CF_LOOP_B","CF_JOIN_A","CF_JOIN_B"

} ;

#endif



/*

 * map from state to downstream port type
@@ -230,10 +228,10 @@ void cfm(struct s_smc *smc, int event) 


	oldstate = smc->mib.fddiSMTCF_State ;

	do {

		DB_CFM("CFM : state %s%s",

			(smc->mib.fddiSMTCF_State & AFLAG) ? "ACTIONS " : "",

			cfm_states[smc->mib.fddiSMTCF_State & ~AFLAG]) ;

		DB_CFM(" event %s\n",cfm_events[event],0) ;

		DB_CFM("CFM : state %s%s event %s",

		       smc->mib.fddiSMTCF_State & AFLAG ? "ACTIONS " : "",

		       cfm_states[smc->mib.fddiSMTCF_State & ~AFLAG],

		       cfm_events[event]);

		state = smc->mib.fddiSMTCF_State ;

		cfm_fsm(smc,event) ;

		event = 0 ;
@@ -297,7 +295,7 @@ static void cfm_fsm(struct s_smc *smc, int cmd) 
		queue_event(smc,EVENT_RMT,RM_JOIN) ;/* signal RMT */

		/* Don't do the WC-Flag changing here */

		ACTIONS_DONE() ;

		DB_CFMN(1,"CFM : %s\n",cfm_states[smc->mib.fddiSMTCF_State],0) ;

		DB_CFMN(1, "CFM : %s", cfm_states[smc->mib.fddiSMTCF_State]);

		break;

	case SC0_ISOLATED :

		/*SC07*/
@@ -338,7 +336,7 @@ static void cfm_fsm(struct s_smc *smc, int cmd) 
			queue_event(smc,EVENT_RMT,RM_JOIN) ;/* signal RMT */

		}

		ACTIONS_DONE() ;

		DB_CFMN(1,"CFM : %s\n",cfm_states[smc->mib.fddiSMTCF_State],0) ;

		DB_CFMN(1, "CFM : %s", cfm_states[smc->mib.fddiSMTCF_State]);

		break ;

	case SC9_C_WRAP_A :

		/*SC10*/
@@ -403,7 +401,7 @@ static void cfm_fsm(struct s_smc *smc, int cmd) 
			queue_event(smc,EVENT_RMT,RM_JOIN) ;/* signal RMT */

		}

		ACTIONS_DONE() ;

		DB_CFMN(1,"CFM : %s\n",cfm_states[smc->mib.fddiSMTCF_State],0) ;

		DB_CFMN(1, "CFM : %s", cfm_states[smc->mib.fddiSMTCF_State]);

		break ;

	case SC10_C_WRAP_B :

		/*SC20*/
@@ -448,7 +446,7 @@ static void cfm_fsm(struct s_smc *smc, int cmd) 
		smc->r.rm_join = TRUE ;

		queue_event(smc,EVENT_RMT,RM_JOIN) ;/* signal RMT */

		ACTIONS_DONE() ;

		DB_CFMN(1,"CFM : %s\n",cfm_states[smc->mib.fddiSMTCF_State],0) ;

		DB_CFMN(1, "CFM : %s", cfm_states[smc->mib.fddiSMTCF_State]);

		break ;

	case SC4_THRU_A :

		/*SC41*/
@@ -481,7 +479,7 @@ static void cfm_fsm(struct s_smc *smc, int cmd) 
		smc->r.rm_join = TRUE ;

		queue_event(smc,EVENT_RMT,RM_JOIN) ;/* signal RMT */

		ACTIONS_DONE() ;

		DB_CFMN(1,"CFM : %s\n",cfm_states[smc->mib.fddiSMTCF_State],0) ;

		DB_CFMN(1, "CFM : %s", cfm_states[smc->mib.fddiSMTCF_State]);

		break ;

	case SC5_THRU_B :

		/*SC51*/
@@ -519,7 +517,7 @@ static void cfm_fsm(struct s_smc *smc, int cmd) 
			queue_event(smc,EVENT_RMT,RM_JOIN) ;/* signal RMT */

		}

		ACTIONS_DONE() ;

		DB_CFMN(1,"CFM : %s\n",cfm_states[smc->mib.fddiSMTCF_State],0) ;

		DB_CFMN(1, "CFM : %s", cfm_states[smc->mib.fddiSMTCF_State]);

		break ;

	case SC11_C_WRAP_S :

		/*SC70*/

drivers/net/fddi/skfp/drvfbi.c

+2 −2
Original line number Diff line number Diff line
@@ -343,8 +343,8 @@ void init_board(struct s_smc *smc, u_char *mac_addr) 
 */

void sm_pm_bypass_req(struct s_smc *smc, int mode)

{

	DB_ECMN(1,"ECM : sm_pm_bypass_req(%s)\n",(mode == BP_INSERT) ?

					"BP_INSERT" : "BP_DEINSERT",0) ;

	DB_ECMN(1, "ECM : sm_pm_bypass_req(%s)",

		mode == BP_INSERT ? "BP_INSERT" : "BP_DEINSERT");



	if (smc->s.sas != SMT_DAS)

		return ;

drivers/net/fddi/skfp/ecm.c

+16 −18
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ static const char ID_sccs[] = "@(#)ecm.c 2.7 99/08/05 (C) SK " ; 
#define EC6_CHECK	6			/* checking bypass */

#define EC7_DEINSERT	7			/* bypass being turnde off */



#ifdef	DEBUG

/*

 * symbolic state names

 */
@@ -83,7 +82,6 @@ static const char * const ecm_events[] = { 
	"EC_TIMEOUT_TD","EC_TIMEOUT_TMAX",

	"EC_TIMEOUT_IMAX","EC_TIMEOUT_INMAX","EC_TEST_DONE"

} ;

#endif



/*

 * all Globals  are defined in smc.h
@@ -126,10 +124,10 @@ void ecm(struct s_smc *smc, int event) 
	int	state ;



	do {

		DB_ECM("ECM : state %s%s",

			(smc->mib.fddiSMTECMState & AFLAG) ? "ACTIONS " : "",

			ecm_states[smc->mib.fddiSMTECMState & ~AFLAG]) ;

		DB_ECM(" event %s\n",ecm_events[event],0) ;

		DB_ECM("ECM : state %s%s event %s",

		       smc->mib.fddiSMTECMState & AFLAG ? "ACTIONS " : "",

		       ecm_states[smc->mib.fddiSMTECMState & ~AFLAG],

		       ecm_events[event]);

		state = smc->mib.fddiSMTECMState ;

		ecm_fsm(smc,event) ;

		event = 0 ;
@@ -379,7 +377,7 @@ static void ecm_fsm(struct s_smc *smc, int cmd) 
			 (((ls_a == PC_ILS) && (ls_b == PC_QLS)) ||

			  ((ls_a == PC_QLS) && (ls_b == PC_ILS)))){

			smc->e.sb_flag = TRUE ;

			DB_ECMN(1,"ECM : EC6_CHECK - stuck bypass\n",0,0) ;

			DB_ECMN(1, "ECM : EC6_CHECK - stuck bypass");

			AIX_EVENT(smc, (u_long) FDDI_RING_STATUS, (u_long)

				FDDI_SMT_ERROR, (u_long) FDDI_BYPASS_STUCK,

				smt_get_error_word(smc));
@@ -443,29 +441,29 @@ static void prop_actions(struct s_smc *smc) 
		return ;

	}



	DB_ECM("ECM : prop_actions - trace_prop %d\n", smc->e.trace_prop,0) ;

	DB_ECM("ECM : prop_actions - in %d out %d\n", port_in,port_out) ;

	DB_ECM("ECM : prop_actions - trace_prop %lu", smc->e.trace_prop);

	DB_ECM("ECM : prop_actions - in %d out %d", port_in, port_out);



	if (smc->e.trace_prop & ENTITY_BIT(ENTITY_MAC)) {

		/* trace initiatior */

		DB_ECM("ECM : initiate TRACE on PHY %c\n",'A'+port_in-PA,0) ;

		DB_ECM("ECM : initiate TRACE on PHY %c", 'A' + port_in - PA);

		queue_event(smc,EVENT_PCM+port_in,PC_TRACE) ;

	}

	else if ((smc->e.trace_prop & ENTITY_BIT(ENTITY_PHY(PA))) &&

		port_out != PA) {

		/* trace propagate upstream */

		DB_ECM("ECM : propagate TRACE on PHY B\n",0,0) ;

		DB_ECM("ECM : propagate TRACE on PHY B");

		queue_event(smc,EVENT_PCMB,PC_TRACE) ;

	}

	else if ((smc->e.trace_prop & ENTITY_BIT(ENTITY_PHY(PB))) &&

		port_out != PB) {

		/* trace propagate upstream */

		DB_ECM("ECM : propagate TRACE on PHY A\n",0,0) ;

		DB_ECM("ECM : propagate TRACE on PHY A");

		queue_event(smc,EVENT_PCMA,PC_TRACE) ;

	}

	else {

		/* signal trace termination */

		DB_ECM("ECM : TRACE terminated\n",0,0) ;

		DB_ECM("ECM : TRACE terminated");

		smc->e.path_test = PT_PENDING ;

	}

	smc->e.trace_prop = 0 ;
@@ -482,13 +480,13 @@ static void prop_actions(struct s_smc *smc) 


	RS_SET(smc,RS_EVENT) ;

	while (smc->e.trace_prop) {

		DB_ECM("ECM : prop_actions - trace_prop %d\n",

			smc->e.trace_prop,0) ;

		DB_ECM("ECM : prop_actions - trace_prop %d",

		       smc->e.trace_prop);



		if (smc->e.trace_prop & ENTITY_BIT(ENTITY_MAC)) {

			initiator = ENTITY_MAC ;

			smc->e.trace_prop &= ~ENTITY_BIT(ENTITY_MAC) ;

			DB_ECM("ECM: MAC initiates trace\n",0,0) ;

			DB_ECM("ECM: MAC initiates trace");

		}

		else {

			for (p = NUMPHYS-1 ; p >= 0 ; p--) {
@@ -503,12 +501,12 @@ static void prop_actions(struct s_smc *smc) 


		if (upstream == ENTITY_MAC) {

			/* signal trace termination */

			DB_ECM("ECM : TRACE terminated\n",0,0) ;

			DB_ECM("ECM : TRACE terminated");

			smc->e.path_test = PT_PENDING ;

		}

		else {

			/* trace propagate upstream */

			DB_ECM("ECM : propagate TRACE on PHY %d\n",upstream,0) ;

			DB_ECM("ECM : propagate TRACE on PHY %d", upstream);

			queue_event(smc,EVENT_PCM+upstream,PC_TRACE) ;

		}

	}

drivers/net/fddi/skfp/ess.c

+34 −32
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm, 
	 * get the resource type

	 */

	if (!(p = (void *) sm_to_para(smc,sm,SMT_P0015))) {

		DB_ESS("ESS: RAF frame error, parameter type not found\n",0,0) ;

		DB_ESS("ESS: RAF frame error, parameter type not found");

		return fs;

	}

	msg_res_type = ((struct smt_p_0015 *)p)->res_type ;
@@ -146,16 +146,16 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm, 
		/*

		 * error in frame: para ESS command was not found

		 */

		 DB_ESS("ESS: RAF frame error, parameter command not found\n",0,0);

		 DB_ESS("ESS: RAF frame error, parameter command not found");

		 return fs;

	}



	DB_ESSN(2,"fc %x	ft %x\n",sm->smt_class,sm->smt_type) ;

	DB_ESSN(2,"ver %x	tran %lx\n",sm->smt_version,sm->smt_tid) ;

	DB_ESSN(2,"stn_id %s\n",addr_to_string(&sm->smt_source),0) ;

	DB_ESSN(2, "fc %x	ft %x", sm->smt_class, sm->smt_type);

	DB_ESSN(2, "ver %x	tran %x", sm->smt_version, sm->smt_tid);

	DB_ESSN(2, "stn_id %s", addr_to_string(&sm->smt_source));



	DB_ESSN(2,"infolen %x	res %x\n",sm->smt_len, msg_res_type) ;

	DB_ESSN(2,"sbacmd %x\n",cmd->sba_cmd,0) ;

	DB_ESSN(2, "infolen %x	res %lx", sm->smt_len, msg_res_type);

	DB_ESSN(2, "sbacmd %x", cmd->sba_cmd);



	/*

	 * evaluate the ESS command
@@ -189,7 +189,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm, 
			 *	 The ESS do not send the Frame to the network!

			 */

			smc->ess.alloc_trans_id = sm->smt_tid ;

			DB_ESS("ESS: save Alloc Req Trans ID %lx\n",sm->smt_tid,0);

			DB_ESS("ESS: save Alloc Req Trans ID %x", sm->smt_tid);

			p = (void *) sm_to_para(smc,sm,SMT_P320F) ;

			((struct smt_p_320f *)p)->mib_payload =

				smc->mib.a[PATH0].fddiPATHSbaPayload ;
@@ -220,7 +220,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm, 
		 * check the parameters

		 */

		if (smt_check_para(smc,sm,plist_raf_alc_res)) {

			DB_ESS("ESS: RAF with para problem, ignoring\n",0,0) ;

			DB_ESS("ESS: RAF with para problem, ignoring");

			return fs;

		}
@@ -241,7 +241,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm, 
			!= SMT_RDF_SUCCESS) ||

			(sm->smt_tid != smc->ess.alloc_trans_id)) {



			DB_ESS("ESS: Allocation Response not accepted\n",0,0) ;

			DB_ESS("ESS: Allocation Response not accepted");

			return fs;

		}
@@ -261,7 +261,8 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm, 
                }       

		overhead = ((struct smt_p_3210 *)p)->mib_overhead ;



		DB_ESSN(2,"payload= %lx	overhead= %lx\n",payload,overhead) ;

		DB_ESSN(2, "payload= %lx	overhead= %lx",

			payload, overhead);



		/*

		 * process the bandwidth allocation
@@ -279,7 +280,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm, 
		 * except only replies

		 */

		if (sm->smt_type != SMT_REQUEST) {

			DB_ESS("ESS: Do not process Change Responses\n",0,0) ;

			DB_ESS("ESS: Do not process Change Responses");

			return fs;

		}
@@ -287,7 +288,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm, 
		 * check the para for the Change Request

		 */

		if (smt_check_para(smc,sm,plist_raf_chg_req)) {

			DB_ESS("ESS: RAF with para problem, ignoring\n",0,0) ;

			DB_ESS("ESS: RAF with para problem, ignoring");

			return fs;

		}
@@ -299,7 +300,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm, 
		 */

		if ((((struct smt_p_320b *)sm_to_para(smc,sm,SMT_P320B))->path_index

			!= PRIMARY_RING) || (msg_res_type != SYNC_BW)) {

			DB_ESS("ESS: RAF frame with para problem, ignoring\n",0,0) ;

			DB_ESS("ESS: RAF frame with para problem, ignoring");

			return fs;

		}
@@ -311,9 +312,10 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm, 
		p = (void *) sm_to_para(smc,sm,SMT_P3210) ;

		overhead = ((struct smt_p_3210 *)p)->mib_overhead ;



		DB_ESSN(2,"ESS: Change Request from %s\n",

			addr_to_string(&sm->smt_source),0) ;

		DB_ESSN(2,"payload= %lx	overhead= %lx\n",payload,overhead) ;

		DB_ESSN(2, "ESS: Change Request from %s",

			addr_to_string(&sm->smt_source));

		DB_ESSN(2, "payload= %lx	overhead= %lx",

			payload, overhead);



		/*

		 * process the bandwidth allocation
@@ -337,18 +339,18 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm, 
		 * except only requests

		 */

		if (sm->smt_type != SMT_REQUEST) {

			DB_ESS("ESS: Do not process a Report Reply\n",0,0) ;

			DB_ESS("ESS: Do not process a Report Reply");

			return fs;

		}



		DB_ESSN(2,"ESS: Report Request from %s\n",

			addr_to_string(&(sm->smt_source)),0) ;

		DB_ESSN(2, "ESS: Report Request from %s",

			addr_to_string(&sm->smt_source));



		/*

		 * verify that the resource type is sync bw only

		 */

		if (msg_res_type != SYNC_BW) {

			DB_ESS("ESS: ignoring RAF with para problem\n",0,0) ;

			DB_ESS("ESS: ignoring RAF with para problem");

			return fs;

		}
@@ -364,7 +366,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm, 
		/*

		 * error in frame

		 */

		DB_ESS("ESS: ignoring RAF with bad sba_cmd\n",0,0) ;

		DB_ESS("ESS: ignoring RAF with bad sba_cmd");

		break ;

	}
@@ -417,17 +419,17 @@ static int process_bw_alloc(struct s_smc *smc, long int payload, long int overhe 
	 * set the mib attributes fddiPATHSbaOverhead, fddiPATHSbaPayload

	 */

/*	if (smt_set_obj(smc,SMT_P320F,payload,S_SET)) {

		DB_ESS("ESS: SMT does not accept the payload value\n",0,0) ;

		DB_ESS("ESS: SMT does not accept the payload value");

		return FALSE;

	}

	if (smt_set_obj(smc,SMT_P3210,overhead,S_SET)) {

		DB_ESS("ESS: SMT does not accept the overhead value\n",0,0) ;

		DB_ESS("ESS: SMT does not accept the overhead value");

		return FALSE;

	} */



	/* premliminary */

	if (payload > MAX_PAYLOAD || overhead > 5000) {

		DB_ESS("ESS: payload / overhead not accepted\n",0,0) ;

		DB_ESS("ESS: payload / overhead not accepted");

		return FALSE;

	}
@@ -446,7 +448,7 @@ static int process_bw_alloc(struct s_smc *smc, long int payload, long int overhe 
	 * evulate the Payload

	 */

	if (payload) {

		DB_ESSN(2,"ESS: turn SMT_ST_SYNC_SERVICE bit on\n",0,0) ;

		DB_ESSN(2, "ESS: turn SMT_ST_SYNC_SERVICE bit on");

		smc->ess.sync_bw_available = TRUE ;



		smc->ess.sync_bw = overhead -
@@ -454,7 +456,7 @@ static int process_bw_alloc(struct s_smc *smc, long int payload, long int overhe 
			payload / 1562 ;

	}

	else {

		DB_ESSN(2,"ESS: turn SMT_ST_SYNC_SERVICE bit off\n",0,0) ;

		DB_ESSN(2, "ESS: turn SMT_ST_SYNC_SERVICE bit off");

		smc->ess.sync_bw_available = FALSE ;

		smc->ess.sync_bw = 0 ;

		overhead = 0 ;
@@ -464,7 +466,7 @@ static int process_bw_alloc(struct s_smc *smc, long int payload, long int overhe 
	smc->mib.a[PATH0].fddiPATHSbaOverhead = overhead ;





	DB_ESSN(2,"tsync = %lx\n",smc->ess.sync_bw,0) ;

	DB_ESSN(2, "tsync = %lx", smc->ess.sync_bw);



	ess_config_fifo(smc) ;

	set_formac_tsync(smc,smc->ess.sync_bw) ;
@@ -541,7 +543,7 @@ void ess_timer_poll(struct s_smc *smc) 
	if (!smc->ess.raf_act_timer_poll)

		return ;



	DB_ESSN(2,"ESS: timer_poll\n",0,0) ;

	DB_ESSN(2, "ESS: timer_poll");



	smc->ess.timer_count++ ;

	if (smc->ess.timer_count == 10) {
@@ -667,11 +669,11 @@ static void ess_send_frame(struct s_smc *smc, SMbuf *mb) 
		/*

		 * Send the Change Reply to the local SBA

		 */

		DB_ESS("ESS:Send to the local SBA\n",0,0) ;

		DB_ESS("ESS:Send to the local SBA");

		if (!smc->ess.sba_reply_pend)

			smc->ess.sba_reply_pend = mb ;

		else {

			DB_ESS("Frame is lost - another frame was pending\n",0,0);

			DB_ESS("Frame is lost - another frame was pending");

			smt_free_mbuf(smc,mb) ;

		}

	}
@@ -679,7 +681,7 @@ static void ess_send_frame(struct s_smc *smc, SMbuf *mb) 
		/*

		 * Send the SBA RAF Change Reply to the network

		 */

		DB_ESS("ESS:Send to the network\n",0,0) ;

		DB_ESS("ESS:Send to the network");

		smt_send_frame(smc,mb,FC_SMT_INFO,0) ;

	}

}

drivers/net/fddi/skfp/fplustm.c

+12 −12
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ void mac2_irq(struct s_smc *smc, u_short code_s2u, u_short code_s2l) 
	if (code_s2u & FM_SMYBEC)

		queue_event(smc,EVENT_RMT,RM_MY_BEACON) ;

	if (change_s2u & code_s2u & FM_SLOCLM) {

		DB_RMTN(2,"RMT : lower claim received\n",0,0) ;

		DB_RMTN(2, "RMT : lower claim received");

	}

	if ((code_s2u & FM_SMYCLM) && !(code_s2l & FM_SDUPCLM)) {

		/*
@@ -746,7 +746,7 @@ void mac2_irq(struct s_smc *smc, u_short code_s2u, u_short code_s2l) 
		queue_event(smc,EVENT_RMT,RM_VALID_CLAIM) ;

	}

	if (change_s2u & code_s2u & FM_SHICLM) {

		DB_RMTN(2,"RMT : higher claim received\n",0,0) ;

		DB_RMTN(2, "RMT : higher claim received");

	}

	if ( (code_s2l & FM_STRTEXP) ||

	     (code_s2l & FM_STRTEXR) )
@@ -1334,7 +1334,7 @@ void rtm_irq(struct s_smc *smc) 
	outpw(ADDR(B2_RTM_CRTL),TIM_CL_IRQ) ;		/* clear IRQ */

	if (inpw(ADDR(B2_RTM_CRTL)) & TIM_RES_TOK) {

		outpw(FM_A(FM_CMDREG1),FM_ICL) ;	/* force claim */

		DB_RMT("RMT: fddiPATHT_Rmode expired\n",0,0) ;

		DB_RMT("RMT: fddiPATHT_Rmode expired");

		AIX_EVENT(smc, (u_long) FDDI_RING_STATUS,

				(u_long) FDDI_SMT_EVENT,

				(u_long) FDDI_RTT, smt_get_event_word(smc));
@@ -1353,8 +1353,8 @@ void rtm_set_timer(struct s_smc *smc) 
	/*

	 * MIB timer and hardware timer have the same resolution of 80nS

	 */

	DB_RMT("RMT: setting new fddiPATHT_Rmode, t = %d ns\n",

		(int) smc->mib.a[PATH0].fddiPATHT_Rmode,0) ;

	DB_RMT("RMT: setting new fddiPATHT_Rmode, t = %d ns",

	       (int)smc->mib.a[PATH0].fddiPATHT_Rmode);

	outpd(ADDR(B2_RTM_INI),smc->mib.a[PATH0].fddiPATHT_Rmode) ;

}
@@ -1469,12 +1469,12 @@ static void smt_split_up_fifo(struct s_smc *smc) 
	smc->hw.fp.fifo.rx2_fifo_start = smc->hw.fp.fifo.tx_a0_start +

		smc->hw.fp.fifo.tx_a0_size ;



	DB_SMT("FIFO split: mode = %x\n",smc->hw.fp.fifo.fifo_config_mode,0) ;

	DB_SMT("rbc_ram_start =	%x	 rbc_ram_end = 	%x\n",

	DB_SMT("FIFO split: mode = %x", smc->hw.fp.fifo.fifo_config_mode);

	DB_SMT("rbc_ram_start =	%x	 rbc_ram_end = 	%x",

	       smc->hw.fp.fifo.rbc_ram_start, smc->hw.fp.fifo.rbc_ram_end);

	DB_SMT("rx1_fifo_start = %x	 tx_s_start = 	%x\n",

	DB_SMT("rx1_fifo_start = %x	 tx_s_start = 	%x",

	       smc->hw.fp.fifo.rx1_fifo_start, smc->hw.fp.fifo.tx_s_start);

	DB_SMT("tx_a0_start =	%x	 rx2_fifo_start = 	%x\n",

	DB_SMT("tx_a0_start =	%x	 rx2_fifo_start = 	%x",

	       smc->hw.fp.fifo.tx_a0_start, smc->hw.fp.fifo.rx2_fifo_start);

}