riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core/byteorder: fix byteorder_htobebufs, byteorder_bebuftohs

Browse Source 
Logic was swapping byte order on Big Endian platforms
This commit is contained in:
Kaspar Schleiser 2018-08-23 10:34:21 +02:00
parent face869e3e
commit accf50ce07
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/include/byteorder.h
View File

@ -445,22 +445,13 @@ static inline uint64_t ntohll(uint64_t v)
static inline uint16_t byteorder_bebuftohs(const uint8_t *buf) static inline uint16_t byteorder_bebuftohs(const uint8_t *buf)
{ {
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ return (uint16_t)((buf[0] << 8) | (buf[1] << 0));
return (uint16_t)((buf[0] << 8) | buf[1]);
#else
return (uint16_t)((buf[1] << 8) | buf[0]);
#endif
} }
static inline void byteorder_htobebufs(uint8_t *buf, uint16_t val) static inline void byteorder_htobebufs(uint8_t *buf, uint16_t val)
{ {
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
buf[0] = (uint8_t)(val >> 8); buf[0] = (uint8_t)(val >> 8);
buf[1] = (uint8_t)(val & 0xff); buf[1] = (uint8_t)(val >> 0);
#else
buf[0] = (uint8_t)(val & 0xff);
buf[1] = (uint8_t)(val >> 8);
#endif
} }
#ifdef __cplusplus #ifdef __cplusplus