mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
parisc: use the new byteorder headers
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Cc: Matthew Wilcox <willy@debian.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
This commit is contained in:
parent
df8e5bc6b7
commit
d2e6675fff
1 changed files with 12 additions and 25 deletions
|
@ -4,9 +4,10 @@
|
|||
#include <asm/types.h>
|
||||
#include <linux/compiler.h>
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define __BIG_ENDIAN
|
||||
#define __SWAB_64_THRU_32__
|
||||
|
||||
static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
|
||||
static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
|
||||
{
|
||||
__asm__("dep %0, 15, 8, %0\n\t" /* deposit 00ab -> 0bab */
|
||||
"shd %%r0, %0, 8, %0" /* shift 000000ab -> 00ba */
|
||||
|
@ -14,8 +15,9 @@ static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
|
|||
: "0" (x));
|
||||
return x;
|
||||
}
|
||||
#define __arch_swab16 __arch_swab16
|
||||
|
||||
static __inline__ __attribute_const__ __u32 ___arch__swab24(__u32 x)
|
||||
static inline __attribute_const__ __u32 __arch_swab24(__u32 x)
|
||||
{
|
||||
__asm__("shd %0, %0, 8, %0\n\t" /* shift xabcxabc -> cxab */
|
||||
"dep %0, 15, 8, %0\n\t" /* deposit cxab -> cbab */
|
||||
|
@ -25,7 +27,7 @@ static __inline__ __attribute_const__ __u32 ___arch__swab24(__u32 x)
|
|||
return x;
|
||||
}
|
||||
|
||||
static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
|
||||
static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
|
||||
{
|
||||
unsigned int temp;
|
||||
__asm__("shd %0, %0, 16, %1\n\t" /* shift abcdabcd -> cdab */
|
||||
|
@ -35,7 +37,7 @@ static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
|
|||
: "0" (x));
|
||||
return x;
|
||||
}
|
||||
|
||||
#define __arch_swab32 __arch_swab32
|
||||
|
||||
#if BITS_PER_LONG > 32
|
||||
/*
|
||||
|
@ -48,7 +50,8 @@ static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
|
|||
** HSHR 67452301 -> *6*4*2*0 into %0
|
||||
** OR %0 | %1 -> 76543210 into %0 (all done!)
|
||||
*/
|
||||
static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x) {
|
||||
static inline __attribute_const__ __u64 __arch_swab64(__u64 x)
|
||||
{
|
||||
__u64 temp;
|
||||
__asm__("permh,3210 %0, %0\n\t"
|
||||
"hshl %0, 8, %1\n\t"
|
||||
|
@ -58,25 +61,9 @@ static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x) {
|
|||
: "0" (x));
|
||||
return x;
|
||||
}
|
||||
#define __arch__swab64(x) ___arch__swab64(x)
|
||||
#define __BYTEORDER_HAS_U64__
|
||||
#elif !defined(__STRICT_ANSI__)
|
||||
static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x)
|
||||
{
|
||||
__u32 t1 = ___arch__swab32((__u32) x);
|
||||
__u32 t2 = ___arch__swab32((__u32) (x >> 32));
|
||||
return (((__u64) t1 << 32) | t2);
|
||||
}
|
||||
#define __arch__swab64(x) ___arch__swab64(x)
|
||||
#define __BYTEORDER_HAS_U64__
|
||||
#endif
|
||||
#define __arch_swab64 __arch_swab64
|
||||
#endif /* BITS_PER_LONG > 32 */
|
||||
|
||||
#define __arch__swab16(x) ___arch__swab16(x)
|
||||
#define __arch__swab24(x) ___arch__swab24(x)
|
||||
#define __arch__swab32(x) ___arch__swab32(x)
|
||||
|
||||
#endif /* __GNUC__ */
|
||||
|
||||
#include <linux/byteorder/big_endian.h>
|
||||
#include <linux/byteorder.h>
|
||||
|
||||
#endif /* _PARISC_BYTEORDER_H */
|
||||
|
|
Loading…
Reference in a new issue