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

Resolving more EP0 build issues due to EAF work

Browse Source
This commit is contained in:
Ross Owen
2014-08-28 13:07:20 +01:00
parent 76886b5087
commit 1715e0c558
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
module_usb_audio/endpoint0/endpoint0.c
View File

@@ -355,38 +355,55 @@ void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
break; break;
} }
#if (NUM_USB_CHAN_OUT > 0) && (NUM_USB_CHAN_IN > 0)
if ((sp.wIndex == INTERFACE_NUMBER_AUDIO_OUTPUT) || (sp.wIndex == INTERFACE_NUMBER_AUDIO_INPUT)) if ((sp.wIndex == INTERFACE_NUMBER_AUDIO_OUTPUT) || (sp.wIndex == INTERFACE_NUMBER_AUDIO_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[INTERFACE_NUMBER_AUDIO_OUTPUT] && !g_interfaceAlt[INTERFACE_NUMBER_AUDIO_INPUT])
{ {
/* If start and input AND output not currently running */ /* If start and input AND output not currently running */
UserAudioStreamStart(); UserAudioStreamStart();
} }
else if(((sp.wIndex == 1) && (!sp.wValue)) && g_interfaceAlt[1] && (!g_interfaceAlt[2])) else if(((sp.wIndex == 1) && (!sp.wValue)) && g_interfaceAlt[INTERFACE_NUMBER_AUDIO_OUTPUT] && (!g_interfaceAlt[INTERFACE_NUMBER_AUDIO_INPUT]))
{ {
/* if output stop and output running and input not running */ /* if output stop and output running and input not running */
UserAudioStreamStop(); UserAudioStreamStop();
} }
else if(((sp.wIndex == 2) && (!sp.wValue)) && g_interfaceAlt[2] && (!g_interfaceAlt[1])) else if(((sp.wIndex == 2) && (!sp.wValue)) && g_interfaceAlt[INTERFACE_NUMBER_AUDIO_INPUT] && (!g_interfaceAlt[INTERFACE_NUMBER_AUDIO_OUTPUT]))
{ {
/* if input stop and input running and output not running */ /* if input stop and input running and output not running */
UserAudioStreamStop(); UserAudioStreamStop();
} }
#elif (NUM_USB_CHAN_OUT > 0) || (NUM_USB_CHAN_IN > 0) }
if(sp.wValue && (!g_interfaceAlt[1])) #elif (NUM_USB_CHAN_OUT > 0)
if(sp.wIndex == INTERFACE_NUMBER_AUDIO_OUTPUT)
{
if(sp.wValue && (!g_interfaceAlt[INTERFACE_NUMBER_AUDIO_OUTPUT]))
{ {
/* if start and not currently running */ /* if start and not currently running */
UserAudioStreamStart(); UserAudioStreamStart();
} }
else if (!sp.wValue && g_interfaceAlt[1]) else if (!sp.wValue && g_interfaceAlt[INTERFACE_NUMBER_AUDIO_OUTPUT])
{ {
/* if stop and currently running */ /* if stop and currently running */
UserAudioStreamStop(); UserAudioStreamStop();
} }
#endif
} }
#elif (NUM_USB_CHAN_IN > 0)
if(sp.wIndex == INTERFACE_NUMBER_AUDIO_INPUT)
{
if(sp.wValue && (!g_interfaceAlt[INTERFACE_NUMBER_AUDIO_INPUT]))
{
/* if start and not currently running */
UserAudioStreamStart();
}
else if (!sp.wValue && g_interfaceAlt[INTERFACE_NUMBER_AUDIO_INPUT])
{
/* if stop and currently running */
UserAudioStreamStop();
}
}
#endif
} /* if(sp.bRequest == SET_INTERFACE) */ } /* if(sp.bRequest == SET_INTERFACE) */
break; /* BMREQ_H2D_STANDARD_INT */ break; /* BMREQ_H2D_STANDARD_INT */