laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

naming change to macro only

Browse Source
This commit is contained in:
Ross Owen
2013-07-16 17:14:28 +01:00
parent f52aaeba8e
commit b514f474e4
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module_usb_audio/usb_buffer/usb_buffer.xc
View File

@@ -27,9 +27,9 @@ void GetADCCounts(unsigned samFreq, int &min, int &mid, int &max);
extern unsigned int g_curSamFreqMultiplier; extern unsigned int g_curSamFreqMultiplier;
#ifdef CHAN_BUFF_CTRL #ifdef CHAN_BUFF_CTRL
#define SET_SHARED_GLOBAL2(x,y) SET_SHARED_GLOBAL(x,y); outuchar(c_buff_ctrl, 0); #define SET_SHARED_GLOBAL0(x,y) SET_SHARED_GLOBAL(x,y); outuchar(c_buff_ctrl, 0);
#else #else
#define SET_SHARED_GLOBAL2(x,y) SET_SHARED_GLOBAL(x,y) #define SET_SHARED_GLOBAL0(x,y) SET_SHARED_GLOBAL(x,y)
#endif #endif
@@ -347,14 +347,14 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
* thread locked, it must stay responsive to packets/SOFs. So, set a flag and check for * thread locked, it must stay responsive to packets/SOFs. So, set a flag and check for
* handshake elsewhere */ * handshake elsewhere */
/* Pass on sample freq change to decouple */ /* Pass on sample freq change to decouple */
SET_SHARED_GLOBAL2(g_freqChange, SET_SAMPLE_FREQ); SET_SHARED_GLOBAL0(g_freqChange, SET_SAMPLE_FREQ);
SET_SHARED_GLOBAL(g_freqChange_sampFreq, sampleFreq); SET_SHARED_GLOBAL(g_freqChange_sampFreq, sampleFreq);
SET_SHARED_GLOBAL(g_freqChange_flag, SET_SAMPLE_FREQ); SET_SHARED_GLOBAL(g_freqChange_flag, SET_SAMPLE_FREQ);
} }
else else
{ {
sampleFreq = inuint(c_aud_ctl); sampleFreq = inuint(c_aud_ctl);
SET_SHARED_GLOBAL2(g_freqChange, tmp); /* Set command */ SET_SHARED_GLOBAL0(g_freqChange, tmp); /* Set command */
SET_SHARED_GLOBAL(g_freqChange_sampFreq, sampleFreq); /* Set flag */ SET_SHARED_GLOBAL(g_freqChange_sampFreq, sampleFreq); /* Set flag */
SET_SHARED_GLOBAL(g_freqChange_flag, tmp); SET_SHARED_GLOBAL(g_freqChange_flag, tmp);
} }
@@ -451,10 +451,9 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
case XUD_SetData_Select(c_aud_in, ep_aud_in, tmp): case XUD_SetData_Select(c_aud_in, ep_aud_in, tmp):
{ {
/* Inform stream that buffer sent */ /* Inform stream that buffer sent */
SET_SHARED_GLOBAL2(g_aud_to_host_flag, bufferIn+1); SET_SHARED_GLOBAL0(g_aud_to_host_flag, bufferIn+1);
} }
break; break;
#endif #endif
#ifdef OUTPUT #ifdef OUTPUT
@@ -491,7 +490,7 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
write_via_xc_ptr(aud_from_host_buffer, tmp); write_via_xc_ptr(aud_from_host_buffer, tmp);
/* Sync with decouple thread */ /* Sync with decouple thread */
SET_SHARED_GLOBAL2(g_aud_from_host_flag, 1); SET_SHARED_GLOBAL0(g_aud_from_host_flag, 1);
} }
break; break;
#endif #endif