From 91dc11598646288ba18a7e6314dd207fe1a5922a Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Tue, 8 Dec 2015 15:38:51 +0000 Subject: [PATCH] Revert "Removed 32kHz support when PDM mics enabled (lib_mic_array supports integer decimation factors only)" This reverts commit 2ae99f11e6da3e246ffaa0fe9bc7d9a4adeebdc7. --- module_usb_audio/endpoint0/audiorequests.xc | 6 +----- module_usb_audio/endpoint0/descriptors.h | 6 ------ 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/module_usb_audio/endpoint0/audiorequests.xc b/module_usb_audio/endpoint0/audiorequests.xc index a5f727cb..591d36fb 100644 --- a/module_usb_audio/endpoint0/audiorequests.xc +++ b/module_usb_audio/endpoint0/audiorequests.xc @@ -874,11 +874,7 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c } #endif /* Special case for some low sample rates */ - unsigned lowSampleRateList[] = {8000, 11025, 12000, 16000, -#if (NUM_PDM_MICS == 0) - 32000 -#endif - }; + unsigned lowSampleRateList[] = {8000, 11025, 12000, 16000, 32000}; for (int k = 0; k < sizeof(lowSampleRateList)/sizeof(unsigned); k++) { diff --git a/module_usb_audio/endpoint0/descriptors.h b/module_usb_audio/endpoint0/descriptors.h index 189e1a12..c8d02437 100644 --- a/module_usb_audio/endpoint0/descriptors.h +++ b/module_usb_audio/endpoint0/descriptors.h @@ -2227,11 +2227,9 @@ const unsigned num_freqs_a1 = MAX(3, (0 #if(MIN_FREQ <= 16000) && (MAX_FREQ_FS >= 16000) +1 #endif -#if (NUM_PDM_MICS == 0) #if(MIN_FREQ <= 32000) && (MAX_FREQ_FS >= 32000) +1 #endif -#endif #if (MIN_FREQ <= 44100) && (MAX_FREQ_FS >= 44100) +1 #endif @@ -2457,11 +2455,9 @@ unsigned char cfgDesc_Audio1[] = CHARIFY_SR(16000), /* sampleFreq - 16KHz */ #endif -#if (NUM_PDM_MICS == 0) #if(MIN_FREQ <= 32000) && (MAX_FREQ_FS >= 32000) CHARIFY_SR(32000), /* sampleFreq - 32KHz */ #endif -#endif #if (MIN_FREQ <= 44100) && (MAX_FREQ_FS >= 44100) 0x44, 0xAC, 0x00, /* sampleFreq - 44.1Khz */ @@ -2587,11 +2583,9 @@ unsigned char cfgDesc_Audio1[] = CHARIFY_SR(16000), /* sampleFreq - 32KHz */ #endif -#if (NUM_PDM_MICS == 0) #if(MIN_FREQ <= 32000) && (MAX_FREQ_FS >= 32000) CHARIFY_SR(32000), /* sampleFreq - 32KHz */ #endif -#endif #if (MIN_FREQ <= 44100) && (MAX_FREQ_FS >= 44100) 0x44, 0xAC, 0x00, /* sampleFreq - 44.1Khz */