Messages in this thread Patch in this message | | | Subject | [PATCH 06/24] cris: use the new byteorder headers | From | Harvey Harrison <> | Date | Tue, 29 Jul 2008 17:55:20 -0700 |
| |
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> --- include/asm-cris/arch-v10/byteorder.h | 6 ++++-- include/asm-cris/arch-v32/byteorder.h | 6 ++++-- include/asm-cris/byteorder.h | 18 +++--------------- 3 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/include/asm-cris/arch-v10/byteorder.h b/include/asm-cris/arch-v10/byteorder.h index 255b646..d8df864 100644 --- a/include/asm-cris/arch-v10/byteorder.h +++ b/include/asm-cris/arch-v10/byteorder.h @@ -9,18 +9,20 @@ * them together into ntohl etc. */ -static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) +static inline __attribute_const__ __u32 __arch_swab32(__u32 x) { __asm__ ("swapwb %0" : "=r" (x) : "0" (x)); return(x); } +#define __arch_swab32 __arch_swab32 -static inline __attribute_const__ __u16 ___arch__swab16(__u16 x) +static inline __attribute_const__ __u16 __arch_swab16(__u16 x) { __asm__ ("swapb %0" : "=r" (x) : "0" (x)); return(x); } +#define __arch_swab16 __arch_swab16 #endif diff --git a/include/asm-cris/arch-v32/byteorder.h b/include/asm-cris/arch-v32/byteorder.h index 6ef8fb4..fb76087 100644 --- a/include/asm-cris/arch-v32/byteorder.h +++ b/include/asm-cris/arch-v32/byteorder.h @@ -4,17 +4,19 @@ #include <asm/types.h> static inline __const__ __u32 -___arch__swab32(__u32 x) +__arch_swab32(__u32 x) { __asm__ __volatile__ ("swapwb %0" : "=r" (x) : "0" (x)); return (x); } +#define __arch_swab32 __arch_swab32 static inline __const__ __u16 -___arch__swab16(__u16 x) +__arch_swab16(__u16 x) { __asm__ __volatile__ ("swapb %0" : "=r" (x) : "0" (x)); return (x); } +#define __arch_swab16 __arch_swab16 #endif /* _ASM_CRIS_ARCH_BYTEORDER_H */ diff --git a/include/asm-cris/byteorder.h b/include/asm-cris/byteorder.h index 0cd9db1..fb02930 100644 --- a/include/asm-cris/byteorder.h +++ b/include/asm-cris/byteorder.h @@ -1,26 +1,14 @@ #ifndef _CRIS_BYTEORDER_H #define _CRIS_BYTEORDER_H -#ifdef __GNUC__ +#define __LITTLE_ENDIAN +#define __SWAB_64_THRU_32__ #ifdef __KERNEL__ #include <asm/arch/byteorder.h> - -/* defines are necessary because the other files detect the presence - * of a defined __arch_swab32, not an inline - */ -#define __arch__swab32(x) ___arch__swab32(x) -#define __arch__swab16(x) ___arch__swab16(x) -#endif /* __KERNEL__ */ - -#if !defined(__STRICT_ANSI__) || defined(__KERNEL__) -# define __BYTEORDER_HAS_U64__ -# define __SWAB_64_THRU_32__ #endif -#endif /* __GNUC__ */ - -#include <linux/byteorder/little_endian.h> +#include <linux/byteorder.h> #endif -- 1.6.0.rc1.154.ge3fc
| |