-#define le_to_h_u32(x) ((u32)((x)[0] | (x)[1] << 8 | (x)[2] << 16 | (x)[3] << 24))
-#define le_to_h_u16(x) ((u16)((x)[0] | (x)[1] << 8))
-#define be_to_h_u32(x) ((u32)((x)[3] | (x)[2] << 8 | (x)[1] << 16 | (x)[0] << 24))
-#define be_to_h_u16(x) ((u16)((x)[1] | (x)[0] << 8))
-
-#define h_u32_to_le(buf, val) do {\
- (buf)[3] = ((val) & 0xff000000) >> 24;\
- (buf)[2] = ((val) & 0x00ff0000) >> 16;\
- (buf)[1] = ((val) & 0x0000ff00) >> 8;\
- (buf)[0] = ((val) & 0x000000ff);\
-} while (0)
-#define h_u32_to_be(buf, val) do {\
- (buf)[0] = ((val) & 0xff000000) >> 24;\
- (buf)[1] = ((val) & 0x00ff0000) >> 16;\
- (buf)[2] = ((val) & 0x0000ff00) >> 8;\
- (buf)[3] = ((val) & 0x000000ff);\
-} while (0)
-
-#define h_u16_to_le(buf, val) do {\
- (buf)[1] = ((val) & 0xff00) >> 8;\
- (buf)[0] = ((val) & 0x00ff) >> 0;\
-} while (0)
-#define h_u16_to_be(buf, val) do {\
- (buf)[0] = ((val) & 0xff00) >> 8;\
- (buf)[1] = ((val) & 0x00ff) >> 0;\
-} while (0)
+
+
+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 uint16_t le_to_h_u16(const uint8_t* buf)
+{
+ return (uint16_t)(buf[0] | buf[1] << 8);
+}
+
+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 uint16_t be_to_h_u16(const uint8_t* buf)
+{
+ return (uint16_t)(buf[1] | buf[0] << 8);
+}
+
+static inline void h_u32_to_le(uint8_t* buf, int val)
+{
+ 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(uint8_t* buf, int val)
+{
+ 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(uint8_t* buf, int val)
+{
+ buf[1] = (uint8_t) (val >> 8);
+ buf[0] = (uint8_t) (val >> 0);
+}
+
+static inline void h_u16_to_be(uint8_t* buf, int val)
+{
+ buf[0] = (uint8_t) (val >> 8);
+ buf[1] = (uint8_t) (val >> 0);
+}
+
+#ifdef __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.
+ */
+
+
+#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)
+
+#define ULLONG_MAX 18446744073709551615
+
+/* C99, eCos is C90 compliant (with bits of C99) */
+#define isblank(c) ((c) == ' ' || (c) == '\t')
+
+
+#endif