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

Various changes to get SPDIF working on x200 board config

Browse Source
This commit is contained in:
Ross Owen
2015-03-17 11:50:02 +00:00
parent 55dd4834c3 1e963e8bc5
commit b1e69b0590
14 changed files with 238 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module_usb_audio/endpoint0/chanstringgen.py
View File

@@ -49,8 +49,8 @@ print "/* Not very nice looking but the standard preprocessor is not very powerf
print "/* Output Strings */\n\n"
genstrings(32, "OUT", "TX", "output", "DAC");
genstrings(33, "OUT", "TX", "output", "DAC");
print "/* Input Strings */\n\n"
genstrings(32, "IN", "RX", "input", "ADC");
genstrings(33, "IN", "RX", "input", "ADC");

82
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 */
@@ -1245,6 +1245,46 @@
,
#endif
#if (NUM_USB_CHAN_OUT > 32-1)
.outputChanStr_32 = ""
#if (32 < I2S_CHANS_DAC+1)
"Analogue 32"
#endif
#if ((32 < SPDIF_TX_INDEX+2+1) && (32 > SPDIF_TX_INDEX)) && defined(SPDIF_TX)
#if (32 < I2S_CHANS_DAC+1)
"/"
#endif
#if(32 - SPDIF_TX_INDEX == 1)
"SPDIF 1"
#elif(32 - SPDIF_TX_INDEX == 2)
"SPDIF 2"
#endif
#endif
#if ((32 < ADAT_TX_INDEX+8+1) && (32 > ADAT_TX_INDEX)) && defined(ADAT_TX)
#if ((32 < SPDIF_TX_INDEX+2+1) && (32 > SPDIF_TX_INDEX)) && defined(SPDIF_TX) || (32 < I2S_CHANS_DAC+1)
"/"
#endif
#if(32 - ADAT_TX_INDEX == 1)
"ADAT 1"
#elif(32 - ADAT_TX_INDEX == 2)
"ADAT 2"
#elif(32 - ADAT_TX_INDEX == 3)
"ADAT 3"
#elif(32 - ADAT_TX_INDEX == 4)
"ADAT 4"
#elif(32 - ADAT_TX_INDEX == 5)
"ADAT 5"
#elif(32 - ADAT_TX_INDEX == 6)
"ADAT 6"
#elif(32 - ADAT_TX_INDEX == 7)
"ADAT 7"
#elif(32 - ADAT_TX_INDEX == 8)
"ADAT 8"
#endif
#endif
,
#endif
/* Input Strings */
@@ -2488,3 +2528,43 @@
,
#endif
#if (NUM_USB_CHAN_IN > 32-1)
.inputChanStr_32 = ""
#if (32 < I2S_CHANS_ADC+1)
"Analogue 32"
#endif
#if ((32 < SPDIF_RX_INDEX+2+1) && (32 > SPDIF_RX_INDEX)) && defined(SPDIF_RX)
#if (32 < I2S_CHANS_ADC+1)
"/"
#endif
#if(32 - SPDIF_TX_INDEX == 1)
"SPDIF 1"
#elif(32 - SPDIF_TX_INDEX == 2)
"SPDIF 2"
#endif
#endif
#if ((32 < ADAT_RX_INDEX+8+1) && (32 > ADAT_RX_INDEX)) && defined(ADAT_RX)
#if ((32 < SPDIF_RX_INDEX+2+1) && (32 > SPDIF_RX_INDEX)) && defined(SPDIF_RX) || (32 < I2S_CHANS_ADC+1)
"/"
#endif
#if(32 - ADAT_TX_INDEX == 1)
"ADAT 1"
#elif(32 - ADAT_TX_INDEX == 2)
"ADAT 2"
#elif(32 - ADAT_TX_INDEX == 3)
"ADAT 3"
#elif(32 - ADAT_TX_INDEX == 4)
"ADAT 4"
#elif(32 - ADAT_TX_INDEX == 5)
"ADAT 5"
#elif(32 - ADAT_TX_INDEX == 6)
"ADAT 6"
#elif(32 - ADAT_TX_INDEX == 7)
"ADAT 7"
#elif(32 - ADAT_TX_INDEX == 8)
"ADAT 8"
#endif
#endif
,
#endif

2
module_usb_audio/endpoint0/descriptors.h
View File

@@ -696,7 +696,7 @@ typedef struct
// USB_Descriptor_Audio_MixerUnit_t Audio_MixerUnit;
unsigned char configDesc_MixerUnit[MIXER_LENGTH];
#endif
#if defined (SPDIF_RX) || defined (ADAT_RX)
#if defined(SPDIF_RX) || defined(ADAT_RX)
/* Interrupt EP */
USB_Descriptor_Endpoint_t Audio_Int_Endpoint;
#endif