summaryrefslogtreecommitdiffstats
path: root/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-20 12:05:42 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-20 12:05:42 -0700
commit26a6b2e1688bc154a16778851d710e90b62f715e (patch)
tree556fe1919c94aa4d4bac68d3e5dfbc40cfdeec10 /drivers/staging/csr/csr_wifi_serialize_primitive_types.c
parentab2b8c7383caf6b071930e4e1d4a8b4bf1708f38 (diff)
downloadop-kernel-dev-26a6b2e1688bc154a16778851d710e90b62f715e.zip
op-kernel-dev-26a6b2e1688bc154a16778851d710e90b62f715e.tar.gz
staging: csr: remove CsrUint32 typedef
Use the in-kernel u32 type instead. Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com> Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com> Cc: Riku Mettälä <riku.mettala@bluegiga.com> Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/csr/csr_wifi_serialize_primitive_types.c')
-rw-r--r--drivers/staging/csr/csr_wifi_serialize_primitive_types.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
index b81e51a..5b5444a 100644
--- a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
+++ b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
@@ -16,9 +16,9 @@
#include "csr_wifi_msgconv.h"
#include "csr_wifi_lib.h"
-void CsrUint24Des(CsrUint32 *v, u8 *buffer, CsrSize *offset)
+void CsrUint24Des(u32 *v, u8 *buffer, CsrSize *offset)
{
- CsrUint32 val;
+ u32 val;
val = ((buffer[(*offset) + 2] << 16) |
(buffer[(*offset) + 1] << 8) |
@@ -41,9 +41,9 @@ void CsrUint16DesBigEndian(u16 *v, u8 *buffer, CsrSize *offset)
}
-void CsrUint24DesBigEndian(CsrUint32 *v, u8 *buffer, CsrSize *offset)
+void CsrUint24DesBigEndian(u32 *v, u8 *buffer, CsrSize *offset)
{
- CsrUint32 val;
+ u32 val;
val = ((buffer[(*offset)] << 16) |
(buffer[(*offset) + 1] << 8) |
@@ -54,9 +54,9 @@ void CsrUint24DesBigEndian(CsrUint32 *v, u8 *buffer, CsrSize *offset)
}
-void CsrUint32DesBigEndian(CsrUint32 *v, u8 *buffer, CsrSize *offset)
+void CsrUint32DesBigEndian(u32 *v, u8 *buffer, CsrSize *offset)
{
- CsrUint32 val;
+ u32 val;
val = ((buffer[(*offset)] << 24) |
(buffer[(*offset) + 1] << 16) |
@@ -68,7 +68,7 @@ void CsrUint32DesBigEndian(CsrUint32 *v, u8 *buffer, CsrSize *offset)
}
-void CsrUint24Ser(u8 *ptr, CsrSize *len, CsrUint32 v)
+void CsrUint24Ser(u8 *ptr, CsrSize *len, u32 v)
{
ptr[(*len) + 2] = (u8)((v & 0x00ff0000) >> 16);
ptr[(*len) + 1] = (u8)((v & 0x0000ff00) >> 8);
@@ -88,7 +88,7 @@ void CsrUint16SerBigEndian(u8 *ptr, CsrSize *len, u16 v)
}
-void CsrUint32SerBigEndian(u8 *ptr, CsrSize *len, CsrUint32 v)
+void CsrUint32SerBigEndian(u8 *ptr, CsrSize *len, u32 v)
{
ptr[(*len)] = (u8)((v & 0xff000000) >> 24);
ptr[(*len) + 1] = (u8)((v & 0x00ff0000) >> 16);
@@ -99,7 +99,7 @@ void CsrUint32SerBigEndian(u8 *ptr, CsrSize *len, CsrUint32 v)
}
-void CsrUint24SerBigEndian(u8 *ptr, CsrSize *len, CsrUint32 v)
+void CsrUint24SerBigEndian(u8 *ptr, CsrSize *len, u32 v)
{
ptr[(*len)] = (u8)((v & 0x00ff0000) >> 16);
ptr[(*len) + 1] = (u8)((v & 0x0000ff00) >> 8);
OpenPOWER on IntegriCloud