From f3a5ea65a9869b8d3bc305165b943922b50108f4 Mon Sep 17 00:00:00 2001 From: hathach Date: Sun, 12 May 2019 19:55:15 +0700 Subject: add index to tud_descriptor_configuration_cb() --- src/device/usbd.c | 10 +++++----- src/device/usbd.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/device') diff --git a/src/device/usbd.c b/src/device/usbd.c index 1eda970a2..6e3a1e1ca 100644 --- a/src/device/usbd.c +++ b/src/device/usbd.c @@ -159,7 +159,7 @@ static osal_queue_t _usbd_q; //--------------------------------------------------------------------+ static void mark_interface_endpoint(uint8_t ep2drv[8][2], uint8_t const* p_desc, uint16_t desc_len, uint8_t driver_id); static bool process_control_request(uint8_t rhport, tusb_control_request_t const * p_request); -static bool process_set_config(uint8_t rhport); +static bool process_set_config(uint8_t rhport, uint8_t cfg_num); static bool process_get_descriptor(uint8_t rhport, tusb_control_request_t const * p_request); void usbd_control_reset (uint8_t rhport); @@ -376,7 +376,7 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const dcd_set_config(rhport, cfg_num); _usbd_dev.configured = cfg_num ? 1 : 0; - TU_ASSERT( process_set_config(rhport) ); + if ( cfg_num ) TU_ASSERT( process_set_config(rhport, cfg_num) ); usbd_control_status(rhport, p_request); } break; @@ -477,9 +477,9 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const // Process Set Configure Request // This function parse configuration descriptor & open drivers accordingly -static bool process_set_config(uint8_t rhport) +static bool process_set_config(uint8_t rhport, uint8_t cfg_num) { - tusb_desc_configuration_t const * desc_cfg = (tusb_desc_configuration_t const *) tud_descriptor_configuration_cb(); + tusb_desc_configuration_t const * desc_cfg = (tusb_desc_configuration_t const *) tud_descriptor_configuration_cb(cfg_num-1); // index is cfg_num-1 TU_ASSERT(desc_cfg != NULL && desc_cfg->bDescriptorType == TUSB_DESC_CONFIGURATION); // Parse configuration descriptor @@ -563,7 +563,7 @@ static bool process_get_descriptor(uint8_t rhport, tusb_control_request_t const case TUSB_DESC_CONFIGURATION: { - tusb_desc_configuration_t const* desc_config = (tusb_desc_configuration_t const*) tud_descriptor_configuration_cb(); + tusb_desc_configuration_t const* desc_config = (tusb_desc_configuration_t const*) tud_descriptor_configuration_cb(desc_index); return usbd_control_xfer(rhport, p_request, (void*) desc_config, desc_config->wTotalLength); } break; diff --git a/src/device/usbd.h b/src/device/usbd.h index 8193c4ce0..2e34b25ac 100644 --- a/src/device/usbd.h +++ b/src/device/usbd.h @@ -69,7 +69,7 @@ uint8_t const * tud_descriptor_device_cb(void); // Invoked when received GET CONFIGURATION DESCRIPTOR request // Application return pointer to descriptor, whose contents must exist long enough for transfer to complete -uint8_t const * tud_descriptor_configuration_cb(void); +uint8_t const * tud_descriptor_configuration_cb(uint8_t index); // Invoked when received GET STRING DESCRIPTOR request // Application return pointer to descriptor, whose contents must exist long enough for transfer to complete -- cgit v1.3.1