From 8ec5f8c7fccd50e7fabee390a41b00171cf2d0ed Mon Sep 17 00:00:00 2001 From: Ed Date: Fri, 26 Jan 2024 11:48:38 +0000 Subject: [PATCH] Review cleanup --- lib_xua/api/xua_audiohub.h | 3 --- lib_xua/api/xua_buffer.h | 29 +++++++++++----------- lib_xua/src/core/buffer/ep/ep_buffer.xc | 3 --- lib_xua/src/core/clocking/sw_pll_wrapper.h | 2 +- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/lib_xua/api/xua_audiohub.h b/lib_xua/api/xua_audiohub.h index 2f18960f..01383277 100644 --- a/lib_xua/api/xua_audiohub.h +++ b/lib_xua/api/xua_audiohub.h @@ -57,9 +57,6 @@ void XUA_AudioHub(chanend ?c_aud, buffered _XUA_CLK_DIR port:32 ?p_bclk, buffered out port:32 (&?p_i2s_dac)[I2S_WIRES_DAC], buffered in port:32 (&?p_i2s_adc)[I2S_WIRES_ADC] -#if (XUA_USE_APP_PLL) || defined(__DOXYGEN__) - , client interface SoftPll_if i_SoftPll -#endif #if (XUA_SPDIF_TX_EN) || defined(__DOXYGEN__) , chanend c_spdif_tx #endif diff --git a/lib_xua/api/xua_buffer.h b/lib_xua/api/xua_buffer.h index 5f853133..e8ebdbc7 100644 --- a/lib_xua/api/xua_buffer.h +++ b/lib_xua/api/xua_buffer.h @@ -13,20 +13,21 @@ * Most of the chanend parameters to the function should be connected to * XUD_Manager(). The uses two cores. * - * \param c_aud_out Audio OUT endpoint channel connected to the XUD - * \param c_aud_in Audio IN endpoint channel connected to the XUD - * \param c_aud_fb Audio feedback endpoint channel connected to the XUD - * \param c_midi_from_host MIDI OUT endpoint channel connected to the XUD - * \param c_midi_to_host MIDI IN endpoint channel connected to the XUD - * \param c_midi Channel connected to MIDI core - * \param c_int Audio clocking interrupt endpoint channel connected to the XUD - * \param c_clk_int Optional chanend connected to the clockGen() thread if present - * \param c_sof Start of frame channel connected to the XUD - * \param c_aud_ctl Audio control channel connected to Endpoint0() - * \param p_off_mclk A port that is clocked of the MCLK input (not the MCLK input itself) - * \param c_aud Channel connected to XUA_AudioHub() core - * \param i_pll_ref Interface to task that toggles reference pin to CS2100 - * \param c_swpll_update Channel connected to software PLL task. Expects master clock counts based on USB frames. + * \param c_aud_out Audio OUT endpoint channel connected to the XUD + * \param c_aud_in Audio IN endpoint channel connected to the XUD + * \param c_aud_fb Audio feedback endpoint channel connected to the XUD + * \param c_midi_from_host MIDI OUT endpoint channel connected to the XUD + * \param c_midi_to_host MIDI IN endpoint channel connected to the XUD + * \param c_midi Channel connected to MIDI core + * \param c_int Audio clocking interrupt endpoint channel connected to the XUD + * \param c_clk_int Optional chanend connected to the clockGen() thread if present + * \param c_sof Start of frame channel connected to the XUD + * \param c_aud_ctl Audio control channel connected to Endpoint0() + * \param p_off_mclk A port that is clocked of the MCLK input (not the MCLK input itself) + * \param c_aud Channel connected to XUA_AudioHub() core + * \param c_audio_rate_change Channel to notify and synchronise on audio rate change + * \param i_pll_ref Interface to task that toggles reference pin to CS2100 + * \param c_swpll_update Channel connected to software PLL task. Expects master clock counts based on USB frames. */ void XUA_Buffer( chanend c_aud_out, diff --git a/lib_xua/src/core/buffer/ep/ep_buffer.xc b/lib_xua/src/core/buffer/ep/ep_buffer.xc index d0fb1adf..050ce5b5 100644 --- a/lib_xua/src/core/buffer/ep/ep_buffer.xc +++ b/lib_xua/src/core/buffer/ep/ep_buffer.xc @@ -593,7 +593,6 @@ void XUA_Buffer_Ep(register chanend c_aud_out, outuint(c_sw_pll, error); outct(c_sw_pll, XS1_CT_END); - printintln(error); #else /* (XUA_USE_SW_PLL) */ /* Do toggle for CS2100 reference clock */ /* Port is accessed via interface to allow flexibilty with location */ @@ -1031,7 +1030,6 @@ void XUA_Buffer_Ep(register chanend c_aud_out, #if (XUA_SYNCMODE == XUA_SYNCMODE_SYNC) case c_audio_rate_change :> u_tmp: - printstr("rc\n"); unsigned selected_mclk_rate = u_tmp; c_audio_rate_change :> u_tmp; /* Sample rate is discarded as only care about mclk */ #if (XUA_USE_SW_PLL) @@ -1051,7 +1049,6 @@ void XUA_Buffer_Ep(register chanend c_aud_out, /* This is fired when sw_pll has completed initialising a new mclk_rate */ case inuint_byref(c_sw_pll, u_tmp): inct(c_sw_pll); - printstr("sy\n"); c_audio_rate_change <: 0; /* ACK back to audio to release */ break; diff --git a/lib_xua/src/core/clocking/sw_pll_wrapper.h b/lib_xua/src/core/clocking/sw_pll_wrapper.h index fbbb98ad..edc86096 100644 --- a/lib_xua/src/core/clocking/sw_pll_wrapper.h +++ b/lib_xua/src/core/clocking/sw_pll_wrapper.h @@ -54,4 +54,4 @@ void do_sw_pll_phase_frequency_detector_dig_rx( unsigned short mclk_time_stamp, {unsigned, unsigned} InitSWPLL(sw_pll_state_t &sw_pll, unsigned mClk); #endif /* XUA_USE_SW_PLL */ -#endif /* _SW_PLL_WRAPPPER_H_ */ \ No newline at end of file +#endif /* _SW_PLL_WRAPPPER_H_ */