Merge: master -> DEV_X200_BRINGUP

This commit is contained in:
Ross Owen
2015-03-23 12:57:57 +00:00
18 changed files with 126 additions and 1718 deletions

View File

@@ -945,7 +945,7 @@ USB_Config_Descriptor_Audio2_t cfgDesc_Audio2=
ID_CLKSRC_ADAT, /* baCSourceID */
#endif
.bmControl = 0x03,
.iClockSelector = 13, /* TODO Shoudn't be hard-coded */
.iClockSelector = offsetof(StringDescTable_t, clockSelectorStr)/sizeof(char *),
},
#if (NUM_USB_CHAN_OUT > 0)