Skip to content

Commit

Permalink
tools/include: use stdint types for user-space byteshift headers
Browse files Browse the repository at this point in the history 
Commit a07f767 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 <[email protected]>
Signed-off-by: Michal Marek <[email protected]>
  • Loading branch information
@yselkowitz @michal42
yselkowitz authored and michal42 committed Jul 3, 2013
1 parent d2aae84 commit b353106
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 34 deletions.
34 changes: 17 additions & 17 deletions tools/include/tools/be_byteshift.h
View file
Original file line number Diff line number Diff line change
@@ -1,68 +1,68 @@
#ifndef _TOOLS_BE_BYTESHIFT_H
#define _TOOLS_BE_BYTESHIFT_H

#include <linux/types.h>
#include <stdint.h>

static inline __u16 __get_unaligned_be16(const __u8 *p)
static inline uint16_t __get_unaligned_be16(const uint8_t *p)
{
return p[0] << 8 | p[1];
}

static inline __u32 __get_unaligned_be32(const __u8 *p)
static inline uint32_t __get_unaligned_be32(const uint8_t *p)
{
return p[0] << 24 | p[1] << 16 | p[2] << 8 | p[3];
}

static inline __u64 __get_unaligned_be64(const __u8 *p)
static inline uint64_t __get_unaligned_be64(const uint8_t *p)
{
return (__u64)__get_unaligned_be32(p) << 32 |
return (uint64_t)__get_unaligned_be32(p) << 32 |
__get_unaligned_be32(p + 4);
}

static inline void __put_unaligned_be16(__u16 val, __u8 *p)
static inline void __put_unaligned_be16(uint16_t val, uint8_t *p)
{
*p++ = val >> 8;
*p++ = val;
}

static inline void __put_unaligned_be32(__u32 val, __u8 *p)
static inline void __put_unaligned_be32(uint32_t val, uint8_t *p)
{
__put_unaligned_be16(val >> 16, p);
__put_unaligned_be16(val, p + 2);
}

static inline void __put_unaligned_be64(__u64 val, __u8 *p)
static inline void __put_unaligned_be64(uint64_t val, uint8_t *p)
{
__put_unaligned_be32(val >> 32, p);
__put_unaligned_be32(val, p + 4);
}

static inline __u16 get_unaligned_be16(const void *p)
static inline uint16_t get_unaligned_be16(const void *p)
{
return __get_unaligned_be16((const __u8 *)p);
return __get_unaligned_be16((const uint8_t *)p);
}

static inline __u32 get_unaligned_be32(const void *p)
static inline uint32_t get_unaligned_be32(const void *p)
{
return __get_unaligned_be32((const __u8 *)p);
return __get_unaligned_be32((const uint8_t *)p);
}

static inline __u64 get_unaligned_be64(const void *p)
static inline uint64_t get_unaligned_be64(const void *p)
{
return __get_unaligned_be64((const __u8 *)p);
return __get_unaligned_be64((const uint8_t *)p);
}

static inline void put_unaligned_be16(__u16 val, void *p)
static inline void put_unaligned_be16(uint16_t val, void *p)
{
__put_unaligned_be16(val, p);
}

static inline void put_unaligned_be32(__u32 val, void *p)
static inline void put_unaligned_be32(uint32_t val, void *p)
{
__put_unaligned_be32(val, p);
}

static inline void put_unaligned_be64(__u64 val, void *p)
static inline void put_unaligned_be64(uint64_t val, void *p)
{
__put_unaligned_be64(val, p);
}
Expand Down
34 changes: 17 additions & 17 deletions tools/include/tools/le_byteshift.h
View file
Original file line number Diff line number Diff line change
@@ -1,68 +1,68 @@
#ifndef _TOOLS_LE_BYTESHIFT_H
#define _TOOLS_LE_BYTESHIFT_H

#include <linux/types.h>
#include <stdint.h>

static inline __u16 __get_unaligned_le16(const __u8 *p)
static inline uint16_t __get_unaligned_le16(const uint8_t *p)
{
return p[0] | p[1] << 8;
}

static inline __u32 __get_unaligned_le32(const __u8 *p)
static inline uint32_t __get_unaligned_le32(const uint8_t *p)
{
return p[0] | p[1] << 8 | p[2] << 16 | p[3] << 24;
}

static inline __u64 __get_unaligned_le64(const __u8 *p)
static inline uint64_t __get_unaligned_le64(const uint8_t *p)
{
return (__u64)__get_unaligned_le32(p + 4) << 32 |
return (uint64_t)__get_unaligned_le32(p + 4) << 32 |
__get_unaligned_le32(p);
}

static inline void __put_unaligned_le16(__u16 val, __u8 *p)
static inline void __put_unaligned_le16(uint16_t val, uint8_t *p)
{
*p++ = val;
*p++ = val >> 8;
}

static inline void __put_unaligned_le32(__u32 val, __u8 *p)
static inline void __put_unaligned_le32(uint32_t val, uint8_t *p)
{
__put_unaligned_le16(val >> 16, p + 2);
__put_unaligned_le16(val, p);
}

static inline void __put_unaligned_le64(__u64 val, __u8 *p)
static inline void __put_unaligned_le64(uint64_t val, uint8_t *p)
{
__put_unaligned_le32(val >> 32, p + 4);
__put_unaligned_le32(val, p);
}

static inline __u16 get_unaligned_le16(const void *p)
static inline uint16_t get_unaligned_le16(const void *p)
{
return __get_unaligned_le16((const __u8 *)p);
return __get_unaligned_le16((const uint8_t *)p);
}

static inline __u32 get_unaligned_le32(const void *p)
static inline uint32_t get_unaligned_le32(const void *p)
{
return __get_unaligned_le32((const __u8 *)p);
return __get_unaligned_le32((const uint8_t *)p);
}

static inline __u64 get_unaligned_le64(const void *p)
static inline uint64_t get_unaligned_le64(const void *p)
{
return __get_unaligned_le64((const __u8 *)p);
return __get_unaligned_le64((const uint8_t *)p);
}

static inline void put_unaligned_le16(__u16 val, void *p)
static inline void put_unaligned_le16(uint16_t val, void *p)
{
__put_unaligned_le16(val, p);
}

static inline void put_unaligned_le32(__u32 val, void *p)
static inline void put_unaligned_le32(uint32_t val, void *p)
{
__put_unaligned_le32(val, p);
}

static inline void put_unaligned_le64(__u64 val, void *p)
static inline void put_unaligned_le64(uint64_t val, void *p)
{
__put_unaligned_le64(val, p);
}
Expand Down

0 comments on commit b353106

Please sign in to comment.