Parcourir la source

qcacmn: Define new qdf_cpu_to_be*() macros

Add a set of OS agnostic CPU-to-Big-Endian byte order macros to QDF.

Change-Id: I8315dd55cf909abb871f7e7eb73684ed794fb134
CRs-Fixed: 2041099
Dustin Brown il y a 8 ans
Parent
commit
a4c33f01bc
2 fichiers modifiés avec 71 ajouts et 20 suppressions
  1. 58 10
      qdf/inc/qdf_util.h
  2. 13 10
      qdf/linux/src/i_qdf_util.h

+ 58 - 10
qdf/inc/qdf_util.h

@@ -393,51 +393,99 @@ static inline uint8_t *qdf_get_u32(uint8_t *ptr, uint32_t *value)
 /**
  * qdf_cpu_to_le16 - Convert a 16-bit value from CPU byte order to
  * little-endian byte order
+ *
+ * @x: value to be converted
  */
 #define qdf_cpu_to_le16(x)                   __qdf_cpu_to_le16(x)
 
 /**
  * qdf_cpu_to_le32 - Convert a 32-bit value from CPU byte order to
  * little-endian byte order
+ *
+ * @x: value to be converted
  */
 #define qdf_cpu_to_le32(x)                   __qdf_cpu_to_le32(x)
 
 /**
  * qdf_cpu_to_le64 - Convert a 64-bit value from CPU byte order to
  * little-endian byte order
+ *
+ * @x: value to be converted
  */
 #define qdf_cpu_to_le64(x)                   __qdf_cpu_to_le64(x)
 
 /**
- * qdf_be32_to_cpu - Convert a 32-bit value from big-endian byte order
- * to CPU byte order
- */
-#define qdf_be32_to_cpu(x)                   __qdf_be32_to_cpu(x)
-
-/**
- * qdf_be64_to_cpu - Convert a 64-bit value from big-endian byte order
+ * qdf_le16_to_cpu - Convert a 16-bit value from little-endian byte order
  * to CPU byte order
+ *
+ * @x: value to be converted
  */
-#define qdf_be64_to_cpu(x)                   __qdf_be64_to_cpu(x)
+#define qdf_le16_to_cpu(x)                   __qdf_le16_to_cpu(x)
 
 /**
  * qdf_le32_to_cpu - Convert a 32-bit value from little-endian byte
  * order to CPU byte order
+ *
+ * @x: value to be converted
  */
 #define qdf_le32_to_cpu(x)                   __qdf_le32_to_cpu(x)
 
 /**
  * qdf_le64_to_cpu - Convert a 64-bit value from little-endian byte
  * order to CPU byte order
+ *
+ * @x: value to be converted
  */
 #define qdf_le64_to_cpu(x)                   __qdf_le64_to_cpu(x)
 
 /**
- * qdf_le16_to_cpu - Convert a 16-bit value from little-endian byte order
+ * qdf_cpu_to_be16 - Convert a 16-bit value from CPU byte order to
+ * big-endian byte order
+ *
+ * @x: value to be converted
+ */
+#define qdf_cpu_to_be16(x)                   __qdf_cpu_to_be16(x)
+
+/**
+ * qdf_cpu_to_be32 - Convert a 32-bit value from CPU byte order to
+ * big-endian byte order
+ *
+ * @x: value to be converted
+ */
+#define qdf_cpu_to_be32(x)                   __qdf_cpu_to_be32(x)
+
+/**
+ * qdf_cpu_to_be64 - Convert a 64-bit value from CPU byte order to
+ * big-endian byte order
+ *
+ * @x: value to be converted
+ */
+#define qdf_cpu_to_be64(x)                   __qdf_cpu_to_be64(x)
+
+
+/**
+ * qdf_be16_to_cpu - Convert a 16-bit value from big-endian byte order
  * to CPU byte order
+ *
  * @x: value to be converted
  */
-#define qdf_le16_to_cpu(x)                   __qdf_le16_to_cpu(x)
+#define qdf_be16_to_cpu(x)                   __qdf_be16_to_cpu(x)
+
+/**
+ * qdf_be32_to_cpu - Convert a 32-bit value from big-endian byte order
+ * to CPU byte order
+ *
+ * @x: value to be converted
+ */
+#define qdf_be32_to_cpu(x)                   __qdf_be32_to_cpu(x)
+
+/**
+ * qdf_be64_to_cpu - Convert a 64-bit value from big-endian byte order
+ * to CPU byte order
+ *
+ * @x: value to be converted
+ */
+#define qdf_be64_to_cpu(x)                   __qdf_be64_to_cpu(x)
 
 /**
  * qdf_function - replace with the name of the current function

+ 13 - 10
qdf/linux/src/i_qdf_util.h

@@ -249,7 +249,6 @@ static inline bool __qdf_is_macaddr_equal(struct qdf_mac_addr *mac_addr1,
 	}     \
 } while (0)
 
-#define __qdf_cpu_to_le64                cpu_to_le64
 #define __qdf_container_of(ptr, type, member) container_of(ptr, type, member)
 
 #define __qdf_ntohs                      ntohs
@@ -258,17 +257,21 @@ static inline bool __qdf_is_macaddr_equal(struct qdf_mac_addr *mac_addr1,
 #define __qdf_htons                      htons
 #define __qdf_htonl                      htonl
 
-#define __qdf_cpu_to_le16                cpu_to_le16
-#define __qdf_cpu_to_le32                cpu_to_le32
-#define __qdf_cpu_to_le64                cpu_to_le64
+#define __qdf_cpu_to_le16 cpu_to_le16
+#define __qdf_cpu_to_le32 cpu_to_le32
+#define __qdf_cpu_to_le64 cpu_to_le64
 
-#define __qdf_le16_to_cpu                le16_to_cpu
-#define __qdf_le32_to_cpu                le32_to_cpu
+#define __qdf_le16_to_cpu le16_to_cpu
+#define __qdf_le32_to_cpu le32_to_cpu
+#define __qdf_le64_to_cpu le64_to_cpu
 
-#define __qdf_be32_to_cpu                be32_to_cpu
-#define __qdf_be64_to_cpu                be64_to_cpu
-#define __qdf_le64_to_cpu                le64_to_cpu
-#define __qdf_le16_to_cpu                le16_to_cpu
+#define __qdf_cpu_to_be16 cpu_to_be16
+#define __qdf_cpu_to_be32 cpu_to_be32
+#define __qdf_cpu_to_be64 cpu_to_be64
+
+#define __qdf_be16_to_cpu be16_to_cpu
+#define __qdf_be32_to_cpu be32_to_cpu
+#define __qdf_be64_to_cpu be64_to_cpu
 
 /**
  * @brief memory barriers.