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

Cleaning up a previous merge conflict.

Browse Source
This commit is contained in:
Michael Banther
2019-10-29 16:45:03 +00:00
parent aea89a4cd6
commit 75abc71cd7
1 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
lib_xua/src/core/endpoint0/xua_endpoint0.c
View File

@@ -439,55 +439,48 @@ void XUA_Endpoint0_loop(XUD_Result_t result, USB_SetupPacket_t sp, chanend c_ep0
} }
#if (NUM_USB_CHAN_OUT > 0) && (NUM_USB_CHAN_IN > 0) #if (NUM_USB_CHAN_OUT > 0) && (NUM_USB_CHAN_IN > 0)
unsigned num_input_interfaces = g_interfaceAlt[INTERFACE_NUMBER_AUDIO_INPUT];
unsigned num_output_interfaces = g_interfaceAlt[INTERFACE_NUMBER_AUDIO_OUTPUT];
if (sp.wIndex == INTERFACE_NUMBER_AUDIO_INPUT)
{ {
unsigned num_input_interfaces = g_interfaceAlt[INTERFACE_NUMBER_AUDIO_INPUT]; // in: 0 -> 1
unsigned num_output_interfaces = g_interfaceAlt[INTERFACE_NUMBER_AUDIO_OUTPUT]; if (sp.wValue && !num_input_interfaces)
if (sp.wIndex == INTERFACE_NUMBER_AUDIO_INPUT)
{ {
// in: 0 -> 1 UserAudioInputStreamStart();
if (sp.wValue && !num_input_interfaces) if (!num_output_interfaces)
{ {
UserAudioInputStreamStart(); UserAudioStreamStart();
if (!num_output_interfaces)
{
UserAudioStreamStart();
}
}
// in: 1 -> 0
else if (!sp.wValue && num_input_interfaces)
{
UserAudioInputStreamStop();
if (!num_output_interfaces)
{
UserAudioStreamStop();
}
} }
} }
else if (sp.wIndex == INTERFACE_NUMBER_AUDIO_OUTPUT) // in: 1 -> 0
else if (!sp.wValue && num_input_interfaces)
{ {
// out: 0 -> 1 UserAudioInputStreamStop();
if (sp.wValue && !num_output_interfaces) if (!num_output_interfaces)
{ {
UserAudioOutputStreamStart(); UserAudioStreamStop();
if (!num_input_interfaces)
{
UserAudioStreamStart();
}
}
// out: 1 -> 0
else if (!sp.wValue && num_output_interfaces)
{
UserAudioOutputStreamStop();
if (!num_input_interfaces)
{
UserAudioStreamStop();
}
} }
} }
else if(((sp.wIndex == 2) && (!sp.wValue)) && g_interfaceAlt[INTERFACE_NUMBER_AUDIO_INPUT] && (!g_interfaceAlt[INTERFACE_NUMBER_AUDIO_OUTPUT])) }
else if (sp.wIndex == INTERFACE_NUMBER_AUDIO_OUTPUT)
{
// out: 0 -> 1
if (sp.wValue && !num_output_interfaces)
{ {
/* if input stop and input running and output not running */ UserAudioOutputStreamStart();
UserAudioStreamStop(); if (!num_input_interfaces)
{
UserAudioStreamStart();
}
}
// out: 1 -> 0
else if (!sp.wValue && num_output_interfaces)
{
UserAudioOutputStreamStop();
if (!num_input_interfaces)
{
UserAudioStreamStop();
}
} }
} }
#elif (NUM_USB_CHAN_OUT > 0) #elif (NUM_USB_CHAN_OUT > 0)