From 00bbf24c1605e10e662f920c9b0a6ab02e6b81ee Mon Sep 17 00:00:00 2001
From: bodylove <bodylove@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Wed, 5 Dec 2007 13:34:02 +0000
Subject: [PATCH] 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
---
src/helper/types.h | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/helper/types.h b/src/helper/types.h
index 027615e4f..c06a7ecec 100644
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -57,14 +57,15 @@ typedef unsigned long long u64;
#define h_u16_to_le(buf, val) \
do { \
- (buf)[0] = ((val) & 0xff000) >> 8; \
- (buf)[1] = ((val) & 0x00ff); \
+ (buf)[1] = ((val) & 0xff00) >> 8; \
+ (buf)[0] = ((val) & 0x00ff); \
} 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)
#else /* little endian host */
+
#define le_to_h_u32(x) (*(u32*)(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)
@@ -83,7 +84,7 @@ typedef unsigned long long u64;
#define h_u16_to_be(buf, val) \
do { \
- (buf)[0] = ((val) & 0xff000) >> 8; \
+ (buf)[0] = ((val) & 0xff00) >> 8; \
(buf)[1] = ((val) & 0x00ff); \
} while (0)
#endif
--
GitLab