* 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 *
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
-
-#ifndef u8
-typedef unsigned char u8;
-#endif
-
-#ifndef u16
-typedef unsigned short u16;
-#endif
-
-#ifndef u32
-typedef unsigned int u32;
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
#endif
-#ifndef u64
-typedef unsigned long long u64;
-#endif
-
-typedef struct jtag_tap_s jtag_tap_t;
-
#ifdef HAVE_STDBOOL_H
#include <stdbool.h>
#else /* HAVE_STDBOOL_H */
#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
*/
-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 this definition... */
+#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"
+
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
+
+ #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
#endif /* TYPES_H */