Vergil_Wong/lib_xua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Building but not tested merge

Browse Source
This commit is contained in:
Ed
2024-01-15 17:00:54 +00:00
parent aac2b4b7fb
commit ca16467158
6 changed files with 521 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib_xua/api/xua_clocking.h
View File

@@ -6,6 +6,8 @@
#include <xs1.h> #include <xs1.h>
#include "sw_pll_wrapper.h"
interface pll_ref_if interface pll_ref_if
{ {
void toggle(); void toggle();
@@ -26,9 +28,10 @@ void PllRefPinTask(server interface pll_ref_if i_pll_ref, out port p_sync);
* clock * clock
* \param c_clk_int channel connected to the decouple() thread for clock * \param c_clk_int channel connected to the decouple() thread for clock
* interrupts * interrupts
* \param p_for_mclk_count_aud port used for counting mclk and providing a timestamp
*
* \param c_mclk_change channel to notify of master clock change * \param c_mclk_change channel to notify of master clock change
* \param p_for_mclk_count_aud port used for counting mclk and providing a timestamp
* \param c_sw_pll channel used to communicate with software PLL task
*
*/ */
void clockGen( streaming chanend ?c_spdif_rx, void clockGen( streaming chanend ?c_spdif_rx,
chanend ?c_adat_rx, chanend ?c_adat_rx,
@@ -36,8 +39,9 @@ void clockGen( streaming chanend ?c_spdif_rx,
chanend c_audio, chanend c_audio,
chanend c_clk_ctl, chanend c_clk_ctl,
chanend c_clk_int, chanend c_clk_int,
chanend c_mclk_change,
port ?p_for_mclk_count_aud, port ?p_for_mclk_count_aud,
chanend c_mclk_change); chanend ?c_sw_pll);
#if (XUA_USE_APP_PLL) #if (XUA_USE_APP_PLL)

9
lib_xua/src/core/audiohub/xua_audiohub.xc
View File

@@ -636,9 +636,9 @@ void XUA_AudioHub(chanend ?c_aud, clock ?clk_audio_mclk, clock ?clk_audio_bclk,
buffered _XUA_CLK_DIR port:32 ?p_bclk, buffered _XUA_CLK_DIR port:32 ?p_bclk,
buffered out port:32 (&?p_i2s_dac)[I2S_WIRES_DAC], buffered out port:32 (&?p_i2s_dac)[I2S_WIRES_DAC],
buffered in port:32 (&?p_i2s_adc)[I2S_WIRES_ADC] buffered in port:32 (&?p_i2s_adc)[I2S_WIRES_ADC]
#if (XUA_USE_APP_PLL) #if (XUA_USE_APP_PLL)
, client interface SoftPll_if i_softPll , client interface SoftPll_if i_softPll
#endif #endif
#if (XUA_SPDIF_TX_EN) //&& (SPDIF_TX_TILE != AUDIO_IO_TILE) #if (XUA_SPDIF_TX_EN) //&& (SPDIF_TX_TILE != AUDIO_IO_TILE)
, chanend c_spdif_out , chanend c_spdif_out
#endif #endif
@@ -814,11 +814,6 @@ void XUA_AudioHub(chanend ?c_aud, clock ?clk_audio_mclk, clock ?clk_audio_bclk,
/* User should mute audio hardware */ /* User should mute audio hardware */
AudioHwConfig_Mute(); AudioHwConfig_Mute();
#if (USE_SW_PLL)
// i_softPll.init(mClk);
#warning SORT THIS
#endif
/* User code should configure audio harware for SampleFreq/MClk etc */ /* User code should configure audio harware for SampleFreq/MClk etc */
AudioHwConfig(curFreq, mClk, dsdMode, curSamRes_DAC, curSamRes_ADC); AudioHwConfig(curFreq, mClk, dsdMode, curSamRes_DAC, curSamRes_ADC);
#if (XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN) #if (XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN)

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

@@ -7,7 +7,6 @@
#include "xua.h" #include "xua.h"
#include "xua_commands.h" #include "xua_commands.h"
#include "xua_clocking.h" #include "xua_clocking.h"
#include "sw_pll_wrapper.h"
#if (XUA_SPDIF_RX_EN) #if (XUA_SPDIF_RX_EN)
#include "spdif.h" #include "spdif.h"
@@ -201,8 +200,6 @@ static inline int validSamples(Counter &counter, int clockIndex)
#endif #endif
#if USE_SW_PLL #if USE_SW_PLL
/* Pointer to sw_pll struct to allow it to be used in separate SDM thread */
extern sw_pll_state_t * unsafe sw_pll_ptr;
unsafe unsafe
{ {
unsigned * unsafe selected_mclk_rate_ptr = NULL; unsigned * unsafe selected_mclk_rate_ptr = NULL;
@@ -225,8 +222,9 @@ void clockGen ( streaming chanend ?c_spdif_rx,
chanend c_dig_rx, chanend c_dig_rx,
chanend c_clk_ctl, chanend c_clk_ctl,
chanend c_clk_int, chanend c_clk_int,
chanend c_mclk_change,
port ?p_for_mclk_count_aud, port ?p_for_mclk_count_aud,
chanend c_mclk_change) chanend ?c_sw_pll)
{ {
timer t_local; timer t_local;
unsigned timeNextEdge, timeLastEdge, timeNextClockDetection; unsigned timeNextEdge, timeLastEdge, timeNextClockDetection;
@@ -343,28 +341,12 @@ void clockGen ( streaming chanend ?c_spdif_rx,
/* Initial ref clock output and get timestamp */ /* Initial ref clock output and get timestamp */
i_pll_ref.init(); i_pll_ref.init();
#if (USE_SW_PLL && (XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN)) #if ((XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN) && USE_SW_PLL)
chan c_sigma_delta;
int reset_sw_pll_pfd = 1; int reset_sw_pll_pfd = 1;
int require_ack_to_audio = 0; int require_ack_to_audio = 0;
restart_sigma_delta(c_sw_pll, MCLK_48); /* default to 48kHz - this will be reset shortly when host selects rate */
/* Set selected_mclk_rate_ptr to point at local var selected_mclk_rate */
unsafe {
selected_mclk_rate_ptr = &selected_mclk_rate;
}
par
{
while(1)
{
unsafe
{
SigmaDeltaTask(c_sigma_delta, selected_mclk_rate_ptr);
}
}
#else
{
#endif #endif
while(1) while(1)
{ {
select select
@@ -534,7 +516,7 @@ void clockGen ( streaming chanend ?c_spdif_rx,
#endif #endif
#if ((XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN) && USE_SW_PLL) #if ((XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN) && USE_SW_PLL)
case inuint_byref(c_sigma_delta, tmp): case inuint_byref(c_sw_pll, tmp):
/* Send ACK back to audiohub to allow I2S to start /* Send ACK back to audiohub to allow I2S to start
This happens only on SDM restart and only once */ This happens only on SDM restart and only once */
if(require_ack_to_audio) if(require_ack_to_audio)
@@ -551,7 +533,7 @@ void clockGen ( streaming chanend ?c_spdif_rx,
c_mclk_change :> selected_sample_rate; c_mclk_change :> selected_sample_rate;
#if USE_SW_PLL #if USE_SW_PLL
mclks_per_sample = selected_mclk_rate / selected_sample_rate; mclks_per_sample = selected_mclk_rate / selected_sample_rate;
restart_sigma_delta(c_sigma_delta); restart_sigma_delta(c_sw_pll, selected_mclk_rate);
reset_sw_pll_pfd = 1; reset_sw_pll_pfd = 1;
/* We will shedule an ACK when sigma delta is up and running */ /* We will shedule an ACK when sigma delta is up and running */
require_ack_to_audio = 1; require_ack_to_audio = 1;
@@ -643,7 +625,7 @@ void clockGen ( streaming chanend ?c_spdif_rx,
#if USE_SW_PLL #if USE_SW_PLL
do_sw_pll_phase_frequency_detector_dig_rx( mclk_time_stamp, do_sw_pll_phase_frequency_detector_dig_rx( mclk_time_stamp,
mclks_per_sample, mclks_per_sample,
c_sigma_delta, c_sw_pll,
spdifCounters.receivedSamples, spdifCounters.receivedSamples,
reset_sw_pll_pfd); reset_sw_pll_pfd);
#else #else
@@ -760,7 +742,7 @@ void clockGen ( streaming chanend ?c_spdif_rx,
#if USE_SW_PLL #if USE_SW_PLL
do_sw_pll_phase_frequency_detector_dig_rx( mclk_time_stamp, do_sw_pll_phase_frequency_detector_dig_rx( mclk_time_stamp,
mclks_per_sample, mclks_per_sample,
c_sigma_delta, c_sw_pll,
adatCounters.receivedSamples, adatCounters.receivedSamples,
reset_sw_pll_pfd); reset_sw_pll_pfd);
#else #else
@@ -905,6 +887,5 @@ void clockGen ( streaming chanend ?c_spdif_rx,
#endif #endif
} /* select */ } /* select */
} /* while(1) */ } /* while(1) */
} /* clkgen task scope */ } /* clkgen task scope */
}

14
lib_xua/src/core/clocking/sw_pll_wrapper.h
View File

@@ -27,29 +27,29 @@ extern "C"
/** Task that receives an error term, passes it through a PI controller and periodically /** Task that receives an error term, passes it through a PI controller and periodically
* calclulates a sigma delta output value and sends it to the PLL fractional register. * calclulates a sigma delta output value and sends it to the PLL fractional register.
* *
* \param c_sigma_delta Channel connected to the clocking thread to pass raw error terms. * \param c_sw_pll Channel connected to the clocking thread to pass raw error terms.
* \param selected_mclk_rate_ptr Pointer to the mclk rate variable declared in clockgen.
*/ */
void SigmaDeltaTask(chanend c_sigma_delta, unsigned * unsafe selected_mclk_rate_ptr); void sw_pll_task(chanend c_sw_pll);
/** Helper function that sends a special restart command. It causes the SDM task /** Helper function that sends a special restart command. It causes the SDM task
* to quit and restart using the new mclk. * to quit and restart using the new mclk.
* *
* \param c_sigma_delta Channel connected to the clocking thread to pass raw error terms. * \param c_sw_pll Channel connected to the clocking thread to pass raw error terms.
* \param mclk_Rate The mclk frequency in Hz.
*/ */
void restart_sigma_delta(chanend c_sigma_delta); void restart_sigma_delta(chanend c_sw_pll, unsigned mclk_rate);
/** Performs a frequency comparsion between the incoming digital Rx stream and the local mclk. /** Performs a frequency comparsion between the incoming digital Rx stream and the local mclk.
* *
* \param mclk_time_stamp The captured mclk count (using port timer) at the time of sample Rx. * \param mclk_time_stamp The captured mclk count (using port timer) at the time of sample Rx.
* \param mclks_per_sample The nominal number of mclks per audio sample. * \param mclks_per_sample The nominal number of mclks per audio sample.
* \param c_sigma_delta Channel connected to the sigma delta and controller thread. * \param c_sw_pll Channel connected to the sigma delta and controller thread.
* \param receivedSamples The number of received samples since tha last call to this function. * \param receivedSamples The number of received samples since tha last call to this function.
* \param reset_sw_pll_pfd Reference to a flag which will be used to signal reset of this function's state. * \param reset_sw_pll_pfd Reference to a flag which will be used to signal reset of this function's state.
*/ */
void do_sw_pll_phase_frequency_detector_dig_rx( unsigned short mclk_time_stamp, void do_sw_pll_phase_frequency_detector_dig_rx( unsigned short mclk_time_stamp,
unsigned mclks_per_sample, unsigned mclks_per_sample,
chanend c_sigma_delta, chanend c_sw_pll,
int receivedSamples, int receivedSamples,
int &reset_sw_pll_pfd); int &reset_sw_pll_pfd);

15
lib_xua/src/core/clocking/sw_pll_wrapper.xc
View File

@@ -114,21 +114,22 @@ void do_sw_pll_phase_frequency_detector_dig_rx( unsigned short mclk_time_stamp,
} }
} }
void SigmaDeltaTask(chanend c_sigma_delta, unsigned * unsafe selected_mclk_rate_ptr){ void sw_pll_task(chanend c_sigma_delta){
/* Zero is an invalid number and the SDM will not write the frac reg until /* Zero is an invalid number and the SDM will not write the frac reg until
the first control value has been received. This avoids issues with the first control value has been received. This avoids issues with
channel lockup if two tasks (eg. init and SDM) try to write at the same time. */ channel lockup if two tasks (eg. init and SDM) try to write at the same time. */
while(1)
{
unsigned selected_mclk_rate = inuint(c_sigma_delta);
int f_error = 0; int f_error = 0;
int dco_setting = 0; /* gets set at InitSWPLL */ int dco_setting = 0; /* gets set at InitSWPLL */
unsigned sdm_interval = 0; /* gets set at InitSWPLL */ unsigned sdm_interval = 0; /* gets set at InitSWPLL */
sw_pll_state_t sw_pll; sw_pll_state_t sw_pll;
unsafe
{
/* initialse the SDM and gather SDM initial settings */ /* initialse the SDM and gather SDM initial settings */
{sdm_interval, dco_setting} = InitSWPLL(sw_pll, (unsigned)*selected_mclk_rate_ptr); {sdm_interval, dco_setting} = InitSWPLL(sw_pll, selected_mclk_rate);
}
tileref_t this_tile = get_local_tile_id(); tileref_t this_tile = get_local_tile_id();
@@ -181,12 +182,14 @@ void SigmaDeltaTask(chanend c_sigma_delta, unsigned * unsafe selected_mclk_rate_
sw_pll_do_sigma_delta(&sw_pll.sdm_state, this_tile, dco_setting); sw_pll_do_sigma_delta(&sw_pll.sdm_state, this_tile, dco_setting);
} }
} /* if running */ } /* if running */
} /* while(1) */
} }
void restart_sigma_delta(chanend c_sigma_delta) void restart_sigma_delta(chanend c_sigma_delta, unsigned selected_mclk_rate)
{ {
outuint(c_sigma_delta, DISABLE_SDM); /* Resets SDM */ outuint(c_sigma_delta, DISABLE_SDM); /* Resets SDM */
outuint(c_sigma_delta, selected_mclk_rate);
} }
#endif /* USE_SW_PLL */ #endif /* USE_SW_PLL */

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

@@ -314,8 +314,11 @@ void usb_audio_io(chanend ?c_aud_in,
#endif #endif
#if (XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN) #if (XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN)
, client interface pll_ref_if i_pll_ref , client interface pll_ref_if i_pll_ref
, port ?p_for_mclk_count_aud #if USE_SW_PLL
#endif , port p_for_mclk_count_aud
, chanend c_sw_pll
#endif /* USE_SW_PLL */
#endif /* (XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN) */
) )
{ {
#if (MIXER) #if (MIXER)
@@ -405,8 +408,9 @@ void usb_audio_io(chanend ?c_aud_in,
c_dig_rx, c_dig_rx,
c_clk_ctl, c_clk_ctl,
c_clk_int, c_clk_int,
c_mclk_change,
p_for_mclk_count_aud, p_for_mclk_count_aud,
c_mclk_change); c_sw_pll);
} }
#endif #endif
@@ -483,7 +487,7 @@ int main()
#endif #endif
#endif #endif
#if ((XUA_SYNCMODE == XUA_SYNCMODE_SYNC || XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN) && !USE_SW_PLL) #if (((XUA_SYNCMODE == XUA_SYNCMODE_SYNC && !USE_SW_PLL) || XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN) )
interface pll_ref_if i_pll_ref; interface pll_ref_if i_pll_ref;
#endif #endif
@@ -511,7 +515,7 @@ int main()
{ {
USER_MAIN_CORES USER_MAIN_CORES
#if ((XUA_SYNCMODE == XUA_SYNCMODE_SYNC || XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN) && !USE_SW_PLL) #if (((XUA_SYNCMODE == XUA_SYNCMODE_SYNC && !USE_SW_PLL) || XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN))
on tile[PLL_REF_TILE]: PllRefPinTask(i_pll_ref, p_pll_ref); on tile[PLL_REF_TILE]: PllRefPinTask(i_pll_ref, p_pll_ref);
#endif #endif
on tile[XUD_TILE]: on tile[XUD_TILE]:
@@ -524,10 +528,6 @@ int main()
DFUHandler(dfuInterface, null); DFUHandler(dfuInterface, null);
#endif #endif
#if ((XUA_SYNCMODE == XUA_SYNCMODE_SYNC || XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN) && USE_SW_PLL)
//XUA_SoftPll(tile[0], i_softPll, c_swpll_update);
#endif
/* Core USB task, buffering, USB etc */ /* Core USB task, buffering, USB etc */
{ {
#ifdef XUD_PRIORITY_HIGH #ifdef XUD_PRIORITY_HIGH
@@ -605,8 +605,8 @@ int main()
#endif /* XUA_USB_EN */ #endif /* XUA_USB_EN */
} }
#if (XUA_SYNCMODE == XUA_SYNCMODE_SYNC && !USE_SW_PLL) #if ((XUA_SYNCMODE == XUA_SYNCMODE_SYNC || XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN) && USE_SW_PLL)
// on tile[AUDIO_IO_TILE]: XUA_SoftPll(tile[0], i_softPll, c_swpll_update); on tile[AUDIO_IO_TILE]: sw_pll_task(c_sw_pll);
#endif #endif
on tile[AUDIO_IO_TILE]: on tile[AUDIO_IO_TILE]:
@@ -625,16 +625,13 @@ int main()
, dfuInterface , dfuInterface
#endif #endif
#if (XUA_NUM_PDM_MICS > 0) #if (XUA_NUM_PDM_MICS > 0)
#if (PDM_TILE == AUDIO_IO_TILE)
, c_ds_output
#endif
, c_pdm_pcm
#endif #endif
#if (XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN) #if ((XUA_SYNCMODE == XUA_SYNCMODE_SYNC && !USE_SW_PLL) || XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN)
, i_pll_ref , i_pll_ref
#endif #endif
#if (XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN) #if (USE_SW_PLL && (XUA_SPDIF_RX_EN || XUA_ADAT_RX_EN))
, p_for_mclk_count_audio , p_for_mclk_count_audio
, c_sw_pll
#endif #endif
); );
} }