X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Ftypes.h;h=21a6a33763282a428c529d4d6daccd32b05bb76f;hb=0ed5f5afd95746db72c071a5373981d79cd49c11;hp=8ee41105f1651be3efb5e2fb7213a8accbc28c0f;hpb=61cba7e0e6dae78ff257bef546e6783c4b634ad4;p=openocd.git

diff --git a/src/helper/types.h b/src/helper/types.h
index 8ee41105f1..21a6a33763 100644
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -2,7 +2,7 @@
  *   Copyright (C) 2004, 2005 by Dominic Rath                              *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -26,21 +26,11 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-
-#ifndef u8
-typedef unsigned char u8;
-#endif
-
-#ifndef u16
-typedef unsigned short u16;
-#endif
-
-#ifndef u32
-typedef unsigned int u32;
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
 #endif
-
-#ifndef u64
-typedef unsigned long long u64;
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
 #endif
 
 typedef struct jtag_tap_s jtag_tap_t;
@@ -57,7 +47,7 @@ typedef struct jtag_tap_s jtag_tap_t;
 #define true		1
 
 typedef int _Bool;
-#else 
+#else
 typedef bool _Bool;
 #endif	/* __cplusplus */
 #endif	/* HAVE__BOOL */
@@ -85,52 +75,88 @@ typedef bool _Bool;
  */
 
 
-static inline u32 le_to_h_u32(const u8* 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 u16 le_to_h_u16(const u8* buf)
+static inline uint16_t le_to_h_u16(const uint8_t* buf)
 {
-	return (u16)(buf[0] | buf[1] << 8);
+	return (uint16_t)(buf[0] | buf[1] << 8);
 }
 
-static inline u32 be_to_h_u32(const u8* 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 u16 be_to_h_u16(const u8* buf)
+static inline uint16_t be_to_h_u16(const uint8_t* buf)
 {
-	return (u16)(buf[1] | buf[0] << 8);
+	return (uint16_t)(buf[1] | buf[0] << 8);
 }
 
-static inline void h_u32_to_le(u8* buf, int val)
+static inline void h_u32_to_le(uint8_t* buf, int val)
 {
-	buf[3] = (u8) (val >> 24);
-	buf[2] = (u8) (val >> 16);
-	buf[1] = (u8) (val >> 8);
-	buf[0] = (u8) (val >> 0);
+	buf[3] = (uint8_t) (val >> 24);
+	buf[2] = (uint8_t) (val >> 16);
+	buf[1] = (uint8_t) (val >> 8);
+	buf[0] = (uint8_t) (val >> 0);
 }
 
-static inline void h_u32_to_be(u8* buf, int val)
+static inline void h_u32_to_be(uint8_t* buf, int val)
 {
-	buf[0] = (u8) (val >> 24);
-	buf[1] = (u8) (val >> 16);
-	buf[2] = (u8) (val >> 8);
-	buf[3] = (u8) (val >> 0);
+	buf[0] = (uint8_t) (val >> 24);
+	buf[1] = (uint8_t) (val >> 16);
+	buf[2] = (uint8_t) (val >> 8);
+	buf[3] = (uint8_t) (val >> 0);
 }
 
-static inline void h_u16_to_le(u8* buf, int val)
+static inline void h_u16_to_le(uint8_t* buf, int val)
 {
-	buf[1] = (u8) (val >> 8);
-	buf[0] = (u8) (val >> 0);
+	buf[1] = (uint8_t) (val >> 8);
+	buf[0] = (uint8_t) (val >> 0);
 }
 
-static inline void h_u16_to_be(u8* buf, int val)
+static inline void h_u16_to_be(uint8_t* buf, int val)
 {
-	buf[0] = (u8) (val >> 8);
-	buf[1] = (u8) (val >> 0);
+	buf[0] = (uint8_t) (val >> 8);
+	buf[1] = (uint8_t) (val >> 0);
 }
 
+#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"
+
+typedef CYG_ADDRWORD intptr_t;
+typedef int64_t intmax_t;
+typedef uint64_t uintmax_t;
+#define INT8_MAX 0x7f
+#define INT8_MIN (-INT8_MAX - 1)
+# define UINT8_MAX		(255)
+#define INT16_MAX 0x7fff
+#define INT16_MIN (-INT16_MAX - 1)
+# define UINT16_MAX		(65535)
+#define INT32_MAX 0x7fffffffL
+#define INT32_MIN (-INT32_MAX - 1L)
+# define UINT32_MAX		(4294967295U)
+#define INT64_MAX 0x7fffffffffffffffLL
+#define INT64_MIN (-INT64_MAX - 1LL)
+#define UINT64_MAX (__CONCAT(INT64_MAX, U) * 2ULL + 1ULL)
+
+
+/* C99, eCos is C90 compliant (with bits of C99) */
+#define isblank(c) ((c) == ' ' || (c) == '\t')
+
+
+#endif
+
 #endif /* TYPES_H */