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

Ensure channel config properly set for UAC1 when chans != 2

Browse Source 
Needed for Windows 10 MC output
This commit is contained in:
Ed Clarke
2018-04-20 14:18:47 +01:00
parent 711efc8be9
commit 817e385f74
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2358,7 +2358,10 @@ unsigned char cfgDesc_Audio1[] =
(OUTPUT_INTERFACES_A1 + 1), /* baInterfaceNr(2) AudioStreaming interface 2 belongs to AC interface */ (OUTPUT_INTERFACES_A1 + 1), /* baInterfaceNr(2) AudioStreaming interface 2 belongs to AC interface */
#endif #endif
#if (NUM_USB_CHAN_OUT > 0) #if (NUM_USB_CHAN_OUT > 0)
#define CHANNEL_CONFIG_OUT (0xFF >> (8 - NUM_USB_CHAN_OUT_FS))
/* CS_Interface Input Terminal 1 Descriptor - USB streaming Host to Device */ /* CS_Interface Input Terminal 1 Descriptor - USB streaming Host to Device */
0x0C, 0x0C,
UAC_CS_DESCTYPE_INTERFACE, /* bDescriptorType (UAC_CS_DESCTYPE_INTERFACE) */ UAC_CS_DESCTYPE_INTERFACE, /* bDescriptorType (UAC_CS_DESCTYPE_INTERFACE) */
@@ -2367,7 +2370,7 @@ unsigned char cfgDesc_Audio1[] =
0x01, 0x01, /* wTerminalType (USB Streaming) */ 0x01, 0x01, /* wTerminalType (USB Streaming) */
0x00, /* Associated terminal - unused */ 0x00, /* Associated terminal - unused */
NUM_USB_CHAN_OUT_FS, /* bNrChannels */ NUM_USB_CHAN_OUT_FS, /* bNrChannels */
0x03, 0x00, /* wChannelConfig */ CHANNEL_CONFIG_OUT, 0x00, /* wChannelConfig */
offsetof(StringDescTable_t, outputChanStr_1)/sizeof(char *), /* iChannelNames */ offsetof(StringDescTable_t, outputChanStr_1)/sizeof(char *), /* iChannelNames */
offsetof(StringDescTable_t, usbInputTermStr_Audio1)/sizeof(char *), /* iTerminal */ offsetof(StringDescTable_t, usbInputTermStr_Audio1)/sizeof(char *), /* iTerminal */
@@ -2427,6 +2430,8 @@ unsigned char cfgDesc_Audio1[] =
#endif #endif
#if (NUM_USB_CHAN_IN > 0) #if (NUM_USB_CHAN_IN > 0)
#define CHANNEL_CONFIG_IN (0xFF >> (8 - NUM_USB_CHAN_IN_FS))
/* CS_Interface Input Terminal 2 Descriptor - Analog in from line in */ /* CS_Interface Input Terminal 2 Descriptor - Analog in from line in */
0x0C, 0x0C,
UAC_CS_DESCTYPE_INTERFACE, UAC_CS_DESCTYPE_INTERFACE,
@@ -2435,7 +2440,7 @@ unsigned char cfgDesc_Audio1[] =
0x01, 0x02, /* Type - streaming in, mic */ 0x01, 0x02, /* Type - streaming in, mic */
0x00, /* Associated terminal - unused */ 0x00, /* Associated terminal - unused */
NUM_USB_CHAN_IN_FS, /* bNrChannels */ NUM_USB_CHAN_IN_FS, /* bNrChannels */
0x03, 0x00, /* wChannelConfigs */ CHANNEL_CONFIG_IN, 0x00, /* wChannelConfigs */
offsetof(StringDescTable_t, inputChanStr_1)/sizeof(char *), /* iChannelNames */ offsetof(StringDescTable_t, inputChanStr_1)/sizeof(char *), /* iChannelNames */
offsetof(StringDescTable_t, usbOutputTermStr_Audio1)/sizeof(char *), /* iTerminal */ offsetof(StringDescTable_t, usbOutputTermStr_Audio1)/sizeof(char *), /* iTerminal */