Vergil_Wong/lib_xua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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

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

@@ -439,7 +439,6 @@ 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_input_interfaces = g_interfaceAlt[INTERFACE_NUMBER_AUDIO_INPUT];
unsigned num_output_interfaces = g_interfaceAlt[INTERFACE_NUMBER_AUDIO_OUTPUT]; unsigned num_output_interfaces = g_interfaceAlt[INTERFACE_NUMBER_AUDIO_OUTPUT];
if (sp.wIndex == INTERFACE_NUMBER_AUDIO_INPUT) if (sp.wIndex == INTERFACE_NUMBER_AUDIO_INPUT)
@@ -484,12 +483,6 @@ void XUA_Endpoint0_loop(XUD_Result_t result, USB_SetupPacket_t sp, chanend c_ep0
} }
} }
} }
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 */
UserAudioStreamStop();
}
}
#elif (NUM_USB_CHAN_OUT > 0) #elif (NUM_USB_CHAN_OUT > 0)
if(sp.wIndex == INTERFACE_NUMBER_AUDIO_OUTPUT) if(sp.wIndex == INTERFACE_NUMBER_AUDIO_OUTPUT)
{ {