From 158dd5527cff6864a0de42a65902a9d07f7d8b47 Mon Sep 17 00:00:00 2001 From: Sol Boucher Date: Thu, 7 May 2015 21:00:05 -0700 Subject: cbfstool: move bit swapping macros to swab.h Change-Id: Id22232c45225011951e01c370e0f473af574d758 Signed-off-by: Sol Boucher Signed-off-by: Patrick Georgi Original-Change-Id: I1a117a9473e895feaf455bb30d0f945f57de51eb Original-Signed-off-by: Sol Boucher Reviewed-on: http://review.coreboot.org/10929 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- util/cbfstool/common.h | 9 --------- util/cbfstool/swab.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h index 06ee00b39b..5fb19065df 100644 --- a/util/cbfstool/common.h +++ b/util/cbfstool/common.h @@ -28,15 +28,6 @@ /* Endianess */ #include "swab.h" -#if !defined(__APPLE__) && !defined(__NetBSD__) -#define ntohl(x) (is_big_endian() ? (uint32_t)(x) : swab32(x)) -#define htonl(x) (is_big_endian() ? (uint32_t)(x) : swab32(x)) -#elif defined(__NetBSD__) -#include -#endif -#define ntohll(x) (is_big_endian() ? (uint64_t)(x) : swab64(x)) -#define htonll(x) (is_big_endian() ? (uint64_t)(x) : swab64(x)) -int is_big_endian(void); /* Message output */ extern int verbose; diff --git a/util/cbfstool/swab.h b/util/cbfstool/swab.h index c5e43709a6..22ae8b41b8 100644 --- a/util/cbfstool/swab.h +++ b/util/cbfstool/swab.h @@ -15,6 +15,15 @@ * */ +#if !defined(__APPLE__) && !defined(__NetBSD__) +#define ntohl(x) (is_big_endian() ? (uint32_t)(x) : swab32(x)) +#define htonl(x) (is_big_endian() ? (uint32_t)(x) : swab32(x)) +#elif defined(__NetBSD__) +#include +#endif +#define ntohll(x) (is_big_endian() ? (uint64_t)(x) : swab64(x)) +#define htonll(x) (is_big_endian() ? (uint64_t)(x) : swab64(x)) + /* casts are necessary for constants, because we never know how for sure * how U/UL/ULL map to __u16, __u32, __u64. At least not in a portable way. */ @@ -41,4 +50,7 @@ (((uint64_t)(x) & (uint64_t)0x00ff000000000000ULL) >> 40) | \ (((uint64_t)(x) & (uint64_t)0xff00000000000000ULL) >> 56) )) +/* common.c */ +int is_big_endian(void); + #endif /* _SWAB_H */ -- cgit v1.2.3