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

Fixed bad usage of NUM_USB_CHAN_OUT when _IN should have been used. Caused output only build to wait for buffer setup to happened forever..

Browse Source
This commit is contained in:
Ross Owen
2014-04-30 21:02:43 +01:00
parent dcfc791b3e
commit 80dff15100
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module_usb_audio/endpoint0/endpoint0.c
View File

@@ -76,10 +76,10 @@ unsigned char mixer1Crossbar[18];
short mixer1Weights[18*8]; short mixer1Weights[18*8];
unsigned char channelMap[NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + MAX_MIX_COUNT]; unsigned char channelMap[NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + MAX_MIX_COUNT];
#if NUM_USB_CHAN_OUT > 0 #if (NUM_USB_CHAN_OUT > 0)
unsigned char channelMapAud[NUM_USB_CHAN_OUT]; unsigned char channelMapAud[NUM_USB_CHAN_OUT];
#endif #endif
#if NUM_USB_CHAN_IN > 0 #if (NUM_USB_CHAN_IN > 0)
unsigned char channelMapUsb[NUM_USB_CHAN_IN]; unsigned char channelMapUsb[NUM_USB_CHAN_IN];
#endif #endif
unsigned char mixSel[MIX_INPUTS]; unsigned char mixSel[MIX_INPUTS];
@@ -337,7 +337,7 @@ void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
} }
} }
} }
#if defined(OUTPUT) && defined(INPUT) #if (NUM_USB_CHAN_OUT > 0) && (NUM_USB_CHAN_IN > 0)
/* Check for stream start stop on output and input audio interfaces */ /* Check for stream start stop on output and input audio interfaces */
if(sp.wValue && !g_interfaceAlt[1] && !g_interfaceAlt[2]) if(sp.wValue && !g_interfaceAlt[1] && !g_interfaceAlt[2])
{ {
@@ -354,7 +354,7 @@ void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
/* if input stop and input running and output not running */ /* if input stop and input running and output not running */
UserAudioStreamStop(); UserAudioStreamStop();
} }
#elif defined(OUTPUT) || defined(INPUT) #elif (NUM_USB_CHAN_OUT > 0) || (NUM_USB_CHAN_IN > 0)
if(sp.wValue && (!g_interfaceAlt[1])) if(sp.wValue && (!g_interfaceAlt[1]))
{ {
/* if start and not currently running */ /* if start and not currently running */

4
module_usb_audio/usb_buffer/decouple.xc
View File

@@ -648,7 +648,7 @@ void decouple(chanend c_mix_out,
int aud_from_host_flag=0; int aud_from_host_flag=0;
xc_ptr released_buffer; xc_ptr released_buffer;
#endif #endif
#if (NUM_USB_CHAN_OUT > 0) #if (NUM_USB_CHAN_IN > 0)
int aud_to_host_flag = 0; int aud_to_host_flag = 0;
#endif #endif
@@ -721,7 +721,7 @@ void decouple(chanend c_mix_out,
XUD_SetReady_OutPtr(aud_from_host_usb_ep, g_aud_from_host_wrptr+4); XUD_SetReady_OutPtr(aud_from_host_usb_ep, g_aud_from_host_wrptr+4);
#endif #endif
#if (NUM_USB_CHAN_OUT > 0) #if (NUM_USB_CHAN_IN > 0)
/* Wait for usb_buffer to set up */ /* Wait for usb_buffer to set up */
while(!aud_to_host_flag) while(!aud_to_host_flag)
{ {