diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2009-01-06 17:56:34 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 21:10:29 -0500 |
commit | 5cbd04ae36fcb8fd1f38c71dacbbe59f3166f074 (patch) | |
tree | 906fc16e7341526dc232fea1021d2154d5ed74ea | |
parent | 919594765dcf803017b2227425c1b27b5ea537be (diff) |
mn10300: introduce asm/swab.h
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/asm-mn10300/Kbuild | 1 | ||||
-rw-r--r-- | include/asm-mn10300/byteorder.h | 41 | ||||
-rw-r--r-- | include/asm-mn10300/swab.h | 42 |
3 files changed, 44 insertions, 40 deletions
diff --git a/include/asm-mn10300/Kbuild b/include/asm-mn10300/Kbuild index c68e1680da01..27b108a86b39 100644 --- a/include/asm-mn10300/Kbuild +++ b/include/asm-mn10300/Kbuild | |||
@@ -1 +1,2 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | unifdef-y += swab.h | ||
diff --git a/include/asm-mn10300/byteorder.h b/include/asm-mn10300/byteorder.h index 3c993cc625f8..45b18ded19e6 100644 --- a/include/asm-mn10300/byteorder.h +++ b/include/asm-mn10300/byteorder.h | |||
@@ -1,46 +1,7 @@ | |||
1 | /* MN10300 Byte-order primitive construction | ||
2 | * | ||
3 | * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. | ||
4 | * Written by David Howells (dhowells@redhat.com) | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public Licence | ||
8 | * as published by the Free Software Foundation; either version | ||
9 | * 2 of the Licence, or (at your option) any later version. | ||
10 | */ | ||
11 | #ifndef _ASM_BYTEORDER_H | 1 | #ifndef _ASM_BYTEORDER_H |
12 | #define _ASM_BYTEORDER_H | 2 | #define _ASM_BYTEORDER_H |
13 | 3 | ||
14 | #include <asm/types.h> | 4 | #include <asm/swab.h> |
15 | |||
16 | #ifdef __GNUC__ | ||
17 | |||
18 | static inline __attribute__((const)) | ||
19 | __u32 ___arch__swab32(__u32 x) | ||
20 | { | ||
21 | __u32 ret; | ||
22 | asm("swap %1,%0" : "=r" (ret) : "r" (x)); | ||
23 | return ret; | ||
24 | } | ||
25 | |||
26 | static inline __attribute__((const)) | ||
27 | __u16 ___arch__swab16(__u16 x) | ||
28 | { | ||
29 | __u16 ret; | ||
30 | asm("swaph %1,%0" : "=r" (ret) : "r" (x)); | ||
31 | return ret; | ||
32 | } | ||
33 | |||
34 | #define __arch__swab32(x) ___arch__swab32(x) | ||
35 | #define __arch__swab16(x) ___arch__swab16(x) | ||
36 | |||
37 | #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) | ||
38 | # define __BYTEORDER_HAS_U64__ | ||
39 | # define __SWAB_64_THRU_32__ | ||
40 | #endif | ||
41 | |||
42 | #endif /* __GNUC__ */ | ||
43 | |||
44 | #include <linux/byteorder/little_endian.h> | 5 | #include <linux/byteorder/little_endian.h> |
45 | 6 | ||
46 | #endif /* _ASM_BYTEORDER_H */ | 7 | #endif /* _ASM_BYTEORDER_H */ |
diff --git a/include/asm-mn10300/swab.h b/include/asm-mn10300/swab.h new file mode 100644 index 000000000000..4504d1b4b477 --- /dev/null +++ b/include/asm-mn10300/swab.h | |||
@@ -0,0 +1,42 @@ | |||
1 | /* MN10300 Byte-order primitive construction | ||
2 | * | ||
3 | * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. | ||
4 | * Written by David Howells (dhowells@redhat.com) | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public Licence | ||
8 | * as published by the Free Software Foundation; either version | ||
9 | * 2 of the Licence, or (at your option) any later version. | ||
10 | */ | ||
11 | #ifndef _ASM_SWAB_H | ||
12 | #define _ASM_SWAB_H | ||
13 | |||
14 | #include <asm/types.h> | ||
15 | |||
16 | #ifdef __GNUC__ | ||
17 | |||
18 | static inline __attribute__((const)) | ||
19 | __u32 __arch_swab32(__u32 x) | ||
20 | { | ||
21 | __u32 ret; | ||
22 | asm("swap %1,%0" : "=r" (ret) : "r" (x)); | ||
23 | return ret; | ||
24 | } | ||
25 | #define __arch_swab32 __arch_swab32 | ||
26 | |||
27 | static inline __attribute__((const)) | ||
28 | __u16 __arch_swab16(__u16 x) | ||
29 | { | ||
30 | __u16 ret; | ||
31 | asm("swaph %1,%0" : "=r" (ret) : "r" (x)); | ||
32 | return ret; | ||
33 | } | ||
34 | #define __arch_swab32 __arch_swab32 | ||
35 | |||
36 | #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) | ||
37 | # define __SWAB_64_THRU_32__ | ||
38 | #endif | ||
39 | |||
40 | #endif /* __GNUC__ */ | ||
41 | |||
42 | #endif /* _ASM_SWAB_H */ | ||