Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa0effbd authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

cris: introduce asm/swab.h 



Adjust the arch overrides to the new names as well.

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5bf431fa

arch/cris/include/arch-v10/arch/byteorder.h→arch/cris/include/arch-v10/arch/swab.h

+10 −6
Original line number Diff line number Diff line 
#ifndef _CRIS_ARCH_BYTEORDER_H

#define _CRIS_ARCH_BYTEORDER_H

#ifndef _CRIS_ARCH_SWAB_H

#define _CRIS_ARCH_SWAB_H



#include <asm/types.h>

#include <linux/compiler.h>



#define __SWAB_64_THRU_32__



/* we just define these two (as we can do the swap in a single

 * asm instruction in CRIS) and the arch-independent files will put

 * 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

arch/cris/include/arch-v32/arch/byteorder.h→arch/cris/include/arch-v32/arch/swab.h

+24 −0
Original line number Diff line number Diff line 
#ifndef _ASM_CRIS_ARCH_BYTEORDER_H

#define _ASM_CRIS_ARCH_BYTEORDER_H

#ifndef _ASM_CRIS_ARCH_SWAB_H

#define _ASM_CRIS_ARCH_SWAB_H



#include <asm/types.h>



#define __SWAB_64_THRU_32__



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 */
 
#endif /* _ASM_CRIS_ARCH_SWAB_H */

arch/cris/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -9,3 +9,4 @@ header-y += sync_serial.h 


unifdef-y += etraxgpio.h

unifdef-y += rs485.h

unifdef-y += swab.h

arch/cris/include/asm/byteorder.h

+1 −19
Original line number Diff line number Diff line 
#ifndef _CRIS_BYTEORDER_H

#define _CRIS_BYTEORDER_H



#ifdef __GNUC__



#ifdef __KERNEL__

#include <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 <asm/swab.h>

#include <linux/byteorder/little_endian.h>



#endif

arch/cris/include/asm/swab.h

0 → 100644
+8 −0
Original line number Diff line number Diff line 
#ifndef _CRIS_SWAB_H

#define _CRIS_SWAB_H



#ifdef __KERNEL__

#include <arch/swab.h>

#endif /* __KERNEL__ */



#endif /* _CRIS_SWAB_H */