diff options
| author | Zixun LI <[email protected]> | 2026-07-29 00:41:26 +0200 |
|---|---|---|
| committer | Zixun LI <[email protected]> | 2026-07-29 00:41:26 +0200 |
| commit | a7d778c68e46c6013a39d8520c176a3592fc0cd7 (patch) | |
| tree | 66a45d15db61ccd6ed146f336143e09b7a74a8c2 /src | |
| parent | 192e0bd872608b4a39b36047e0d5c1d18c2a8f02 (diff) | |
| parent | 1eb216ed024002119a16ac15004e0b0124a7da6a (diff) | |
Merge tinyusb/master into fix/lpc43-hfp-reliability
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/tusb_types.h | 2 | ||||
| -rw-r--r-- | src/device/usbd.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/tusb_types.h b/src/common/tusb_types.h index d49d277ed..fa4d67df1 100644 --- a/src/common/tusb_types.h +++ b/src/common/tusb_types.h @@ -244,7 +244,7 @@ enum { TUSB_DESC_CONFIG_ATT_SELF_POWERED = 1 << 6, }; -#define TUSB_DESC_CONFIG_POWER_MA(x) ((x)/2) +#define TUSB_DESC_CONFIG_POWER_MA(x) ((uint8_t)TU_MIN((x)/2, UINT8_MAX)) // USB 2.0 Spec Table 9-7: Test Mode Selectors typedef enum { diff --git a/src/device/usbd.h b/src/device/usbd.h index 9be12ed0a..2015d1869 100644 --- a/src/device/usbd.h +++ b/src/device/usbd.h @@ -229,7 +229,7 @@ bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_requ // Config number, interface count, string index, total length, attribute, power in mA #define TUD_CONFIG_DESCRIPTOR(config_num, _itfcount, _stridx, _total_len, _attribute, _power_ma) \ - 9, TUSB_DESC_CONFIGURATION, U16_TO_U8S_LE(_total_len), _itfcount, config_num, _stridx, TU_BIT(7) | _attribute, (_power_ma)/2 + 9, TUSB_DESC_CONFIGURATION, U16_TO_U8S_LE(_total_len), _itfcount, config_num, _stridx, TU_BIT(7) | _attribute, (uint8_t)TU_MIN((_power_ma)/2, UINT8_MAX) //--------------------------------------------------------------------+ // CDC Descriptor Templates |