From 5655c91fd8b83407a72d2030cf1507475fa6b96d Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Mon, 30 Mar 2015 12:22:00 +0100 Subject: [PATCH 01/11] BCD_DEVICE now guarded by #ifndef (Caused issues with DFU test configs) --- CHANGELOG.rst | 2 ++ module_usb_audio/devicedefines.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3b07643d..1cb9fa40 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -8,6 +8,8 @@ HEAD - RESOLVED: (Minor) Potential build issue due to duplicate labels in inline asm in set_interrupt_handler macro - 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: Now uses module_adat_rx from sc_adat (local module_usb_audio_adat removed) diff --git a/module_usb_audio/devicedefines.h b/module_usb_audio/devicedefines.h index ce3f747d..b55f56f5 100644 --- a/module_usb_audio/devicedefines.h +++ b/module_usb_audio/devicedefines.h @@ -472,8 +472,9 @@ * * Default: XMOS USB Audio Release version (e.g. 0x0651 for 6.5.1). */ +#ifndef BCD_DEVICE #define BCD_DEVICE ((BCD_DEVICE_J << 8) | ((BCD_DEVICE_M & 0xF) << 4) | (BCD_DEVICE_N & 0xF)) - +#endif /** * @brief Number of supported output stream formats. From 4eef47785941d92cfb5c73297c6c0081be6bc0d6 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Mon, 30 Mar 2015 12:22:15 +0100 Subject: [PATCH 02/11] Changelog update --- CHANGELOG.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1cb9fa40..9f322ff8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,10 +1,14 @@ sc_usb_audio Change Log ======================= -HEAD ----- +6.11.2 +------ - RESOLVED: (Major) Enumeration issue when MAX_MIX_COUNT > 0 only. Introduced in mixer - optimisations in 6.11.0. Does not effect designs without mixer enabled. + optimisations in 6.11.0. Only affects designs using mixer functionality. + - RESOLVED: (Normal) Audio buffering request system modified such that the mixer output is + not silent when in underflow case (i.e. host output stream not active) This issue was + introduced with the addition of DSD functionality and only affects designs using + mixer functionality. - RESOLVED: (Minor) Potential build issue due to duplicate labels in inline asm in set_interrupt_handler macro - RESOLVED: (Minor) String descriptor for Clock Selector unit incorrectly reported From b27de0b96d9518c85a3a2b327b5b2fa7e83d968e Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Mon, 30 Mar 2015 12:23:01 +0100 Subject: [PATCH 03/11] Removed old (commented out) CLKBLK defines --- module_usb_audio/uac_hwresources.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/module_usb_audio/uac_hwresources.h b/module_usb_audio/uac_hwresources.h index a5f67f6e..31181e19 100644 --- a/module_usb_audio/uac_hwresources.h +++ b/module_usb_audio/uac_hwresources.h @@ -27,8 +27,6 @@ #define CLKBLK_USB_RST XS1_CLKBLK_4 /* Clock block passed into L/G series XUD */ #define CLKBLK_FLASHLIB XS1_CLKBLK_5 /* Clock block for use by flash lib */ -/* #define CLKBLK_SPDIF_TX XS1_CLKBLK_1 */ -/* #define CLKBLK_MCLK XS1_CLKBLK_2 */ #define CLKBLK_I2S_BIT XS1_CLKBLK_3 #else @@ -44,11 +42,8 @@ /* use REF for ADAT_RX on U-series */ /* #define CLKBLK_ADAT_RX XS1_CLKBLK_3 */ /* Note, U-series XUD uses clock blocks 4 and 5 - see XUD_Ports.xc */ - #define CLKBLK_FLASHLIB XS1_CLKBLK_5 /* Clock block for use by flash lib */ -/* #define CLKBLK_SPDIF_TX XS1_CLKBLK_1 */ -/* #define CLKBLK_MCLK XS1_CLKBLK_2 */ #define CLKBLK_I2S_BIT XS1_CLKBLK_3 #endif From 34e65e5c8c41eaacfdea76ef1d0e3ab88b9df614 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Mon, 30 Mar 2015 12:24:03 +0100 Subject: [PATCH 04/11] xpd: Patched version number --- module_usb_audio/devicedefines.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module_usb_audio/devicedefines.h b/module_usb_audio/devicedefines.h index b55f56f5..55166648 100644 --- a/module_usb_audio/devicedefines.h +++ b/module_usb_audio/devicedefines.h @@ -462,7 +462,7 @@ * @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 -#define BCD_DEVICE_N 1 +#define BCD_DEVICE_N 2 #endif /** From 575ee95714761eef35b2b59db4d09fe0bb311827 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Mon, 30 Mar 2015 12:24:03 +0100 Subject: [PATCH 05/11] xpd: Cleaned up whitespace --- module_usb_audio/mixer/mixer.xc | 2 +- module_usb_audio/usb_buffer/decouple.xc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module_usb_audio/mixer/mixer.xc b/module_usb_audio/mixer/mixer.xc index 9d637344..bc38ccb2 100644 --- a/module_usb_audio/mixer/mixer.xc +++ b/module_usb_audio/mixer/mixer.xc @@ -620,7 +620,7 @@ static void mixer2(chanend c_mixer1, chanend c_audio) { #pragma xta endpoint "mixer2_req" request = inuint(c_audio); - + /* Forward the request on */ outuint(c_mixer1, request); diff --git a/module_usb_audio/usb_buffer/decouple.xc b/module_usb_audio/usb_buffer/decouple.xc index 8dd20c01..c28d00db 100644 --- a/module_usb_audio/usb_buffer/decouple.xc +++ b/module_usb_audio/usb_buffer/decouple.xc @@ -130,7 +130,7 @@ void handle_audio_request(chanend c_mix_out) /* Input word that triggered interrupt and handshake back */ unsigned underflowSample = inuint(c_mix_out); - + outuint(c_mix_out, 0); /* If in overflow condition then receive samples and throw away */ From 5bf4f147b1442ab7c682bb39cf9a159fe3770bf2 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Mon, 30 Mar 2015 15:01:49 +0100 Subject: [PATCH 06/11] 'Release: 6.11.2rc0' --- README.rst | 2 +- xpd.xml | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index 74daa595..b129f906 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ USB Audio Shared ................ -:Latest release: 6.11.1beta2 +:Latest release: 6.11.2rc0 :Maintainer: xross :Description: USB Audio Shared Components. For use in the XMOS USB Audio Refererence Designs. diff --git a/xpd.xml b/xpd.xml index 73bc8090..5c6c2191 100644 --- a/xpd.xml +++ b/xpd.xml @@ -14,14 +14,10 @@ XR-USB-AUDIO-20-MC USB Audio UAC2 - - XR-USB-AUDIO-20-MC - ADAT - - module_xassert module_queue + module_xassert MIDI @@ -84,7 +80,8 @@ - + + XM-004720-SM XMOS From 67b217f48f3e37fc9c185f126d0ce78e1892203d Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Tue, 31 Mar 2015 22:39:35 +0100 Subject: [PATCH 07/11] Fixed SPDIF Rx channel string table entry issue due to RX/TX typo (fixed in generation script). Also removed trailing spaces and end of generated lines from generation script. --- module_usb_audio/endpoint0/chanstringgen.py | 52 ++++---- module_usb_audio/endpoint0/chanstrings.h | 126 ++++++++++---------- 2 files changed, 89 insertions(+), 89 deletions(-) diff --git a/module_usb_audio/endpoint0/chanstringgen.py b/module_usb_audio/endpoint0/chanstringgen.py index 2053c3c4..342d49cb 100644 --- a/module_usb_audio/endpoint0/chanstringgen.py +++ b/module_usb_audio/endpoint0/chanstringgen.py @@ -4,47 +4,47 @@ def genstrings(outputChanCount, chanString, portString, structureString, adc_dac for i in range(1,outputChanCount): - print "#if (NUM_USB_CHAN_{c} > {i}-1) \n\ + print "#if (NUM_USB_CHAN_{c} > {i}-1)\n\ .{s}ChanStr_{i} = \"\"\n\ - #if ({i} < I2S_CHANS_{adcdac}+1) \n\ - \"Analogue {i}\" \n\ - #endif \n\ - #if (({i} < SPDIF_{p}_INDEX+2+1) && ({i} > SPDIF_{p}_INDEX)) && defined(SPDIF_{p}) \n\ - #if ({i} < I2S_CHANS_{adcdac}+1) \n\ - \"/\" \n\ - #endif \n\ - #if({i} - SPDIF_TX_INDEX == 1) \n\ + #if ({i} < I2S_CHANS_{adcdac}+1)\n\ + \"Analogue {i}\"\n\ + #endif\n\ + #if (({i} < SPDIF_{p}_INDEX+2+1) && ({i} > SPDIF_{p}_INDEX)) && defined(SPDIF_{p})\n\ + #if ({i} < I2S_CHANS_{adcdac}+1)\n\ + \"/\"\n\ + #endif\n\ + #if({i} - SPDIF_{p}_INDEX == 1)\n\ \"SPDIF 1\"\n\ - #elif({i} - SPDIF_TX_INDEX == 2) \n\ + #elif({i} - SPDIF_{p}_INDEX == 2)\n\ \"SPDIF 2\"\n\ #endif\n\ #endif\n\ - #if (({i} < ADAT_{p}_INDEX+8+1) && ({i} > ADAT_{p}_INDEX)) && defined(ADAT_{p}) \n\ - #if (({i} < SPDIF_{p}_INDEX+2+1) && ({i} > SPDIF_{p}_INDEX)) && defined(SPDIF_{p}) || ({i} < I2S_CHANS_{adcdac}+1) \n\ - \"/\" \n\ - #endif \n\ - #if({i} - ADAT_TX_INDEX == 1) \n\ + #if (({i} < ADAT_{p}_INDEX+8+1) && ({i} > ADAT_{p}_INDEX)) && defined(ADAT_{p})\n\ + #if (({i} < SPDIF_{p}_INDEX+2+1) && ({i} > SPDIF_{p}_INDEX)) && defined(SPDIF_{p}) || ({i} < I2S_CHANS_{adcdac}+1)\n\ + \"/\"\n\ + #endif\n\ + #if({i} - ADAT_TX_INDEX == 1)\n\ \"ADAT 1\"\n\ - #elif({i} - ADAT_TX_INDEX == 2) \n\ + #elif({i} - ADAT_TX_INDEX == 2)\n\ \"ADAT 2\"\n\ - #elif({i} - ADAT_TX_INDEX == 3) \n\ + #elif({i} - ADAT_TX_INDEX == 3)\n\ \"ADAT 3\"\n\ - #elif({i} - ADAT_TX_INDEX == 4) \n\ + #elif({i} - ADAT_TX_INDEX == 4)\n\ \"ADAT 4\"\n\ - #elif({i} - ADAT_TX_INDEX == 5) \n\ + #elif({i} - ADAT_TX_INDEX == 5)\n\ \"ADAT 5\"\n\ - #elif({i} - ADAT_TX_INDEX == 6) \n\ + #elif({i} - ADAT_TX_INDEX == 6)\n\ \"ADAT 6\"\n\ - #elif({i} - ADAT_TX_INDEX == 7) \n\ + #elif({i} - ADAT_TX_INDEX == 7)\n\ \"ADAT 7\"\n\ - #elif({i} - ADAT_TX_INDEX == 8) \n\ + #elif({i} - ADAT_TX_INDEX == 8)\n\ \"ADAT 8\"\n\ - #endif\n \ - #endif\n\ - , \n#endif \n".format(i=i, c=chanString, p=portString, s=structureString, adcdac=adc_dac); + #endif\n\ + #endif\n\ + ,\n#endif\n".format(i=i, c=chanString, p=portString, s=structureString, adcdac=adc_dac); return; -print "/* AUTOGENERATED using chanstringgen.py */ \n" +print "/* AUTOGENERATED using chanstringgen.py */\n" print "/* Not very nice looking but the standard preprocessor is not very powerful\n and we save some memory over doing this all at runtime */" print "/* Output Strings */\n\n" diff --git a/module_usb_audio/endpoint0/chanstrings.h b/module_usb_audio/endpoint0/chanstrings.h index 01f8afb2..bb24494c 100644 --- a/module_usb_audio/endpoint0/chanstrings.h +++ b/module_usb_audio/endpoint0/chanstrings.h @@ -1,4 +1,4 @@ -/* AUTOGENERATED using stringtable.py */ +/* AUTOGENERATED using chanstringgen.py */ /* Not very nice looking but the standard preprocessor is not very powerful and we save some memory over doing this all at runtime */ @@ -1257,9 +1257,9 @@ #if (1 < I2S_CHANS_ADC+1) "/" #endif - #if(1 - SPDIF_TX_INDEX == 1) + #if(1 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(1 - SPDIF_TX_INDEX == 2) + #elif(1 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -1297,9 +1297,9 @@ #if (2 < I2S_CHANS_ADC+1) "/" #endif - #if(2 - SPDIF_TX_INDEX == 1) + #if(2 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(2 - SPDIF_TX_INDEX == 2) + #elif(2 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -1337,9 +1337,9 @@ #if (3 < I2S_CHANS_ADC+1) "/" #endif - #if(3 - SPDIF_TX_INDEX == 1) + #if(3 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(3 - SPDIF_TX_INDEX == 2) + #elif(3 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -1377,9 +1377,9 @@ #if (4 < I2S_CHANS_ADC+1) "/" #endif - #if(4 - SPDIF_TX_INDEX == 1) + #if(4 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(4 - SPDIF_TX_INDEX == 2) + #elif(4 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -1417,9 +1417,9 @@ #if (5 < I2S_CHANS_ADC+1) "/" #endif - #if(5 - SPDIF_TX_INDEX == 1) + #if(5 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(5 - SPDIF_TX_INDEX == 2) + #elif(5 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -1457,9 +1457,9 @@ #if (6 < I2S_CHANS_ADC+1) "/" #endif - #if(6 - SPDIF_TX_INDEX == 1) + #if(6 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(6 - SPDIF_TX_INDEX == 2) + #elif(6 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -1497,9 +1497,9 @@ #if (7 < I2S_CHANS_ADC+1) "/" #endif - #if(7 - SPDIF_TX_INDEX == 1) + #if(7 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(7 - SPDIF_TX_INDEX == 2) + #elif(7 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -1537,9 +1537,9 @@ #if (8 < I2S_CHANS_ADC+1) "/" #endif - #if(8 - SPDIF_TX_INDEX == 1) + #if(8 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(8 - SPDIF_TX_INDEX == 2) + #elif(8 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -1577,9 +1577,9 @@ #if (9 < I2S_CHANS_ADC+1) "/" #endif - #if(9 - SPDIF_TX_INDEX == 1) + #if(9 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(9 - SPDIF_TX_INDEX == 2) + #elif(9 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -1617,9 +1617,9 @@ #if (10 < I2S_CHANS_ADC+1) "/" #endif - #if(10 - SPDIF_TX_INDEX == 1) + #if(10 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(10 - SPDIF_TX_INDEX == 2) + #elif(10 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -1657,9 +1657,9 @@ #if (11 < I2S_CHANS_ADC+1) "/" #endif - #if(11 - SPDIF_TX_INDEX == 1) + #if(11 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(11 - SPDIF_TX_INDEX == 2) + #elif(11 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -1697,9 +1697,9 @@ #if (12 < I2S_CHANS_ADC+1) "/" #endif - #if(12 - SPDIF_TX_INDEX == 1) + #if(12 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(12 - SPDIF_TX_INDEX == 2) + #elif(12 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -1737,9 +1737,9 @@ #if (13 < I2S_CHANS_ADC+1) "/" #endif - #if(13 - SPDIF_TX_INDEX == 1) + #if(13 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(13 - SPDIF_TX_INDEX == 2) + #elif(13 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -1777,9 +1777,9 @@ #if (14 < I2S_CHANS_ADC+1) "/" #endif - #if(14 - SPDIF_TX_INDEX == 1) + #if(14 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(14 - SPDIF_TX_INDEX == 2) + #elif(14 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -1817,9 +1817,9 @@ #if (15 < I2S_CHANS_ADC+1) "/" #endif - #if(15 - SPDIF_TX_INDEX == 1) + #if(15 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(15 - SPDIF_TX_INDEX == 2) + #elif(15 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -1857,9 +1857,9 @@ #if (16 < I2S_CHANS_ADC+1) "/" #endif - #if(16 - SPDIF_TX_INDEX == 1) + #if(16 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(16 - SPDIF_TX_INDEX == 2) + #elif(16 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -1897,9 +1897,9 @@ #if (17 < I2S_CHANS_ADC+1) "/" #endif - #if(17 - SPDIF_TX_INDEX == 1) + #if(17 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(17 - SPDIF_TX_INDEX == 2) + #elif(17 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -1937,9 +1937,9 @@ #if (18 < I2S_CHANS_ADC+1) "/" #endif - #if(18 - SPDIF_TX_INDEX == 1) + #if(18 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(18 - SPDIF_TX_INDEX == 2) + #elif(18 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -1977,9 +1977,9 @@ #if (19 < I2S_CHANS_ADC+1) "/" #endif - #if(19 - SPDIF_TX_INDEX == 1) + #if(19 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(19 - SPDIF_TX_INDEX == 2) + #elif(19 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -2017,9 +2017,9 @@ #if (20 < I2S_CHANS_ADC+1) "/" #endif - #if(20 - SPDIF_TX_INDEX == 1) + #if(20 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(20 - SPDIF_TX_INDEX == 2) + #elif(20 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -2057,9 +2057,9 @@ #if (21 < I2S_CHANS_ADC+1) "/" #endif - #if(21 - SPDIF_TX_INDEX == 1) + #if(21 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(21 - SPDIF_TX_INDEX == 2) + #elif(21 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -2097,9 +2097,9 @@ #if (22 < I2S_CHANS_ADC+1) "/" #endif - #if(22 - SPDIF_TX_INDEX == 1) + #if(22 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(22 - SPDIF_TX_INDEX == 2) + #elif(22 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -2137,9 +2137,9 @@ #if (23 < I2S_CHANS_ADC+1) "/" #endif - #if(23 - SPDIF_TX_INDEX == 1) + #if(23 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(23 - SPDIF_TX_INDEX == 2) + #elif(23 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -2177,9 +2177,9 @@ #if (24 < I2S_CHANS_ADC+1) "/" #endif - #if(24 - SPDIF_TX_INDEX == 1) + #if(24 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(24 - SPDIF_TX_INDEX == 2) + #elif(24 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -2217,9 +2217,9 @@ #if (25 < I2S_CHANS_ADC+1) "/" #endif - #if(25 - SPDIF_TX_INDEX == 1) + #if(25 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(25 - SPDIF_TX_INDEX == 2) + #elif(25 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -2257,9 +2257,9 @@ #if (26 < I2S_CHANS_ADC+1) "/" #endif - #if(26 - SPDIF_TX_INDEX == 1) + #if(26 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(26 - SPDIF_TX_INDEX == 2) + #elif(26 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -2297,9 +2297,9 @@ #if (27 < I2S_CHANS_ADC+1) "/" #endif - #if(27 - SPDIF_TX_INDEX == 1) + #if(27 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(27 - SPDIF_TX_INDEX == 2) + #elif(27 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -2337,9 +2337,9 @@ #if (28 < I2S_CHANS_ADC+1) "/" #endif - #if(28 - SPDIF_TX_INDEX == 1) + #if(28 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(28 - SPDIF_TX_INDEX == 2) + #elif(28 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -2377,9 +2377,9 @@ #if (29 < I2S_CHANS_ADC+1) "/" #endif - #if(29 - SPDIF_TX_INDEX == 1) + #if(29 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(29 - SPDIF_TX_INDEX == 2) + #elif(29 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -2417,9 +2417,9 @@ #if (30 < I2S_CHANS_ADC+1) "/" #endif - #if(30 - SPDIF_TX_INDEX == 1) + #if(30 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(30 - SPDIF_TX_INDEX == 2) + #elif(30 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif @@ -2457,9 +2457,9 @@ #if (31 < I2S_CHANS_ADC+1) "/" #endif - #if(31 - SPDIF_TX_INDEX == 1) + #if(31 - SPDIF_RX_INDEX == 1) "SPDIF 1" - #elif(31 - SPDIF_TX_INDEX == 2) + #elif(31 - SPDIF_RX_INDEX == 2) "SPDIF 2" #endif #endif From 46faa608ccdc0b44eb00425d2eb381cc8920504b Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Tue, 31 Mar 2015 22:45:02 +0100 Subject: [PATCH 08/11] 'Release: 6.11.2rc1' --- README.rst | 2 +- module_dfu/.cproject | 2 +- module_queue/.cproject | 2 +- module_usb_audio/.cproject | 2 +- module_usb_midi/.cproject | 2 +- xpd.xml | 5 +++-- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index b129f906..1313e13b 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ USB Audio Shared ................ -:Latest release: 6.11.2rc0 +:Latest release: 6.11.2rc1 :Maintainer: xross :Description: USB Audio Shared Components. For use in the XMOS USB Audio Refererence Designs. diff --git a/module_dfu/.cproject b/module_dfu/.cproject index bb778c83..1ab30e26 100644 --- a/module_dfu/.cproject +++ b/module_dfu/.cproject @@ -43,7 +43,7 @@ -