alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(enum): Returned usb_round_up_to_mps for control request of string descriptors

Browse Source
This commit is contained in:
Tomas Rezucha 2024-06-13 23:50:13 +08:00 committed by Roman Leonov
parent 71708508d6
commit a9f8f2576a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/usb/enum.c
View File

@ -425,6 +425,7 @@ static void control_request_string(void)
{
usb_transfer_t *transfer = &p_enum_driver->constant.urb->transfer;
enum_stage_t stage = p_enum_driver->dynamic.stage;
uint8_t ctrl_ep_mps = p_enum_driver->single_thread.dev_params.bMaxPacketSize0;
uint8_t bLength = p_enum_driver->single_thread.dev_params.str_desc_bLength;
uint8_t index = 0;
uint16_t langid = 0;
@ -438,7 +439,7 @@ static void control_request_string(void)
case ENUM_STAGE_GET_SHORT_SER_STR_DESC: {
// Get only the header of the string descriptor
USB_SETUP_PACKET_INIT_GET_STR_DESC((usb_setup_packet_t *)transfer->data_buffer, index, langid, sizeof(usb_str_desc_t));
transfer->num_bytes = sizeof(usb_setup_packet_t) + sizeof(usb_str_desc_t) /* usb_round_up_to_mps(sizeof(usb_str_desc_t), ctx->bMaxPacketSize0) */;
transfer->num_bytes = sizeof(usb_setup_packet_t) + usb_round_up_to_mps(sizeof(usb_str_desc_t), ctrl_ep_mps);
// IN data stage should return exactly sizeof(usb_str_desc_t) bytes
p_enum_driver->single_thread.expect_num_bytes = sizeof(usb_setup_packet_t) + sizeof(usb_str_desc_t);
break;
@ -449,7 +450,7 @@ static void control_request_string(void)
case ENUM_STAGE_GET_FULL_SER_STR_DESC: {
// Get the full string descriptor at a particular index, requesting the descriptors exact length
USB_SETUP_PACKET_INIT_GET_STR_DESC((usb_setup_packet_t *)transfer->data_buffer, index, langid, bLength);
transfer->num_bytes = sizeof(usb_setup_packet_t) + bLength /* usb_round_up_to_mps(ctx->str_desc_bLength, ctx->bMaxPacketSize0) */;
transfer->num_bytes = sizeof(usb_setup_packet_t) + usb_round_up_to_mps(bLength, ctrl_ep_mps);
// IN data stage should return exactly str_desc_bLength bytes
p_enum_driver->single_thread.expect_num_bytes = sizeof(usb_setup_packet_t) + bLength;
break;