From a4b753557c2f2b021e41dc72c74ccd233b86a6cf Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Fri, 19 Sep 2014 11:59:07 +0100 Subject: [PATCH] SetupZeroSendBuffer() now does calculations based on global g_numUsbChan_In (rather than checking bus speed and using NUM_USB_CHAN_ defines) --- module_usb_audio/usb_buffer/decouple.xc | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/module_usb_audio/usb_buffer/decouple.xc b/module_usb_audio/usb_buffer/decouple.xc index 5a44a290..edb985e0 100644 --- a/module_usb_audio/usb_buffer/decouple.xc +++ b/module_usb_audio/usb_buffer/decouple.xc @@ -576,20 +576,23 @@ static inline void SetupZerosSendBuffer(XUD_ep aud_to_host_usb_ep, unsigned samp GetADCCounts(sampFreq, min, mid, max); // TODO, don't need to use speed. - if (usb_speed == XUD_SPEED_HS) - { - mid *= NUM_USB_CHAN_IN * slotSize; - } - else - { - mid *= NUM_USB_CHAN_IN_FS * slotSize; - } + //if (usb_speed == XUD_SPEED_HS) + //{ + // mid *= NUM_USB_CHAN_IN * slotSize; + // } + //else + //{ + // 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)); /* Mark EP ready with the zero buffer. Note this will simply update the packet size * if it is already ready */ GET_SHARED_GLOBAL(p, g_aud_to_host_buffer); + 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); } - } else {