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

moved defined to xua_conf.h. Fixed bug that causes compile error

Browse Source
This commit is contained in:
Keith Au
2020-01-08 13:49:54 +08:00
parent 5361ef8866
commit eae62a9e3c
3 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib_xua/api/xua_conf_default.h
View File

@@ -233,30 +233,6 @@
#define DEFAULT_AUDOUT_FREQ (48000)
#endif
#define USB_CMD_CFG_SAMP_FREQ
// Not ready yet
// #define USB_IN_CONFIGURABLE_BIT_RES
// #ifdef USB_IN_CONFIGURABLE_BIT_RES
// #define USB_IN_BIT_RES_0 STREAM_FORMAT_INPUT_1_RESOLUTION_BITS
// #define USB_IN_BIT_RES_1 STREAM_FORMAT_INPUT_1_RESOLUTION_BITS//24
// #endif
#ifdef USB_CMD_CFG_SAMP_FREQ
#define USB_IN_SAMP_FREQ_NUM 3
#define USB_IN_SAMP_FREQ_0 DEFAULT_AUDOUT_FREQ
#define USB_IN_SAMP_FREQ_1 16000
#define USB_IN_SAMP_FREQ_2 16000
#if (USB_IN_SAMP_FREQ_NUM < 3)
#error "USB_IN_SAMP_FREQ_NUM must be >=3"
#endif
#else
#define USB_IN_DESCRIPTOR_FREQ_OVERRIDE //used if USB in frequency is not conifigurable by USB endpoint command
#ifdef USB_IN_DESCRIPTOR_FREQ_OVERRIDE
#define USB_IN_FREQ_DESCIPTOR_OFFSET 161 //161- (3 * 3) are the position of descriptor that needed to be modified for USB in frequency
#endif
#endif
/* Audio Class Defines */
/**

2
lib_xua/src/core/endpoint0/xua_ep0_descriptors.h
View File

@@ -20,7 +20,7 @@
#include "iap2.h" /* Defines iAP EA Native Transport protocol name */
#endif
#include "xua_conf_default.h"
#include "xua_conf.h"
#define APPEND_VENDOR_STR(x) VENDOR_STR" "#x

2
lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc
View File

@@ -1116,7 +1116,7 @@ int AudioEndpointRequests_1(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp
{
return result;
}
#if ((MAX_FREQ != MIN_FREQ) || (defined USB_CMD_CFG_SAMP_FREQ)
#if ((MAX_FREQ != MIN_FREQ) || (defined USB_CMD_CFG_SAMP_FREQ))
if(controlSelector == SAMPLING_FREQ_CONTROL)
{
/* Expect length 3 for sample rate */