Merged rev 215 changes from /branches/xscale-ixp-be into trunk:
- Obvious fixes to big endian type conversion macros - Fixed obvious typos for byte masks git-svn-id: svn://svn.berlios.de/openocd/trunk@217 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
parent
ba379aa80e
commit
00bbf24c16
|
@ -57,14 +57,15 @@ typedef unsigned long long u64;
|
||||||
|
|
||||||
#define h_u16_to_le(buf, val) \
|
#define h_u16_to_le(buf, val) \
|
||||||
do { \
|
do { \
|
||||||
(buf)[0] = ((val) & 0xff000) >> 8; \
|
(buf)[1] = ((val) & 0xff00) >> 8; \
|
||||||
(buf)[1] = ((val) & 0x00ff); \
|
(buf)[0] = ((val) & 0x00ff); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
#define h_u32_to_be(buf, val) do { *(u32*)(buf) = (val); } while (0)
|
#define h_u32_to_be(buf, val) do { *(u32*)(buf) = (val); } while (0)
|
||||||
#define h_u16_to_be(buf, val) do { *(u16*)(buf) = (val); } while (0)
|
#define h_u16_to_be(buf, val) do { *(u16*)(buf) = (val); } while (0)
|
||||||
|
|
||||||
#else /* little endian host */
|
#else /* little endian host */
|
||||||
|
|
||||||
#define le_to_h_u32(x) (*(u32*)(x))
|
#define le_to_h_u32(x) (*(u32*)(x))
|
||||||
#define le_to_h_u16(x) (*(u16*)(x))
|
#define le_to_h_u16(x) (*(u16*)(x))
|
||||||
#define be_to_h_u32(x) (u32)((x)[3] | (x)[2] << 8 | (x)[1] << 16 | (x)[0] << 24)
|
#define be_to_h_u32(x) (u32)((x)[3] | (x)[2] << 8 | (x)[1] << 16 | (x)[0] << 24)
|
||||||
|
@ -83,7 +84,7 @@ typedef unsigned long long u64;
|
||||||
|
|
||||||
#define h_u16_to_be(buf, val) \
|
#define h_u16_to_be(buf, val) \
|
||||||
do { \
|
do { \
|
||||||
(buf)[0] = ((val) & 0xff000) >> 8; \
|
(buf)[0] = ((val) & 0xff00) >> 8; \
|
||||||
(buf)[1] = ((val) & 0x00ff); \
|
(buf)[1] = ((val) & 0x00ff); \
|
||||||
} while (0)
|
} while (0)
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue