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

Fixed FS feedback and input packet sizing

Browse Source
This commit is contained in:
Ross Owen
2015-11-20 16:19:49 +00:00
parent d919a807cd
commit a2010a05c0
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
module_usb_audio/usb_buffer/usb_buffer.xc
View File

@@ -482,7 +482,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 = 16ULL; feedbackMul = 8ULL; /* Used 8 instead of 16 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));
@@ -503,8 +503,15 @@ 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;
clocks <<=3; if(usb_speed == XUD_SPEED_HS)
{
clocks <<= 3;
}
else
{
clocks <<= 6;
}
#ifdef FB_TOLERANCE_TEST #ifdef FB_TOLERANCE_TEST
if (clocks > (expected_fb - FB_TOLERANCE) && if (clocks > (expected_fb - FB_TOLERANCE) &&
@@ -516,14 +523,13 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in,
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;
} }
else else
{ {
(fb_clocks, unsigned[])[0] = clocks>>1; (fb_clocks, unsigned[])[0] = clocks >> 2;
} }
} }
#ifdef FB_TOLERANCE_TEST #ifdef FB_TOLERANCE_TEST