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

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.

Browse Source
This commit is contained in:
Ross Owen
2015-03-31 22:39:35 +01:00
parent 5bf4f147b1
commit 67b217f48f
2 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
module_usb_audio/endpoint0/chanstringgen.py
View File

@@ -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"

126
module_usb_audio/endpoint0/chanstrings.h
View File

@@ -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