From fa5723947f5d7fc2d5e40e4d7cea3639db3eb0a2 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Thu, 15 Jun 2023 12:44:02 +0100 Subject: [PATCH 1/3] xpd: Cleaned up whitespace --- lib_xua/src/core/audiohub/audiohub_initport.xc | 10 +++++----- lib_xua/src/core/audiohub/xua_audiohub.xc | 4 ++-- lib_xua/src/core/buffer/decouple/decouple.xc | 6 +++--- lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib_xua/src/core/audiohub/audiohub_initport.xc b/lib_xua/src/core/audiohub/audiohub_initport.xc index 61ab6324..a24a0e66 100644 --- a/lib_xua/src/core/audiohub/audiohub_initport.xc +++ b/lib_xua/src/core/audiohub/audiohub_initport.xc @@ -38,12 +38,12 @@ void InitPorts_master(buffered _XUA_CLK_DIR port:32 p_lrclk, buffered _XUA_CLK_D #endif unsigned tmp; - + if(XUA_I2S_N_BITS == 32) p_lrclk <: 0 @ tmp; else tmp = partout_timestamped(p_lrclk, XUA_I2S_N_BITS, 0); - + tmp += 100; /* Since BCLK is free-running, setup outputs/inputs at a known point in the future */ @@ -72,7 +72,7 @@ void InitPorts_master(buffered _XUA_CLK_DIR port:32 p_lrclk, buffered _XUA_CLK_D for(int i = 0; i < I2S_WIRES_ADC; i++) { asm("setpt res[%0], %1"::"r"(p_i2s_adc[i]),"r"(tmp-1)); - + if(XUA_I2S_N_BITS != 32) set_port_shift_count(p_i2s_adc[i], XUA_I2S_N_BITS); } @@ -127,13 +127,13 @@ void InitPorts_slave(buffered _XUA_CLK_DIR port:32 p_lrclk, buffered _XUA_CLK_DI for(int i = 0; i < I2S_WIRES_ADC; i++) { asm("setpt res[%0], %1"::"r"(p_i2s_adc[i]),"r"(tmp-1)); - if(XUA_I2S_N_BITS != 32) + if(XUA_I2S_N_BITS != 32) set_port_shift_count(p_i2s_adc[i], XUA_I2S_N_BITS); } #endif asm("setpt res[%0], %1"::"r"(p_lrclk),"r"(tmp-1)); - if(XUA_I2S_N_BITS != 32) + if(XUA_I2S_N_BITS != 32) set_port_shift_count(p_lrclk, XUA_I2S_N_BITS); #endif /* (I2S_CHANS_ADC != 0 || I2S_CHANS_DAC != 0) */ } diff --git a/lib_xua/src/core/audiohub/xua_audiohub.xc b/lib_xua/src/core/audiohub/xua_audiohub.xc index e50cee24..08ad7517 100755 --- a/lib_xua/src/core/audiohub/xua_audiohub.xc +++ b/lib_xua/src/core/audiohub/xua_audiohub.xc @@ -86,7 +86,7 @@ static inline int HandleSampleClock(int frameCount, buffered _XUA_CLK_DIR port:3 unsigned syncError = 0; unsigned lrval = 0; const unsigned lrval_mask = (0xffffffff << (32 - XUA_I2S_N_BITS)); - + if(XUA_I2S_N_BITS != 32) { asm volatile("in %0, res[%1]":"=r"(lrval):"r"(p_lrclk):"memory"); @@ -306,7 +306,7 @@ unsigned static AudioHub_MainLoop(chanend ?c_out, chanend ?c_spd_out // Manual IN instruction since compiler generates an extra setc per IN (bug #15256) unsigned sample; asm volatile("in %0, res[%1]" : "=r"(sample) : "r"(p_i2s_adc[index])); - + sample = bitrev(sample); if(XUA_I2S_N_BITS != 32) { diff --git a/lib_xua/src/core/buffer/decouple/decouple.xc b/lib_xua/src/core/buffer/decouple/decouple.xc index c276abda..1beb3ea4 100644 --- a/lib_xua/src/core/buffer/decouple/decouple.xc +++ b/lib_xua/src/core/buffer/decouple/decouple.xc @@ -394,7 +394,7 @@ __builtin_unreachable(); unsigned l; unsafe { - mult = multInPtr[i]; + mult = multInPtr[i]; } {h, l} = macs(mult, sample, 0, 0); sample = h << 3; @@ -427,7 +427,7 @@ __builtin_unreachable(); unsigned l; unsafe { - mult = multInPtr[i]; + mult = multInPtr[i]; } {h, l} = macs(mult, sample, 0, 0); sample = h << 3; @@ -461,7 +461,7 @@ __builtin_unreachable(); unsigned l; unsafe { - mult = multInPtr[i]; + mult = multInPtr[i]; } {h, l} = macs(mult, sample, 0, 0); sample = h << 3; diff --git a/lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc b/lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc index 5ef46010..4300313a 100644 --- a/lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc +++ b/lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc @@ -145,7 +145,7 @@ static void updateMasterVol(int unitID, chanend ?c_mix_ctl) outuint(c_mix_ctl, x); outct(c_mix_ctl, XS1_CT_END); } -#else +#else unsafe { unsigned int * unsafe multOutPtr = multOut; From 15036f2bcc8edb076915bc62ebb9d3a72299d403 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Thu, 15 Jun 2023 12:45:03 +0100 Subject: [PATCH 2/3] 'Release: 3.5.0' --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index 00ce34c3..57e4897c 100644 --- a/README.rst +++ b/README.rst @@ -3,6 +3,7 @@ lib_xua :Version: 3.5.0 :Vendor: XMOS + :Scope: General Use Summary From a485ffe41abcaf0f02ed289a9c759751dd75b29a Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Wed, 21 Jun 2023 12:21:02 +0100 Subject: [PATCH 3/3] 'Release: 3.5.1' --- README.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 57e4897c..0ed7808c 100644 --- a/README.rst +++ b/README.rst @@ -1,9 +1,10 @@ lib_xua ####### -:Version: 3.5.0 +:Version: 3.5.1 :Vendor: XMOS + :Scope: General Use Summary