diff --git a/module_usb_audio/audio.xc b/module_usb_audio/audio.xc index cc9f4742..debf9695 100755 --- a/module_usb_audio/audio.xc +++ b/module_usb_audio/audio.xc @@ -794,8 +794,8 @@ void audio(chanend c_mix_out, chanend ?c_dig_rx, chanend ?c_config, chanend ?c) chan c_spdif_out; #endif unsigned curSamFreq = DEFAULT_FREQ; - unsigned curSamRes_DAC = STREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS; /* Default to something reasonable */ - unsigned curSamRes_ADC = STREAM_FORMAT_INPUT_1_RESOLUTION_BITS; /* Default to something reasonable - note, currently this never changes*/ + unsigned curSamRes_DAC = STREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS; /* Default to something reasonable */ + unsigned curSamRes_ADC = STREAM_FORMAT_INPUT_1_RESOLUTION_BITS; /* Default to something reasonable - note, currently this never changes*/ unsigned command; unsigned mClk; unsigned divide; @@ -999,7 +999,7 @@ void audio(chanend c_mix_out, chanend ?c_dig_rx, chanend ?c_config, chanend ?c) * Native = 2 */ dsdMode = inuint(c_mix_out); - curSamRes_DAC = inuint(c_mix_out); + curSamRes_DAC = inuint(c_mix_out); } /* Currently no more audio will happen after this point */ diff --git a/module_usb_audio/audiohw.h b/module_usb_audio/audiohw.h index 0ddddaa0..1c74cb2b 100644 --- a/module_usb_audio/audiohw.h +++ b/module_usb_audio/audiohw.h @@ -7,7 +7,7 @@ void AudioHwInit(chanend ?c_codec); /* Configure audio hardware (clocking, CODECs etc) for a specific mClk/Sample frquency - run on every sample frequency change */ -void AudioHwConfig(unsigned samFreq, unsigned mClk, chanend ?c_codec, unsigned dsdMode, +void AudioHwConfig(unsigned samFreq, unsigned mClk, chanend ?c_codec, unsigned dsdMode, unsigned sampRes_DAC, unsigned sampRes_ADC); #endif diff --git a/module_usb_audio/endpoint0/endpoint0.c b/module_usb_audio/endpoint0/endpoint0.c index 26cae04d..e2ad9f23 100755 --- a/module_usb_audio/endpoint0/endpoint0.c +++ b/module_usb_audio/endpoint0/endpoint0.c @@ -255,7 +255,7 @@ void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl, if((sp.wValue > 0) && (g_curStreamAlt_Out != sp.wValue)) { g_curStreamAlt_Out = sp.wValue; - + /* Send format of data onto buffering */ outuint(c_audioControl, SET_STREAM_FORMAT_OUT); outuint(c_audioControl, g_dataFormat_Out[sp.wValue-1]); /* Data format (PCM/DSD) */ @@ -288,7 +288,7 @@ void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl, if((sp.wValue > 0) && (g_curStreamAlt_In != sp.wValue)) { g_curStreamAlt_In = sp.wValue; - + /* Send format of data onto buffering */ outuint(c_audioControl, SET_STREAM_FORMAT_IN); outuint(c_audioControl, g_dataFormat_In[sp.wValue-1]); /* Data format (PCM/DSD) */ diff --git a/module_usb_audio/ports/audioports.xc b/module_usb_audio/ports/audioports.xc index 7abb9d7b..9e5fcd63 100644 --- a/module_usb_audio/ports/audioports.xc +++ b/module_usb_audio/ports/audioports.xc @@ -34,7 +34,7 @@ unsigned int divide) #ifndef CODEC_MASTER /* Note this call to stop_clock() will pause forever if the port clocking the clock-block is not low. * deliver() should return with this being the case */ - + stop_clock(clk_audio_bclk); if(!isnull(p_lrclk))