Tidy up MIN/MAX freq checks

This commit is contained in:
Ross Owen
2016-12-08 11:51:11 +00:00
parent 10efbb709e
commit a699c51075
2 changed files with 2 additions and 3 deletions

View File

@@ -723,13 +723,12 @@ 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 (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);
GET_SHARED_GLOBAL(sampFreq, g_freqChange_sampFreq); GET_SHARED_GLOBAL(sampFreq, g_freqChange_sampFreq);
/* Pass on to mixer */ /* Pass on to mixer */
DISABLE_INTERRUPTS(); DISABLE_INTERRUPTS();
inuint(c_mix_out); inuint(c_mix_out);

View File

@@ -310,7 +310,7 @@ 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 (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);