diff options
| author | Roger Pau Monne <roger.pau@entel.upc.edu> | 2011-12-20 08:31:40 +0100 |
|---|---|---|
| committer | Roger Pau Monne <roger.pau@entel.upc.edu> | 2011-12-20 08:31:40 +0100 |
| commit | 2f8f5504ff57a07ed4fa8dd14af142792887d36c (patch) | |
| tree | 2f7b39a24a06db63f113cb899521dc5643f4f63d /tools/blktap2 | |
| parent | 5b4d77e1bd3a48f91207d3c2246fea007875c3c3 (diff) | |
| download | xen-2f8f5504ff57a07ed4fa8dd14af142792887d36c.tar.gz xen-2f8f5504ff57a07ed4fa8dd14af142792887d36c.tar.bz2 xen-2f8f5504ff57a07ed4fa8dd14af142792887d36c.zip | |
blktap2: remove local definitions and include byteswap.h
Use the same approach as tools/blktap2/include/libvhd.h, remove local
definitions of bswap* and include byteswap.h. Also remove the
HAVE_BYTESWAP_H ifdef, since it was not defined in this context (it's
defined by QEMU).
Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/blktap2')
| -rw-r--r-- | tools/blktap2/drivers/bswap.h | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/tools/blktap2/drivers/bswap.h b/tools/blktap2/drivers/bswap.h index 45016b978b..7a2691b8a2 100644 --- a/tools/blktap2/drivers/bswap.h +++ b/tools/blktap2/drivers/bswap.h @@ -13,45 +13,10 @@ #define bswap_16(x) swap16(x) #define bswap_32(x) swap32(x) #define bswap_64(x) swap64(x) -#else +#elif defined(__linux__) -#ifdef HAVE_BYTESWAP_H +#include <endian.h> #include <byteswap.h> -#else - -#define bswap_16(x) \ -({ \ - uint16_t __x = (x); \ - ((uint16_t)( \ - (((uint16_t)(__x) & (uint16_t)0x00ffU) << 8) | \ - (((uint16_t)(__x) & (uint16_t)0xff00U) >> 8) )); \ -}) - -#define bswap_32(x) \ -({ \ - uint32_t __x = (x); \ - ((uint32_t)( \ - (((uint32_t)(__x) & (uint32_t)0x000000ffUL) << 24) | \ - (((uint32_t)(__x) & (uint32_t)0x0000ff00UL) << 8) | \ - (((uint32_t)(__x) & (uint32_t)0x00ff0000UL) >> 8) | \ - (((uint32_t)(__x) & (uint32_t)0xff000000UL) >> 24) )); \ -}) - -#define bswap_64(x) \ -({ \ - uint64_t __x = (x); \ - ((uint64_t)( \ - (uint64_t)(((uint64_t)(__x) & (uint64_t)0x00000000000000ffULL) << 56) | \ - (uint64_t)(((uint64_t)(__x) & (uint64_t)0x000000000000ff00ULL) << 40) | \ - (uint64_t)(((uint64_t)(__x) & (uint64_t)0x0000000000ff0000ULL) << 24) | \ - (uint64_t)(((uint64_t)(__x) & (uint64_t)0x00000000ff000000ULL) << 8) | \ - (uint64_t)(((uint64_t)(__x) & (uint64_t)0x000000ff00000000ULL) >> 8) | \ - (uint64_t)(((uint64_t)(__x) & (uint64_t)0x0000ff0000000000ULL) >> 24) | \ - (uint64_t)(((uint64_t)(__x) & (uint64_t)0x00ff000000000000ULL) >> 40) | \ - (uint64_t)(((uint64_t)(__x) & (uint64_t)0xff00000000000000ULL) >> 56) )); \ -}) - -#endif /* !HAVE_BYTESWAP_H */ static inline uint16_t bswap16(uint16_t x) { |