Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sh: use the new byteorder headers.

Browse source 
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Harvey Harrison 2008-10-31 16:01:22 +09:00 committed by Paul Mundt
parent ddb72b0241
commit 1406266732
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
arch/sh/include/asm/byteorder.h
View file

@ -8,7 +8,15 @@
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/types.h> #include <linux/types.h>
static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) #ifdef __LITTLE_ENDIAN__
# define __LITTLE_ENDIAN
#else
# define __BIG_ENDIAN
#endif
#define __SWAB_64_THRU_32__
static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
{ {
__asm__( __asm__(
#ifdef __SH5__ #ifdef __SH5__
@ -24,8 +32,9 @@ static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
return 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__( __asm__(
#ifdef __SH5__ #ifdef __SH5__
@ -39,32 +48,21 @@ static inline __attribute_const__ __u16 ___arch__swab16(__u16 x)
return x; return x;
} }
#define __arch_swab16 __arch_swab16
static inline __u64 ___arch__swab64(__u64 val) static inline __u64 __arch_swab64(__u64 val)
{ {
union { union {
struct { __u32 a,b; } s; struct { __u32 a,b; } s;
__u64 u; __u64 u;
} v, w; } v, w;
v.u = val; v.u = val;
w.s.b = ___arch__swab32(v.s.a); w.s.b = __arch_swab32(v.s.a);
w.s.a = ___arch__swab32(v.s.b); w.s.a = __arch_swab32(v.s.b);
return w.u; return w.u;
} }
#define __arch_swab64 __arch_swab64
#define __arch__swab64(x) ___arch__swab64(x) #include <linux/byteorder.h>
#define __arch__swab32(x) ___arch__swab32(x)
#define __arch__swab16(x) ___arch__swab16(x)
#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
# define __BYTEORDER_HAS_U64__
# define __SWAB_64_THRU_32__
#endif
#ifdef __LITTLE_ENDIAN__
#include <linux/byteorder/little_endian.h>
#else
#include <linux/byteorder/big_endian.h>
#endif
#endif /* __ASM_SH_BYTEORDER_H */ #endif /* __ASM_SH_BYTEORDER_H */