diff options
author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2013-06-25 21:13:37 -0400 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2013-07-03 10:02:28 -0400 |
commit | b35310627f396efcc25d71fb343b3aa02039d20d (patch) | |
tree | 8e6378e4abf220f884a060877f0249380ceabd55 /tools | |
parent | d2aae8477cd00325bb7c7c7e95be488088900c48 (diff) |
tools/include: use stdint types for user-space byteshift headers
Commit a07f7672d7cf0ff0d6e548a9feb6e0bd016d9c6c added user-space copies
of the byteshift headers to be used by hostprogs, changing e.g. u8 to __u8.
However, in order to cross-compile the kernel from a non-Linux system,
stdint.h types need to be used instead of linux/types.h types.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/include/tools/be_byteshift.h | 34 | ||||
-rw-r--r-- | tools/include/tools/le_byteshift.h | 34 |
2 files changed, 34 insertions, 34 deletions
diff --git a/tools/include/tools/be_byteshift.h b/tools/include/tools/be_byteshift.h index f4912e2668ba..84c17d836578 100644 --- a/tools/include/tools/be_byteshift.h +++ b/tools/include/tools/be_byteshift.h | |||
@@ -1,68 +1,68 @@ | |||
1 | #ifndef _TOOLS_BE_BYTESHIFT_H | 1 | #ifndef _TOOLS_BE_BYTESHIFT_H |
2 | #define _TOOLS_BE_BYTESHIFT_H | 2 | #define _TOOLS_BE_BYTESHIFT_H |
3 | 3 | ||
4 | #include <linux/types.h> | 4 | #include <stdint.h> |
5 | 5 | ||
6 | static inline __u16 __get_unaligned_be16(const __u8 *p) | 6 | static inline uint16_t __get_unaligned_be16(const uint8_t *p) |
7 | { | 7 | { |
8 | return p[0] << 8 | p[1]; | 8 | return p[0] << 8 | p[1]; |
9 | } | 9 | } |
10 | 10 | ||
11 | static inline __u32 __get_unaligned_be32(const __u8 *p) | 11 | static inline uint32_t __get_unaligned_be32(const uint8_t *p) |
12 | { | 12 | { |
13 | return p[0] << 24 | p[1] << 16 | p[2] << 8 | p[3]; | 13 | return p[0] << 24 | p[1] << 16 | p[2] << 8 | p[3]; |
14 | } | 14 | } |
15 | 15 | ||
16 | static inline __u64 __get_unaligned_be64(const __u8 *p) | 16 | static inline uint64_t __get_unaligned_be64(const uint8_t *p) |
17 | { | 17 | { |
18 | return (__u64)__get_unaligned_be32(p) << 32 | | 18 | return (uint64_t)__get_unaligned_be32(p) << 32 | |
19 | __get_unaligned_be32(p + 4); | 19 | __get_unaligned_be32(p + 4); |
20 | } | 20 | } |
21 | 21 | ||
22 | static inline void __put_unaligned_be16(__u16 val, __u8 *p) | 22 | static inline void __put_unaligned_be16(uint16_t val, uint8_t *p) |
23 | { | 23 | { |
24 | *p++ = val >> 8; | 24 | *p++ = val >> 8; |
25 | *p++ = val; | 25 | *p++ = val; |
26 | } | 26 | } |
27 | 27 | ||
28 | static inline void __put_unaligned_be32(__u32 val, __u8 *p) | 28 | static inline void __put_unaligned_be32(uint32_t val, uint8_t *p) |
29 | { | 29 | { |
30 | __put_unaligned_be16(val >> 16, p); | 30 | __put_unaligned_be16(val >> 16, p); |
31 | __put_unaligned_be16(val, p + 2); | 31 | __put_unaligned_be16(val, p + 2); |
32 | } | 32 | } |
33 | 33 | ||
34 | static inline void __put_unaligned_be64(__u64 val, __u8 *p) | 34 | static inline void __put_unaligned_be64(uint64_t val, uint8_t *p) |
35 | { | 35 | { |
36 | __put_unaligned_be32(val >> 32, p); | 36 | __put_unaligned_be32(val >> 32, p); |
37 | __put_unaligned_be32(val, p + 4); | 37 | __put_unaligned_be32(val, p + 4); |
38 | } | 38 | } |
39 | 39 | ||
40 | static inline __u16 get_unaligned_be16(const void *p) | 40 | static inline uint16_t get_unaligned_be16(const void *p) |
41 | { | 41 | { |
42 | return __get_unaligned_be16((const __u8 *)p); | 42 | return __get_unaligned_be16((const uint8_t *)p); |
43 | } | 43 | } |
44 | 44 | ||
45 | static inline __u32 get_unaligned_be32(const void *p) | 45 | static inline uint32_t get_unaligned_be32(const void *p) |
46 | { | 46 | { |
47 | return __get_unaligned_be32((const __u8 *)p); | 47 | return __get_unaligned_be32((const uint8_t *)p); |
48 | } | 48 | } |
49 | 49 | ||
50 | static inline __u64 get_unaligned_be64(const void *p) | 50 | static inline uint64_t get_unaligned_be64(const void *p) |
51 | { | 51 | { |
52 | return __get_unaligned_be64((const __u8 *)p); | 52 | return __get_unaligned_be64((const uint8_t *)p); |
53 | } | 53 | } |
54 | 54 | ||
55 | static inline void put_unaligned_be16(__u16 val, void *p) | 55 | static inline void put_unaligned_be16(uint16_t val, void *p) |
56 | { | 56 | { |
57 | __put_unaligned_be16(val, p); | 57 | __put_unaligned_be16(val, p); |
58 | } | 58 | } |
59 | 59 | ||
60 | static inline void put_unaligned_be32(__u32 val, void *p) | 60 | static inline void put_unaligned_be32(uint32_t val, void *p) |
61 | { | 61 | { |
62 | __put_unaligned_be32(val, p); | 62 | __put_unaligned_be32(val, p); |
63 | } | 63 | } |
64 | 64 | ||
65 | static inline void put_unaligned_be64(__u64 val, void *p) | 65 | static inline void put_unaligned_be64(uint64_t val, void *p) |
66 | { | 66 | { |
67 | __put_unaligned_be64(val, p); | 67 | __put_unaligned_be64(val, p); |
68 | } | 68 | } |
diff --git a/tools/include/tools/le_byteshift.h b/tools/include/tools/le_byteshift.h index c99d45a68bda..8fe9f2488ec7 100644 --- a/tools/include/tools/le_byteshift.h +++ b/tools/include/tools/le_byteshift.h | |||
@@ -1,68 +1,68 @@ | |||
1 | #ifndef _TOOLS_LE_BYTESHIFT_H | 1 | #ifndef _TOOLS_LE_BYTESHIFT_H |
2 | #define _TOOLS_LE_BYTESHIFT_H | 2 | #define _TOOLS_LE_BYTESHIFT_H |
3 | 3 | ||
4 | #include <linux/types.h> | 4 | #include <stdint.h> |
5 | 5 | ||
6 | static inline __u16 __get_unaligned_le16(const __u8 *p) | 6 | static inline uint16_t __get_unaligned_le16(const uint8_t *p) |
7 | { | 7 | { |
8 | return p[0] | p[1] << 8; | 8 | return p[0] | p[1] << 8; |
9 | } | 9 | } |
10 | 10 | ||
11 | static inline __u32 __get_unaligned_le32(const __u8 *p) | 11 | static inline uint32_t __get_unaligned_le32(const uint8_t *p) |
12 | { | 12 | { |
13 | return p[0] | p[1] << 8 | p[2] << 16 | p[3] << 24; | 13 | return p[0] | p[1] << 8 | p[2] << 16 | p[3] << 24; |
14 | } | 14 | } |
15 | 15 | ||
16 | static inline __u64 __get_unaligned_le64(const __u8 *p) | 16 | static inline uint64_t __get_unaligned_le64(const uint8_t *p) |
17 | { | 17 | { |
18 | return (__u64)__get_unaligned_le32(p + 4) << 32 | | 18 | return (uint64_t)__get_unaligned_le32(p + 4) << 32 | |
19 | __get_unaligned_le32(p); | 19 | __get_unaligned_le32(p); |
20 | } | 20 | } |
21 | 21 | ||
22 | static inline void __put_unaligned_le16(__u16 val, __u8 *p) | 22 | static inline void __put_unaligned_le16(uint16_t val, uint8_t *p) |
23 | { | 23 | { |
24 | *p++ = val; | 24 | *p++ = val; |
25 | *p++ = val >> 8; | 25 | *p++ = val >> 8; |
26 | } | 26 | } |
27 | 27 | ||
28 | static inline void __put_unaligned_le32(__u32 val, __u8 *p) | 28 | static inline void __put_unaligned_le32(uint32_t val, uint8_t *p) |
29 | { | 29 | { |
30 | __put_unaligned_le16(val >> 16, p + 2); | 30 | __put_unaligned_le16(val >> 16, p + 2); |
31 | __put_unaligned_le16(val, p); | 31 | __put_unaligned_le16(val, p); |
32 | } | 32 | } |
33 | 33 | ||
34 | static inline void __put_unaligned_le64(__u64 val, __u8 *p) | 34 | static inline void __put_unaligned_le64(uint64_t val, uint8_t *p) |
35 | { | 35 | { |
36 | __put_unaligned_le32(val >> 32, p + 4); | 36 | __put_unaligned_le32(val >> 32, p + 4); |
37 | __put_unaligned_le32(val, p); | 37 | __put_unaligned_le32(val, p); |
38 | } | 38 | } |
39 | 39 | ||
40 | static inline __u16 get_unaligned_le16(const void *p) | 40 | static inline uint16_t get_unaligned_le16(const void *p) |
41 | { | 41 | { |
42 | return __get_unaligned_le16((const __u8 *)p); | 42 | return __get_unaligned_le16((const uint8_t *)p); |
43 | } | 43 | } |
44 | 44 | ||
45 | static inline __u32 get_unaligned_le32(const void *p) | 45 | static inline uint32_t get_unaligned_le32(const void *p) |
46 | { | 46 | { |
47 | return __get_unaligned_le32((const __u8 *)p); | 47 | return __get_unaligned_le32((const uint8_t *)p); |
48 | } | 48 | } |
49 | 49 | ||
50 | static inline __u64 get_unaligned_le64(const void *p) | 50 | static inline uint64_t get_unaligned_le64(const void *p) |
51 | { | 51 | { |
52 | return __get_unaligned_le64((const __u8 *)p); | 52 | return __get_unaligned_le64((const uint8_t *)p); |
53 | } | 53 | } |
54 | 54 | ||
55 | static inline void put_unaligned_le16(__u16 val, void *p) | 55 | static inline void put_unaligned_le16(uint16_t val, void *p) |
56 | { | 56 | { |
57 | __put_unaligned_le16(val, p); | 57 | __put_unaligned_le16(val, p); |
58 | } | 58 | } |
59 | 59 | ||
60 | static inline void put_unaligned_le32(__u32 val, void *p) | 60 | static inline void put_unaligned_le32(uint32_t val, void *p) |
61 | { | 61 | { |
62 | __put_unaligned_le32(val, p); | 62 | __put_unaligned_le32(val, p); |
63 | } | 63 | } |
64 | 64 | ||
65 | static inline void put_unaligned_le64(__u64 val, void *p) | 65 | static inline void put_unaligned_le64(uint64_t val, void *p) |
66 | { | 66 | { |
67 | __put_unaligned_le64(val, p); | 67 | __put_unaligned_le64(val, p); |
68 | } | 68 | } |