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

ID_CLKSRC_EXT -> ID_CLKSRC_SPDIF

Browse Source
This commit is contained in:
Ross Owen
2014-03-28 12:21:12 +00:00
parent 1b78f3f861
commit caee7b6713
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module_usb_audio/clocking/clockgen.xc
View File

@@ -262,7 +262,7 @@ void clockGen (streaming chanend c_spdif_rx, chanend c_adat_rx, out port p, chan
clockFreq[CLOCK_SPDIF_INDEX] = 0; clockFreq[CLOCK_SPDIF_INDEX] = 0;
clockValid[CLOCK_SPDIF_INDEX] = 0; clockValid[CLOCK_SPDIF_INDEX] = 0;
clockInt[CLOCK_SPDIF_INDEX] = 0; clockInt[CLOCK_SPDIF_INDEX] = 0;
clockId[CLOCK_SPDIF_INDEX] = ID_CLKSRC_EXT; clockId[CLOCK_SPDIF_INDEX] = ID_CLKSRC_SPDIF;
#endif #endif
clockFreq[CLOCK_INTERNAL_INDEX] = 0; clockFreq[CLOCK_INTERNAL_INDEX] = 0;
clockId[CLOCK_INTERNAL_INDEX] = ID_CLKSRC_INT; clockId[CLOCK_INTERNAL_INDEX] = ID_CLKSRC_INT;

3
module_usb_audio/devicedefines.h
View File

@@ -627,7 +627,6 @@ enum USBEndpointNumber_Out
#endif #endif
#endif #endif
/* Length of clock unit/clock-selector units */ /* Length of clock unit/clock-selector units */
#if defined(SPDIF_RX) && defined(ADAT_RX) #if defined(SPDIF_RX) && defined(ADAT_RX)
#define NUM_CLOCKS (3) #define NUM_CLOCKS (3)
@@ -647,7 +646,7 @@ enum USBEndpointNumber_Out
#define ID_CLKSEL 40 /* Clock selector ID */ #define ID_CLKSEL 40 /* Clock selector ID */
#define ID_CLKSRC_INT 41 /* Clock source ID (internal) */ #define ID_CLKSRC_INT 41 /* Clock source ID (internal) */
#define ID_CLKSRC_EXT 42 /* Clock source ID (external) */ #define ID_CLKSRC_SPDIF 42 /* Clock source ID (external) */
#define ID_CLKSRC_ADAT 43 /* Clock source ID (external) */ #define ID_CLKSRC_ADAT 43 /* Clock source ID (external) */
#define ID_XU_MIXSEL 50 #define ID_XU_MIXSEL 50

8
module_usb_audio/endpoint0/audiorequests.xc
View File

@@ -285,7 +285,7 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
{ {
/* Clock Unit(s) */ /* Clock Unit(s) */
case ID_CLKSRC_INT: case ID_CLKSRC_INT:
case ID_CLKSRC_EXT: case ID_CLKSRC_SPDIF:
case ID_CLKSRC_ADAT: case ID_CLKSRC_ADAT:
{ {
/* Check Control selector (CS) */ /* Check Control selector (CS) */
@@ -345,7 +345,7 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
{ {
switch(unitID) switch(unitID)
{ {
case ID_CLKSRC_EXT: case ID_CLKSRC_SPDIF:
case ID_CLKSRC_ADAT: case ID_CLKSRC_ADAT:
#ifdef REPORT_SPDIF_FREQ #ifdef REPORT_SPDIF_FREQ
/* Interogate clockgen thread for SPDIF freq */ /* Interogate clockgen thread for SPDIF freq */
@@ -393,7 +393,7 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
return XUD_DoGetRequest(ep0_out, ep0_in, buffer, 1, sp.wLength); return XUD_DoGetRequest(ep0_out, ep0_in, buffer, 1, sp.wLength);
break; break;
case ID_CLKSRC_EXT: case ID_CLKSRC_SPDIF:
/* Interogate clockgen thread for validity */ /* Interogate clockgen thread for validity */
if (!isnull(c_clk_ctl)) if (!isnull(c_clk_ctl))
@@ -791,7 +791,7 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
switch( unitID ) switch( unitID )
{ {
/* Clock Source Units */ /* Clock Source Units */
case ID_CLKSRC_EXT: case ID_CLKSRC_SPDIF:
case ID_CLKSRC_ADAT: case ID_CLKSRC_ADAT:
case ID_CLKSRC_INT: case ID_CLKSRC_INT: