Add macros for 64bit byte order swapping

Change-Id: Ic31ccd41ba3e0af7046eafc29221810d4cd196c8
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/275
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>

diff --git a/src/arch/x86/include/arch/byteorder.h b/src/arch/x86/include/arch/byteorder.h
index ab344e6394353106709a097bd4b269eaf540e9e2..8dc069f486392bc19919ca6b27af73c65878ca8d 100644 (file)
--- a/src/arch/x86/include/arch/byteorder.h
+++ b/src/arch/x86/include/arch/byteorder.h
@@ -3,18 +3,25 @@
 
 #define __LITTLE_ENDIAN 1234
 
+#include <stdint.h>
 #include <swab.h>
 
-#define cpu_to_le32(x) ((unsigned int)(x))
-#define le32_to_cpu(x) ((unsigned int)(x))
-#define cpu_to_le16(x) ((unsigned short)(x))
-#define le16_to_cpu(x) ((unsigned short)(x))
+#define cpu_to_le64(x) ((uint64_t)(x))
+#define le64_to_cpu(x) ((uint64_t)(x))
+#define cpu_to_le32(x) ((uint32_t)(x))
+#define le32_to_cpu(x) ((uint32_t)(x))
+#define cpu_to_le16(x) ((uint16_t)(x))
+#define le16_to_cpu(x) ((uint16_t)(x))
+#define cpu_to_be64(x) swab64(x)
+#define be64_to_cpu(x) swab64(x)
 #define cpu_to_be32(x) swab32((x))
 #define be32_to_cpu(x) swab32((x))
 #define cpu_to_be16(x) swab16((x))
 #define be16_to_cpu(x) swab16((x))
 
-#define ntohl(x) be32_to_cpu(x)
-#define htonl(x) cpu_to_be32(x)
+#define ntohll(x) be64_to_cpu(x)
+#define htonll(x) cpu_to_be64(x)
+#define ntohl(x)  be32_to_cpu(x)
+#define htonl(x)  cpu_to_be32(x)
 
 #endif /* _BYTEORDER_H */

diff --git a/src/include/swab.h b/src/include/swab.h
index 3a166863ec6e7ff1f683b0c868ff63a66e78fdac..c5e43709a6f63ff0625cf2d9245a4bcad34073bf 100644 (file)
--- a/src/include/swab.h
+++ b/src/include/swab.h
@@ -30,4 +30,15 @@
                (((unsigned int)(x) & (unsigned int)0x00ff0000UL) >>  8) | \
                (((unsigned int)(x) & (unsigned int)0xff000000UL) >> 24) ))
 
+#define swab64(x) \
+       ((uint64_t)( \
+               (((uint64_t)(x) & (uint64_t)0x00000000000000ffULL) << 56) | \
+               (((uint64_t)(x) & (uint64_t)0x000000000000ff00ULL) << 40) | \
+               (((uint64_t)(x) & (uint64_t)0x0000000000ff0000ULL) << 24) | \
+               (((uint64_t)(x) & (uint64_t)0x00000000ff000000ULL) <<  8) | \
+               (((uint64_t)(x) & (uint64_t)0x000000ff00000000ULL) >>  8) | \
+               (((uint64_t)(x) & (uint64_t)0x0000ff0000000000ULL) >> 24) | \
+               (((uint64_t)(x) & (uint64_t)0x00ff000000000000ULL) >> 40) | \
+               (((uint64_t)(x) & (uint64_t)0xff00000000000000ULL) >> 56) ))
+
 #endif /* _SWAB_H */