improve str_to_buf and buf_to_str helpers

[openocd] / src / helper / types.h

diff --git a/src/helper/types.h b/src/helper/types.h
index 11b97f61e9f0b8f9b488b2732ac0ae10006602fd..79eac13ae7df8796a436086ade7ffcccb0037a7a 100644 (file)
--- 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  *
@@ -29,8 +29,9 @@
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
-
-typedef struct jtag_tap_s jtag_tap_t;
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
 
 #ifdef HAVE_STDBOOL_H
 #include <stdbool.h>
@@ -53,6 +54,10 @@ typedef bool _Bool;
 
 #endif /* HAVE_STDBOOL_H */
 
+/// turns a macro argument into a string constant
+#define stringify(s) __stringify(s)
+#define __stringify(s) #s
+
 /* DANGER!!!! here be dragons!
  *
  * Leave these fn's as byte accesses because it is safe
@@ -120,9 +125,20 @@ 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"
+#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;
@@ -138,8 +154,19 @@ 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')
 
 
 #endif