X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fbyteorder.h;h=0ed874bbf68910da09c38ee7565fa05d30cc58ea;hb=4654a69f5df97af36ee5456d20cbccdc19012dc2;hp=82bd9241cbd9ba07e26445936c8b2932b200450d;hpb=9ba9dcf2a59a952609e19154e11de3e2478cbf42;p=bertos.git

diff --git a/mware/byteorder.h b/mware/byteorder.h
index 82bd9241..0ed874bb 100644
--- a/mware/byteorder.h
+++ b/mware/byteorder.h
@@ -38,45 +38,11 @@
  * \author Stefano Fedrigo <aleph@develer.com>
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.10  2006/06/10 05:37:03  bernie
- *#* Convert to new Doxygen comments.
- *#*
- *#* Revision 1.9  2005/11/04 16:20:02  bernie
- *#* Fix reference to README.devlib in header.
- *#*
- *#* Revision 1.8  2005/06/14 06:16:03  bernie
- *#* Add all missing functions.
- *#*
- *#* Revision 1.7  2005/04/12 04:08:49  bernie
- *#* host_to_net(16|32)(), net_to_host(16|32)(): New functions.
- *#*
- *#* Revision 1.6  2005/04/11 19:10:28  bernie
- *#* Include top-level headers from cfg/ subdir.
- *#*
- *#* Revision 1.5  2004/08/25 14:12:09  rasky
- *#* Aggiornato il comment block dei log RCS
- *#*
- *#* Revision 1.4  2004/07/22 01:08:43  bernie
- *#* swab32(): Fix a very serious bug.
- *#*
- *#* Revision 1.3  2004/07/20 23:47:12  bernie
- *#* Finally remove redundant protos.
- *#*
- *#* Revision 1.2  2004/07/20 17:09:11  bernie
- *#* swab16(), swab32(), cpu_to_be32(), cpu_to_le32(): New functions.
- *#*
- *#* Revision 1.1  2004/07/20 16:26:15  bernie
- *#* Import byte-order macros into DevLib.
- *#*
- *#*/
-
 #ifndef MWARE_BYTEORDER_H
 #define MWARE_BYTEORDER_H
 
 #include <cfg/compiler.h>
-#include <cfg/cpu.h>
+#include <cpu/attr.h>
 
 /**
  * Swap upper and lower bytes in a 16-bit value.
@@ -98,6 +64,15 @@ INLINE uint32_t swab32(uint32_t x)
 		| ((x & (uint32_t)0xFF000000UL) >> 24);
 }
 
+/**
+ * Reverse bytes in a 64-bit value.
+ */
+INLINE uint64_t swab64(uint64_t x)
+{
+	return (uint64_t)swab32(x >> 32)
+		| ((uint64_t)swab32(x & 0xFFFFFFFFUL) << 32);
+}
+
 /**
  * Reverse bytes in a float value.
  */
@@ -133,6 +108,16 @@ INLINE uint32_t cpu_to_le32(uint32_t x)
 	return (CPU_BYTE_ORDER == CPU_BIG_ENDIAN) ? swab32(x) : x;
 }
 
+INLINE uint64_t cpu_to_be64(uint64_t x)
+{
+	return (CPU_BYTE_ORDER == CPU_LITTLE_ENDIAN) ? swab64(x) : x;
+}
+
+INLINE uint64_t cpu_to_le64(uint64_t x)
+{
+	return (CPU_BYTE_ORDER == CPU_BIG_ENDIAN) ? swab64(x) : x;
+}
+
 INLINE float cpu_to_be_float(float x)
 {
 	return (CPU_BYTE_ORDER == CPU_LITTLE_ENDIAN) ? swab_float(x) : x;
@@ -163,6 +148,16 @@ INLINE uint32_t le32_to_cpu(uint32_t x)
 	return cpu_to_le32(x);
 }
 
+INLINE uint64_t be64_to_cpu(uint64_t x)
+{
+	return cpu_to_be64(x);
+}
+
+INLINE uint64_t le64_to_cpu(uint64_t x)
+{
+	return cpu_to_le64(x);
+}
+
 INLINE float be_float_to_cpu(float x)
 {
 	return cpu_to_be_float(x);
@@ -193,6 +188,16 @@ INLINE uint32_t net_to_host32(uint32_t x)
 	return be32_to_cpu(x);
 }
 
+INLINE uint64_t host_to_net64(uint64_t x)
+{
+	return cpu_to_be64(x);
+}
+
+INLINE uint64_t net_to_host64(uint64_t x)
+{
+	return be64_to_cpu(x);
+}
+
 INLINE float host_to_net_float(float x)
 {
 	return cpu_to_be_float(x);
@@ -211,8 +216,10 @@ INLINE T swab(T x);
 
 template<> INLINE uint16_t swab(uint16_t x) { return swab16(x); }
 template<> INLINE uint32_t swab(uint32_t x) { return swab32(x); }
+template<> INLINE uint64_t swab(uint64_t x) { return swab64(x); }
 template<> INLINE int16_t  swab(int16_t x)  { return static_cast<int16_t>(swab16(static_cast<uint16_t>(x))); }
 template<> INLINE int32_t  swab(int32_t x)  { return static_cast<int32_t>(swab32(static_cast<uint32_t>(x))); }
+template<> INLINE int64_t  swab(int64_t x)  { return static_cast<int64_t>(swab64(static_cast<uint64_t>(x))); }
 template<> INLINE float    swab(float x)    { return swab_float(x); }
 
 /// Type generic conversion from CPU byte order to big-endian byte order.