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

Fix non-integer divide result issue

Browse Source
This commit is contained in:
Ed
2024-01-23 10:45:27 +00:00
parent 3be17bf8cc
commit d49c6b4656
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -376,14 +376,14 @@ void XUA_Buffer_Ep(register chanend c_aud_out,
#if (XUA_USE_SW_PLL) #if (XUA_USE_SW_PLL)
/* Setup the phase frequency detector */ /* Setup the phase frequency detector */
const unsigned controller_rate_hz = 100; const unsigned controller_rate_hz = 100;
const unsigned sof_rate_hz = (AUDIO_CLASS == 1 ? 1000 : 8000); const unsigned pfd_ppm_max = 2000; /* PPM range before we assume unlocked */
sw_pll_pfd_state_t sw_pll_pfd; sw_pll_pfd_state_t sw_pll_pfd;
sw_pll_pfd_init(&sw_pll_pfd, sw_pll_pfd_init(&sw_pll_pfd,
sof_rate_hz / controller_rate_hz, /* How often the PFD is invoked */ 1, /* How often the PFD is invoked per call */
masterClockFreq / sof_rate_hz, /* pll ratio integer */ masterClockFreq / controller_rate_hz, /* pll ratio integer */
0, /* Assume precise timing of sampling */ 0, /* Assume precise timing of sampling */
2000); /* PPM range before we assume unlocked */ pfd_ppm_max);
outuint(c_sw_pll, masterClockFreq); outuint(c_sw_pll, masterClockFreq);
inuint(c_sw_pll); /* receive ACK */ inuint(c_sw_pll); /* receive ACK */
@@ -601,8 +601,8 @@ void XUA_Buffer_Ep(register chanend c_aud_out,
} }
sw_pll_pfd.mclk_pt_last = mclk_pt; sw_pll_pfd.mclk_pt_last = mclk_pt;
outuint(c_sw_pll, error); outuint(c_sw_pll, error);
printintln(error);
// outct(c_sw_pll, XS1_CT_END); // outct(c_sw_pll, XS1_CT_END);
} }
#endif #endif
@@ -752,7 +752,6 @@ void XUA_Buffer_Ep(register chanend c_aud_out,
clocks < (expected_fb + FB_TOLERANCE)) clocks < (expected_fb + FB_TOLERANCE))
#endif #endif
{ {
int usb_speed;
asm volatile("stw %0, dp[g_speed]"::"r"(clocks)); // g_speed = clocks asm volatile("stw %0, dp[g_speed]"::"r"(clocks)); // g_speed = clocks
GET_SHARED_GLOBAL(usb_speed, g_curUsbSpeed); GET_SHARED_GLOBAL(usb_speed, g_curUsbSpeed);
@@ -1031,10 +1030,10 @@ void XUA_Buffer_Ep(register chanend c_aud_out,
c_audio_rate_change :> u_tmp; /* Sample rate is discarded as only care about mclk */ c_audio_rate_change :> u_tmp; /* Sample rate is discarded as only care about mclk */
#if (XUA_USE_SW_PLL) #if (XUA_USE_SW_PLL)
sw_pll_pfd_init(&sw_pll_pfd, sw_pll_pfd_init(&sw_pll_pfd,
sof_rate_hz / controller_rate_hz, /* How often the PFD is invoked */ 1, /* How often the PFD is invoked per call */
selected_mclk_rate / sof_rate_hz, /* pll muliplication ratio integer */ selected_mclk_rate / controller_rate_hz, /* pll muliplication ratio integer */
0, /* Assume precise timing of sampling */ 0, /* Assume precise timing of sampling */
2000); pfd_ppm_max);
restart_sigma_delta(c_sw_pll, selected_mclk_rate); restart_sigma_delta(c_sw_pll, selected_mclk_rate);
/* Delay ACK until sw_pll says it is ready */ /* Delay ACK until sw_pll says it is ready */
#else #else

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

@@ -181,7 +181,7 @@ void sw_pll_task(chanend c_sw_pll){
unsafe { unsafe {
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 */ } /* while running */
} /* while(1) */ } /* while(1) */
} }