- remove target specific variant and use target->variant member

[fw/openocd] / src / helper / types.h

diff --git a/src/helper/types.h b/src/helper/types.h
index 90f493963eb3aacabfe8f8ffff160722960fac11..641190d8920a2a9352722eab919667c959b28454 100644 (file)
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -2,6 +2,9 @@
  *   Copyright (C) 2004, 2005 by Dominic Rath                              *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -20,7 +23,9 @@
 #ifndef TYPES_H
 #define TYPES_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #ifndef u8
 typedef unsigned char u8;
@@ -34,52 +39,43 @@ 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)
+#ifndef u64
+typedef unsigned long long u64;
+#endif
 
-#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)
+typedef struct jtag_tap_s jtag_tap_t;
 
-#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)
+/* DANGER!!!! here be dragons! Note that the pointer in 
+ * memory might be unaligned. On some CPU's, i.e. ARM7,
+ * the 2 lsb are ignored for 32 bit access, on others
+ * it will cause an exception and on e.g. x86, it works
+ * the same as if aligned.
+ */
+#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)[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_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_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_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
+#define h_u16_to_le(buf, val) do {\
+       (buf)[1] = ((val) & 0xff00) >> 8;\
+       (buf)[0] = ((val) & 0x00ff) >> 0;\
+} while (0)
+#define h_u16_to_be(buf, val) do {\
+       (buf)[0] = ((val) & 0xff00) >> 8;\
+       (buf)[1] = ((val) & 0x00ff) >> 0;\
+} while (0)
 
 #endif /* TYPES_H */