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

SetupZeroSendBuffer() now does calculations based on global g_numUsbChan_In (rather than checking bus speed and using NUM_USB_CHAN_ defines)

Browse Source
This commit is contained in:
Ross Owen
2014-09-19 11:59:07 +01:00
parent 5946dd76a1
commit a4b753557c
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
module_usb_audio/usb_buffer/decouple.xc
View File

@@ -576,20 +576,23 @@ static inline void SetupZerosSendBuffer(XUD_ep aud_to_host_usb_ep, unsigned samp
GetADCCounts(sampFreq, min, mid, max); GetADCCounts(sampFreq, min, mid, max);
// TODO, don't need to use speed. // TODO, don't need to use speed.
if (usb_speed == XUD_SPEED_HS) //if (usb_speed == XUD_SPEED_HS)
{ //{
mid *= NUM_USB_CHAN_IN * slotSize; // mid *= NUM_USB_CHAN_IN * slotSize;
} // }
else //else
{ //{
mid *= NUM_USB_CHAN_IN_FS * slotSize; // mid *= NUM_USB_CHAN_IN_FS * slotSize;
} //}
mid *= g_numUsbChan_In * slotSize;
asm("stw %0, %1[0]"::"r"(mid),"r"(g_aud_to_host_zeros)); asm("stw %0, %1[0]"::"r"(mid),"r"(g_aud_to_host_zeros));
/* Mark EP ready with the zero buffer. Note this will simply update the packet size /* Mark EP ready with the zero buffer. Note this will simply update the packet size
* if it is already ready */ * if it is already ready */
GET_SHARED_GLOBAL(p, g_aud_to_host_buffer); GET_SHARED_GLOBAL(p, g_aud_to_host_buffer);
XUD_SetReady_InPtr(aud_to_host_usb_ep, p+4, mid); XUD_SetReady_InPtr(aud_to_host_usb_ep, p+4, mid);
} }
@@ -962,7 +965,6 @@ void decouple(chanend c_mix_out
{ {
SET_SHARED_GLOBAL(g_aud_to_host_buffer, g_aud_to_host_zeros); SET_SHARED_GLOBAL(g_aud_to_host_buffer, g_aud_to_host_zeros);
} }
} }
else else
{ {