BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix endian neutral helper macro to return an integer type

This commit is contained in:
Aurelien Jacobs 2013-12-30 19:23:54 +01:00
parent 264c99eda2
commit 79a1176b3f
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libsigrok-internal.h
View File

@ -55,36 +55,36 @@
* @param x a pointer to the input memory * @param x a pointer to the input memory
* @return the corresponding integer * @return the corresponding integer
*/ */
#define RB16(x) ((((const uint8_t*)(x))[0] << 8) | \ #define RB16(x) (((unsigned)((const uint8_t*)(x))[0] << 8) | \
((const uint8_t*)(x))[1]) (unsigned)((const uint8_t*)(x))[1])
/** /**
* Read a 16 bits little endian integer out of memory. * Read a 16 bits little endian integer out of memory.
* @param x a pointer to the input memory * @param x a pointer to the input memory
* @return the corresponding integer * @return the corresponding integer
*/ */
#define RL16(x) ((((const uint8_t*)(x))[1] << 8) | \ #define RL16(x) (((unsigned)((const uint8_t*)(x))[1] << 8) | \
((const uint8_t*)(x))[0]) (unsigned)((const uint8_t*)(x))[0])
/** /**
* Read a 32 bits big endian integer out of memory. * Read a 32 bits big endian integer out of memory.
* @param x a pointer to the input memory * @param x a pointer to the input memory
* @return the corresponding integer * @return the corresponding integer
*/ */
#define RB32(x) ((((const uint8_t*)(x))[0] << 24) | \ #define RB32(x) (((unsigned)((const uint8_t*)(x))[0] << 24) | \
(((const uint8_t*)(x))[1] << 16) | \ ((unsigned)((const uint8_t*)(x))[1] << 16) | \
(((const uint8_t*)(x))[2] << 8) | \ ((unsigned)((const uint8_t*)(x))[2] << 8) | \
((const uint8_t*)(x))[3]) (unsigned)((const uint8_t*)(x))[3])
/** /**
* Read a 32 bits little endian integer out of memory. * Read a 32 bits little endian integer out of memory.
* @param x a pointer to the input memory * @param x a pointer to the input memory
* @return the corresponding integer * @return the corresponding integer
*/ */
#define RL32(x) ((((const uint8_t*)(x))[3] << 24) | \ #define RL32(x) (((unsigned)((const uint8_t*)(x))[3] << 24) | \
(((const uint8_t*)(x))[2] << 16) | \ ((unsigned)((const uint8_t*)(x))[2] << 16) | \
(((const uint8_t*)(x))[1] << 8) | \ ((unsigned)((const uint8_t*)(x))[1] << 8) | \
((const uint8_t*)(x))[0]) (unsigned)((const uint8_t*)(x))[0])
/* Portability fixes for FreeBSD. */ /* Portability fixes for FreeBSD. */
#ifdef __FreeBSD__ #ifdef __FreeBSD__