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

Fixed up IAP_INTERFACE_STRING_INDEX when MIXER not enabled but MAX_MIX_COUNT !=0

Browse Source
This commit is contained in:
Ross Owen
2014-02-13 18:26:35 +00:00
parent 2894eaf106
commit 255c336f97
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module_usb_audio/devicedefines.h
View File

@@ -488,9 +488,13 @@
#define MIX_INPUTS 18 #define MIX_INPUTS 18
#endif #endif
#ifdef MIXER
#ifndef MAX_MIX_COUNT #ifndef MAX_MIX_COUNT
#define MAX_MIX_COUNT 8 #define MAX_MIX_COUNT 8
#endif #endif
#else
#define MAX_MIX_COUNT 0
#endif
/* Volume defines */ /* Volume defines */

4
module_usb_audio/endpoint0/descriptors.h
View File

@@ -268,7 +268,11 @@ enum {
#endif #endif
#endif #endif
#ifdef IAP #ifdef IAP
#ifdef MIXER
IAP_INTERFACE_STRING_INDEX = INPUT_INTERFACE_LAST_STRING_INDEX + MAX_MIX_COUNT + 1, IAP_INTERFACE_STRING_INDEX = INPUT_INTERFACE_LAST_STRING_INDEX + MAX_MIX_COUNT + 1,
#else
IAP_INTERFACE_STRING_INDEX = INPUT_INTERFACE_LAST_STRING_INDEX,
#endif
#endif #endif
}; };