---

yaml --- r: 318153 b: refs/heads/master c: 9d25edf h: refs/heads/master i: 318151: 516a5ff v: v3
git-mirror · Jul 20, 2012 · 69c6aab · 69c6aab
1 parent e54581b
commit 69c6aab
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95e326c28aa66d6ff5821f3c1d22b46a8d335939
+refs/heads/master: 9d25edfca7db9404d821c4558e06a2bb98981240
diff --git a/trunk/drivers/staging/csr/csr_macro.h b/trunk/drivers/staging/csr/csr_macro.h
@@ -41,8 +41,8 @@ extern "C" {
     ((u8 *) (ptr))[2] = ((u8) (((uint) >> 16) & 0x000000FF)); \
     ((u8 *) (ptr))[3] = ((u8) (((uint) >> 24) & 0x000000FF))
 #define CSR_GET_UINT16_FROM_BIG_ENDIAN(ptr) (((u16) ((u8 *) (ptr))[1]) | ((u16) ((u8 *) (ptr))[0]) << 8)
-#define CSR_GET_UINT24_FROM_BIG_ENDIAN(ptr) (((CsrUint24) ((u8 *) (ptr))[2]) | \
-                                             ((CsrUint24) ((u8 *) (ptr))[1]) << 8 | ((CsrUint24) ((u8 *) (ptr))[0]) << 16)
+#define CSR_GET_UINT24_FROM_BIG_ENDIAN(ptr) (((u32) ((u8 *) (ptr))[2]) | \
+                                             ((u32) ((u8 *) (ptr))[1]) << 8 | ((u32) ((u8 *) (ptr))[0]) << 16)
 #define CSR_GET_UINT32_FROM_BIG_ENDIAN(ptr) (((u32) ((u8 *) (ptr))[3]) | ((u32) ((u8 *) (ptr))[2]) << 8 | \
                                              ((u32) ((u8 *) (ptr))[1]) << 16 | ((u32) ((u8 *) (ptr))[0]) << 24)
 #define CSR_COPY_UINT16_TO_BIG_ENDIAN(uint, ptr)    ((u8 *) (ptr))[1] = ((u8) ((uint) & 0x00FF)); \

diff --git a/trunk/drivers/staging/csr/csr_types.h b/trunk/drivers/staging/csr/csr_types.h
@@ -39,7 +39,6 @@ typedef u8 CsrBool;
 typedef char CsrCharString;
 typedef u8 CsrUtf8String;
 typedef u16 CsrUtf16String;   /* 16-bit UTF16 strings */
-typedef u32 CsrUint24;
 
 /*
  * 64-bit integers

diff --git a/trunk/drivers/staging/csr/csr_wifi_hip_sigs.h b/trunk/drivers/staging/csr/csr_wifi_hip_sigs.h
@@ -429,7 +429,7 @@ typedef u16 CSR_DIALOG_TOKEN;
 
 typedef struct CSR_GENERIC_POINTER
 {
-    CsrUint24        MemoryOffset;
+    u32        MemoryOffset;
     CSR_MEMORY_SPACE MemorySpace;
 } CSR_GENERIC_POINTER;