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

Audio 2 desc munging for HS/FS now guarded by NUM_USB_CHAN_ defines

Browse Source
This commit is contained in:
Ross Owen
2014-01-23 12:39:54 +00:00
parent f3244c3bdc
commit e21ade9c8f
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module_usb_audio/endpoint0/endpoint0.xc
View File

@@ -589,6 +589,7 @@ void Endpoint0( chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
/* Unfortunately we need to munge the descriptors a bit between full and high-speed */
if(g_curUsbSpeed == XUD_SPEED_HS)
{
#if (NUM_USB_CHAN_OUT > 0)
/* Output interface - Interface 1 */
/* Mod bSlotSize */
cfgDesc_Audio2[STREAMING_OUTPUT_ALT1_OFFSET+20] = SAMPLE_SUBSLOT_SIZE_HS;
@@ -602,7 +603,8 @@ void Endpoint0( chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
/* bNrChannels */
cfgDesc_Audio2[STREAMING_OUTPUT_ALT1_OFFSET+10] = NUM_USB_CHAN_OUT;
#endif
#if (NUM_USB_CHAN_IN > 0)
/* Input interface - Interface 2 */
/* Mod bSlotSize */
cfgDesc_Audio2[STREAMING_INPUT_ALT1_OFFSET+20] = SAMPLE_SUBSLOT_SIZE_HS;
@@ -616,10 +618,11 @@ void Endpoint0( chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
/* bNrChannels */
cfgDesc_Audio2[STREAMING_INPUT_ALT1_OFFSET+10] = NUM_USB_CHAN_IN;
#endif
}
else
{
#if (NUM_USB_CHAN_OUT > 0)
/* Output interface - Interface 1 */
/* Mod bSlotSize */
cfgDesc_Audio2[STREAMING_OUTPUT_ALT1_OFFSET+20] = SAMPLE_SUBSLOT_SIZE_FS;
@@ -633,7 +636,8 @@ void Endpoint0( chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
/* bNrChannels */
cfgDesc_Audio2[STREAMING_OUTPUT_ALT1_OFFSET+10] = NUM_USB_CHAN_OUT_FS;
#endif
#if (NUM_USB_CHAN_IN > 0)
/* Input interface - Interface 2 */
/* Mod bSlotSize */
cfgDesc_Audio2[STREAMING_INPUT_ALT1_OFFSET+20] = SAMPLE_SUBSLOT_SIZE_FS;
@@ -647,7 +651,7 @@ void Endpoint0( chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
/* bNrChannels */
cfgDesc_Audio2[STREAMING_INPUT_ALT1_OFFSET+10] = NUM_USB_CHAN_IN_FS;
#endif
}
retVal = USB_StandardRequests(ep0_out, ep0_in,