kingkevin
/
passkey_fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up descriptor search for interrupt endpoint

This commit is contained in:
Mark K Cowan 2022-10-26 21:40:30 +03:00
parent 025d3477e8
commit 15ed45e1a3
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/class/audio/audio_device.c
View File

@ -1090,40 +1090,36 @@ static bool set_int_ctr_number(audiod_function_t *audio)
uint8_t const *p_desc_end = audio->p_desc + audio->desc_length - TUD_AUDIO_DESC_IAD_LEN; uint8_t const *p_desc_end = audio->p_desc + audio->desc_length - TUD_AUDIO_DESC_IAD_LEN;
// p_desc starts at required interface with alternate setting zero bool found = false;
while (p_desc < p_desc_end) while (!found && p_desc < p_desc_end)
{ {
// Find correct interface // For each interface/alternate
if (tu_desc_type(p_desc) == TUSB_DESC_INTERFACE && ((tusb_desc_interface_t const * )p_desc)->bInterfaceNumber == 0 && ((tusb_desc_interface_t const * )p_desc)->bAlternateSetting == 0) if (tu_desc_type(p_desc) == TUSB_DESC_INTERFACE)
{ {
uint8_t foundEPs = 0, nEps = ((tusb_desc_interface_t const * )p_desc)->bNumEndpoints; uint8_t foundEPs = 0, nEps = ((tusb_desc_interface_t const * )p_desc)->bNumEndpoints;
while (foundEPs < nEps && p_desc < p_desc_end) while (!found && foundEPs < nEps && p_desc < p_desc_end)
{ {
// found :n endpoint // For each endpoint
if (tu_desc_type(p_desc) == TUSB_DESC_ENDPOINT) if (tu_desc_type(p_desc) == TUSB_DESC_ENDPOINT)
{ {
tusb_desc_endpoint_t const* desc_ep = (tusb_desc_endpoint_t const *) p_desc; tusb_desc_endpoint_t const* desc_ep = (tusb_desc_endpoint_t const *) p_desc;
uint8_t const ep_addr = desc_ep->bEndpointAddress; uint8_t const ep_addr = desc_ep->bEndpointAddress;
// If endpoint is input-direction and interrupt-type
if (tu_edpt_dir(ep_addr) == TUSB_DIR_IN && desc_ep->bmAttributes.xfer == 0x03) // Check if usage is interrupt EP if (tu_edpt_dir(ep_addr) == TUSB_DIR_IN && desc_ep->bmAttributes.xfer == 0x03) // Check if usage is interrupt EP
{ {
// Store endpoint number and open endpoint
audio->ep_int_ctr = ep_addr; audio->ep_int_ctr = ep_addr;
TU_ASSERT(usbd_edpt_open(audio->rhport, desc_ep)); TU_ASSERT(usbd_edpt_open(audio->rhport, desc_ep));
found = true;
} }
foundEPs += 1; foundEPs += 1;
} }
p_desc = tu_desc_next(p_desc); p_desc = tu_desc_next(p_desc);
} }
break;
} }
p_desc = tu_desc_next(p_desc); p_desc = tu_desc_next(p_desc);
} }
return found;
return true;
} }
#endif #endif