added item to come up with slick new 32 bit jtag_add_xxx() API

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

diff --git a/src/helper/types.h b/src/helper/types.h
index 44967bd31a4e967eaaa5e1fd51d6d919c4e1f49d..a5c2624a1a3eb3a553e8db00664e369733d640b1 100644 (file)
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -29,21 +29,8 @@
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
-
-#ifndef uint8_t
-typedef unsigned char uint8_t;
-#endif
-
-#ifndef uint16_t
-typedef unsigned short uint16_t;
-#endif
-
-#ifndef u32
-typedef unsigned int u32;
-#endif
-
-#ifndef u64
-typedef unsigned long long u64;
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
 #endif
 
 typedef struct jtag_tap_s jtag_tap_t;
@@ -88,9 +75,9 @@ typedef bool _Bool;
  */
 
 
-static inline u32 le_to_h_u32(const uint8_t* buf)
+static inline uint32_t le_to_h_u32(const uint8_t* buf)
 {
-       return (u32)(buf[0] | buf[1] << 8 | buf[2] << 16 | buf[3] << 24);
+       return (uint32_t)(buf[0] | buf[1] << 8 | buf[2] << 16 | buf[3] << 24);
 }
 
 static inline uint16_t le_to_h_u16(const uint8_t* buf)
@@ -98,9 +85,9 @@ static inline uint16_t le_to_h_u16(const uint8_t* buf)
        return (uint16_t)(buf[0] | buf[1] << 8);
 }
 
-static inline u32 be_to_h_u32(const uint8_t* buf)
+static inline uint32_t be_to_h_u32(const uint8_t* buf)
 {
-       return (u32)(buf[3] | buf[2] << 8 | buf[1] << 16 | buf[0] << 24);
+       return (uint32_t)(buf[3] | buf[2] << 8 | buf[1] << 16 | buf[0] << 24);
 }
 
 static inline uint16_t be_to_h_u16(const uint8_t* buf)
@@ -137,8 +124,18 @@ static inline void h_u16_to_be(uint8_t* buf, int val)
 }
 
 #ifdef __ECOS
+/* eCos plain lacks these definition... A series of upstream patches
+ * could probably repair it, but it seems like too much work to be
+ * worth it.
+ */
+
+
+#define PRIx32 "x"
+#define PRId32 "d"
+#define SCNx32 "x"
+#define PRIi32 "i"
+#define PRIu32 "u"
 
-/* eCos plain lacks this definition... */
 typedef CYG_ADDRWORD intptr_t;
 typedef int64_t intmax_t;
 typedef uint64_t uintmax_t;