Merge branch '6V3_DEV' of git://git/apps/sc_usb_audio into 6V3_DEV

This commit is contained in:
Sam Chesney
2013-11-27 18:31:26 +00:00
3 changed files with 517 additions and 519 deletions

View File

@@ -60,8 +60,8 @@ unsigned char devDesc_Audio2[] =
MANUFACTURER_STR_INDEX, /* 14 iManufacturer : Index of manufacturer string */ MANUFACTURER_STR_INDEX, /* 14 iManufacturer : Index of manufacturer string */
PRODUCT_STR_INDEX_A2, /* 15 iProduct : Index of product string descriptor */ PRODUCT_STR_INDEX_A2, /* 15 iProduct : Index of product string descriptor */
0,// SERIAL_STR_INDEX, /* 16 iSerialNumber : Index of serial number decriptor */ 0,// SERIAL_STR_INDEX, /* 16 iSerialNumber : Index of serial number decriptor */
0x02 /* 17 bNumConfigurations : Number of possible configs. Set to 2 so that Windows 0x02 /* 17 bNumConfigurations : Number of possible configs.
does not load Composite driver. */ Set to 2 so that Windows does not load Composite driver. */
}; };
/* Device Descriptor for Null Device */ /* Device Descriptor for Null Device */

View File

@@ -124,8 +124,6 @@ void VendorAudioRequestsInit(chanend c_audioControl, chanend ?c_mix_ctl, chanend
void Endpoint0( chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl, void Endpoint0( chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
chanend ?c_mix_ctl, chanend ?c_clk_ctl, chanend ?c_usb_test) chanend ?c_mix_ctl, chanend ?c_clk_ctl, chanend ?c_usb_test)
{ {
unsigned char buffer[2];
USB_SetupPacket_t sp; USB_SetupPacket_t sp;
XUD_ep ep0_out = XUD_InitEp(c_ep0_out); XUD_ep ep0_out = XUD_InitEp(c_ep0_out);
XUD_ep ep0_in = XUD_InitEp(c_ep0_in); XUD_ep ep0_in = XUD_InitEp(c_ep0_in);

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<xpd> <xpd>
<description>USB Audio Shared Components. For use in the XMOS USB Audio Refererence Designs.</description> <description>USB Audio Shared Components. For use in the XMOS USB Audio Refererence Designs.</description>
<location>ssh://git@github.com:22/xcore/sc_usb_audio.git</location> <location>git://git/apps/sc_usb_audio</location>
<name>USB Audio Shared Components</name> <name>USB Audio Shared Components</name>
<vendor>XMOS</vendor> <vendor>XMOS</vendor>
<xpd_version>1.0</xpd_version> <xpd_version>1.0</xpd_version>