X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=utils.h;h=9688a6a42e4f53906f959d9743ae6576ec9a56bf;hp=03cecb0bd89e9eec7594600c84877ee938be4dbd;hb=13b5c1d4ca488575ee3dd4726b669f768fad8ffa;hpb=d01922625d21f97fcab757d0299586178333f1e0 diff --git a/utils.h b/utils.h index 03cecb0..9688a6a 100644 --- a/utils.h +++ b/utils.h @@ -22,6 +22,7 @@ #include #include #include +#include #include /* @@ -99,7 +100,10 @@ void clock_gettime(int type, struct timespec *tv); #define __LITTLE_ENDIAN LITTLE_ENDIAN #endif -#define __u_bswap16(x) ((uint16_t)((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8))) +static inline uint16_t __u_bswap16(uint16_t val) +{ + return ((val >> 8) & 0xffu) | ((val & 0xffu) << 8); +} #if _GNUC_MIN_VER(4, 2) #define __u_bswap32(x) __builtin_bswap32(x) @@ -113,11 +117,11 @@ void clock_gettime(int type, struct timespec *tv); #define cpu_to_be64(x) __u_bswap64(x) #define cpu_to_be32(x) __u_bswap32(x) -#define cpu_to_be16(x) __u_bswap16((uint16_t) x) +#define cpu_to_be16(x) __u_bswap16((uint16_t) (x)) #define be64_to_cpu(x) __u_bswap64(x) #define be32_to_cpu(x) __u_bswap32(x) -#define be16_to_cpu(x) __u_bswap16((uint16_t) x) +#define be16_to_cpu(x) __u_bswap16((uint16_t) (x)) #define cpu_to_le64(x) (x) #define cpu_to_le32(x) (x) @@ -131,11 +135,11 @@ void clock_gettime(int type, struct timespec *tv); #define cpu_to_le64(x) __u_bswap64(x) #define cpu_to_le32(x) __u_bswap32(x) -#define cpu_to_le16(x) __u_bswap16((uint16_t) x) +#define cpu_to_le16(x) __u_bswap16((uint16_t) (x)) #define le64_to_cpu(x) __u_bswap64(x) #define le32_to_cpu(x) __u_bswap32(x) -#define le16_to_cpu(x) __u_bswap16((uint16_t) x) +#define le16_to_cpu(x) __u_bswap16((uint16_t) (x)) #define cpu_to_be64(x) (x) #define cpu_to_be32(x) (x) @@ -151,4 +155,28 @@ void clock_gettime(int type, struct timespec *tv); #define __packed __attribute__((packed)) #endif +#ifndef __constructor +#define __constructor __attribute__((constructor)) +#endif + +#ifndef __hidden +#define __hidden __attribute__((visibility("hidden"))) +#endif + +#ifndef BITS_PER_LONG +#define BITS_PER_LONG (8 * sizeof(unsigned long)) +#endif + +#define BITFIELD_SIZE(_n) (((_n) + (BITS_PER_LONG - 1)) / BITS_PER_LONG) + +static inline void bitfield_set(unsigned long *bits, int bit) +{ + bits[bit / BITS_PER_LONG] |= (1UL << (bit % BITS_PER_LONG)); +} + +static inline bool bitfield_test(unsigned long *bits, int bit) +{ + return !!(bits[bit / BITS_PER_LONG] & (1UL << (bit % BITS_PER_LONG))); +} + #endif