From e6ed1729b252acaf2f4cd551586f942b8ab7549b Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 6 Feb 2013 18:12:26 +0700 Subject: update enumeration up to get full configuration descriptor --- tinyusb/common/common.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'tinyusb/common/common.h') diff --git a/tinyusb/common/common.h b/tinyusb/common/common.h index a3c8cfef5..6859b0e01 100644 --- a/tinyusb/common/common.h +++ b/tinyusb/common/common.h @@ -109,15 +109,21 @@ static inline uint32_t u32_from_u8(uint8_t b1, uint8_t b2, uint8_t b3, uint8_t b } /// min value -static inline uint32_t min_of(uint32_t x, uint32_t y) ATTR_ALWAYS_INLINE ATTR_CONST; -static inline uint32_t min_of(uint32_t x, uint32_t y) +static inline uint8_t min8_of(uint8_t x, uint8_t y) ATTR_ALWAYS_INLINE ATTR_CONST; +static inline uint8_t min8_of(uint8_t x, uint8_t y) +{ + return (x < y) ? x : y; +} + +static inline uint32_t min32_of(uint32_t x, uint32_t y) ATTR_ALWAYS_INLINE ATTR_CONST; +static inline uint32_t min32_of(uint32_t x, uint32_t y) { return (x < y) ? x : y; } /// max value -static inline uint32_t max_of(uint32_t x, uint32_t y) ATTR_ALWAYS_INLINE ATTR_CONST; -static inline uint32_t max_of(uint32_t x, uint32_t y) +static inline uint32_t max32_of(uint32_t x, uint32_t y) ATTR_ALWAYS_INLINE ATTR_CONST; +static inline uint32_t max32_of(uint32_t x, uint32_t y) { return (x > y) ? x : y; } -- cgit v1.3.1