diff options
Diffstat (limited to 'src/usr/hwpf')
| -rw-r--r-- | src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C | 4 | ||||
| -rw-r--r-- | src/usr/hwpf/hwp/fapiHwpExecInitFile.C | 12 | ||||
| -rw-r--r-- | src/usr/hwpf/hwp/slave_sbe/slave_sbe.C | 7 |
3 files changed, 10 insertions, 13 deletions
diff --git a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C index 277470570..38aa4601e 100644 --- a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C +++ b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C @@ -394,8 +394,8 @@ void* call_host_build_winkle( void *io_pArgs ) // Continue, build SLW images TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "Got real mem buffer for 0x%08x cpu's = 0x%p", - MAX_POSSIBLE_PROCS_IN_P8_SYSTEM, + "Got real mem buffer for %d cpus = 0x%p", + P8_MAX_PROCS, l_pRealMemBase ); //Load the reference image from PNOR diff --git a/src/usr/hwpf/hwp/fapiHwpExecInitFile.C b/src/usr/hwpf/hwp/fapiHwpExecInitFile.C index 664cdd69b..146829704 100644 --- a/src/usr/hwpf/hwp/fapiHwpExecInitFile.C +++ b/src/usr/hwpf/hwp/fapiHwpExecInitFile.C @@ -77,6 +77,10 @@ extern "C" { +#ifndef SUPPRESS_UNUSED_VARIABLE +#define SUPPRESS_UNUSED_VARIABLE(...) +#endif + // -------------------------------------------------------------------- // enable minimal debug. This will trace: // Attr table, literal table, scoms, rows, and expressions being processed. @@ -86,7 +90,7 @@ extern "C" #ifdef HWPEXECINITFILE_DEBUG #define IF_DBG(_fmt_, _args_...) FAPI_IMP(_fmt_, ##_args_) #else -#define IF_DBG(_fmt_, _args_...) +#define IF_DBG(_fmt_, _args_...) SUPPRESS_UNUSED_VARIABLE(NULL, ##_args_) #endif // -------------------------------------------------------------------- @@ -98,7 +102,7 @@ extern "C" #ifdef HWPEXECINITFILE_MALLOC_DEBUG #define IF_MDBG(_fmt_, _args_...) FAPI_IMP(_fmt_, ##_args_) #else -#define IF_MDBG(_fmt_, _args_...) +#define IF_MDBG(_fmt_, _args_...) SUPPRESS_UNUSED_VARIABLE(NULL, ##_args_) #endif // -------------------------------------------------------------------- @@ -109,7 +113,7 @@ extern "C" #ifdef HWPEXECINITFILE_ATTR_DEBUG #define IF_ADBG(_fmt_, _args_...) FAPI_IMP(_fmt_, ##_args_) #else -#define IF_ADBG(_fmt_, _args_...) +#define IF_ADBG(_fmt_, _args_...) SUPPRESS_UNUSED_VARIABLE(NULL, ##_args_) #endif // -------------------------------------------------------------------- @@ -120,7 +124,7 @@ extern "C" #ifdef HWPEXECINITFILE_DEBUG2 #define IF_DBG2(_fmt_, _args_...) FAPI_INF(_fmt_, ##_args_) #else -#define IF_DBG2(_fmt_, _args_...) +#define IF_DBG2(_fmt_, _args_...) SUPPRESS_UNUSED_VARIABLE(NULL, ##_args_) #endif //****************************************************************************** diff --git a/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C b/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C index 1f13794ba..e96dd3ea5 100644 --- a/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C +++ b/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C @@ -133,7 +133,6 @@ void* call_proc_revert_sbe_mcs_setup(void *io_pArgs) //****************************************************************************** void* call_host_slave_sbe_config(void *io_pArgs) { - errlHndl_t l_errl = NULL; IStepError l_stepError; TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, @@ -142,8 +141,6 @@ void* call_host_slave_sbe_config(void *io_pArgs) // execute proc_read_nest_freq.C // execute proc_setup_sbe_config.C - l_errl = NULL; // assignment to make the compiler happy - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_slave_sbe_config exit" ); @@ -157,13 +154,11 @@ void* call_host_slave_sbe_config(void *io_pArgs) //****************************************************************************** void* call_host_sbe_start( void *io_pArgs ) { - errlHndl_t l_errl = NULL; IStepError l_stepError; TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_sbe_start entry" ); // call proc_sbe_start.C - l_errl = NULL; // assignment to make the compiler happy TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_sbe_start exit" ); @@ -339,14 +334,12 @@ void* call_proc_check_slave_sbe_seeprom_complete( void *io_pArgs ) //****************************************************************************** void* call_proc_xmit_sbe(void *io_pArgs ) { - errlHndl_t l_errl = NULL; IStepError l_stepError; TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_proc_xmit_sbe entry" ); // call proc_xmit_sbe.C - l_errl = NULL; // assignment to make the compiler happy TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_proc_xmit_sbe exit" ); |
