aboutsummaryrefslogtreecommitdiffstats
path: root/extras/mini-os/include/byteswap.h
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-06-09 09:46:16 +0100
committerKeir Fraser <keir.fraser@citrix.com>2008-06-09 09:46:16 +0100
commit2b888b8d42cc6e5161dd7ac4d9cc9e1e93d9e206 (patch)
tree5679e52b5e3b33cb03994f75c13232bb87cd6b7f /extras/mini-os/include/byteswap.h
parent591e88391250ccb38b3726f8ea6cdc89587e6d71 (diff)
downloadxen-2b888b8d42cc6e5161dd7ac4d9cc9e1e93d9e206.tar.gz
xen-2b888b8d42cc6e5161dd7ac4d9cc9e1e93d9e206.tar.bz2
xen-2b888b8d42cc6e5161dd7ac4d9cc9e1e93d9e206.zip
minios: use inlines instead of macros for bswap*
Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
Diffstat (limited to 'extras/mini-os/include/byteswap.h')
-rw-r--r--extras/mini-os/include/byteswap.h39
1 files changed, 25 insertions, 14 deletions
diff --git a/extras/mini-os/include/byteswap.h b/extras/mini-os/include/byteswap.h
index 7c4ffe393c..6d97f78f74 100644
--- a/extras/mini-os/include/byteswap.h
+++ b/extras/mini-os/include/byteswap.h
@@ -2,21 +2,32 @@
#define _BYTESWAP_H_
/* Unfortunately not provided by newlib. */
-#define bswap_16(x) \
- ((((x) & 0xff00) >> 8) | (((x) & 0xff) << 8))
-#define bswap_32(x) \
- ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
- (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
+#include <types.h>
+static inline uint16_t bswap_16(uint16_t x)
+{
+ return
+ ((((x) & 0xff00) >> 8) | (((x) & 0xff) << 8));
+}
-#define bswap_64(x) \
- ((((x) & 0xff00000000000000ULL) >> 56) | \
- (((x) & 0x00ff000000000000ULL) >> 40) | \
- (((x) & 0x0000ff0000000000ULL) >> 24) | \
- (((x) & 0x000000ff00000000ULL) >> 8) | \
- (((x) & 0x00000000ff000000ULL) << 8) | \
- (((x) & 0x0000000000ff0000ULL) << 24) | \
- (((x) & 0x000000000000ff00ULL) << 40) | \
- (((x) & 0x00000000000000ffULL) << 56))
+static inline uint32_t bswap_32(uint32_t x)
+{
+ return
+ ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) |
+ (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24));
+}
+
+static inline uint64_t bswap_64(uint64_t x)
+{
+ return
+ ((((x) & 0xff00000000000000ULL) >> 56) |
+ (((x) & 0x00ff000000000000ULL) >> 40) |
+ (((x) & 0x0000ff0000000000ULL) >> 24) |
+ (((x) & 0x000000ff00000000ULL) >> 8) |
+ (((x) & 0x00000000ff000000ULL) << 8) |
+ (((x) & 0x0000000000ff0000ULL) << 24) |
+ (((x) & 0x000000000000ff00ULL) << 40) |
+ (((x) & 0x00000000000000ffULL) << 56));
+}
#endif /* _BYTESWAP_H */