From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Vrabel Subject: [PATCH 2/8] libfdt: fixup libfdt_env.h for xen Date: Fri, 10 Feb 2012 13:03:38 +0000 Message-ID: <1328879024-5621-3-git-send-email-david.vrabel@citrix.com> References: <1328879024-5621-1-git-send-email-david.vrabel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1328879024-5621-1-git-send-email-david.vrabel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: David Vrabel List-Id: xen-devel@lists.xenproject.org From: David Vrabel Signed-off-by: David Vrabel --- xen/common/libfdt/libfdt_env.h | 27 ++++++++++----------------- xen/include/xen/types.h | 2 ++ 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/xen/common/libfdt/libfdt_env.h b/xen/common/libfdt/libfdt_env.h index 449bf60..8c0c030 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 -#include -#include +#include +#include +#include +#include -#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 */ diff --git a/xen/include/xen/types.h b/xen/include/xen/types.h index ac96647..8596ded 100644 --- a/xen/include/xen/types.h +++ b/xen/include/xen/types.h @@ -57,4 +57,6 @@ typedef __u32 __be32; typedef __u64 __le64; typedef __u64 __be64; +typedef unsigned long uintptr_t; + #endif /* __TYPES_H__ */ -- 1.7.2.5