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

Conflicted merge: master -> DEV_X200_BRINGUP

Browse Source
This commit is contained in:
Ross Owen
2015-04-07 14:52:51 +01:00
parent 160dac773a e1726efd17
commit 3558bc6049
14 changed files with 1579 additions and 1579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.rst
View File

@@ -14,6 +14,8 @@ sc_usb_audio Change Log
- RESOLVED: (Minor) BCD_DEVICE define in devicedefines.h now guarded by ifndef (caused issues - RESOLVED: (Minor) BCD_DEVICE define in devicedefines.h now guarded by ifndef (caused issues
with DFU test build configs. with DFU test build configs.
- RESOLVED: (Minor) String descriptor for Clock Selector unit incorrectly reported - RESOLVED: (Minor) String descriptor for Clock Selector unit incorrectly reported
- RESOLVED: (Minor) BCD_DEVICE in devicedefines.h now guarded by #ifndef (Caused issues with
default DFU test build configs.
- CHANGE: HID report descriptor defines added to shared user_hid.h - CHANGE: HID report descriptor defines added to shared user_hid.h
- CHANGE: Now uses module_adat_rx from sc_adat (local module_usb_audio_adat removed) - CHANGE: Now uses module_adat_rx from sc_adat (local module_usb_audio_adat removed)

2
README.rst
View File

@@ -1,7 +1,7 @@
USB Audio Shared USB Audio Shared
................ ................
:Latest release: 6.11.1beta2 :Latest release: 6.11.2rc2
:Maintainer: xross :Maintainer: xross
:Description: USB Audio Shared Components. For use in the XMOS USB Audio Refererence Designs. :Description: USB Audio Shared Components. For use in the XMOS USB Audio Refererence Designs.

2
module_dfu/.cproject
View File

@@ -43,7 +43,7 @@
</outputEntries> </outputEntries>
</builder> </builder>
<tool id = "com.xmos.cdt.xc.compiler.56671338" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler"> <tool id = "com.xmos.cdt.xc.compiler.56671338" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
<option id = "com.xmos.c.compiler.option.defined.symbols.87205741" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols"> <option id = "com.xmos.xc.compiler.option.defined.symbols.87205741" name="com.xmos.xc.compiler.option.defined.symbols" superClass="com.xmos.xc.compiler.option.defined.symbols" valueType="definedSymbols">
<listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/> <listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
<listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/> <listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
<listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/> <listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>

2
module_queue/.cproject
View File

@@ -43,7 +43,7 @@
</outputEntries> </outputEntries>
</builder> </builder>
<tool id = "com.xmos.cdt.xc.compiler.7708331" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler"> <tool id = "com.xmos.cdt.xc.compiler.7708331" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
<option id = "com.xmos.c.compiler.option.defined.symbols.60520286" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols"> <option id = "com.xmos.xc.compiler.option.defined.symbols.60520286" name="com.xmos.xc.compiler.option.defined.symbols" superClass="com.xmos.xc.compiler.option.defined.symbols" valueType="definedSymbols">
<listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/> <listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
<listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/> <listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
<listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/> <listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>

2
module_usb_audio/.cproject
View File

@@ -43,7 +43,7 @@
</outputEntries> </outputEntries>
</builder> </builder>
<tool id = "com.xmos.cdt.xc.compiler.55196333" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler"> <tool id = "com.xmos.cdt.xc.compiler.55196333" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
<option id = "com.xmos.c.compiler.option.defined.symbols.36159420" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols"> <option id = "com.xmos.xc.compiler.option.defined.symbols.36159420" name="com.xmos.xc.compiler.option.defined.symbols" superClass="com.xmos.xc.compiler.option.defined.symbols" valueType="definedSymbols">
<listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/> <listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
<listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/> <listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
<listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/> <listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>

2
module_usb_audio/devicedefines.h
View File

@@ -469,7 +469,7 @@
* @brief Device firmware version number in Binary Coded Decimal format: 0xJJMN where JJ: major, M: minor, N: sub-minor version number. * @brief Device firmware version number in Binary Coded Decimal format: 0xJJMN where JJ: major, M: minor, N: sub-minor version number.
*/ */
#ifndef BCD_DEVICE_N #ifndef BCD_DEVICE_N
#define BCD_DEVICE_N 1 #define BCD_DEVICE_N 2
#endif #endif
/** /**

4
module_usb_audio/endpoint0/chanstringgen.py
View File

@@ -13,9 +13,9 @@ def genstrings(outputChanCount, chanString, portString, structureString, adc_dac
#if ({i} < I2S_CHANS_{adcdac}+1)\n\ #if ({i} < I2S_CHANS_{adcdac}+1)\n\
\"/\"\n\ \"/\"\n\
#endif\n\ #endif\n\
#if({i} - SPDIF_TX_INDEX == 1) \n\ #if({i} - SPDIF_{p}_INDEX == 1)\n\
\"SPDIF 1\"\n\ \"SPDIF 1\"\n\
#elif({i} - SPDIF_TX_INDEX == 2) \n\ #elif({i} - SPDIF_{p}_INDEX == 2)\n\
\"SPDIF 2\"\n\ \"SPDIF 2\"\n\
#endif\n\ #endif\n\
#endif\n\ #endif\n\

128
module_usb_audio/endpoint0/chanstrings.h
View File

@@ -1297,9 +1297,9 @@
#if (1 < I2S_CHANS_ADC+1) #if (1 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(1 - SPDIF_TX_INDEX == 1) #if(1 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(1 - SPDIF_TX_INDEX == 2) #elif(1 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -1337,9 +1337,9 @@
#if (2 < I2S_CHANS_ADC+1) #if (2 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(2 - SPDIF_TX_INDEX == 1) #if(2 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(2 - SPDIF_TX_INDEX == 2) #elif(2 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -1377,9 +1377,9 @@
#if (3 < I2S_CHANS_ADC+1) #if (3 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(3 - SPDIF_TX_INDEX == 1) #if(3 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(3 - SPDIF_TX_INDEX == 2) #elif(3 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -1417,9 +1417,9 @@
#if (4 < I2S_CHANS_ADC+1) #if (4 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(4 - SPDIF_TX_INDEX == 1) #if(4 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(4 - SPDIF_TX_INDEX == 2) #elif(4 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -1457,9 +1457,9 @@
#if (5 < I2S_CHANS_ADC+1) #if (5 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(5 - SPDIF_TX_INDEX == 1) #if(5 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(5 - SPDIF_TX_INDEX == 2) #elif(5 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -1497,9 +1497,9 @@
#if (6 < I2S_CHANS_ADC+1) #if (6 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(6 - SPDIF_TX_INDEX == 1) #if(6 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(6 - SPDIF_TX_INDEX == 2) #elif(6 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -1537,9 +1537,9 @@
#if (7 < I2S_CHANS_ADC+1) #if (7 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(7 - SPDIF_TX_INDEX == 1) #if(7 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(7 - SPDIF_TX_INDEX == 2) #elif(7 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -1577,9 +1577,9 @@
#if (8 < I2S_CHANS_ADC+1) #if (8 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(8 - SPDIF_TX_INDEX == 1) #if(8 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(8 - SPDIF_TX_INDEX == 2) #elif(8 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -1617,9 +1617,9 @@
#if (9 < I2S_CHANS_ADC+1) #if (9 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(9 - SPDIF_TX_INDEX == 1) #if(9 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(9 - SPDIF_TX_INDEX == 2) #elif(9 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -1657,9 +1657,9 @@
#if (10 < I2S_CHANS_ADC+1) #if (10 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(10 - SPDIF_TX_INDEX == 1) #if(10 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(10 - SPDIF_TX_INDEX == 2) #elif(10 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -1697,9 +1697,9 @@
#if (11 < I2S_CHANS_ADC+1) #if (11 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(11 - SPDIF_TX_INDEX == 1) #if(11 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(11 - SPDIF_TX_INDEX == 2) #elif(11 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -1737,9 +1737,9 @@
#if (12 < I2S_CHANS_ADC+1) #if (12 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(12 - SPDIF_TX_INDEX == 1) #if(12 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(12 - SPDIF_TX_INDEX == 2) #elif(12 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -1777,9 +1777,9 @@
#if (13 < I2S_CHANS_ADC+1) #if (13 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(13 - SPDIF_TX_INDEX == 1) #if(13 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(13 - SPDIF_TX_INDEX == 2) #elif(13 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -1817,9 +1817,9 @@
#if (14 < I2S_CHANS_ADC+1) #if (14 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(14 - SPDIF_TX_INDEX == 1) #if(14 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(14 - SPDIF_TX_INDEX == 2) #elif(14 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -1857,9 +1857,9 @@
#if (15 < I2S_CHANS_ADC+1) #if (15 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(15 - SPDIF_TX_INDEX == 1) #if(15 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(15 - SPDIF_TX_INDEX == 2) #elif(15 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -1897,9 +1897,9 @@
#if (16 < I2S_CHANS_ADC+1) #if (16 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(16 - SPDIF_TX_INDEX == 1) #if(16 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(16 - SPDIF_TX_INDEX == 2) #elif(16 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -1937,9 +1937,9 @@
#if (17 < I2S_CHANS_ADC+1) #if (17 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(17 - SPDIF_TX_INDEX == 1) #if(17 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(17 - SPDIF_TX_INDEX == 2) #elif(17 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -1977,9 +1977,9 @@
#if (18 < I2S_CHANS_ADC+1) #if (18 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(18 - SPDIF_TX_INDEX == 1) #if(18 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(18 - SPDIF_TX_INDEX == 2) #elif(18 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -2017,9 +2017,9 @@
#if (19 < I2S_CHANS_ADC+1) #if (19 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(19 - SPDIF_TX_INDEX == 1) #if(19 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(19 - SPDIF_TX_INDEX == 2) #elif(19 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -2057,9 +2057,9 @@
#if (20 < I2S_CHANS_ADC+1) #if (20 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(20 - SPDIF_TX_INDEX == 1) #if(20 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(20 - SPDIF_TX_INDEX == 2) #elif(20 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -2097,9 +2097,9 @@
#if (21 < I2S_CHANS_ADC+1) #if (21 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(21 - SPDIF_TX_INDEX == 1) #if(21 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(21 - SPDIF_TX_INDEX == 2) #elif(21 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -2137,9 +2137,9 @@
#if (22 < I2S_CHANS_ADC+1) #if (22 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(22 - SPDIF_TX_INDEX == 1) #if(22 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(22 - SPDIF_TX_INDEX == 2) #elif(22 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -2177,9 +2177,9 @@
#if (23 < I2S_CHANS_ADC+1) #if (23 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(23 - SPDIF_TX_INDEX == 1) #if(23 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(23 - SPDIF_TX_INDEX == 2) #elif(23 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -2217,9 +2217,9 @@
#if (24 < I2S_CHANS_ADC+1) #if (24 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(24 - SPDIF_TX_INDEX == 1) #if(24 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(24 - SPDIF_TX_INDEX == 2) #elif(24 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -2257,9 +2257,9 @@
#if (25 < I2S_CHANS_ADC+1) #if (25 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(25 - SPDIF_TX_INDEX == 1) #if(25 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(25 - SPDIF_TX_INDEX == 2) #elif(25 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -2297,9 +2297,9 @@
#if (26 < I2S_CHANS_ADC+1) #if (26 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(26 - SPDIF_TX_INDEX == 1) #if(26 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(26 - SPDIF_TX_INDEX == 2) #elif(26 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -2337,9 +2337,9 @@
#if (27 < I2S_CHANS_ADC+1) #if (27 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(27 - SPDIF_TX_INDEX == 1) #if(27 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(27 - SPDIF_TX_INDEX == 2) #elif(27 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -2377,9 +2377,9 @@
#if (28 < I2S_CHANS_ADC+1) #if (28 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(28 - SPDIF_TX_INDEX == 1) #if(28 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(28 - SPDIF_TX_INDEX == 2) #elif(28 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -2417,9 +2417,9 @@
#if (29 < I2S_CHANS_ADC+1) #if (29 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(29 - SPDIF_TX_INDEX == 1) #if(29 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(29 - SPDIF_TX_INDEX == 2) #elif(29 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -2457,9 +2457,9 @@
#if (30 < I2S_CHANS_ADC+1) #if (30 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(30 - SPDIF_TX_INDEX == 1) #if(30 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(30 - SPDIF_TX_INDEX == 2) #elif(30 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -2497,9 +2497,9 @@
#if (31 < I2S_CHANS_ADC+1) #if (31 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(31 - SPDIF_TX_INDEX == 1) #if(31 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(31 - SPDIF_TX_INDEX == 2) #elif(31 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif
@@ -2537,9 +2537,9 @@
#if (32 < I2S_CHANS_ADC+1) #if (32 < I2S_CHANS_ADC+1)
"/" "/"
#endif #endif
#if(32 - SPDIF_TX_INDEX == 1) #if(32 - SPDIF_RX_INDEX == 1)
"SPDIF 1" "SPDIF 1"
#elif(32 - SPDIF_TX_INDEX == 2) #elif(32 - SPDIF_RX_INDEX == 2)
"SPDIF 2" "SPDIF 2"
#endif #endif
#endif #endif

1
module_usb_audio/uac_hwresources.h
View File

@@ -42,7 +42,6 @@
/* use REF for ADAT_RX on U-series */ /* use REF for ADAT_RX on U-series */
/* #define CLKBLK_ADAT_RX XS1_CLKBLK_3 */ /* #define CLKBLK_ADAT_RX XS1_CLKBLK_3 */
/* Note, U-series XUD uses clock blocks 4 and 5 - see XUD_Ports.xc */ /* Note, U-series XUD uses clock blocks 4 and 5 - see XUD_Ports.xc */
#define CLKBLK_I2S_BIT XS1_CLKBLK_3 #define CLKBLK_I2S_BIT XS1_CLKBLK_3
#endif #endif

2
module_usb_midi/.cproject
View File

@@ -43,7 +43,7 @@
</outputEntries> </outputEntries>
</builder> </builder>
<tool id = "com.xmos.cdt.xc.compiler.79700694" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler"> <tool id = "com.xmos.cdt.xc.compiler.79700694" name="com.xmos.cdt.xc.compiler" superClass="com.xmos.cdt.xc.compiler">
<option id = "com.xmos.c.compiler.option.defined.symbols.78264953" name="com.xmos.c.compiler.option.defined.symbols" superClass="com.xmos.c.compiler.option.defined.symbols" valueType="definedSymbols"> <option id = "com.xmos.xc.compiler.option.defined.symbols.78264953" name="com.xmos.xc.compiler.option.defined.symbols" superClass="com.xmos.xc.compiler.option.defined.symbols" valueType="definedSymbols">
<listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/> <listOptionValue builtIn="false" value="__SHRT_MAX__=32767"/>
<listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/> <listOptionValue builtIn="false" value="__SCHAR_MAX__=127"/>
<listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/> <listOptionValue builtIn="false" value="__SIZE_TYPE__=unsigned"/>

11
xpd.xml
View File

@@ -14,14 +14,10 @@
<board>XR-USB-AUDIO-20-MC</board> <board>XR-USB-AUDIO-20-MC</board>
<keyword>USB Audio UAC2</keyword> <keyword>USB Audio UAC2</keyword>
</component> </component>
<component description = "ADAT" type = "demoCode" scope = "General Use" path = "module_usb_audio_adat" local = "false" id = "module_usb_audio_adat" name = "ADAT Module for UAC2 MC Reference Design">
<board>XR-USB-AUDIO-20-MC</board>
<keyword>ADAT</keyword>
</component>
<component description = "MIDI" type = "demoCode" scope = "General Use" path = "module_usb_midi" local = "false" id = "module_usb_midi" name = "MIDI Module for USB Audio Framework"> <component description = "MIDI" type = "demoCode" scope = "General Use" path = "module_usb_midi" local = "false" id = "module_usb_midi" name = "MIDI Module for USB Audio Framework">
<board></board> <board></board>
<componentDependency version = "6.11.2">module_queue</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.4">module_xassert</componentDependency> <componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.4">module_xassert</componentDependency>
<componentDependency version = "6.11.1">module_queue</componentDependency>
<keyword>MIDI</keyword> <keyword>MIDI</keyword>
</component> </component>
</components> </components>
@@ -84,7 +80,10 @@
<release parenthash = "66ce8f8a6e982c3de563205d12e0ed10725ef8c3" version = "6.11.0alpha2" githash = "7f8c3c687022e4664ba8f7d455ffcef8656911c0"></release> <release parenthash = "66ce8f8a6e982c3de563205d12e0ed10725ef8c3" version = "6.11.0alpha2" githash = "7f8c3c687022e4664ba8f7d455ffcef8656911c0"></release>
<release parenthash = "6eaa986eb9b385a4be9de719fd906daa8b36a6bf" version = "6.11.1beta0" githash = "fa12263ac6248aa95abcdb11eaa5d6b09cffff7f"></release> <release parenthash = "6eaa986eb9b385a4be9de719fd906daa8b36a6bf" version = "6.11.1beta0" githash = "fa12263ac6248aa95abcdb11eaa5d6b09cffff7f"></release>
<release parenthash = "8335ef56cdc879e7e84a338534e10091b86b1e5a" version = "6.11.1beta1" githash = "3e61cee71c4aaa845908d5d9dfb9257a1000215d"></release> <release parenthash = "8335ef56cdc879e7e84a338534e10091b86b1e5a" version = "6.11.1beta1" githash = "3e61cee71c4aaa845908d5d9dfb9257a1000215d"></release>
<release parenthash = "214c5c4f4287b2e0f78a397d5ae9edeaceefa3b2" version = "6.11.1beta2"></release> <release parenthash = "214c5c4f4287b2e0f78a397d5ae9edeaceefa3b2" version = "6.11.1beta2" githash = "1e963e8bc5e02fc4a03cc1b4059533a7734417e9"></release>
<release parenthash = "575ee95714761eef35b2b59db4d09fe0bb311827" version = "6.11.2rc0" githash = "5bf4f147b1442ab7c682bb39cf9a159fe3770bf2"></release>
<release parenthash = "67b217f48f3e37fc9c185f126d0ce78e1892203d" version = "6.11.2rc1" githash = "46faa608ccdc0b44eb00425d2eb381cc8920504b"></release>
<release parenthash = "5eec2dd557d7d6c7e76643ad083879a24791e832" version = "6.11.2rc2"></release>
<subpartnumber>XM-004720-SM</subpartnumber> <subpartnumber>XM-004720-SM</subpartnumber>
<vendor>XMOS</vendor> <vendor>XMOS</vendor>
<version_defines> <version_defines>