[HAL] cleaned up debug/warning message printing

- phase value was printed too often, should be done only if debugging - printf() should be avoided, changed to proper macros

[HAL] cleaned up debug/warning message printing
- phase value was printed too often, should be done only if debugging - printf() should be avoided, changed to proper macros
62a125d2 · Maciej Lipinski · Jean-Claude BAU · d1a89f3e · 62a125d2 · 62a125d2
Commit 62a125d2 authored Aug 22, 2019 by Maciej Lipinski Committed by Jean-Claude BAU Oct 11, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

hal_port_fsm.c userspace/wrsw_hal/hal_port_fsm.c +2 -2

hal_port_gen_fsm.c userspace/wrsw_hal/hal_port_gen_fsm.c +1 -1

hal_ports.c userspace/wrsw_hal/hal_ports.c +1 -1

No files found.
--- a/userspace/wrsw_hal/hal_port_fsm.c
+++ b/userspace/wrsw_hal/hal_port_fsm.c
@@ -226,8 +226,8 @@ static int _hal_port_state_link_up(void *vpfg, int eventMsk, int isNewState) {
 		struct channel *ch=&getRtsState().channels[ps->hw_index];
 		ps->phase_val = ch->phase_loopback;
 		ps->phase_val_valid =ch->flags & CHAN_PMEAS_READY ? 1 : 0;
-		if (ps->hw_index==0 ) //JCB
-			printf("Phase=%d valid=%d\n",ps->phase_val,ps->phase_val_valid);
+		pr_debug("wri%d: phase=%d valid=%d\n",ps->hw_index+1,
+			ps->phase_val,ps->phase_val_valid);
 	}

 	// Run PLL state machine

--- a/userspace/wrsw_hal/hal_port_gen_fsm.c
+++ b/userspace/wrsw_hal/hal_port_gen_fsm.c
@@ -30,7 +30,7 @@ int hal_port_generic_fsm( halPortFsmGen_t *pfg) {
 			while (pt->state!=-1 ) {
 				if (pt->state==_getState(pfg) ) {
 					if ( FSM_GEN_DEBUG && pt->fctName!=NULL)
-						printf("%s.%s:  Calling %s (newState=%d, evts=%s),\n",
+						pr_debug("%s.%s:  Calling %s (newState=%d, evts=%s),\n",
 								pfg->ps->name,pfg->fsm_name,
 								pt->fctName, isNewState,evtStr);
 					ret=(*pt->fct)(pfg,portEventMask,isNewState);

--- a/userspace/wrsw_hal/hal_ports.c
+++ b/userspace/wrsw_hal/hal_ports.c
@@ -297,7 +297,7 @@ int hal_port_poll_rts_state(void)

 	setRtsStateValidity( rts_get_state(hs) < 0 ? 0 : 1);
 	if (! isRtsStateValid() )
-		printf("rts_get_state failure, weird...\n");
+		pr_warning("rts_get_state failure, weird...\n");
 	return isRtsStateValid();
 }