X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Ftypes.h;h=44967bd31a4e967eaaa5e1fd51d6d919c4e1f49d;hp=047f76c2fda4c5970b8e8dd48e046aeeecefafc1;hb=f876d5e9c769a288faa7fd14b7bf373363542aab;hpb=e77ae9096a40707d3b878b46969a60a06656dc06

diff --git a/src/helper/types.h b/src/helper/types.h
index 047f76c2fd..44967bd31a 100644
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -23,16 +23,19 @@
 #ifndef TYPES_H
 #define TYPES_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
 #endif
 
-#ifndef u8
-typedef unsigned char u8;
+#ifndef uint8_t
+typedef unsigned char uint8_t;
 #endif
 
-#ifndef u16
-typedef unsigned short u16;
+#ifndef uint16_t
+typedef unsigned short uint16_t;
 #endif
 
 #ifndef u32
@@ -50,14 +53,19 @@ typedef struct jtag_tap_s jtag_tap_t;
 #else	/* HAVE_STDBOOL_H */
 #define __bool_true_false_are_defined 1
 
+#ifndef HAVE__BOOL
 #ifndef __cplusplus
 
 #define false	0
 #define true		1
 
-#define bool		_Bool
 typedef int _Bool;
+#else
+typedef bool _Bool;
 #endif	/* __cplusplus */
+#endif	/* HAVE__BOOL */
+
+#define bool _Bool
 
 #endif	/* HAVE_STDBOOL_H */
 
@@ -80,52 +88,76 @@ typedef int _Bool;
  */
 
 
-static inline u32 le_to_h_u32(const u8* buf)
+static inline u32 le_to_h_u32(const uint8_t* buf)
 {
 	return (u32)(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 u32 be_to_h_u32(const uint8_t* buf)
 {
 	return (u32)(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 this definition... */
+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)
+
+
+
+
+#endif
+
 #endif /* TYPES_H */