[Xen-devel] [PATCH] minios: use inlines instead of macros for bswap*

[Samuel Thibault <samuel.thibault@xxxxxxxxxxxxx>]

minios: use inlines instead of macros for bswap*

Signed-off-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxxx>

diff -r b320cfe1f10f extras/mini-os/include/byteswap.h
--- a/extras/mini-os/include/byteswap.h Thu Jun 05 13:04:07 2008 +0100
+++ b/extras/mini-os/include/byteswap.h Fri Jun 06 11:28:08 2008 +0100
@@ -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 */

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel