FreeCalypso > hg > fc-magnetite
diff src/cs/layer1/cfile/l1_trace.c @ 514:68e0373035d7
L1_DYN_DSP_DWNLD=1 && MELODY_E2=0: fixed broken build
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Fri, 29 Jun 2018 04:53:00 +0000 |
| parents | 70e3acc5d4c8 |
| children |
line wrap: on
line diff
--- a/src/cs/layer1/cfile/l1_trace.c Mon Jun 25 22:42:48 2018 +0000 +++ b/src/cs/layer1/cfile/l1_trace.c Fri Jun 29 04:53:00 2018 +0000 @@ -6261,11 +6261,16 @@ if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_DSP_DEBUG) // Flag DSP error for DSP trace and memorize address of start of DSP trace { -#if(MELODY_E2 || L1_MP3 || L1_AAC || L1_DYN_DSP_DWNLD ) +#if 0 /* LoCosto code */ + #if(MELODY_E2 || L1_MP3 || L1_AAC || L1_DYN_DSP_DWNLD ) // DSP Trace is output ONLY if melody e2, mp3 or dynamic download are not currently running if(trace_info.dsptrace_handler_globals.trace_flag_blocked == FALSE) -#endif - + #endif +#else /* FreeCalypso support for L1_DYN_DSP_DWNLD=1 with MELODY_E2=0 */ + #if (L1_DYN_DSP_DWNLD) + if (l1a.dyn_dwnld.trace_flag_blocked == FALSE) + #endif +#endif DSP_DEBUG_ENABLE } #endif //(DSP_DEBUG_TRACE_ENABLE) @@ -6373,11 +6378,16 @@ // Flag DSP error for DSP trace and memorize address of start of DSP trace { -#if(MELODY_E2 || L1_MP3 || L1_AAC || L1_DYN_DSP_DWNLD) +#if 0 /* LoCosto code */ + #if(MELODY_E2 || L1_MP3 || L1_AAC || L1_DYN_DSP_DWNLD) // DSP Trace is output ONLY if melody e2, mp3 or dynamic download are not currently running if(trace_info.dsptrace_handler_globals.trace_flag_blocked == FALSE) -#endif - + #endif +#else /* FreeCalypso support for L1_DYN_DSP_DWNLD=1 with MELODY_E2=0 */ + #if (L1_DYN_DSP_DWNLD) + if (l1a.dyn_dwnld.trace_flag_blocked == FALSE) + #endif +#endif DSP_DEBUG_ENABLE } #endif //(DSP_DEBUG_TRACE_ENABLE) @@ -7040,10 +7050,16 @@ // DSP debug buffer trace only if an ERROR is detected (not for a End of error detection) if ((changed_bits & d_error_status_masked) & ~trace_info.d_error_status_old) { -#if(MELODY_E2 || L1_MP3 || L1_AAC || L1_DYN_DSP_DWNLD ) +#if 0 /* LoCosto code */ + #if(MELODY_E2 || L1_MP3 || L1_AAC || L1_DYN_DSP_DWNLD ) // DSP Trace is output ONLY if melody e2, mp3 or dynamic download are not currently running if(trace_info.dsptrace_handler_globals.trace_flag_blocked == FALSE) - #endif + #endif +#else /* FreeCalypso support for L1_DYN_DSP_DWNLD=1 with MELODY_E2=0 */ + #if (L1_DYN_DSP_DWNLD) + if (l1a.dyn_dwnld.trace_flag_blocked == FALSE) + #endif +#endif // Flag DSP error for DSP trace and memorize address of start of DSP trace DSP_DEBUG_ENABLE }