diff options
| author | hathach <[email protected]> | 2013-11-26 13:15:40 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-11-26 13:15:40 +0700 |
| commit | 8f70a6a886aa557dd87086b807367eef662a7e77 (patch) | |
| tree | 062c136d68c807be53bf74677c8210940bc5d661 /tinyusb/common | |
| parent | 51def3f7ed6b1ac849cb357a9868328d8c5e3117 (diff) | |
change endian conversion to native to be & be to native
completely deferred xfer isr event to usbd task
complete read10, write10 sequence for large data transfer
Diffstat (limited to 'tinyusb/common')
| -rw-r--r-- | tinyusb/common/common.h | 10 | ||||
| -rw-r--r-- | tinyusb/common/compiler/compiler_gcc.h | 6 | ||||
| -rw-r--r-- | tinyusb/common/compiler/compiler_iar.h | 4 |
3 files changed, 13 insertions, 7 deletions
diff --git a/tinyusb/common/common.h b/tinyusb/common/common.h index 4ea40b0e2..bf0955924 100644 --- a/tinyusb/common/common.h +++ b/tinyusb/common/common.h @@ -107,8 +107,8 @@ #define U32_TO_U8S_BE(u32) U32_B1_U8(u32), U32_B2_U8(u32), U32_B3_U8(u32), U32_B4_U8(u32) #define U32_TO_U8S_LE(u32) U32_B4_U8(u32), U32_B3_U8(u32), U32_B2_U8(u32), U32_B1_U8(u32) -#define __h2be_16(u16) ((uint16_t) ((U16_LOW_U8(u16) << 8) | U16_HIGH_U8(u16)) ) // TODO refractor later -#define __be2h_16(u16) __h2be_16(u16) +#define __n2be_16(u16) ((uint16_t) ((U16_LOW_U8(u16) << 8) | U16_HIGH_U8(u16)) ) // TODO refractor later +#define __be2n_16(u16) __n2be_16(u16) //--------------------------------------------------------------------+ // INLINE FUNCTION @@ -180,6 +180,12 @@ static inline uint32_t max32_of(uint32_t x, uint32_t y) return (x > y) ? x : y; } +static inline uint16_t max16_of(uint16_t x, uint16_t y) ATTR_ALWAYS_INLINE ATTR_CONST; +static inline uint16_t max16_of(uint16_t x, uint16_t y) +{ + return (x > y) ? x : y; +} + //------------- Align -------------// static inline uint32_t align32 (uint32_t value) ATTR_ALWAYS_INLINE ATTR_CONST; static inline uint32_t align32 (uint32_t value) diff --git a/tinyusb/common/compiler/compiler_gcc.h b/tinyusb/common/compiler/compiler_gcc.h index 8f759ec9a..f300661a5 100644 --- a/tinyusb/common/compiler/compiler_gcc.h +++ b/tinyusb/common/compiler/compiler_gcc.h @@ -130,9 +130,9 @@ * @{ */ -// built-in function to convert 32-bit Big-Endian to Little-Endian -#define __be2le __builtin_bswap32 -#define __le2be __be2le +// built-in function to convert 32-bit from native to Big Endian +#define __be2n __builtin_bswap32 +#define __n2be __be2n //#define __le2be_16 __builtin_bswap16 diff --git a/tinyusb/common/compiler/compiler_iar.h b/tinyusb/common/compiler/compiler_iar.h index c611d0b2a..2d079b85f 100644 --- a/tinyusb/common/compiler/compiler_iar.h +++ b/tinyusb/common/compiler/compiler_iar.h @@ -82,8 +82,8 @@ #define ATTR_UNUSED // built-in function to convert 32-bit Big-Endian to Little-Endian -#define __be2le __REV -#define __le2be __be2le +#define __be2n __REV +#define __n2be __be2n #ifdef __cplusplus } |