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

Removed some build warnings and updated comments for doc inclusion

Browse Source
This commit is contained in:
xross
2022-10-13 16:08:19 +01:00
parent e04373d4a6
commit 918e2ed0f1
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib_xua/module_build_info
View File

@@ -14,7 +14,7 @@ DEPENDENT_MODULES = lib_locks(>=2.1.0) \
lib_spdif(>=4.1.0) \ lib_spdif(>=4.1.0) \
lib_xassert(>=4.1.0) \ lib_xassert(>=4.1.0) \
lib_xud(>=2.1.0) \ lib_xud(>=2.1.0) \
lib_adat (>=1.0.0) lib_adat(>=1.0.0)
MODULE_XCC_FLAGS = $(XCC_FLAGS) \ MODULE_XCC_FLAGS = $(XCC_FLAGS) \
-O3 \ -O3 \

7
lib_xua/src/core/buffer/ep/ep_buffer.xc
View File

@@ -230,8 +230,11 @@ void XUA_Buffer_Ep(register chanend c_aud_out,
unsigned u_tmp; unsigned u_tmp;
unsigned sampleFreq = DEFAULT_FREQ; unsigned sampleFreq = DEFAULT_FREQ;
unsigned masterClockFreq = DEFAULT_MCLK_FREQ; unsigned masterClockFreq = DEFAULT_MCLK_FREQ;
unsigned lastClock = 0;
#if (XUA_SYNCMODE == XUA_SYNCMODE_ASYNC)
unsigned lastClock = 0;
unsigned freqChange = 0;
#endif
unsafe{masterClockFreq_ptr = &masterClockFreq;} unsafe{masterClockFreq_ptr = &masterClockFreq;}
unsigned clocks = 0; unsigned clocks = 0;
@@ -245,7 +248,6 @@ void XUA_Buffer_Ep(register chanend c_aud_out,
unsigned bufferIn = 1; unsigned bufferIn = 1;
#endif #endif
unsigned sofCount = 0; unsigned sofCount = 0;
unsigned freqChange = 0;
unsigned mod_from_last_time = 0; unsigned mod_from_last_time = 0;
#ifdef FB_TOLERANCE_TEST #ifdef FB_TOLERANCE_TEST
@@ -355,7 +357,6 @@ void XUA_Buffer_Ep(register chanend c_aud_out,
#ifndef LOCAL_CLOCK_MARGIN #ifndef LOCAL_CLOCK_MARGIN
#define LOCAL_CLOCK_MARGIN (1000) #define LOCAL_CLOCK_MARGIN (1000)
#endif #endif
int sofClockValid = 0;
timer t_sofCheck; timer t_sofCheck;
unsigned timeLastEdge; unsigned timeLastEdge;
unsigned timeNextEdge; unsigned timeNextEdge;

10
lib_xua/src/core/main.xc
View File

@@ -310,12 +310,11 @@ VENDOR_REQUESTS_PARAMS_DEC_
/* Run UAC2.0 at high-speed, UAC1.0 at full-speed */ /* Run UAC2.0 at high-speed, UAC1.0 at full-speed */
unsigned usbSpeed = (AUDIO_CLASS == 2) ? XUD_SPEED_HS : XUD_SPEED_FS; unsigned usbSpeed = (AUDIO_CLASS == 2) ? XUD_SPEED_HS : XUD_SPEED_FS;
/* USB Interface Core */ /* USB interface core */
XUD_Main(c_xud_out, ENDPOINT_COUNT_OUT, c_xud_in, ENDPOINT_COUNT_IN, XUD_Main(c_xud_out, ENDPOINT_COUNT_OUT, c_xud_in, ENDPOINT_COUNT_IN,
c_sof, epTypeTableOut, epTypeTableIn, usbSpeed, XUD_PWR_CFG); c_sof, epTypeTableOut, epTypeTableIn, usbSpeed, XUD_PWR_CFG);
} }
/* USB Packet buffering Core */
{ {
unsigned x; unsigned x;
thread_speed(); thread_speed();
@@ -332,7 +331,7 @@ VENDOR_REQUESTS_PARAMS_DEC_
asm("ldw %0, dp[clk_audio_mclk]":"=r"(x)); asm("ldw %0, dp[clk_audio_mclk]":"=r"(x));
asm("setclk res[%0], %1"::"r"(p_for_mclk_count), "r"(x)); asm("setclk res[%0], %1"::"r"(p_for_mclk_count), "r"(x));
#endif #endif
//:buffer /* Endpoint & audio buffering cores */
XUA_Buffer(c_xud_out[ENDPOINT_NUMBER_OUT_AUDIO],/* Audio Out*/ XUA_Buffer(c_xud_out[ENDPOINT_NUMBER_OUT_AUDIO],/* Audio Out*/
#if (NUM_USB_CHAN_IN > 0) #if (NUM_USB_CHAN_IN > 0)
@@ -460,7 +459,7 @@ void usb_audio_io(chanend ?c_aud_in,
} }
#endif #endif
/* Audio I/O Core (pars additional S/PDIF TX Core) */ /* Audio I/O core (pars additional S/PDIF TX Core) */
{ {
thread_speed(); thread_speed();
#ifdef MIXER #ifdef MIXER
@@ -596,6 +595,7 @@ int main()
#endif #endif
#endif #endif
#if XUA_USB_EN #if XUA_USB_EN
/* Core USB audio task, buffering, USB etc */
usb_audio_core(c_mix_out usb_audio_core(c_mix_out
#ifdef MIDI #ifdef MIDI
, c_midi , c_midi
@@ -621,6 +621,7 @@ int main()
on tile[AUDIO_IO_TILE]: on tile[AUDIO_IO_TILE]:
{ {
/* Audio I/O task, includes mixing etc */
usb_audio_io(c_mix_out usb_audio_io(c_mix_out
#if (XUA_SPDIF_TX_EN) && (SPDIF_TX_TILE != AUDIO_IO_TILE) #if (XUA_SPDIF_TX_EN) && (SPDIF_TX_TILE != AUDIO_IO_TILE)
, c_spdif_tx , c_spdif_tx
@@ -643,6 +644,7 @@ int main()
#endif #endif
); );
} }
//:
#if (XUA_SPDIF_TX_EN) && (SPDIF_TX_TILE != AUDIO_IO_TILE) #if (XUA_SPDIF_TX_EN) && (SPDIF_TX_TILE != AUDIO_IO_TILE)
on tile[SPDIF_TX_TILE]: on tile[SPDIF_TX_TILE]: