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

Merge branch 'master' into REINSTATE_MIXER

Browse Source
This commit is contained in:
Ross Owen
2014-07-30 11:29:20 +01:00
parent 5f9c699be4 eea9122373
commit 6477ecc676
16 changed files with 184 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
module_usb_audio/endpoint0/descriptors.h
View File

@@ -529,7 +529,7 @@ StringDescTable_t g_strTable =
#endif
/*** INPUT CHANNEL STRINGS ***/
#if (NUM_USB_CHAN_IN > 0)
#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 0)
#if defined(SPDIF_RX) && (SPDIF_RX_INDEX < I2S_CHANS_ADC)
@@ -849,8 +849,8 @@ StringDescTable_t g_strTable =
#if (NUM_USB_CHAN_IN > 18)
#error NUM_USB_CHAN_IN > 18
#endif
#endif
.iAPInterfaceStr = "iAP Interface",
};
@@ -1119,6 +1119,9 @@ typedef struct
#endif
USB_Descriptor_Audio_OutputTerminal_t Audio_In_OutputTerminal;
#endif
#if defined (SPDIF_RX) || defined (ADAT_RX)
USB_Descriptor_Endpoint_t Audio_Int_Endpoint;
#endif
} __attribute__((packed)) USB_CfgDesc_Audio2_CS_Control_Int;
typedef struct
@@ -1576,6 +1579,19 @@ USB_Config_Descriptor_Audio2_t cfgDesc_Audio2=
.iTerminal = offsetof(StringDescTable_t, usbOutputTermStr_Audio2)/sizeof(char *)
},
#endif
#if defined(SPDIF_RX) || defined(ADAT_RX)
/* Standard AS Interrupt Endpoint Descriptor (4.8.2.1): */
.Audio_Int_Endpoint =
{
.bLength = sizeof(USB_Descriptor_Endpoint_t),
.bDescriptorType = USB_DESCTYPE_ENDPOINT,
.bEndpointAddress = ENDPOINT_ADDRESS_IN_INTERRUPT, /* (D7: 0:out, 1:in) */
.bmAttributes = 0x03, /* (bitmap) */
.wMaxPacketSize = 6,
.bInterval = 8,
},
#endif
}, /* End of .Audio_CS_Control_Int */
#if (NUM_USB_CHAN_OUT > 0)