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

Partially undid removal of SR change code when MIN_FREQ=MAX_FREQ. DFU currently uses the SR change code to operate.

Browse Source
This commit is contained in:
Ross Owen
2017-03-14 17:17:59 +00:00
parent 248b73e285
commit 8815f8ce6c
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module_usb_audio/usb_buffer/decouple.xc
View File

@@ -718,7 +718,6 @@ void decouple(chanend c_mix_out
/* Check for freq change or other update */ /* Check for freq change or other update */
GET_SHARED_GLOBAL(tmp, g_freqChange_flag); GET_SHARED_GLOBAL(tmp, g_freqChange_flag);
#if (MIN_FREQ != MAX_FREQ)
if (tmp == SET_SAMPLE_FREQ) if (tmp == SET_SAMPLE_FREQ)
{ {
SET_SHARED_GLOBAL(g_freqChange_flag, 0); SET_SHARED_GLOBAL(g_freqChange_flag, 0);
@@ -765,7 +764,6 @@ void decouple(chanend c_mix_out
speedRem = 0; speedRem = 0;
continue; continue;
} }
#endif
#if (AUDIO_CLASS == 2) #if (AUDIO_CLASS == 2)
#if (MIN_FREQ != MAX_FREQ) #if (MIN_FREQ != MAX_FREQ)
else else

4
module_usb_audio/usb_buffer/usb_buffer.xc
View File

@@ -312,11 +312,11 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in,
{ {
unsigned cmd = inuint(c_aud_ctl); unsigned cmd = inuint(c_aud_ctl);
#if (MAX_FREQ != MIN_FREQ)
if(cmd == SET_SAMPLE_FREQ) if(cmd == SET_SAMPLE_FREQ)
{ {
unsigned receivedSampleFreq = inuint(c_aud_ctl); unsigned receivedSampleFreq = inuint(c_aud_ctl);
#if (MAX_FREQ != MIN_FREQ)
/* Don't update things for DFU command.. */ /* Don't update things for DFU command.. */
if(receivedSampleFreq != AUDIO_STOP_FOR_DFU) if(receivedSampleFreq != AUDIO_STOP_FOR_DFU)
{ {
@@ -347,13 +347,13 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in,
masterClockFreq = MCLK_441; masterClockFreq = MCLK_441;
} }
} }
#endif
/* Ideally we want to wait for handshake (and pass back up) here. But we cannot keep this /* Ideally we want to wait for handshake (and pass back up) here. But we cannot keep this
* core locked, it must stay responsive to packets (MIDI etc) and SOFs. So, set a flag and check for * core locked, it must stay responsive to packets (MIDI etc) and SOFs. So, set a flag and check for
* handshake elsewhere */ * handshake elsewhere */
SET_SHARED_GLOBAL(g_freqChange_sampFreq, receivedSampleFreq); SET_SHARED_GLOBAL(g_freqChange_sampFreq, receivedSampleFreq);
} }
else else
#endif
#if (AUDIO_CLASS == 2) #if (AUDIO_CLASS == 2)
if(cmd == SET_STREAM_FORMAT_IN) if(cmd == SET_STREAM_FORMAT_IN)
{ {