diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2012-02-13 13:34:08 +0000 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2012-02-13 13:34:08 +0000 |
| commit | c3436384d0e088f9fb0f79b008c509baa7f6dc2a (patch) | |
| tree | 985e4d30c1895003941bfa342de9adbd771a2907 /xen/common/libfdt | |
| parent | f0ea065580683f85d2256cafac922add3443de81 (diff) | |
| download | xen-c3436384d0e088f9fb0f79b008c509baa7f6dc2a.tar.gz xen-c3436384d0e088f9fb0f79b008c509baa7f6dc2a.tar.bz2 xen-c3436384d0e088f9fb0f79b008c509baa7f6dc2a.zip | |
libfdt: fixup libfdt_env.h for xen
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>
Committed-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/common/libfdt')
| -rw-r--r-- | xen/common/libfdt/libfdt_env.h | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/xen/common/libfdt/libfdt_env.h b/xen/common/libfdt/libfdt_env.h index 449bf602da..8c0c03034b 100644 --- a/xen/common/libfdt/libfdt_env.h +++ b/xen/common/libfdt/libfdt_env.h @@ -1,23 +1,16 @@ #ifndef _LIBFDT_ENV_H #define _LIBFDT_ENV_H -#include <stddef.h> -#include <stdint.h> -#include <string.h> +#include <xen/config.h> +#include <xen/types.h> +#include <xen/string.h> +#include <asm/byteorder.h> -#define _B(n) ((unsigned long long)((uint8_t *)&x)[n]) -static inline uint32_t fdt32_to_cpu(uint32_t x) -{ - return (_B(0) << 24) | (_B(1) << 16) | (_B(2) << 8) | _B(3); -} -#define cpu_to_fdt32(x) fdt32_to_cpu(x) - -static inline uint64_t fdt64_to_cpu(uint64_t x) -{ - return (_B(0) << 56) | (_B(1) << 48) | (_B(2) << 40) | (_B(3) << 32) - | (_B(4) << 24) | (_B(5) << 16) | (_B(6) << 8) | _B(7); -} -#define cpu_to_fdt64(x) fdt64_to_cpu(x) -#undef _B +#define fdt16_to_cpu(x) be16_to_cpu(x) +#define cpu_to_fdt16(x) cpu_to_be16(x) +#define fdt32_to_cpu(x) be32_to_cpu(x) +#define cpu_to_fdt32(x) cpu_to_be32(x) +#define fdt64_to_cpu(x) be64_to_cpu(x) +#define cpu_to_fdt64(x) cpu_to_be64(x) #endif /* _LIBFDT_ENV_H */ |