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

xpd: Cleaned up whitespace

Browse Source
This commit is contained in:
xross
2022-10-25 19:18:28 +01:00
parent 3fff130e4e
commit 16ce73391a
11 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib_xua/api/xua_buffer.h
View File

@@ -32,7 +32,7 @@ void XUA_Buffer(
#if (NUM_USB_CHAN_IN > 0) || defined(__DOXYGEN__)
chanend c_aud_in,
#endif
#if (NUM_USB_CHAN_IN == 0) || defined (UAC_FORCE_FEEDBACK_EP)
#if (NUM_USB_CHAN_IN == 0) || defined (UAC_FORCE_FEEDBACK_EP)
chanend c_aud_fb,
#endif
#if defined(MIDI) || defined(__DOXYGEN__)

4
lib_xua/api/xua_conf_default.h
View File

@@ -966,7 +966,7 @@
* Default: XUA_POWERMODE_BUS
*/
#ifndef XUA_POWERMODE
#define XUA_POWERMODE XUA_POWERMODE_BUS
#define XUA_POWERMODE XUA_POWERMODE_BUS
#endif
/**
@@ -1136,7 +1136,7 @@
#undef UAC_FORCE_FEEDBACK_EP
#endif
/* Synchronisation defines */
/* Synchronisation defines */
#define XUA_SYNCMODE_ASYNC (1) // USB_ENDPOINT_SYNCTYPE_ASYNC
#define XUA_SYNCMODE_ADAPT (2) // USB_ENDPOINT_SYNCTYPE_ADAPT
#define XUA_SYNCMODE_SYNC (3) // USB_ENDPOINT_SYNCTYPE_SYNC

10
lib_xua/api/xua_endpoint0.h
View File

@@ -22,15 +22,15 @@
* present
* \param c_clk_ctl Optional chanend to be connected to the clockgen core if
* present
* \param dfuInterface Interface to DFU task (this task must be run on a tile
* connected to boot flash.
* \param dfuInterface Interface to DFU task (this task must be run on a tile
* connected to boot flash.
* \param c_EANativeTransport_ctrl Optional chanend to be connected to EA Native
* endpoint manager if present
*/
void XUA_Endpoint0(chanend c_ep0_out,
void XUA_Endpoint0(chanend c_ep0_out,
chanend c_ep0_in, chanend ?c_audioCtrl,
chanend ?c_mix_ctl, chanend ?c_clk_ctl,
chanend ?c_EANativeTransport_ctrl,
chanend ?c_mix_ctl, chanend ?c_clk_ctl,
chanend ?c_EANativeTransport_ctrl,
client interface i_dfu ?dfuInterface
#if !defined(__DOXYGEN__)
VENDOR_REQUESTS_PARAMS_DEC_

14
lib_xua/src/core/clocking/clockgen.xc
View File

@@ -53,7 +53,7 @@ void PllRefPinTask(server interface pll_ref_if i_pll_ref, out port p_pll_ref)
pinVal = ~pinVal;
p_pll_ref <: pinVal;
break;
case i_pll_ref.init():
p_pll_ref <: pinVal @ pinTime;
pinTime += (unsigned short)(LOCAL_CLOCK_INCREMENT - (LOCAL_CLOCK_INCREMENT/2));
@@ -61,9 +61,9 @@ void PllRefPinTask(server interface pll_ref_if i_pll_ref, out port p_pll_ref)
break;
case i_pll_ref.toggle_timed(int relative):
if (!relative)
{
{
pinTime += (short) LOCAL_CLOCK_INCREMENT;
pinVal = !pinVal;
p_pll_ref @ pinTime <: pinVal;
@@ -353,7 +353,7 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, client interfa
/* Initial ref clock output and get timestamp */
i_pll_ref.init();
while(1)
{
select
@@ -485,8 +485,8 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, client interfa
timeNextClockDetection = timeNextEdge + (LOCAL_CLOCK_INCREMENT/2);
timeNextEdge += LOCAL_CLOCK_INCREMENT;
/* If we are in an external clock mode and this fire, then clock invalid
* reset counters in case we are moved to digital clock - we want a well timed
/* If we are in an external clock mode and this fire, then clock invalid
* reset counters in case we are moved to digital clock - we want a well timed
* first edge */
#if (XUA_SPDIF_RX_EN)
spdifCounters.receivedSamples = 0;
@@ -707,7 +707,7 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, client interfa
/* Toggle edge */
i_pll_ref.toggle_timed(1);
/* Reset counters */
adatCounters.receivedSamples = 0;

4
lib_xua/src/core/endpoint0/xua_ep0_descriptors.h
View File

@@ -46,7 +46,7 @@
#define ISO_EP_ATTRIBUTES_ASYNC ((USB_ENDPOINT_TRANSTYPE_ISO << USB_ENDPOINT_TRANSTYPE_SHIFT)\
| (USB_ENDPOINT_SYNCTYPE_ASYNC << USB_ENDPOINT_SYNCTYPE_SHIFT)\
| (USB_ENDPOINT_USAGETYPE_DATA << USB_ENDPOINT_USAGETYPE_SHIFT))
#define ISO_EP_ATTRIBUTES_ADAPTIVE ((USB_ENDPOINT_TRANSTYPE_ISO << USB_ENDPOINT_TRANSTYPE_SHIFT)\
| (USB_ENDPOINT_SYNCTYPE_ADAPT << USB_ENDPOINT_SYNCTYPE_SHIFT)\
| (USB_ENDPOINT_USAGETYPE_DATA << USB_ENDPOINT_USAGETYPE_SHIFT))
@@ -1486,7 +1486,7 @@ USB_Config_Descriptor_Audio2_t cfgDesc_Audio2=
#elif (XUA_SYNCMODE == XUA_SYNCMODE_SYNC)
.bmAttributes = ISO_EP_ATTRIBUTES_SYNC,
#else
#error "Bad XUA_SYNCMODE"
#error "Bad XUA_SYNCMODE"
#endif
.wMaxPacketSize = HS_STREAM_FORMAT_OUTPUT_1_MAXPACKETSIZE,
.bInterval = 1,

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

@@ -311,7 +311,7 @@ VENDOR_REQUESTS_PARAMS_DEC_
unsigned usbSpeed = (AUDIO_CLASS == 2) ? XUD_SPEED_HS : XUD_SPEED_FS;
unsigned xudPwrCfg = (XUA_POWERMODE == XUA_POWERMODE_SELF) ? XUD_PWR_SELF : XUD_PWR_BUS;
/* USB interface core */
XUD_Main(c_xud_out, ENDPOINT_COUNT_OUT, c_xud_in, ENDPOINT_COUNT_IN,
c_sof, epTypeTableOut, epTypeTableIn, usbSpeed, xudPwrCfg);
@@ -491,8 +491,8 @@ void usb_audio_io(chanend ?c_aud_in,
#if (XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN)
{
/* ClockGen must currently run on same tile as AudioHub due to shared memory buffer
* However, due to the use of an interface the pll reference signal port can be on another tile
/* ClockGen must currently run on same tile as AudioHub due to shared memory buffer
* However, due to the use of an interface the pll reference signal port can be on another tile
*/
thread_speed();
clockGen(c_spdif_rx, c_adat_rx, i_pll_ref, c_dig_rx, c_clk_ctl, c_clk_int);