diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-02-12 00:46:41 +0400 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-02-12 00:46:41 +0400 |
commit | 5ad190fccfc01fcc6f68d9eefe5ea0df718c6006 (patch) | |
tree | d3341bb47fd3dec052a40590d0b0a6121e462a67 /blob.h | |
parent | 4ab499899ce2ed884a1235ada501c39e355911e7 (diff) |
utils: move endian swap helpers and __packed definition to utils.h
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Diffstat (limited to 'blob.h')
-rw-r--r-- | blob.h | 58 |
1 files changed, 1 insertions, 57 deletions
@@ -26,59 +26,7 @@ #include <stdio.h> #include <errno.h> -#if defined(__linux__) || defined(__CYGWIN__) -#include <byteswap.h> -#include <endian.h> - -#elif defined(__APPLE__) -#include <machine/endian.h> -#include <machine/byte_order.h> -#define bswap_16(x) OSSwapInt16(x) -#define bswap_32(x) OSSwapInt32(x) -#define bswap_64(x) OSSwapInt64(x) -#elif defined(__FreeBSD__) -#include <sys/endian.h> -#define bswap_16(x) bswap16(x) -#define bswap_32(x) bswap32(x) -#define bswap_64(x) bswap64(x) -#else -#include <machine/endian.h> -#define bswap_16(x) swap16(x) -#define bswap_32(x) swap32(x) -#define bswap_64(x) swap64(x) -#endif - -#ifndef __BYTE_ORDER -#define __BYTE_ORDER BYTE_ORDER -#endif -#ifndef __BIG_ENDIAN -#define __BIG_ENDIAN BIG_ENDIAN -#endif -#ifndef __LITTLE_ENDIAN -#define __LITTLE_ENDIAN LITTLE_ENDIAN -#endif - -#if __BYTE_ORDER == __LITTLE_ENDIAN - -#define cpu_to_be64(x) bswap_64(x) -#define cpu_to_be32(x) bswap_32(x) -#define cpu_to_be16(x) bswap_16(x) - -#define be64_to_cpu(x) bswap_64(x) -#define be32_to_cpu(x) bswap_32(x) -#define be16_to_cpu(x) bswap_16(x) - -#else - -#define cpu_to_be64(x) (x) -#define cpu_to_be32(x) (x) -#define cpu_to_be16(x) (x) - -#define be64_to_cpu(x) (x) -#define be32_to_cpu(x) (x) -#define be16_to_cpu(x) (x) - -#endif +#include "utils.h" enum { BLOB_ATTR_UNSPEC, @@ -97,10 +45,6 @@ enum { #define BLOB_ATTR_LEN_MASK 0x00ffffff #define BLOB_ATTR_ALIGN 4 -#ifndef __packed -#define __packed __attribute__((packed)) -#endif - struct blob_attr { uint32_t id_len; char data[]; |