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

sofCount reset to 1 on sample rate change (was 0). Caused first feedback value to be incorrect. This was a particular issue for FS operation where updates happen more slowly.

Browse Source
This commit is contained in:
Ross Owen
2015-11-21 00:09:44 +00:00
parent bf1a19a7be
commit c2c5d4f24e
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
module_usb_audio/usb_buffer/usb_buffer.xc
View File

@@ -171,7 +171,7 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in,
#if (NUM_USB_CHAN_IN > 0) #if (NUM_USB_CHAN_IN > 0)
unsigned bufferIn = 1; unsigned bufferIn = 1;
#endif #endif
unsigned remnant = 0, cycles; unsigned remnant = 0;
unsigned sofCount = 0; unsigned sofCount = 0;
unsigned freqChange = 0; unsigned freqChange = 0;
@@ -318,7 +318,7 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in,
/* Reset FB */ /* Reset FB */
/* Note, Endpoint 0 will hold off host for a sufficient period to allow our feedback /* Note, Endpoint 0 will hold off host for a sufficient period to allow our feedback
* to stabilise (i.e. sofCount == 128 to fire) */ * to stabilise (i.e. sofCount == 128 to fire) */
sofCount = 0; sofCount = 1;
clocks = 0; clocks = 0;
remnant = 0; remnant = 0;
clockcounter = 0; clockcounter = 0;
@@ -415,9 +415,6 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in,
{ {
unsigned usb_speed; unsigned usb_speed;
GET_SHARED_GLOBAL(usb_speed, g_curUsbSpeed); GET_SHARED_GLOBAL(usb_speed, g_curUsbSpeed);
#if 0 #if 0
unsigned mask = MASK_16_13; unsigned mask = MASK_16_13;
/* Original feedback implementation */ /* Original feedback implementation */
@@ -454,9 +451,6 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in,
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);
printhexln(clocks);
if (usb_speed == XUD_SPEED_HS) if (usb_speed == XUD_SPEED_HS)
{ {
(fb_clocks, unsigned[])[0] = clocks; (fb_clocks, unsigned[])[0] = clocks;
@@ -483,7 +477,7 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in,
unsigned long long feedbackMul = 64ULL; unsigned long long feedbackMul = 64ULL;
if(usb_speed != XUD_SPEED_HS) if(usb_speed != XUD_SPEED_HS)
feedbackMul = 8ULL; /* Used 8 instead of 16 to avoid windows LSB issues */ feedbackMul = 8ULL; /* TODO Use 4 instead of 8 to avoid windows LSB issues? */
/* Number of MCLK ticks in this SOF period (E.g = 125 * 24.576 = 3072) */ /* Number of MCLK ticks in this SOF period (E.g = 125 * 24.576 = 3072) */
int count = (int) ((short)(u_tmp - lastClock)); int count = (int) ((short)(u_tmp - lastClock));
@@ -504,7 +498,7 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in,
clockcounter += mod_from_last_time; clockcounter += mod_from_last_time;
clocks = clockcounter / masterClockFreq; clocks = clockcounter / masterClockFreq;
mod_from_last_time = clockcounter % masterClockFreq; mod_from_last_time = clockcounter % masterClockFreq;
if(usb_speed == XUD_SPEED_HS) if(usb_speed == XUD_SPEED_HS)
{ {
clocks <<= 3; clocks <<= 3;