X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fhelper%2Ftypes.h;h=d47fb44ad2d676c5d562efa908378d45621654b3;hb=5c739b148e019d44b60be061585bf177397ceb41;hp=44967bd31a4e967eaaa5e1fd51d6d919c4e1f49d;hpb=f876d5e9c769a288faa7fd14b7bf373363542aab;p=fw%2Fopenocd diff --git a/src/helper/types.h b/src/helper/types.h index 44967bd31..d47fb44ad 100644 --- 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 * @@ -23,31 +23,17 @@ #ifndef TYPES_H #define TYPES_H +#include #ifdef HAVE_SYS_TYPES_H #include #endif #ifdef HAVE_STDINT_H #include #endif - -#ifndef uint8_t -typedef unsigned char uint8_t; -#endif - -#ifndef uint16_t -typedef unsigned short uint16_t; +#ifdef HAVE_INTTYPES_H +#include #endif -#ifndef u32 -typedef unsigned int u32; -#endif - -#ifndef u64 -typedef unsigned long long u64; -#endif - -typedef struct jtag_tap_s jtag_tap_t; - #ifdef HAVE_STDBOOL_H #include #else /* HAVE_STDBOOL_H */ @@ -69,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. + * + * const char *strs[] = { "a", "b", "c" }; + * unsigned num_strs = ARRAY_SIZE(strs); + * + */ +#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 *)( (void *) ( (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 @@ -88,9 +111,14 @@ typedef bool _Bool; */ -static inline u32 le_to_h_u32(const uint8_t* buf) +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 (u32)(buf[0] | buf[1] << 8 | buf[2] << 16 | buf[3] << 24); + return (uint32_t)(buf[0] | buf[1] << 8 | buf[2] << 16); } static inline uint16_t le_to_h_u16(const uint8_t* buf) @@ -98,9 +126,14 @@ static inline uint16_t le_to_h_u16(const uint8_t* buf) return (uint16_t)(buf[0] | buf[1] << 8); } -static inline u32 be_to_h_u32(const uint8_t* buf) +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 (u32)(buf[3] | buf[2] << 8 | buf[1] << 16 | buf[0] << 24); + return (uint32_t)(buf[2] | buf[1] << 8 | buf[0] << 16); } static inline uint16_t be_to_h_u16(const uint8_t* buf) @@ -124,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); @@ -136,9 +183,23 @@ 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" +#define PRId8 PRId32 +#define SCNx64 "llx" +#define PRIx64 "llx" -/* eCos plain lacks this definition... */ typedef CYG_ADDRWORD intptr_t; typedef int64_t intmax_t; typedef uint64_t uintmax_t; @@ -154,8 +215,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