- added support for AT91SAM7A3 flash (patch from andre renaud, thanks)

- fix trunk build for mac os x (patch from Lauri Leukkunen, thanks)
- added check for host endianness, defines WORDS_BIGENDIAN on a big-endian host (e.g. mac os-x)
- fixed bug where endianness of memory accesses could be swapped on BE hosts
- added space for zero termination of ftd2xx_layout string (from Magnus Ludin, tahnks)


git-svn-id: svn://svn.berlios.de/openocd/trunk@73 b42882b7-edfa-0310-969c-e2dbd0fdcd60

1 files changed, 50 insertions, 1 deletions

diff --git a/src/helper/types.h b/src/helper/types.h
index 6d49bbb0..90f49396 100644
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -17,10 +17,11 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-
 #ifndef TYPES_H
 #define TYPES_H
 
+#include "config.h"
+
 #ifndef u8
 typedef unsigned char u8;
 #endif
@@ -33,4 +34,52 @@ typedef unsigned short u16;
 typedef unsigned int u32;
 #endif
 
+#ifdef WORDS_BIGENDIAN /* big endian host */
+
+#define le_to_h_u32(x) (u32)(x[0] | x[1] << 8 | x[2] << 16 | x[3] << 24)
+#define le_to_h_u16(x) (u16)(x[0] | x[1] << 8)
+#define be_to_h_u32(x) (*(u32*)(x))
+#define be_to_h_u16(x) (*(u16*)(x))
+
+#define h_u32_to_le(buf, val) \
+	do { \
+		buf[3] = (val & 0xff000000) >> 24; \
+		buf[2] = (val & 0x00ff0000) >> 16; \
+		buf[1] = (val & 0x0000ff00) >> 8; \
+		buf[0] = (val & 0x000000ff); \
+	} while (0)
+
+#define h_u16_to_le(buf, val)  \
+	do { \
+		buf[0] = (val & 0xff000) >> 8; \
+		buf[1] = (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)
+#define be_to_h_u16(x) (u16)(x[1] | x[0] << 8)
+
+#define h_u32_to_le(buf, val) do { *(u32*)(buf) = (val); } while (0)
+#define h_u16_to_le(buf, val) do { *(u16*)(buf) = (val); } while (0)
+
+#define h_u32_to_be(buf, val) \
+	do { \
+		buf[0] = (val & 0xff000000) >> 24; \
+		buf[1] = (val & 0x00ff0000) >> 16; \
+		buf[2] = (val & 0x0000ff00) >> 8; \
+		buf[3] = (val & 0x000000ff); \
+	} while (0)
+
+#define h_u16_to_be(buf, val) \
+	do { \
+		buf[0] = (val & 0xff000) >> 8; \
+		buf[1] = (val & 0x00ff); \
+	} while (0)
+#endif
+
 #endif /* TYPES_H */