diff --git a/examples/device/webusb/src/usb_descriptors.c b/examples/device/webusb/src/usb_descriptors.c index 97c05e5d..cd9b6bc1 100644 --- a/examples/device/webusb/src/usb_descriptors.c +++ b/examples/device/webusb/src/usb_descriptors.c @@ -180,20 +180,12 @@ uint16_t const* tud_descriptor_string_cb(uint8_t index) //--------------------------------------------------------------------+ #define URL "github.com/hathach/tinyusb" -typedef struct TU_ATTR_PACKED -{ - uint8_t bLength; - uint8_t bDescriptorType; - uint8_t bScheme; - char url[]; -} tusb_desc_webusb_url_t; - const tusb_desc_webusb_url_t desc_url = { - .bLength = 3 + sizeof(URL) - 1, + .bLength = 3 + sizeof(URL) - 1, .bDescriptorType = 3, // WEBUSB URL type - .bScheme = 1, // 0: http, 1: https - .url = URL + .bScheme = 1, // 0: http, 1: https + .url = URL }; bool tud_control_vendor_request_cb(uint8_t rhport, tusb_control_request_t const * request) diff --git a/src/common/tusb_types.h b/src/common/tusb_types.h index 7270ec58..2776eaa8 100644 --- a/src/common/tusb_types.h +++ b/src/common/tusb_types.h @@ -228,7 +228,7 @@ enum }; //--------------------------------------------------------------------+ -// USB Standard Descriptors +// USB Descriptors //--------------------------------------------------------------------+ /// USB Device Descriptor @@ -360,13 +360,7 @@ typedef struct TU_ATTR_PACKED uint8_t iFunction ; ///< Index of the string descriptor describing the interface association. } tusb_desc_interface_assoc_t; -/// USB Header Descriptor -typedef struct TU_ATTR_PACKED -{ - uint8_t bLength ; ///< Size of this descriptor in bytes - uint8_t bDescriptorType ; ///< Descriptor Type -} tusb_desc_header_t; - +// USB String Descriptor typedef struct TU_ATTR_PACKED { uint8_t bLength ; ///< Size of this descriptor in bytes @@ -374,6 +368,7 @@ typedef struct TU_ATTR_PACKED uint16_t unicode_string[]; } tusb_desc_string_t; +// USB Binary Device Object Store (BOS) typedef struct TU_ATTR_PACKED { uint8_t bLength; @@ -384,6 +379,15 @@ typedef struct TU_ATTR_PACKED uint8_t CapabilityData[]; } tusb_desc_bos_platform_t; +// USB WebuSB URL Descriptor +typedef struct TU_ATTR_PACKED +{ + uint8_t bLength; + uint8_t bDescriptorType; + uint8_t bScheme; + char url[]; +} tusb_desc_webusb_url_t; + /*------------------------------------------------------------------*/ /* Types *------------------------------------------------------------------*/