diff options
| author | hathach <[email protected]> | 2019-08-01 13:20:00 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2019-08-01 13:20:00 +0700 |
| commit | 30de17a83029abeee44cbfd7aa5a3ac63d0ce65d (patch) | |
| tree | e83ed2f45c942a0047eaf72a3044ecdf57b2fc89 /src | |
| parent | bd08d0edc9067d57a6d6c3cc32438095b2de29c8 (diff) | |
clean up
- remove TUD_WEBUSB_URL_DESCRIPTOR to avoid flexible array member (C++
forbid in strict mode)
- remove unused TUD_DESC_STRLEN/TUD_DESC_STR_HEADER/TUD_DESC_STR_HEADER
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/tusb_types.h | 9 | ||||
| -rw-r--r-- | src/device/usbd.h | 5 |
2 files changed, 0 insertions, 14 deletions
diff --git a/src/common/tusb_types.h b/src/common/tusb_types.h index e7c0c93e6..9aea2d772 100644 --- a/src/common/tusb_types.h +++ b/src/common/tusb_types.h @@ -469,15 +469,6 @@ static inline uint8_t tu_desc_len(void const* desc) return ((uint8_t const*) desc)[DESC_OFFSET_LEN];
}
-// Length of the string descriptors in bytes with slen characters
-#define TUD_DESC_STRLEN(_chr_count) (2*(_chr_count) + 2)
-
-// Header of string descriptors with len + string type
-#define TUD_DESC_STR_HEADER(_chr_count) ( (uint16_t) ( (TUSB_DESC_STRING << 8 ) | TUD_DESC_STRLEN(_chr_count)) )
-
-// Convert comma-separated string to descriptor unicode format
-#define TUD_DESC_STRCONV( ... ) (const uint16_t[]) { TUD_DESC_STR_HEADER(TU_ARGS_NUM(__VA_ARGS__)), __VA_ARGS__ }
-
#ifdef __cplusplus
}
#endif
diff --git a/src/device/usbd.h b/src/device/usbd.h index 3979dcb1e..396964e00 100644 --- a/src/device/usbd.h +++ b/src/device/usbd.h @@ -143,11 +143,6 @@ TU_ATTR_WEAK bool tud_vendor_control_complete_cb(uint8_t rhport, tusb_control_re 0xDF, 0x60, 0xDD, 0xD8, 0x89, 0x45, 0xC7, 0x4C, \
0x9C, 0xD2, 0x65, 0x9D, 0x9E, 0x64, 0x8A, 0x9F
-//------------- WebUSB URL -------------//
-// used to init tusb_desc_webusb_url_t
-#define TUD_WEBUSB_URL_DESCRIPTOR(_scheme, _url) \
- { 3 + sizeof(_url) - 1, 3, _scheme, _url }
-
//--------------------------------------------------------------------+
// Configuration & Interface Descriptor Templates
//--------------------------------------------------------------------+
|