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

Update xua_ep0_descriptors.h

Browse Source
This commit is contained in:
Ross Owen
2018-06-04 10:41:16 +01:00
committed by GitHub
parent ab127f2eb2
commit 38de67054e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
// Copyright (c) 2011-2018, XMOS Ltd, All rights reserved // Copyright (c) 2011-2018, XMOS Ltd, All rights reserved
/** /**
* @file descriptors.h * @file xua_ep0_descriptors.h
* @brief Device Descriptors * @brief Device Descriptors
* @author Ross Owen, XMOS Limited * @author Ross Owen, XMOS Limited
*/ */
@@ -43,7 +43,7 @@ typedef struct
STR_TABLE_ENTRY(usbInputTermStr_Audio2); /* Users sees as output from host */ STR_TABLE_ENTRY(usbInputTermStr_Audio2); /* Users sees as output from host */
STR_TABLE_ENTRY(usbOutputTermStr_Audio2); /* User sees as input to host */ STR_TABLE_ENTRY(usbOutputTermStr_Audio2); /* User sees as input to host */
#endif #endif
#if (AUDIO_CLASS_FALLBACK != 0) || (AUDIO_CLASS == 1) #if (AUDIO_CLASS_FALLBACK) || (AUDIO_CLASS == 1)
/* Audio 1.0 Strings */ /* Audio 1.0 Strings */
STR_TABLE_ENTRY(productStr_Audio1); /* Product string for Audio 1 */ STR_TABLE_ENTRY(productStr_Audio1); /* Product string for Audio 1 */
STR_TABLE_ENTRY(outputInterfaceStr_Audio1); /* iInterface for streaming intefaces */ STR_TABLE_ENTRY(outputInterfaceStr_Audio1); /* iInterface for streaming intefaces */
@@ -317,7 +317,7 @@ StringDescTable_t g_strTable =
.usbInputTermStr_Audio2 = APPEND_PRODUCT_STR_A2(), .usbInputTermStr_Audio2 = APPEND_PRODUCT_STR_A2(),
.usbOutputTermStr_Audio2 = APPEND_PRODUCT_STR_A2(), .usbOutputTermStr_Audio2 = APPEND_PRODUCT_STR_A2(),
#endif #endif
#if (AUDIO_CLASS_FALLBACK != 0) || (AUDIO_CLASS == 1) #if (AUDIO_CLASS_FALLBACK) || (AUDIO_CLASS == 1)
.productStr_Audio1 = PRODUCT_STR_A1, .productStr_Audio1 = PRODUCT_STR_A1,
.outputInterfaceStr_Audio1 = APPEND_PRODUCT_STR_A1(), .outputInterfaceStr_Audio1 = APPEND_PRODUCT_STR_A1(),
.inputInterfaceStr_Audio1 = APPEND_PRODUCT_STR_A1(), .inputInterfaceStr_Audio1 = APPEND_PRODUCT_STR_A1(),
@@ -392,7 +392,7 @@ StringDescTable_t g_strTable =
/***** Device Descriptors *****/ /***** Device Descriptors *****/
#if (AUDIO_CLASS_FALLBACK != 0) || (AUDIO_CLASS==1) #if (AUDIO_CLASS_FALLBACK) || (AUDIO_CLASS == 1)
/* Device Descriptor for Audio Class 1.0 (Assumes Full-Speed) */ /* Device Descriptor for Audio Class 1.0 (Assumes Full-Speed) */
USB_Descriptor_Device_t devDesc_Audio1 = USB_Descriptor_Device_t devDesc_Audio1 =
{ {
@@ -474,7 +474,7 @@ unsigned char devQualDesc_Audio2[] =
0x00 /* 9 bReserved (must be zero) */ 0x00 /* 9 bReserved (must be zero) */
}; };
#if (AUDIO_CLASS_FALLBACK != 0) || (AUDIO_CLASS == 1) #if (AUDIO_CLASS_FALLBACK) || (AUDIO_CLASS == 1)
/* Device Qualifier Descriptor for running at high-speed (matches audio 1.0 device descriptor) */ /* Device Qualifier Descriptor for running at high-speed (matches audio 1.0 device descriptor) */
unsigned char devQualDesc_Audio1[] = unsigned char devQualDesc_Audio1[] =
{ {
@@ -2208,7 +2208,7 @@ unsigned char cfgDesc_Null[] =
}; };
#if (AUDIO_CLASS_FALLBACK != 0) || (AUDIO_CLASS == 1) #if (AUDIO_CLASS_FALLBACK) || (AUDIO_CLASS == 1)
/* Configuration descriptor for Audio v1.0 */ /* Configuration descriptor for Audio v1.0 */
/* Note Audio 1.0 descriptors still a simple array so we need some extra defines regarding lengths.. */ /* Note Audio 1.0 descriptors still a simple array so we need some extra defines regarding lengths.. */
#if (NUM_USB_CHAN_IN > 0) #if (NUM_USB_CHAN_IN > 0)