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

Merge branch 'master' of git://git/apps/sc_usb_audio

Browse Source
This commit is contained in:
Sam Chesney
2014-01-27 16:04:15 +00:00
parent b65048f20e bc8b311be0
commit 598477b3f3
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module_usb_audio/clocking/clockgen.xc
View File

@@ -38,6 +38,8 @@ static int clockValid[NUM_CLOCKS]; /* Store current val
static int clockInt[NUM_CLOCKS]; /* Interupt flag for clocks */ static int clockInt[NUM_CLOCKS]; /* Interupt flag for clocks */
static int clockId[NUM_CLOCKS]; static int clockId[NUM_CLOCKS];
#if defined(SPDIF_RX) || defined(ADAT_RX)
static int abs(int x) static int abs(int x)
{ {
if (x < 0) return -x; if (x < 0) return -x;
@@ -67,6 +69,7 @@ static void outInterrupt(chanend c_interruptControl, int value)
outct(c_interruptControl, XS1_CT_END); outct(c_interruptControl, XS1_CT_END);
} }
} }
#endif
#ifdef CLOCK_VALIDITY_CALL #ifdef CLOCK_VALIDITY_CALL
void VendorClockValidity(int valid); void VendorClockValidity(int valid);

6
module_usb_audio/endpoint0/descriptors.h
View File

@@ -457,7 +457,8 @@ unsigned char cfgDesc_Audio2[] =
CS_INTERFACE, /* 1 bDescriptorType: 0x24 */ CS_INTERFACE, /* 1 bDescriptorType: 0x24 */
INPUT_TERMINAL, /* 2 bDescriptorSubType: INPUT_TERMINAL */ INPUT_TERMINAL, /* 2 bDescriptorSubType: INPUT_TERMINAL */
ID_IT_USB, /* 3 bTerminalID */ ID_IT_USB, /* 3 bTerminalID */
(USB_STREAMING&0xff),USB_STREAMING>>8, /* 4 wTerminalType: USB Streaming */ USB_TERMTYPE_USB_STREAMING&0xff,
USB_TERMTYPE_USB_STREAMING>>8, /* 5 wTerminalType: USB Streaming */
0x00, /* 6 bAssocTerminal */ 0x00, /* 6 bAssocTerminal */
ID_CLKSEL, /* 7 bCSourceID: ID of Clock Entity */ ID_CLKSEL, /* 7 bCSourceID: ID of Clock Entity */
NUM_USB_CHAN_OUT, /* 8 bNrChannels */ NUM_USB_CHAN_OUT, /* 8 bNrChannels */
@@ -680,7 +681,8 @@ unsigned char cfgDesc_Audio2[] =
CS_INTERFACE, /* 1 bDescriptorType: 0x24 */ CS_INTERFACE, /* 1 bDescriptorType: 0x24 */
OUTPUT_TERMINAL, /* 2 bDescriptorSubType: OUTPUT_TERMINAL */ OUTPUT_TERMINAL, /* 2 bDescriptorSubType: OUTPUT_TERMINAL */
ID_OT_USB, /* 3 bTerminalID */ ID_OT_USB, /* 3 bTerminalID */
(USB_STREAMING&0xff),USB_STREAMING>>8, /* 4 wTerminalType */ (USB_TERMTYPE_USB_STREAMING&0xff),
(USB_TERMTYPE_USB_STREAMING>>8),/* 5 wTerminalType */
0x00, /* 6 bAssocTerminal */ 0x00, /* 6 bAssocTerminal */
FU_USBIN, /* 7 bSourceID Connect to analog input feature unit*/ FU_USBIN, /* 7 bSourceID Connect to analog input feature unit*/
ID_CLKSEL, /* 8 bCSourceUD */ ID_CLKSEL, /* 8 bCSourceUD */

2
module_usb_audio/flashlib_user.c
View File

@@ -14,7 +14,7 @@
#define portout(a,b) {__asm__ __volatile__("out res[%0], %1": : "r" (a) , "r" (b));} #define portout(a,b) {__asm__ __volatile__("out res[%0], %1": : "r" (a) , "r" (b));}
#ifdef DFU_FLASH_DEVICE #ifdef DFU_FLASH_DEVICE
#warning Using custom flash spec /* Using specified flash device rather than all supported in tools */
fl_DeviceSpec flash_devices[] = {DFU_FLASH_DEVICE}; fl_DeviceSpec flash_devices[] = {DFU_FLASH_DEVICE};
#endif #endif

3
module_usb_audio/main.xc
View File

@@ -330,8 +330,9 @@ void usb_audio_io(chanend c_aud_in, chanend ?c_adc
#endif #endif
) )
{ {
#ifdef MIXER
chan c_mix_out; chan c_mix_out;
#endif
par par
{ {