From 481e50fdf78918e2640b2256c70402cdb4c59891 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Wed, 22 Jan 2014 21:55:14 +0000 Subject: [PATCH] Extension units in descs now guarded by MAX_MIX_COUNT > 0 --- module_usb_audio/endpoint0/audiorequests.xc | 2 +- module_usb_audio/endpoint0/descriptors.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module_usb_audio/endpoint0/audiorequests.xc b/module_usb_audio/endpoint0/audiorequests.xc index c5bd4003..0fa6124a 100644 --- a/module_usb_audio/endpoint0/audiorequests.xc +++ b/module_usb_audio/endpoint0/audiorequests.xc @@ -821,7 +821,7 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c if (usbSpeed == XUD_SPEED_FS) { - maxFreq = MAX_FREQ_A1; + maxFreq = MAX_FREQ_FS; } #endif diff --git a/module_usb_audio/endpoint0/descriptors.h b/module_usb_audio/endpoint0/descriptors.h index 67969fc7..42efe9de 100644 --- a/module_usb_audio/endpoint0/descriptors.h +++ b/module_usb_audio/endpoint0/descriptors.h @@ -138,7 +138,7 @@ unsigned char devQualDesc_Null[] = }; -#if defined(MIXER) && !defined(AUDIO_PATH_XUS) +#if defined(MIXER) && !defined(AUDIO_PATH_XUS) && (MAX_MIX_COUNT > 0) #warning Extention units on the audio path are required for mixer. Enabling them now. #define AUDIO_PATH_XUS #endif