iphase: Fix 64bit warning.

[linux-2.6] / include / asm-sh / byteorder.h

diff --git a/include/asm-sh/byteorder.h b/include/asm-sh/byteorder.h
index bff2b1382e01b1eae63c30db2c73e1c533807d4b..4c13e61175632c3dc8f5a60712dda405eb177b66 100644 (file)
--- a/include/asm-sh/byteorder.h
+++ b/include/asm-sh/byteorder.h
@@ -3,40 +3,54 @@
 
 /*
  * Copyright (C) 1999  Niibe Yutaka
+ * Copyright (C) 2000, 2001  Paolo Alberelli
  */
-
-#include <asm/types.h>
 #include <linux/compiler.h>
+#include <linux/types.h>
 
-static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
+static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
 {
-       __asm__("swap.b %0, %0\n\t"
-               "swap.w %0, %0\n\t"
-               "swap.b %0, %0"
+       __asm__(
+#ifdef __SH5__
+               "byterev        %0, %0\n\t"
+               "shari          %0, 32, %0"
+#else
+               "swap.b         %0, %0\n\t"
+               "swap.w         %0, %0\n\t"
+               "swap.b         %0, %0"
+#endif
                : "=r" (x)
                : "0" (x));
+
        return x;
 }
 
-static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
+static inline __attribute_const__ __u16 ___arch__swab16(__u16 x)
 {
-       __asm__("swap.b %0, %0"
+       __asm__(
+#ifdef __SH5__
+               "byterev        %0, %0\n\t"
+               "shari          %0, 32, %0"
+#else
+               "swap.b         %0, %0"
+#endif
                : "=r" (x)
                :  "0" (x));
+
        return x;
 }
 
-static inline __u64 ___arch__swab64(__u64 val) 
-{ 
-       union { 
+static inline __u64 ___arch__swab64(__u64 val)
+{
+       union {
                struct { __u32 a,b; } s;
                __u64 u;
        } v, w;
        v.u = val;
-       w.s.b = ___arch__swab32(v.s.a); 
-       w.s.a = ___arch__swab32(v.s.b); 
-       return w.u;     
-} 
+       w.s.b = ___arch__swab32(v.s.a);
+       w.s.a = ___arch__swab32(v.s.b);
+       return w.u;
+}
 
 #define __arch__swab64(x) ___arch__swab64(x)
 #define __arch__swab32(x) ___arch__swab32(x)