diff options
| author | Ha Thach <[email protected]> | 2020-04-22 12:24:05 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-04-22 12:24:05 +0700 |
| commit | 379b8ac5564bad58b4ad3c0e90cc12fbd06cd8be (patch) | |
| tree | 4030429f633e073a0f220855bf7bd10081083434 /src/device | |
| parent | 1d33aa9b6f7940f9eac07ce684515856940175da (diff) | |
| parent | 0ec69de77c22bd018f9e5e5d038cfb8275922351 (diff) | |
Merge pull request #365 from pigrew/desc_tu_verify
tu_verify for getting descriptors
Diffstat (limited to 'src/device')
| -rw-r--r-- | src/device/usbd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/device/usbd.c b/src/device/usbd.c index 26183c960..219dd23be 100644 --- a/src/device/usbd.c +++ b/src/device/usbd.c @@ -91,7 +91,7 @@ typedef struct bool (* control_request ) (uint8_t rhport, tusb_control_request_t const * request); bool (* control_complete ) (uint8_t rhport, tusb_control_request_t const * request); bool (* xfer_cb ) (uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes); - void (* sof ) (uint8_t rhport); + void (* sof ) (uint8_t rhport); /* optional */ } usbd_class_driver_t; static usbd_class_driver_t const _usbd_driver[] = @@ -450,8 +450,6 @@ void tud_task (void) // Helper to invoke class driver control request handler static bool invoke_class_control(uint8_t rhport, uint8_t drvid, tusb_control_request_t const * request) { - TU_ASSERT(_usbd_driver[drvid].control_request); - usbd_control_set_complete_callback(_usbd_driver[drvid].control_complete); TU_LOG2(" %s control request\r\n", _usbd_driver[drvid].name); return _usbd_driver[drvid].control_request(rhport, request); @@ -817,7 +815,8 @@ static bool process_get_descriptor(uint8_t rhport, tusb_control_request_t const // The 0xEE index string is a Microsoft OS Descriptors. // https://docs.microsoft.com/en-us/windows-hardware/drivers/usbcon/microsoft-defined-usb-descriptors return false; - }else + } + else { uint8_t const* desc_str = (uint8_t const*) tud_descriptor_string_cb(desc_index, p_request->wIndex); TU_ASSERT(desc_str); |