diff --git a/include/nuttx/usb/usb.h b/include/nuttx/usb/usb.h index 8c4a23e4ce..2b70e1d796 100644 --- a/include/nuttx/usb/usb.h +++ b/include/nuttx/usb/usb.h @@ -65,10 +65,10 @@ #define MSBYTE(u16) ((u16) >> 8) /* Get MS byte from uint16_t */ #define LSBYTE(u16) ((u16) & 0xff) /* Get LS byte from uint16_t */ -#define GETUINT16(p) (((uint16_t)p[1] << 8) | (uint16_t)p[0]) -#define GETUINT32(p) (((uint32_t)p[3] << 24) | \ - ((uint32_t)p[2] << 16) | \ - ((uint32_t)p[1] << 8) | (uint32_t)p[0]) +#define GETUINT16(p) ((uint16_t)((uint16_t)(p[1] << 8) | (uint16_t)p[0])) +#define GETUINT32(p) ((uint32_t)((uint32_t)p[3] << 24) | \ + ((uint32_t)p[2] << 16) | \ + ((uint32_t)p[1] << 8) | (uint32_t)p[0]) /* USB directions (in endpoint addresses) */ diff --git a/net/sixlowpan/sixlowpan_internal.h b/net/sixlowpan/sixlowpan_internal.h index 29626af8f6..a7abf9416a 100644 --- a/net/sixlowpan/sixlowpan_internal.h +++ b/net/sixlowpan/sixlowpan_internal.h @@ -103,7 +103,7 @@ /* GET 16-bit data: source in network order */ #define GETUINT16(ptr,index) \ - ((((uint16_t)((ptr)[index])) << 8) | ((uint16_t)(((ptr)[(index) + 1])))) + ((uint16_t)((((uint16_t)((ptr)[index])) << 8) | ((uint16_t)(((ptr)[(index) + 1]))))) /* PUT 16-bit data: source in host order, result in network order */