andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

change tud_descriptor_string_cb() to be consistent with other descriptor callback

Browse Source
This commit is contained in:
hathach
2019-05-12 15:38:15 +07:00
parent ba2136486c
commit 1174949308
8 changed files with 90 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/tusb_types.h
View File

@@ -403,10 +403,10 @@ static inline uint8_t tu_desc_len(void const* desc)
}
// Length of the string descriptors in bytes with slen characters
#define TUD_DESC_STRLEN(_slen) (2*(_slen) + 2)
#define TUD_DESC_STRLEN(_chr_count) (2*(_chr_count) + 2)
// Header of string descriptors with len + string type
#define TUD_DESC_STR_HEADER(_slen) ( (uint16_t) ( (TUSB_DESC_STRING << 8 ) | TUD_DESC_STRLEN(_slen)) )
#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(VA_ARGS_NUM_(__VA_ARGS__)), __VA_ARGS__ }