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

diff --git a/src/helper/types.h b/src/helper/types.h
index 21a6a33763..03ab5f0c2e 100644
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -23,6 +23,7 @@
 #ifndef TYPES_H
 #define TYPES_H
 
+#include <stddef.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -33,8 +34,6 @@
 #include <inttypes.h>
 #endif
 
-typedef struct jtag_tap_s jtag_tap_t;
-
 #ifdef HAVE_STDBOOL_H
 #include <stdbool.h>
 #else	/* HAVE_STDBOOL_H */
@@ -56,6 +55,43 @@ typedef bool _Bool;
 
 #endif	/* HAVE_STDBOOL_H */
 
+/// turns a macro argument into a string constant
+#define stringify(s) __stringify(s)
+#define __stringify(s) #s
+
+
+/**
+ * Compute the number of elements of a variable length array.
+ * <code>
+ * const char *strs[] = { "a", "b", "c" };
+ * unsigned num_strs = ARRAY_SIZE(strs);
+ * </code>
+ */
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
+
+
+/**
+ * Cast a member of a structure out to the containing structure.
+ * @param ptr The pointer to the member.
+ * @param type The type of the container struct this is embedded in.
+ * @param member The name of the member within the struct.
+ *
+ * This is a mechanism which is used throughout the Linux kernel.
+ */
+#define container_of(ptr, type, member) ({			\
+	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
+	(type *)( (char *)__mptr - offsetof(type,member) );})
+
+
+/**
+ * Rounds @c m up to the nearest multiple of @c n using division.
+ * @param m The value to round up to @c n.
+ * @param n Round @c m up to a multiple of this number.
+ * @returns The rounded integer value.
+ */
+#define DIV_ROUND_UP(m, n)	(((m) + (n) - 1) / (n))
+
+
 /* DANGER!!!! here be dragons!
  *
  * Leave these fn's as byte accesses because it is safe
@@ -123,13 +159,14 @@ static inline void h_u16_to_be(uint8_t* buf, int val)
 	buf[1] = (uint8_t) (val >> 0);
 }
 
-#ifdef __ECOS
+#if defined(__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.
  */
 
-
+#if !defined(_STDINT_H)
 #define PRIx32 "x"
 #define PRId32 "d"
 #define SCNx32 "x"
@@ -151,7 +188,16 @@ typedef uint64_t uintmax_t;
 #define INT64_MAX 0x7fffffffffffffffLL
 #define INT64_MIN (-INT64_MAX - 1LL)
 #define UINT64_MAX (__CONCAT(INT64_MAX, U) * 2ULL + 1ULL)
+#endif
+
+    #ifndef LLONG_MAX
+	#define ULLONG_MAX	UINT64_C(0xFFFFFFFFFFFFFFFF)
+	#define LLONG_MAX	INT64_C(0x7FFFFFFFFFFFFFFF)
+	#define LLONG_MIN	ULLONG_MAX
+    #endif
+
 
+#define ULLONG_MAX 18446744073709551615
 
 /* C99, eCos is C90 compliant (with bits of C99) */
 #define isblank(c) ((c) == ' ' || (c) == '\t')