diff options
| author | hathach <[email protected]> | 2019-05-12 14:09:35 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2019-05-12 14:09:35 +0700 |
| commit | ba2136486c153edd372eadaa325dab27fe1297b2 (patch) | |
| tree | d30de0dbfb87172da850733d88cf08ec9751e69e /src/device/usbd.c | |
| parent | de56a0ca8987c15c06112ece2589dab18f1d6666 (diff) | |
add tud_hid_descriptor_report_cb()
- remove tud_desc_set.hid_report
- remove tud_desc_set_t
Diffstat (limited to 'src/device/usbd.c')
| -rw-r--r-- | src/device/usbd.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/device/usbd.c b/src/device/usbd.c index 8812a70f4..64ed7668e 100644 --- a/src/device/usbd.c +++ b/src/device/usbd.c @@ -479,7 +479,7 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const // This function parse configuration descriptor & open drivers accordingly
static bool process_set_config(uint8_t rhport)
{
- tusb_desc_configuration_t const * desc_cfg = (tusb_desc_configuration_t const *) tud_desc_set.config;
+ tusb_desc_configuration_t const * desc_cfg = (tusb_desc_configuration_t const *) tud_descriptor_configuration_cb();
TU_ASSERT(desc_cfg != NULL && desc_cfg->bDescriptorType == TUSB_DESC_CONFIGURATION);
// Parse configuration descriptor
@@ -558,11 +558,14 @@ static bool process_get_descriptor(uint8_t rhport, tusb_control_request_t const switch(desc_type)
{
case TUSB_DESC_DEVICE:
- return usbd_control_xfer(rhport, p_request, (void*) tud_desc_set.device, sizeof(tusb_desc_device_t));
+ return usbd_control_xfer(rhport, p_request, (void*) tud_descriptor_device_cb(), sizeof(tusb_desc_device_t));
break;
case TUSB_DESC_CONFIGURATION:
- return usbd_control_xfer(rhport, p_request, (void*) tud_desc_set.config, ((tusb_desc_configuration_t const*) tud_desc_set.config)->wTotalLength);
+ {
+ tusb_desc_configuration_t const* desc_config = (tusb_desc_configuration_t const*) tud_descriptor_configuration_cb();
+ return usbd_control_xfer(rhport, p_request, (void*) desc_config, desc_config->wTotalLength);
+ }
break;
case TUSB_DESC_STRING:
|