X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fbyteorder.h;h=8bd11c4f31bb4217bbce55982a178051e7d7d42b;hb=8737ed1a8db8fe9fef38725131f0dba09a5d48d6;hp=cf7d137418aafca7bb91c3fe5fa3cbd910954cc3;hpb=aaed3ed803ffbd77b476d71055388cf00232469a;p=bertos.git

diff --git a/mware/byteorder.h b/mware/byteorder.h
index cf7d1374..8bd11c4f 100755
--- a/mware/byteorder.h
+++ b/mware/byteorder.h
@@ -15,6 +15,15 @@
 
 /*
  * $Log$
+ * 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.
  *
@@ -26,22 +35,44 @@
 #include <compiler.h>
 #include <cpu.h>
 
-INLINE uint16_t cpu_to_be16(uint16_t n);
-INLINE uint16_t cpu_to_be16(uint16_t n)
+/*!
+ * \brief Swap upper and lower bytes in a 16-bit value.
+ */
+INLINE uint16_t swab16(uint16_t x)
 {
-	if (CPU_BYTE_ORDER == CPU_LITTLE_ENDIAN)
-		n = n << 8 | n >> 8;
+	return    ((x & (uint16_t)0x00FFU) << 8)
+		| ((x & (uint16_t)0xFF00U) >> 8);
+}
 
-	return n;
+/*!
+ * \brief Reverse bytes in a 32-bit value (e.g.: 0x12345678 -> 0x78563412).
+ */
+INLINE uint32_t swab32(uint32_t x)
+{
+	return    ((x & (uint32_t)0x000000FFUL) << 24)
+		| ((x & (uint32_t)0x0000FF00UL) <<  8)
+		| ((x & (uint32_t)0x00FF0000UL) >>  8)
+		| ((x & (uint32_t)0xFF000000UL) >> 24);
 }
 
-INLINE uint16_t cpu_to_le16(uint16_t n);
-INLINE uint16_t cpu_to_le16(uint16_t n)
+INLINE uint16_t cpu_to_be16(uint16_t x)
 {
-	if (CPU_BYTE_ORDER == CPU_BIG_ENDIAN)
-		n = n << 8 | n >> 8;
+	return (CPU_BYTE_ORDER == CPU_LITTLE_ENDIAN) ? swab16(x) : x;
+}
+
+INLINE uint16_t cpu_to_le16(uint16_t x)
+{
+	return (CPU_BYTE_ORDER == CPU_BIG_ENDIAN) ? swab16(x) : x;
+}
 
-	return n;
+INLINE uint32_t cpu_to_be32(uint32_t x)
+{
+	return (CPU_BYTE_ORDER == CPU_LITTLE_ENDIAN) ? swab32(x) : x;
+}
+
+INLINE uint32_t cpu_to_le32(uint32_t x)
+{
+	return (CPU_BYTE_ORDER == CPU_BIG_ENDIAN) ? swab32(x) : x;
 }
 
 #endif /* MWARE_BYTEORDER_H */