---

yaml --- r: 318187 b: refs/heads/master c: 9e16d45 h: refs/heads/master i: 318185: e4b75f7 318183: 9132f87 v: v3
git-mirror · Jul 21, 2012 · 037b60d · 037b60d
1 parent 2e8d11d
commit 037b60d
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 1,156 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eaae2e9223e859cd968b58bd3173a3f17b50538d
+refs/heads/master: 9e16d457689d1b866e8c1b7de331cb069e341f4c
diff --git a/trunk/drivers/staging/csr/Makefile b/trunk/drivers/staging/csr/Makefile
@@ -71,6 +71,5 @@ csr_helper-y :=	csr_time.o			\
 		csr_framework_ext.o		\
 		csr_wifi_serialize_primitive_types.o	\
 		csr_serialize_primitive_types.o	\
-		csr_utf16.o			\
 		csr_msgconv.o			\
 		csr_panic.o
diff --git a/trunk/drivers/staging/csr/csr_msgconv.h b/trunk/drivers/staging/csr/csr_msgconv.h
@@ -14,7 +14,6 @@
 #include <linux/types.h>
 #include "csr_prim_defs.h"
 #include "csr_sched.h"
-#include "csr_unicode.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/trunk/drivers/staging/csr/csr_serialize_primitive_types.c b/trunk/drivers/staging/csr/csr_serialize_primitive_types.c
@@ -15,6 +15,34 @@
 #include "csr_macro.h"
 #include "csr_lib.h"
 
+/********************************************************************************
+*
+*   Name:           CsrUtf16StrLen
+*
+*   Description:    The function returns the number of 16 bit elements present
+*                   in the 0-terminated string.
+*
+*   Input:          0-terminated string of 16 bit unicoded characters.
+*
+*   Output:         The number of 16 bit elements in the string.
+*
+*********************************************************************************/
+static u32 CsrUtf16StrLen(const u16 *unicodeString)
+{
+    u32 length;
+
+    length = 0;
+    if (unicodeString != NULL)
+    {
+        while (*unicodeString)
+        {
+            length++;
+            unicodeString++;
+        }
+    }
+    return length;
+}
+
 void CsrUint8Des(u8 *value, u8 *buffer, size_t *offset)
 {
     *value = buffer[*offset];

diff --git a/trunk/drivers/staging/csr/csr_unicode.h b/trunk/drivers/staging/csr/csr_unicode.h