mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-03-31 16:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #905 from HiFiPhile/uac_fix

Browse Source 
UAC fixes
This commit is contained in:
Ha Thach 2021-06-29 22:34:57 +07:00 committed by GitHub
commit 3b539fdd8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 131 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -393,12 +393,12 @@ static uint8_t audiod_get_audio_fct_idx(audiod_function_t * audio);
#if CFG_TUD_AUDIO_ENABLE_ENCODING || CFG_TUD_AUDIO_ENABLE_DECODING #if CFG_TUD_AUDIO_ENABLE_ENCODING || CFG_TUD_AUDIO_ENABLE_DECODING
static void audiod_parse_for_AS_params(audiod_function_t* audio, uint8_t const * p_desc, uint8_t const * p_desc_end, uint8_t const as_itf); static void audiod_parse_for_AS_params(audiod_function_t* audio, uint8_t const * p_desc, uint8_t const * p_desc_end, uint8_t const as_itf);
#endif
static inline uint8_t tu_desc_subtype(void const* desc) static inline uint8_t tu_desc_subtype(void const* desc)
{ {
return ((uint8_t const*) desc)[2]; return ((uint8_t const*) desc)[2];
} }
#endif
bool tud_audio_n_mounted(uint8_t func_id) bool tud_audio_n_mounted(uint8_t func_id)
{ {
@ -885,7 +885,7 @@ range [-1, +1)
* */ * */
// Helper function // Helper function
static inline uint8_t * audiod_interleaved_copy_bytes_fast_encode(uint16_t const nBytesToCopy, void * src, uint8_t * src_end, uint8_t * dst, uint8_t const n_ff_used) static inline uint8_t * audiod_interleaved_copy_bytes_fast_encode(uint16_t const nBytesToCopy, uint8_t * src, uint8_t * src_end, uint8_t * dst, uint8_t const n_ff_used)
{ {
// Optimize for fast half word copies // Optimize for fast half word copies
typedef struct{ typedef struct{
@ -900,15 +900,15 @@ static inline uint8_t * audiod_interleaved_copy_bytes_fast_encode(uint16_t const
switch (nBytesToCopy) switch (nBytesToCopy)
{ {
case 1: case 1:
while((uint8_t *)src < src_end) while(src < src_end)
{ {
*dst = *(uint8_t *)src++; *dst = *src++;
dst += n_ff_used; dst += n_ff_used;
} }
break; break;
case 2: case 2:
while((uint8_t *)src < src_end) while(src < src_end)
{ {
*(unaligned_uint16_t*)dst = *(unaligned_uint16_t*)src; *(unaligned_uint16_t*)dst = *(unaligned_uint16_t*)src;
src += 2; src += 2;
@ -917,23 +917,23 @@ static inline uint8_t * audiod_interleaved_copy_bytes_fast_encode(uint16_t const
break; break;
case 3: case 3:
while((uint8_t *)src < src_end) while(src < src_end)
{ {
// memcpy(dst, src, 3); // memcpy(dst, src, 3);
// src = (uint8_t *)src + 3; // src = (uint8_t *)src + 3;
// dst += 3 * n_ff_used; // dst += 3 * n_ff_used;
// TODO: Is there a faster way to copy 3 bytes? // TODO: Is there a faster way to copy 3 bytes?
*dst++ = *(uint8_t *)src++; *dst++ = *src++;
*dst++ = *(uint8_t *)src++; *dst++ = *src++;
*dst++ = *(uint8_t *)src++; *dst++ = *src++;
dst += 3 * (n_ff_used - 1); dst += 3 * (n_ff_used - 1);
} }
break; break;
case 4: case 4:
while((uint8_t *)src < src_end) while(src < src_end)
{ {
*(unaligned_uint32_t*)dst = *(unaligned_uint32_t*)src; *(unaligned_uint32_t*)dst = *(unaligned_uint32_t*)src;
src += 4; src += 4;
@ -993,7 +993,7 @@ static uint16_t audiod_encode_type_I_pcm(uint8_t rhport, audiod_function_t* audi
if (info.len_lin != 0) if (info.len_lin != 0)
{ {
info.len_lin = tu_min16(nBytesPerFFToSend, info.len_lin); // Limit up to desired length info.len_lin = tu_min16(nBytesPerFFToSend, info.len_lin); // Limit up to desired length
src_end = info.ptr_lin + info.len_lin; src_end = (uint8_t *)info.ptr_lin + info.len_lin;
dst = audiod_interleaved_copy_bytes_fast_encode(nBytesToCopy, info.ptr_lin, src_end, dst, n_ff_used); dst = audiod_interleaved_copy_bytes_fast_encode(nBytesToCopy, info.ptr_lin, src_end, dst, n_ff_used);
// Limit up to desired length // Limit up to desired length
@ -1002,7 +1002,7 @@ static uint16_t audiod_encode_type_I_pcm(uint8_t rhport, audiod_function_t* audi
// Handle wrapped part of FIFO // Handle wrapped part of FIFO
if (info.len_wrap != 0) if (info.len_wrap != 0)
{ {
src_end = info.ptr_wrap + info.len_wrap; src_end = (uint8_t *)info.ptr_wrap + info.len_wrap;
audiod_interleaved_copy_bytes_fast_encode(nBytesToCopy, info.ptr_wrap, src_end, dst, n_ff_used); audiod_interleaved_copy_bytes_fast_encode(nBytesToCopy, info.ptr_wrap, src_end, dst, n_ff_used);
} }
@ -1658,8 +1658,8 @@ static bool audiod_control_complete(uint8_t rhport, tusb_control_request_t const
switch (p_request->bmRequestType_bit.recipient) switch (p_request->bmRequestType_bit.recipient)
{ {
case TUSB_REQ_RCPT_INTERFACE: ; // The semicolon is there to enable a declaration right after the label case TUSB_REQ_RCPT_INTERFACE:
{
uint8_t itf = TU_U16_LOW(p_request->wIndex); uint8_t itf = TU_U16_LOW(p_request->wIndex);
uint8_t entityID = TU_U16_HIGH(p_request->wIndex); uint8_t entityID = TU_U16_HIGH(p_request->wIndex);
@ -1695,11 +1695,11 @@ static bool audiod_control_complete(uint8_t rhport, tusb_control_request_t const
return false; // In case no callback function is present or request can not be conducted we stall it return false; // In case no callback function is present or request can not be conducted we stall it
} }
} }
}
break; break;
case TUSB_REQ_RCPT_ENDPOINT: ; // The semicolon is there to enable a declaration right after the label case TUSB_REQ_RCPT_ENDPOINT:
{
uint8_t ep = TU_U16_LOW(p_request->wIndex); uint8_t ep = TU_U16_LOW(p_request->wIndex);
if (tud_audio_set_req_ep_cb) if (tud_audio_set_req_ep_cb)
@ -1715,7 +1715,8 @@ static bool audiod_control_complete(uint8_t rhport, tusb_control_request_t const
TU_LOG2(" No EP set request callback available!\r\n"); TU_LOG2(" No EP set request callback available!\r\n");
return false; // In case no callback function is present or request can not be conducted we stall it return false; // In case no callback function is present or request can not be conducted we stall it
} }
}
break;
// Unknown/Unsupported recipient // Unknown/Unsupported recipient
default: TU_BREAKPOINT(); return false; default: TU_BREAKPOINT(); return false;
} }
@ -1754,8 +1755,8 @@ static bool audiod_control_request(uint8_t rhport, tusb_control_request_t const
// Conduct checks which depend on the recipient // Conduct checks which depend on the recipient
switch (p_request->bmRequestType_bit.recipient) switch (p_request->bmRequestType_bit.recipient)
{ {
case TUSB_REQ_RCPT_INTERFACE: ; // The semicolon is there to enable a declaration right after the label case TUSB_REQ_RCPT_INTERFACE:
{
uint8_t entityID = TU_U16_HIGH(p_request->wIndex); uint8_t entityID = TU_U16_HIGH(p_request->wIndex);
// Verify if entity is present // Verify if entity is present
@ -1797,10 +1798,11 @@ static bool audiod_control_request(uint8_t rhport, tusb_control_request_t const
} }
} }
} }
}
break; break;
case TUSB_REQ_RCPT_ENDPOINT: ; // The semicolon is there to enable a declaration right after the label case TUSB_REQ_RCPT_ENDPOINT:
{
uint8_t ep = TU_U16_LOW(p_request->wIndex); uint8_t ep = TU_U16_LOW(p_request->wIndex);
// Find index of audio driver structure and verify EP really exists // Find index of audio driver structure and verify EP really exists
@ -1819,6 +1821,7 @@ static bool audiod_control_request(uint8_t rhport, tusb_control_request_t const
return false; // Stall return false; // Stall
} }
} }
}
break; break;
// Unknown/Unsupported recipient // Unknown/Unsupported recipient
@ -1935,8 +1938,8 @@ bool tud_audio_buffer_and_schedule_control_xfer(uint8_t rhport, tusb_control_req
// Conduct checks which depend on the recipient // Conduct checks which depend on the recipient
switch (p_request->bmRequestType_bit.recipient) switch (p_request->bmRequestType_bit.recipient)
{ {
case TUSB_REQ_RCPT_INTERFACE: ; // The semicolon is there to enable a declaration right after the label case TUSB_REQ_RCPT_INTERFACE:
{
uint8_t entityID = TU_U16_HIGH(p_request->wIndex); uint8_t entityID = TU_U16_HIGH(p_request->wIndex);
// Verify if entity is present // Verify if entity is present
@ -1950,14 +1953,16 @@ bool tud_audio_buffer_and_schedule_control_xfer(uint8_t rhport, tusb_control_req
// Find index of audio driver structure and verify interface really exists // Find index of audio driver structure and verify interface really exists
TU_VERIFY(audiod_verify_itf_exists(itf, &func_id)); TU_VERIFY(audiod_verify_itf_exists(itf, &func_id));
} }
}
break; break;
case TUSB_REQ_RCPT_ENDPOINT: ; // The semicolon is there to enable a declaration right after the label case TUSB_REQ_RCPT_ENDPOINT:
{
uint8_t ep = TU_U16_LOW(p_request->wIndex); uint8_t ep = TU_U16_LOW(p_request->wIndex);
// Find index of audio driver structure and verify EP really exists // Find index of audio driver structure and verify EP really exists
TU_VERIFY(audiod_verify_ep_exists(ep, &func_id)); TU_VERIFY(audiod_verify_ep_exists(ep, &func_id));
}
break; break;
// Unknown/Unsupported recipient // Unknown/Unsupported recipient
@ -2137,10 +2142,10 @@ static void audiod_parse_for_AS_params(audiod_function_t* audio, uint8_t const *
if (as_itf == audio->ep_in_as_intf_num) if (as_itf == audio->ep_in_as_intf_num)
{ {
audio->n_channels_tx = ((audio_desc_cs_as_interface_t const * )p_desc)->bNrChannels; audio->n_channels_tx = ((audio_desc_cs_as_interface_t const * )p_desc)->bNrChannels;
audio->format_type_tx = ((audio_desc_cs_as_interface_t const * )p_desc)->bFormatType; audio->format_type_tx = (audio_format_type_t)(((audio_desc_cs_as_interface_t const * )p_desc)->bFormatType);
#if CFG_TUD_AUDIO_ENABLE_TYPE_I_ENCODING #if CFG_TUD_AUDIO_ENABLE_TYPE_I_ENCODING
audio->format_type_I_tx = ((audio_desc_cs_as_interface_t const * )p_desc)->bmFormats; audio->format_type_I_tx = (audio_data_format_type_I_t)(((audio_desc_cs_as_interface_t const * )p_desc)->bmFormats);
#endif #endif
} }
#endif #endif