diff options
| author | hathach <[email protected]> | 2021-09-15 18:29:28 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2021-09-15 18:29:28 +0700 |
| commit | f39656b6d7f1f005e2e17b535ddf5f9ad497b293 (patch) | |
| tree | bae599c74ee9ccdb1dd23991d6781dec7bd09c8e /src/common | |
| parent | 2998f67eacfb007806198a7d91cc1623ee966c2c (diff) | |
| parent | 03866ddf9be007e8c26dc290e28093a9e59b1e17 (diff) | |
Merge branch 'master' of github.com:hathach/tinyusb into kkitayam-impl_close_all_for_khci
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/tusb_common.h | 4 | ||||
| -rw-r--r-- | src/common/tusb_types.h | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/common/tusb_common.h b/src/common/tusb_common.h index 687f980be..1899b35cc 100644 --- a/src/common/tusb_common.h +++ b/src/common/tusb_common.h @@ -372,7 +372,7 @@ typedef struct static inline const char* tu_lookup_find(tu_lookup_table_t const* p_table, uint32_t key) { - static char not_found[10]; + static char not_found[11]; for(uint16_t i=0; i<p_table->count; i++) { @@ -380,7 +380,7 @@ static inline const char* tu_lookup_find(tu_lookup_table_t const* p_table, uint3 } // not found return the key value in hex - sprintf(not_found, "0x%08lX", key); + sprintf(not_found, "0x%08lX", (unsigned long) key); return not_found; } diff --git a/src/common/tusb_types.h b/src/common/tusb_types.h index d23c6b2dd..f26983a74 100644 --- a/src/common/tusb_types.h +++ b/src/common/tusb_types.h @@ -372,7 +372,7 @@ typedef struct TU_ATTR_PACKED uint8_t bNumInterfaces ; ///< Number of interfaces supported by this speed configuration uint8_t bConfigurationValue ; ///< Value to use to select configuration - uint8_t IConfiguration ; ///< Index of string descriptor + uint8_t iConfiguration ; ///< Index of string descriptor uint8_t bmAttributes ; ///< Same as Configuration descriptor uint8_t bMaxPower ; ///< Same as Configuration descriptor } tusb_desc_other_speed_t; @@ -387,11 +387,14 @@ typedef struct TU_ATTR_PACKED uint8_t bDeviceClass ; ///< Class Code uint8_t bDeviceSubClass ; ///< SubClass Code uint8_t bDeviceProtocol ; ///< Protocol Code + uint8_t bMaxPacketSize0 ; ///< Maximum packet size for other speed uint8_t bNumConfigurations ; ///< Number of Other-speed Configurations uint8_t bReserved ; ///< Reserved for future use, must be zero } tusb_desc_device_qualifier_t; +TU_VERIFY_STATIC( sizeof(tusb_desc_device_qualifier_t) == 10, "size is not correct"); + /// USB Interface Association Descriptor (IAD ECN) typedef struct TU_ATTR_PACKED { |