Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-30 23:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

avr32: use the new byteorder headers

Browse Source 
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
[haavard.skinnemoen@atmel.com: fix <mach/io.h> build breakage]
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
This commit is contained in:
Harvey Harrison 2008-08-12 17:26:35 -07:00 committed by Haavard Skinnemoen
parent 72d31053f6
commit f3c450be7b
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arch/avr32/include/asm/byteorder.h
View File

@ -7,6 +7,9 @@
#include <asm/types.h> #include <asm/types.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#define __BIG_ENDIAN
#define __SWAB_64_THRU_32__
#ifdef __CHECKER__ #ifdef __CHECKER__
extern unsigned long __builtin_bswap_32(unsigned long x); extern unsigned long __builtin_bswap_32(unsigned long x);
extern unsigned short __builtin_bswap_16(unsigned short x); extern unsigned short __builtin_bswap_16(unsigned short x);
@ -17,15 +20,18 @@ extern unsigned short __builtin_bswap_16(unsigned short x);
* the result. * the result.
*/ */
#if !(__GNUC__ == 4 && __GNUC_MINOR__ < 2) #if !(__GNUC__ == 4 && __GNUC_MINOR__ < 2)
#define __arch__swab32(x) __builtin_bswap_32(x) static inline __attribute_const__ __u16 __arch_swab16(__u16 val)
#define __arch__swab16(x) __builtin_bswap_16(x) {
return __builtin_bswap_16(val);
}
#define __arch_swab16 __arch_swab16
static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
{
return __builtin_bswap_32(val);
}
#define __arch_swab32 __arch_swab32
#endif #endif
#if !defined(__STRICT_ANSI__) || defined(__KERNEL__) #include <linux/byteorder.h>
# define __BYTEORDER_HAS_U64__
# define __SWAB_64_THRU_32__
#endif
#include <linux/byteorder/big_endian.h>
#endif /* __ASM_AVR32_BYTEORDER_H */ #endif /* __ASM_AVR32_BYTEORDER_H */

3
arch/avr32/mach-at32ap/include/mach/io.h
View File

@ -1,8 +1,7 @@
#ifndef __ASM_AVR32_ARCH_AT32AP_IO_H #ifndef __ASM_AVR32_ARCH_AT32AP_IO_H
#define __ASM_AVR32_ARCH_AT32AP_IO_H #define __ASM_AVR32_ARCH_AT32AP_IO_H
/* For "bizarre" halfword swapping */ #include <linux/swab.h>
#include <linux/byteorder/swabb.h>
#if defined(CONFIG_AP700X_32_BIT_SMC) #if defined(CONFIG_AP700X_32_BIT_SMC)
# define __swizzle_addr_b(addr) (addr ^ 3UL) # define __swizzle_addr_b(addr) (addr ^ 3UL)