X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Ftypes.h;h=6866f560d5c1813347fa245f1f52fd880d79c0e5;hp=8f6283b57bdd8878a8c4b5dfddfb6e45568f6f17;hb=00ba179dbc1861bf51a67565abd4fa687831573f;hpb=a94748ec6da9bdc6e25a7f73bbea723b8b55fa33

diff --git a/src/helper/types.h b/src/helper/types.h
index 8f6283b57b..6866f560d5 100644
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -60,6 +60,16 @@ typedef bool _Bool;
 #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.
@@ -70,13 +80,13 @@ typedef bool _Bool;
  */
 #define container_of(ptr, type, member) ({			\
 	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
-	(type *)( (char *)__mptr - offsetof(type,member) );})
+	(type *)( (void *) ( (char *)__mptr - offsetof(type,member) ) );})
 
 
 /**
  * Rounds @c m up to the nearest multiple of @c n using division.
- * @params m The value to round up to @c n.
- * @params n Round @c m up to a multiple of this number.
+ * @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))
@@ -106,6 +116,11 @@ static inline uint32_t le_to_h_u32(const uint8_t* buf)
 	return (uint32_t)(buf[0] | buf[1] << 8 | buf[2] << 16 | buf[3] << 24);
 }
 
+static inline uint32_t le_to_h_u24(const uint8_t* buf)
+{
+	return (uint32_t)(buf[0] | buf[1] << 8 | buf[2] << 16);
+}
+
 static inline uint16_t le_to_h_u16(const uint8_t* buf)
 {
 	return (uint16_t)(buf[0] | buf[1] << 8);
@@ -116,6 +131,11 @@ static inline uint32_t be_to_h_u32(const uint8_t* buf)
 	return (uint32_t)(buf[3] | buf[2] << 8 | buf[1] << 16 | buf[0] << 24);
 }
 
+static inline uint32_t be_to_h_u24(const uint8_t* buf)
+{
+	return (uint32_t)(buf[2] | buf[1] << 8 | buf[0] << 16);
+}
+
 static inline uint16_t be_to_h_u16(const uint8_t* buf)
 {
 	return (uint16_t)(buf[1] | buf[0] << 8);
@@ -137,6 +157,20 @@ static inline void h_u32_to_be(uint8_t* buf, int val)
 	buf[3] = (uint8_t) (val >> 0);
 }
 
+static inline void h_u24_to_le(uint8_t* buf, int val)
+{
+	buf[2] = (uint8_t) (val >> 16);
+	buf[1] = (uint8_t) (val >> 8);
+	buf[0] = (uint8_t) (val >> 0);
+}
+
+static inline void h_u24_to_be(uint8_t* buf, int val)
+{
+	buf[0] = (uint8_t) (val >> 16);
+	buf[1] = (uint8_t) (val >> 8);
+	buf[2] = (uint8_t) (val >> 0);
+}
+
 static inline void h_u16_to_le(uint8_t* buf, int val)
 {
 	buf[1] = (uint8_t) (val >> 8);
@@ -162,6 +196,9 @@ static inline void h_u16_to_be(uint8_t* buf, int val)
 #define SCNx32 "x"
 #define PRIi32 "i"
 #define PRIu32 "u"
+#define PRId8 PRId32
+#define SCNx64 "llx"
+#define PRIx64 "llx"
 
 typedef CYG_ADDRWORD intptr_t;
 typedef int64_t intmax_t;
@@ -180,11 +217,11 @@ typedef uint64_t uintmax_t;
 #define UINT64_MAX (__CONCAT(INT64_MAX, U) * 2ULL + 1ULL)
 #endif
 
-    #ifndef LLONG_MAX
+	#ifndef LLONG_MAX
 	#define ULLONG_MAX	UINT64_C(0xFFFFFFFFFFFFFFFF)
 	#define LLONG_MAX	INT64_C(0x7FFFFFFFFFFFFFFF)
 	#define LLONG_MIN	ULLONG_MAX
-    #endif
+	#endif
 
 
 #define ULLONG_MAX 18446744073709551615