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

Removed resize of zero-sample IN buffer from usb_buffer. This effort is duplicated in decouple.

Browse Source
This commit is contained in:
Ross Owen
2014-02-19 17:10:28 +00:00
parent f37a196627
commit 52483207ad
1 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
module_usb_audio/usb_buffer/usb_buffer.xc
View File

@@ -69,6 +69,7 @@ unsigned char fb_clocks[16];
#define FB_TOLERANCE 0x100 #define FB_TOLERANCE 0x100
extern unsigned inZeroBuff[]; extern unsigned inZeroBuff[];
/** /**
* Buffers data from audio endpoints * Buffers data from audio endpoints
* @param c_aud_out chanend for audio from xud * @param c_aud_out chanend for audio from xud
@@ -125,8 +126,6 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
#ifdef HID_CONTROLS #ifdef HID_CONTROLS
XUD_ep ep_hid = XUD_InitEp(c_hid); XUD_ep ep_hid = XUD_InitEp(c_hid);
#endif #endif
int tmp; int tmp;
unsigned u_tmp; unsigned u_tmp;
unsigned sampleFreq = 0; unsigned sampleFreq = 0;
@@ -204,13 +203,12 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
mid*=NUM_USB_CHAN_IN_FS*SAMPLE_SUBSLOT_SIZE_FS; mid*=NUM_USB_CHAN_IN_FS*SAMPLE_SUBSLOT_SIZE_FS;
asm("stw %0, %1[0]"::"r"(mid),"r"(p_inZeroBuff)); asm("stw %0, %1[0]"::"r"(mid),"r"(p_inZeroBuff));
}
#ifdef FB_TOLERANCE_TEST #ifdef FB_TOLERANCE_TEST
expected_fb = ((DEFAULT_FREQ * 0x2000) / 1000); expected_fb = ((DEFAULT_FREQ * 0x2000) / 1000);
#endif #endif
}
#ifdef OUTPUT #ifdef OUTPUT
SET_SHARED_GLOBAL(g_aud_from_host_flag, 1); SET_SHARED_GLOBAL(g_aud_from_host_flag, 1);
#endif #endif
@@ -295,21 +293,9 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
/* Don't update things for DFU command.. */ /* Don't update things for DFU command.. */
if(sampleFreq != AUDIO_STOP_FOR_DFU) if(sampleFreq != AUDIO_STOP_FOR_DFU)
{ {
/* Tidy up double buffer, note we can do better than this for 44.1 etc but better
* than sending two packets at old speed! */
GetADCCounts(sampleFreq, min, mid, max);
#ifdef FB_TOLERANCE_TEST #ifdef FB_TOLERANCE_TEST
expected_fb = ((sampleFreq * 0x2000) / frameTime); expected_fb = ((sampleFreq * 0x2000) / frameTime);
#endif #endif
asm("stw %0, dp[g_speed]"::"r"(mid << 16));
if (usb_speed == XUD_SPEED_HS)
mid *= NUM_USB_CHAN_IN*SAMPLE_SUBSLOT_SIZE_HS;
else
mid *= NUM_USB_CHAN_IN_FS*SAMPLE_SUBSLOT_SIZE_FS;
asm("stw %0, %1[0]"::"r"(mid),"r"(p_inZeroBuff));
/* 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) */