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

Conflicted merge

Browse Source
This commit is contained in:
Ross Owen
2014-07-14 14:51:59 +01:00
parent 4d4c7b8f39 97987767b2
commit d96a60da7c
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module_usb_audio/devicedefines.h
View File

@@ -769,6 +769,14 @@
#endif #endif
#endif #endif
#ifndef XUD_PWR_CFG
#ifdef SELF_POWERED
#define XUD_PWR_CFG XUD_PWR_SELF
#else
#define XUD_PWR_CFG XUD_PWR_BUS
#endif
#endif
/* Mixer defines */ /* Mixer defines */
/** /**

10
module_usb_audio/main.xc
View File

@@ -224,12 +224,6 @@ void xscope_user_init()
} }
#endif #endif
#ifdef SELF_POWERED
#define pwrConfig XUD_PWR_SELF
#else
#define pwrConfig XUD_PWR_BUS
#endif
/* Core USB Audio functions - must be called on the Tile connected to the USB Phy */ /* Core USB Audio functions - must be called on the Tile connected to the USB Phy */
void usb_audio_core(chanend c_mix_out void usb_audio_core(chanend c_mix_out
#ifdef MIDI #ifdef MIDI
@@ -262,11 +256,11 @@ void usb_audio_core(chanend c_mix_out
#if (AUDIO_CLASS==2) #if (AUDIO_CLASS==2)
XUD_Manager(c_xud_out, ENDPOINT_COUNT_OUT, c_xud_in, ENDPOINT_COUNT_IN, XUD_Manager(c_xud_out, ENDPOINT_COUNT_OUT, c_xud_in, ENDPOINT_COUNT_IN,
c_sof, epTypeTableOut, epTypeTableIn, p_usb_rst, c_sof, epTypeTableOut, epTypeTableIn, p_usb_rst,
clk, 1, XUD_SPEED_HS, pwrConfig); clk, 1, XUD_SPEED_HS, XUD_PWR_CFG);
#else #else
XUD_Manager(c_xud_out, ENDPOINT_COUNT_OUT, c_xud_in, ENDPOINT_COUNT_IN, XUD_Manager(c_xud_out, ENDPOINT_COUNT_OUT, c_xud_in, ENDPOINT_COUNT_IN,
c_sof, epTypeTableOut, epTypeTableIn, p_usb_rst, c_sof, epTypeTableOut, epTypeTableIn, p_usb_rst,
clk, 1, XUD_SPEED_FS, pwrConfig); clk, 1, XUD_SPEED_FS, XUD_PWR_CFG);
#endif #endif
/* USB Packet buffering Core */ /* USB Packet buffering Core */