From 635d2b00e5070378e7bf812acf47fb135c6ab928 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 19 Jun 2012 16:15:42 -0700 Subject: Staging: add CSR wifi module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This consists of two modules, the driver, and a "helper" module that is just a wrapper around common kernel functions. The wrapper module will be removed soon, but for now it's needed. These files were based on the csr-linux-wifi-5.0.3-oss.tar.gz package provided by CSR and Blue Giga, and is covered under the license specified in the LICENSE.txt file (basically dual BSD and GPLv2). The files were flattened out of the deep directory mess they were originally in, and a few EXPORT_SYMBOL_GPL() were added in order for everything to link properly with the helper module setup. Cc: Mikko Virkkilä Cc: Lauri Hintsala Cc: Riku Mettälä Cc: Veli-Pekka Peltola Signed-off-by: Greg Kroah-Hartman --- drivers/staging/csr/csr_wifi_fsm.h | 250 +++++++++++++++++++++++++++++++++++++ 1 file changed, 250 insertions(+) create mode 100644 drivers/staging/csr/csr_wifi_fsm.h (limited to 'drivers/staging/csr/csr_wifi_fsm.h') diff --git a/drivers/staging/csr/csr_wifi_fsm.h b/drivers/staging/csr/csr_wifi_fsm.h new file mode 100644 index 00000000000..cfdf082349e --- /dev/null +++ b/drivers/staging/csr/csr_wifi_fsm.h @@ -0,0 +1,250 @@ +/***************************************************************************** + + (c) Cambridge Silicon Radio Limited 2011 + All rights reserved and confidential information of CSR + + Refer to LICENSE.txt included with this source for details + on the license terms. + +*****************************************************************************/ + +#ifndef CSR_WIFI_FSM_H +#define CSR_WIFI_FSM_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include "csr_types.h" +#include "csr_pmem.h" +#include "csr_prim_defs.h" +#include "csr_log_text.h" +#include "csr_wifi_fsm_event.h" + +/* including this file for CsrWifiInterfaceMode*/ +#include "csr_wifi_common.h" + +#define CSR_WIFI_FSM_ENV (0xFFFF) + +/** + * @brief + * Toplevel FSM context data + * + * @par Description + * Holds ALL FSM static and dynamic data for a FSM + */ +typedef struct CsrWifiFsmContext CsrWifiFsmContext; + +/** + * @brief + * FSM External Wakeup CallbackFunction Pointer + * + * @par Description + * Defines the external wakeup function for the FSM + * to call when an external event is injected into the systen + * + * @param[in] context : External context + * + * @return + * void + */ +typedef void (*CsrWifiFsmExternalWakupCallbackPtr)(void *context); + +/** + * @brief + * Initialises a top level FSM context + * + * @par Description + * Initialises the FSM Context to an initial state and allocates + * space for "maxProcesses" number of instances + * + * @param[in] osaContext : OSA context + * @param[in] applicationContext : Internal fsm application context + * @param[in] externalContext : External context + * @param[in] maxProcesses : Max processes to allocate room for + * + * @return + * CsrWifiFsmContext* fsm context + */ +extern CsrWifiFsmContext* CsrWifiFsmInit(void *applicationContext, void *externalContext, CsrUint16 maxProcesses, CsrLogTextTaskId loggingTaskId); + +/** + * @brief + * Resets the FSM's back to first conditions + * + * @par Description + * This function is used to free any dynamic resources allocated for the + * given context by CsrWifiFsmInit(). + * The FSM's reset function is called to cleanup any fsm specific memory + * The reset funtion does NOT need to free the fsm data pointer as + * CsrWifiFsmShutdown() will do it. + * the FSM's init function is call again to reinitialise the FSM context. + * CsrWifiFsmReset() should NEVER be called when CsrWifiFsmExecute() is running. + * + * @param[in] context : FSM context + * + * @return + * void + */ +extern void CsrWifiFsmReset(CsrWifiFsmContext *context); + +/** + * @brief + * Frees resources allocated by CsrWifiFsmInit + * + * @par Description + * This function is used to free any dynamic resources allocated for the + * given context by CsrWifiFsmInit(), prior to complete termination of + * the program. + * The FSM's reset function is called to cleanup any fsm specific memory. + * The reset funtion does NOT need to free the fsm data pointer as + * CsrWifiFsmShutdown() will do it. + * CsrWifiFsmShutdown() should NEVER be called when CsrWifiFsmExecute() is running. + * + * @param[in] context : FSM context + * + * @return + * void + */ +extern void CsrWifiFsmShutdown(CsrWifiFsmContext *context); + +/** + * @brief + * Executes the fsm context + * + * @par Description + * Executes the FSM context and runs until ALL events in the context are processed. + * When no more events are left to process then CsrWifiFsmExecute() returns to a time + * specifying when to next call the CsrWifiFsmExecute() + * Scheduling, threading, blocking and external event notification are outside + * the scope of the FSM and CsrWifiFsmExecute(). + * + * @param[in] context : FSM context + * + * @return + * CsrUint32 Time in ms until next timeout or 0xFFFFFFFF for no timer set + */ +extern CsrUint32 CsrWifiFsmExecute(CsrWifiFsmContext *context); + +/** + * @brief + * Adds an event to the FSM context's external event queue for processing + * + * @par Description + * Adds an event to the contexts external queue + * This is thread safe and adds an event to the fsm's external event queue. + * + * @param[in] context : FSM context + * @param[in] event : event to add to the event queue + * @param[in] source : source of the event (this can be a synergy task queue or an fsm instance id) + * @param[in] destination : destination of the event (This can be a fsm instance id or CSR_WIFI_FSM_ENV) + * @param[in] id : event id + * + * @return + * void + */ +extern void CsrWifiFsmSendEventExternal(CsrWifiFsmContext *context, CsrWifiFsmEvent *event, CsrUint16 source, CsrUint16 destination, CsrPrim primtype, CsrUint16 id); + +/** + * @brief + * Adds an Alien event to the FSM context's external event queue for processing + * + * @par Description + * Adds an event to the contexts external queue + * This is thread safe and adds an event to the fsm's external event queue. + * + * @param[in] context : FSM context + * @param[in] event : event to add to the event queue + * @param[in] source : source of the event (this can be a synergy task queue or an fsm instance id) + * @param[in] destination : destination of the event (This can be a fsm instance id or CSR_WIFI_FSM_ENV) + * @param[in] id : event id + */ +#define CsrWifiFsmSendAlienEventExternal(_context, _alienEvent, _source, _destination, _primtype, _id) \ + { \ + CsrWifiFsmAlienEvent *_evt = (CsrWifiFsmAlienEvent *)CsrPmemAlloc(sizeof(CsrWifiFsmAlienEvent)); \ + _evt->alienEvent = _alienEvent; \ + CsrWifiFsmSendEventExternal(_context, (CsrWifiFsmEvent *)_evt, _source, _destination, _primtype, _id); \ + } + + +/** + * @brief + * Current time of day in ms + * + * @param[in] context : FSM context + * + * @return + * CsrUint32 32 bit ms tick + */ +extern CsrUint32 CsrWifiFsmGetTimeOfDayMs(CsrWifiFsmContext *context); + +/** + * @brief + * Gets the time until the next FSM timer expiry + * + * @par Description + * Returns the next timeout time or 0 if no timers are set. + * + * @param[in] context : FSM context + * + * @return + * CsrUint32 Time in ms until next timeout or 0xFFFFFFFF for no timer set + */ +extern CsrUint32 CsrWifiFsmGetNextTimeout(CsrWifiFsmContext *context); + +/** + * @brief + * Fast forwards the fsm timers by ms Milliseconds + * + * @param[in] context : FSM context + * @param[in] ms : Milliseconds to fast forward by + * + * @return + * void + */ +extern void CsrWifiFsmFastForward(CsrWifiFsmContext *context, CsrUint16 ms); + +/** + * @brief + * shift the current time of day by ms amount + * + * @par Description + * usefull to speed up tests where time needs to pass + * + * @param[in] context : FSM context + * @param[in] ms : ms to adjust time by + * + * @return + * void + */ +extern void CsrWifiFsmTestAdvanceTime(CsrWifiFsmContext *context, CsrUint32 ms); + +/** + * @brief + * Check if the fsm has events to process + * + * @param[in] context : FSM context + * + * @return + * CsrBool returns TRUE if there are events for the FSM to process + */ +extern CsrBool CsrWifiFsmHasEvents(CsrWifiFsmContext *context); + +/** + * @brief + * function that installs the contexts wakeup function + * + * @param[in] context : FSM context + * @param[in] callback : Callback function pointer + * + * @return + * void + */ +extern void CsrWifiFsmInstallWakeupCallback(CsrWifiFsmContext *context, CsrWifiFsmExternalWakupCallbackPtr callback); + +#ifdef __cplusplus +} +#endif + +#endif /* CSR_WIFI_FSM_H */ + -- cgit v1.2.3-70-g09d2 From 8c87f69acf942222d8e2ead6d0ca144957141284 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 20 Jul 2012 12:00:10 -0700 Subject: staging: csr: remove CsrUint16 typedef MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the in-kernel u16 type instead. Cc: Mikko Virkkilä Cc: Lauri Hintsala Cc: Riku Mettälä Cc: Veli-Pekka Peltola Signed-off-by: Greg Kroah-Hartman --- drivers/staging/csr/csr_framework_ext.c | 2 +- drivers/staging/csr/csr_framework_ext.h | 18 +- drivers/staging/csr/csr_lib.h | 34 +- drivers/staging/csr/csr_log.h | 24 +- drivers/staging/csr/csr_log_configure.h | 4 +- drivers/staging/csr/csr_log_text.h | 24 +- drivers/staging/csr/csr_macro.h | 8 +- drivers/staging/csr/csr_msgconv.c | 34 +- drivers/staging/csr/csr_msgconv.h | 32 +- drivers/staging/csr/csr_panic.c | 2 +- drivers/staging/csr/csr_panic.h | 2 +- drivers/staging/csr/csr_prim_defs.h | 50 +- drivers/staging/csr/csr_result.h | 2 +- drivers/staging/csr/csr_sched.h | 30 +- drivers/staging/csr/csr_sdio.h | 16 +- .../staging/csr/csr_serialize_primitive_types.c | 6 +- drivers/staging/csr/csr_time.h | 2 +- drivers/staging/csr/csr_types.h | 3 +- drivers/staging/csr/csr_unicode.h | 4 +- drivers/staging/csr/csr_utf16.c | 20 +- drivers/staging/csr/csr_util.c | 22 +- drivers/staging/csr/csr_util.h | 4 +- drivers/staging/csr/csr_wifi_fsm.h | 6 +- drivers/staging/csr/csr_wifi_fsm_event.h | 2 +- drivers/staging/csr/csr_wifi_fsm_types.h | 38 +- drivers/staging/csr/csr_wifi_hip_card.h | 8 +- drivers/staging/csr/csr_wifi_hip_card_sdio.c | 46 +- drivers/staging/csr/csr_wifi_hip_card_sdio.h | 108 +- drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c | 108 +- drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c | 52 +- drivers/staging/csr/csr_wifi_hip_chiphelper.c | 26 +- drivers/staging/csr/csr_wifi_hip_chiphelper.h | 98 +- .../staging/csr/csr_wifi_hip_chiphelper_private.h | 72 +- drivers/staging/csr/csr_wifi_hip_conversions.h | 2 +- drivers/staging/csr/csr_wifi_hip_download.c | 14 +- drivers/staging/csr/csr_wifi_hip_dump.c | 36 +- drivers/staging/csr/csr_wifi_hip_packing.c | 4 +- drivers/staging/csr/csr_wifi_hip_send.c | 12 +- drivers/staging/csr/csr_wifi_hip_signals.c | 2 +- drivers/staging/csr/csr_wifi_hip_sigs.h | 50 +- drivers/staging/csr/csr_wifi_hip_ta_sampling.c | 8 +- drivers/staging/csr/csr_wifi_hip_ta_sampling.h | 2 +- drivers/staging/csr/csr_wifi_hip_udi.c | 18 +- drivers/staging/csr/csr_wifi_hip_unifi.h | 32 +- .../staging/csr/csr_wifi_hip_unifi_signal_names.c | 2 +- drivers/staging/csr/csr_wifi_hip_xbv.c | 60 +- drivers/staging/csr/csr_wifi_hip_xbv.h | 4 +- drivers/staging/csr/csr_wifi_lib.h | 14 +- drivers/staging/csr/csr_wifi_msgconv.h | 4 +- .../staging/csr/csr_wifi_nme_ap_converter_init.c | 4 +- .../csr/csr_wifi_nme_ap_free_downstream_contents.c | 4 +- .../csr/csr_wifi_nme_ap_free_upstream_contents.c | 2 +- drivers/staging/csr/csr_wifi_nme_ap_lib.h | 4 +- drivers/staging/csr/csr_wifi_nme_ap_prim.h | 24 +- drivers/staging/csr/csr_wifi_nme_ap_serialize.c | 260 +-- drivers/staging/csr/csr_wifi_nme_lib.h | 4 +- drivers/staging/csr/csr_wifi_nme_prim.h | 44 +- .../staging/csr/csr_wifi_router_converter_init.c | 4 +- .../csr/csr_wifi_router_ctrl_converter_init.c | 4 +- ...csr_wifi_router_ctrl_free_downstream_contents.c | 2 +- .../csr_wifi_router_ctrl_free_upstream_contents.c | 2 +- drivers/staging/csr/csr_wifi_router_ctrl_lib.h | 4 +- drivers/staging/csr/csr_wifi_router_ctrl_prim.h | 152 +- .../staging/csr/csr_wifi_router_ctrl_serialize.c | 826 ++++---- .../csr/csr_wifi_router_free_downstream_contents.c | 2 +- .../csr/csr_wifi_router_free_upstream_contents.c | 2 +- drivers/staging/csr/csr_wifi_router_lib.h | 4 +- drivers/staging/csr/csr_wifi_router_prim.h | 32 +- drivers/staging/csr/csr_wifi_router_serialize.c | 132 +- drivers/staging/csr/csr_wifi_router_transport.c | 14 +- .../csr/csr_wifi_serialize_primitive_types.c | 6 +- drivers/staging/csr/csr_wifi_sme_ap_lib.h | 6 +- drivers/staging/csr/csr_wifi_sme_ap_prim.h | 56 +- drivers/staging/csr/csr_wifi_sme_converter_init.c | 4 +- .../csr/csr_wifi_sme_free_downstream_contents.c | 6 +- .../csr/csr_wifi_sme_free_upstream_contents.c | 8 +- drivers/staging/csr/csr_wifi_sme_lib.h | 4 +- drivers/staging/csr/csr_wifi_sme_prim.h | 278 +-- drivers/staging/csr/csr_wifi_sme_serialize.c | 2102 ++++++++++---------- drivers/staging/csr/csr_wifi_vif_utils.h | 14 +- drivers/staging/csr/data_tx.c | 2 +- drivers/staging/csr/drv.c | 16 +- drivers/staging/csr/io.c | 2 +- drivers/staging/csr/netdev.c | 60 +- drivers/staging/csr/os.c | 8 +- drivers/staging/csr/putest.c | 2 +- drivers/staging/csr/sdio_mmc.c | 6 +- drivers/staging/csr/sdio_stubs.c | 2 +- drivers/staging/csr/sme_blocking.c | 10 +- drivers/staging/csr/sme_native.c | 2 +- drivers/staging/csr/sme_sys.c | 42 +- drivers/staging/csr/sme_userspace.c | 2 +- drivers/staging/csr/sme_wext.c | 4 +- drivers/staging/csr/ul_int.c | 2 +- drivers/staging/csr/unifi_clients.h | 2 +- drivers/staging/csr/unifi_event.c | 8 +- drivers/staging/csr/unifi_os.h | 16 +- drivers/staging/csr/unifi_pdu_processing.c | 80 +- drivers/staging/csr/unifi_priv.h | 98 +- drivers/staging/csr/unifi_sme.c | 24 +- drivers/staging/csr/unifi_sme.h | 14 +- drivers/staging/csr/unifi_wext.h | 6 +- drivers/staging/csr/unifiio.h | 14 +- drivers/staging/csr/wext_events.c | 6 +- 104 files changed, 2804 insertions(+), 2805 deletions(-) (limited to 'drivers/staging/csr/csr_wifi_fsm.h') diff --git a/drivers/staging/csr/csr_framework_ext.c b/drivers/staging/csr/csr_framework_ext.c index 1586b235e29..b2b2ea9e53d 100644 --- a/drivers/staging/csr/csr_framework_ext.c +++ b/drivers/staging/csr/csr_framework_ext.c @@ -138,7 +138,7 @@ CsrResult CsrMutexUnlock(CsrMutexHandle *mutexHandle) * void * *----------------------------------------------------------------------------*/ -void CsrThreadSleep(CsrUint16 sleepTimeInMs) +void CsrThreadSleep(u16 sleepTimeInMs) { unsigned long t; diff --git a/drivers/staging/csr/csr_framework_ext.h b/drivers/staging/csr/csr_framework_ext.h index 401bf2d547a..942db87faa0 100644 --- a/drivers/staging/csr/csr_framework_ext.h +++ b/drivers/staging/csr/csr_framework_ext.h @@ -27,13 +27,13 @@ extern "C" { #define CSR_FE_RESULT_NO_MORE_THREADS ((CsrResult) 0x0006) /* Thread priorities */ -#define CSR_THREAD_PRIORITY_HIGHEST ((CsrUint16) 0) -#define CSR_THREAD_PRIORITY_HIGH ((CsrUint16) 1) -#define CSR_THREAD_PRIORITY_NORMAL ((CsrUint16) 2) -#define CSR_THREAD_PRIORITY_LOW ((CsrUint16) 3) -#define CSR_THREAD_PRIORITY_LOWEST ((CsrUint16) 4) +#define CSR_THREAD_PRIORITY_HIGHEST ((u16) 0) +#define CSR_THREAD_PRIORITY_HIGH ((u16) 1) +#define CSR_THREAD_PRIORITY_NORMAL ((u16) 2) +#define CSR_THREAD_PRIORITY_LOW ((u16) 3) +#define CSR_THREAD_PRIORITY_LOWEST ((u16) 4) -#define CSR_EVENT_WAIT_INFINITE ((CsrUint16) 0xFFFF) +#define CSR_EVENT_WAIT_INFINITE ((u16) 0xFFFF) /*----------------------------------------------------------------------------* * NAME @@ -66,7 +66,7 @@ CsrResult CsrEventCreate(CsrEventHandle *eventHandle); * CSR_FE_RESULT_INVALID_POINTER in case the eventBits pointer is invalid * *----------------------------------------------------------------------------*/ -CsrResult CsrEventWait(CsrEventHandle *eventHandle, CsrUint16 timeoutInMs, CsrUint32 *eventBits); +CsrResult CsrEventWait(CsrEventHandle *eventHandle, u16 timeoutInMs, CsrUint32 *eventBits); /*----------------------------------------------------------------------------* * NAME @@ -195,7 +195,7 @@ void CsrGlobalMutexUnlock(void); * *----------------------------------------------------------------------------*/ CsrResult CsrThreadCreate(void (*threadFunction)(void *pointer), void *pointer, - CsrUint32 stackSize, CsrUint16 priority, + CsrUint32 stackSize, u16 priority, const CsrCharString *threadName, CsrThreadHandle *threadHandle); /*----------------------------------------------------------------------------* @@ -240,7 +240,7 @@ CsrResult CsrThreadEqual(CsrThreadHandle *threadHandle1, CsrThreadHandle *thread * void * *----------------------------------------------------------------------------*/ -void CsrThreadSleep(CsrUint16 sleepTimeInMs); +void CsrThreadSleep(u16 sleepTimeInMs); #ifndef CSR_PMEM_DEBUG_ENABLE /*----------------------------------------------------------------------------* diff --git a/drivers/staging/csr/csr_lib.h b/drivers/staging/csr/csr_lib.h index 041bd0950b3..7259b63f17a 100644 --- a/drivers/staging/csr/csr_lib.h +++ b/drivers/staging/csr/csr_lib.h @@ -30,7 +30,7 @@ typedef struct * Allocates and fills in a message with the signature CsrEvent * *----------------------------------------------------------------------------*/ -CsrEvent *CsrEvent_struct(CsrUint16 primtype, CsrUint16 msgtype); +CsrEvent *CsrEvent_struct(u16 primtype, u16 msgtype); typedef struct { @@ -46,12 +46,12 @@ typedef struct * Allocates and fills in a message with the signature CsrEventCsrUint8 * *----------------------------------------------------------------------------*/ -CsrEventCsrUint8 *CsrEventCsrUint8_struct(CsrUint16 primtype, CsrUint16 msgtype, u8 value); +CsrEventCsrUint8 *CsrEventCsrUint8_struct(u16 primtype, u16 msgtype, u8 value); typedef struct { CsrPrim type; - CsrUint16 value; + u16 value; } CsrEventCsrUint16; /*----------------------------------------------------------------------------* @@ -62,12 +62,12 @@ typedef struct * Allocates and fills in a message with the signature CsrEventCsrUint16 * *----------------------------------------------------------------------------*/ -CsrEventCsrUint16 *CsrEventCsrUint16_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrUint16 value); +CsrEventCsrUint16 *CsrEventCsrUint16_struct(u16 primtype, u16 msgtype, u16 value); typedef struct { CsrPrim type; - CsrUint16 value1; + u16 value1; u8 value2; } CsrEventCsrUint16CsrUint8; @@ -79,13 +79,13 @@ typedef struct * Allocates and fills in a message with the signature CsrEventCsrUint16CsrUint8 * *----------------------------------------------------------------------------*/ -CsrEventCsrUint16CsrUint8 *CsrEventCsrUint16CsrUint8_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrUint16 value1, u8 value2); +CsrEventCsrUint16CsrUint8 *CsrEventCsrUint16CsrUint8_struct(u16 primtype, u16 msgtype, u16 value1, u8 value2); typedef struct { CsrPrim type; - CsrUint16 value1; - CsrUint16 value2; + u16 value1; + u16 value2; } CsrEventCsrUint16CsrUint16; /*----------------------------------------------------------------------------* @@ -96,12 +96,12 @@ typedef struct * Allocates and fills in a message with the signature CsrEventCsrUint16CsrUint16 * *----------------------------------------------------------------------------*/ -CsrEventCsrUint16CsrUint16 *CsrEventCsrUint16CsrUint16_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrUint16 value1, CsrUint16 value2); +CsrEventCsrUint16CsrUint16 *CsrEventCsrUint16CsrUint16_struct(u16 primtype, u16 msgtype, u16 value1, u16 value2); typedef struct { CsrPrim type; - CsrUint16 value1; + u16 value1; CsrUint32 value2; } CsrEventCsrUint16CsrUint32; @@ -113,12 +113,12 @@ typedef struct * Allocates and fills in a message with the signature CsrEventCsrUint16 * *----------------------------------------------------------------------------*/ -CsrEventCsrUint16CsrUint32 *CsrEventCsrUint16CsrUint32_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrUint16 value1, CsrUint32 value2); +CsrEventCsrUint16CsrUint32 *CsrEventCsrUint16CsrUint32_struct(u16 primtype, u16 msgtype, u16 value1, CsrUint32 value2); typedef struct { CsrPrim type; - CsrUint16 value1; + u16 value1; CsrCharString *value2; } CsrEventCsrUint16CsrCharString; @@ -130,7 +130,7 @@ typedef struct * Allocates and fills in a message with the signature CsrEventCsrUint16CsrCharString * *----------------------------------------------------------------------------*/ -CsrEventCsrUint16CsrCharString *CsrEventCsrUint16CsrCharString_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrUint16 value1, CsrCharString *value2); +CsrEventCsrUint16CsrCharString *CsrEventCsrUint16CsrCharString_struct(u16 primtype, u16 msgtype, u16 value1, CsrCharString *value2); typedef struct { @@ -146,13 +146,13 @@ typedef struct * Allocates and fills in a message with the signature CsrEventCsrUint32 * *----------------------------------------------------------------------------*/ -CsrEventCsrUint32 *CsrEventCsrUint32_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrUint32 value); +CsrEventCsrUint32 *CsrEventCsrUint32_struct(u16 primtype, u16 msgtype, CsrUint32 value); typedef struct { CsrPrim type; CsrUint32 value1; - CsrUint16 value2; + u16 value2; } CsrEventCsrUint32CsrUint16; /*----------------------------------------------------------------------------* @@ -163,7 +163,7 @@ typedef struct * Allocates and fills in a message with the signature CsrEventCsrUint32CsrUint16 * *----------------------------------------------------------------------------*/ -CsrEventCsrUint32CsrUint16 *CsrEventCsrUint32CsrUint16_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrUint32 value1, CsrUint32 value2); +CsrEventCsrUint32CsrUint16 *CsrEventCsrUint32CsrUint16_struct(u16 primtype, u16 msgtype, CsrUint32 value1, CsrUint32 value2); typedef struct { @@ -180,7 +180,7 @@ typedef struct * Allocates and fills in a message with the signature CsrEventCsrUint32CsrCharString * *----------------------------------------------------------------------------*/ -CsrEventCsrUint32CsrCharString *CsrEventCsrUint32CsrCharString_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrUint32 value1, CsrCharString *value2); +CsrEventCsrUint32CsrCharString *CsrEventCsrUint32CsrCharString_struct(u16 primtype, u16 msgtype, CsrUint32 value1, CsrCharString *value2); #ifdef __cplusplus } diff --git a/drivers/staging/csr/csr_log.h b/drivers/staging/csr/csr_log.h index f86c4920628..f6aaac18f99 100644 --- a/drivers/staging/csr/csr_log.h +++ b/drivers/staging/csr/csr_log.h @@ -96,7 +96,7 @@ CsrBool CsrLogTaskIsFiltered(CsrSchedQid taskId, CsrLogLevelTask level); typedef struct { - CsrUint16 primitiveType; + u16 primitiveType; const CsrCharString *primitiveName; CsrMsgConvMsgEntry *messageConv; /* Private - do not use */ } CsrLogPrimitiveInformation; @@ -112,7 +112,7 @@ typedef struct /* Tech logging */ /*---------------------------------*/ typedef u8 bitmask8_t; -typedef CsrUint16 bitmask16_t; +typedef u16 bitmask16_t; typedef CsrUint32 bitmask32_t; #ifdef CSR_LOG_ENABLE @@ -175,7 +175,7 @@ void CsrLogSchedStart(u8 thread_id); void CsrLogSchedStop(u8 thread_id); void CsrLogInitTask(u8 thread_id, CsrSchedQid tskid, const CsrCharString *tskName); -void CsrLogDeinitTask(CsrUint16 task_id); +void CsrLogDeinitTask(u16 task_id); void CsrLogActivate(CsrSchedQid tskid); void CsrLogDeactivate(CsrSchedQid tskid); @@ -188,14 +188,14 @@ void CsrLogMessagePut(CsrUint32 line, CsrSchedQid src_task_id, CsrSchedQid dst_taskid, CsrSchedMsgId msg_id, - CsrUint16 prim_type, + u16 prim_type, const void *msg); void CsrLogMessageGet(CsrSchedQid src_task_id, CsrSchedQid dst_taskid, CsrBool get_res, CsrSchedMsgId msg_id, - CsrUint16 prim_type, + u16 prim_type, const void *msg); void CsrLogTimedEventIn(CsrUint32 line, @@ -203,7 +203,7 @@ void CsrLogTimedEventIn(CsrUint32 line, CsrSchedQid task_id, CsrSchedTid tid, CsrTime requested_delay, - CsrUint16 fniarg, + u16 fniarg, const void *fnvarg); void CsrLogTimedEventFire(CsrSchedQid task_id, @@ -227,18 +227,18 @@ void CsrLogBgintSet(CsrSchedBgint irq); void CsrLogBgintServiceStart(CsrSchedBgint irq); void CsrLogBgintServiceDone(CsrSchedBgint irq); -void CsrLogExceptionStateEvent(CsrUint16 prim_type, +void CsrLogExceptionStateEvent(u16 prim_type, CsrPrim msg_type, - CsrUint16 state, + u16 state, CsrUint32 line, const CsrCharString *file); -void CsrLogExceptionGeneral(CsrUint16 prim_type, - CsrUint16 state, +void CsrLogExceptionGeneral(u16 prim_type, + u16 state, const CsrCharString *text, CsrUint32 line, const CsrCharString *file); -void CsrLogExceptionWarning(CsrUint16 prim_type, - CsrUint16 state, +void CsrLogExceptionWarning(u16 prim_type, + u16 state, const CsrCharString *text, CsrUint32 line, const CsrCharString *file); diff --git a/drivers/staging/csr/csr_log_configure.h b/drivers/staging/csr/csr_log_configure.h index 8c727adce76..c47016ba833 100644 --- a/drivers/staging/csr/csr_log_configure.h +++ b/drivers/staging/csr/csr_log_configure.h @@ -57,7 +57,7 @@ typedef CsrUint32 CsrLogLevelText; #define CSR_LOG_LEVEL_TEXT_ALL ((CsrLogLevelText) 0xFFFF) /* The log text interface is used by both scheduler tasks and components outside the scheduler context. - * Therefore a CsrLogTextTaskId is introduced. It is effectively considered as two CsrUint16's. The lower + * Therefore a CsrLogTextTaskId is introduced. It is effectively considered as two u16's. The lower * 16 bits corresponds one2one with the scheduler queueId's (CsrSchedQid) and as such these bits can not be used * by components outside scheduler tasks. The upper 16 bits are allocated for use of components outside the * scheduler like drivers etc. Components in this range is defined independently by each technology. To avoid @@ -78,7 +78,7 @@ void CsrLogLevelTextSetTask(CsrLogTextTaskId taskId, CsrLogLevelText warningLeve /* Set the text logging level for a given tasks subOrigin */ /* This function can be used as a complement to CsrLogLevelTextSetAll() and CsrLogLevelTextSetTask() to add more _or_ less log from a given * subOrigin within a task than what is set generally with CsrLogLevelTextSetAll() _or_ CsrLogLevelTextSetTask(). */ -void CsrLogLevelTextSetTaskSubOrigin(CsrLogTextTaskId taskId, CsrUint16 subOrigin, CsrLogLevelText warningLevelMask); +void CsrLogLevelTextSetTaskSubOrigin(CsrLogTextTaskId taskId, u16 subOrigin, CsrLogLevelText warningLevelMask); /******************************************************************************* diff --git a/drivers/staging/csr/csr_log_text.h b/drivers/staging/csr/csr_log_text.h index 6e0df43c008..cb01655aed6 100644 --- a/drivers/staging/csr/csr_log_text.h +++ b/drivers/staging/csr/csr_log_text.h @@ -19,13 +19,13 @@ extern "C" { typedef struct CsrLogSubOrigin { - CsrUint16 subOriginNumber; /* Id of the given SubOrigin */ + u16 subOriginNumber; /* Id of the given SubOrigin */ const CsrCharString *subOriginName; /* Prefix Text for this SubOrigin */ } CsrLogSubOrigin; /* Register a task which is going to use the CSR_LOG_TEXT_XXX interface */ #ifdef CSR_LOG_ENABLE -void CsrLogTextRegister(CsrLogTextTaskId taskId, const CsrCharString *taskName, CsrUint16 subOriginsLength, const CsrLogSubOrigin *subOrigins); +void CsrLogTextRegister(CsrLogTextTaskId taskId, const CsrCharString *taskName, u16 subOriginsLength, const CsrLogSubOrigin *subOrigins); #else #define CsrLogTextRegister(taskId, taskName, subOriginsLength, subOrigins) #endif @@ -33,8 +33,8 @@ void CsrLogTextRegister(CsrLogTextTaskId taskId, const CsrCharString *taskName, /* CRITICAL: Conditions that are threatening to the integrity/stability of the system as a whole. */ #if defined(CSR_LOG_ENABLE) && !defined(CSR_LOG_LEVEL_TEXT_CRITICAL_DISABLE) -void CsrLogTextCritical(CsrLogTextTaskId taskId, CsrUint16 subOrigin, const CsrCharString *formatString, ...); -void CsrLogTextBufferCritical(CsrLogTextTaskId taskId, CsrUint16 subOrigin, CsrSize bufferLength, const void *buffer, const CsrCharString *formatString, ...); +void CsrLogTextCritical(CsrLogTextTaskId taskId, u16 subOrigin, const CsrCharString *formatString, ...); +void CsrLogTextBufferCritical(CsrLogTextTaskId taskId, u16 subOrigin, CsrSize bufferLength, const void *buffer, const CsrCharString *formatString, ...); #define CSR_LOG_TEXT_CRITICAL(taskId_subOrigin_formatString_varargs) CsrLogTextCritical taskId_subOrigin_formatString_varargs #define CSR_LOG_TEXT_CONDITIONAL_CRITICAL(condition, logtextargs) {if (condition) {CSR_LOG_TEXT_CRITICAL(logtextargs);}} #define CSR_LOG_TEXT_BUFFER_CRITICAL(taskId_subOrigin_length_buffer_formatString_varargs) CsrLogTextBufferCritical taskId_subOrigin_length_buffer_formatString_varargs @@ -49,8 +49,8 @@ void CsrLogTextBufferCritical(CsrLogTextTaskId taskId, CsrUint16 subOrigin, CsrS /* ERROR: Malfunction of a component rendering it unable to operate correctly, causing lack of functionality but not loss of system integrity/stability. */ #if defined(CSR_LOG_ENABLE) && !defined(CSR_LOG_LEVEL_TEXT_ERROR_DISABLE) -void CsrLogTextError(CsrLogTextTaskId taskId, CsrUint16 subOrigin, const CsrCharString *formatString, ...); -void CsrLogTextBufferError(CsrLogTextTaskId taskId, CsrUint16 subOrigin, CsrSize bufferLength, const void *buffer, const CsrCharString *formatString, ...); +void CsrLogTextError(CsrLogTextTaskId taskId, u16 subOrigin, const CsrCharString *formatString, ...); +void CsrLogTextBufferError(CsrLogTextTaskId taskId, u16 subOrigin, CsrSize bufferLength, const void *buffer, const CsrCharString *formatString, ...); #define CSR_LOG_TEXT_ERROR(taskId_subOrigin_formatString_varargs) CsrLogTextError taskId_subOrigin_formatString_varargs #define CSR_LOG_TEXT_CONDITIONAL_ERROR(condition, logtextargs) {if (condition) {CSR_LOG_TEXT_ERROR(logtextargs);}} #define CSR_LOG_TEXT_BUFFER_ERROR(taskId_subOrigin_length_buffer_formatString_varargs) CsrLogTextBufferError taskId_subOrigin_length_buffer_formatString_varargs @@ -66,8 +66,8 @@ void CsrLogTextBufferError(CsrLogTextTaskId taskId, CsrUint16 subOrigin, CsrSize or violations of specifications, where the result of such deviations does not lead to malfunction of the component. */ #if defined(CSR_LOG_ENABLE) && !defined(CSR_LOG_LEVEL_TEXT_WARNING_DISABLE) -void CsrLogTextWarning(CsrLogTextTaskId taskId, CsrUint16 subOrigin, const CsrCharString *formatString, ...); -void CsrLogTextBufferWarning(CsrLogTextTaskId taskId, CsrUint16 subOrigin, CsrSize bufferLength, const void *buffer, const CsrCharString *formatString, ...); +void CsrLogTextWarning(CsrLogTextTaskId taskId, u16 subOrigin, const CsrCharString *formatString, ...); +void CsrLogTextBufferWarning(CsrLogTextTaskId taskId, u16 subOrigin, CsrSize bufferLength, const void *buffer, const CsrCharString *formatString, ...); #define CSR_LOG_TEXT_WARNING(taskId_subOrigin_formatString_varargs) CsrLogTextWarning taskId_subOrigin_formatString_varargs #define CSR_LOG_TEXT_CONDITIONAL_WARNING(condition, logtextargs) {if (condition) {CSR_LOG_TEXT_WARNING(logtextargs);}} #define CSR_LOG_TEXT_BUFFER_WARNING(taskId_subOrigin_length_buffer_formatString_varargs) CsrLogTextBufferWarning taskId_subOrigin_length_buffer_formatString_varargs @@ -82,8 +82,8 @@ void CsrLogTextBufferWarning(CsrLogTextTaskId taskId, CsrUint16 subOrigin, CsrSi /* INFO: Important events that may aid in determining the conditions under which the more severe conditions are encountered. */ #if defined(CSR_LOG_ENABLE) && !defined(CSR_LOG_LEVEL_TEXT_INFO_DISABLE) -void CsrLogTextInfo(CsrLogTextTaskId taskId, CsrUint16 subOrigin, const CsrCharString *formatString, ...); -void CsrLogTextBufferInfo(CsrLogTextTaskId taskId, CsrUint16 subOrigin, CsrSize bufferLength, const void *buffer, const CsrCharString *formatString, ...); +void CsrLogTextInfo(CsrLogTextTaskId taskId, u16 subOrigin, const CsrCharString *formatString, ...); +void CsrLogTextBufferInfo(CsrLogTextTaskId taskId, u16 subOrigin, CsrSize bufferLength, const void *buffer, const CsrCharString *formatString, ...); #define CSR_LOG_TEXT_INFO(taskId_subOrigin_formatString_varargs) CsrLogTextInfo taskId_subOrigin_formatString_varargs #define CSR_LOG_TEXT_CONDITIONAL_INFO(condition, logtextargs) {if (condition) {CSR_LOG_TEXT_INFO(logtextargs);}} #define CSR_LOG_TEXT_BUFFER_INFO(taskId_subOrigin_length_buffer_formatString_varargs) CsrLogTextBufferInfo taskId_subOrigin_length_buffer_formatString_varargs @@ -97,8 +97,8 @@ void CsrLogTextBufferInfo(CsrLogTextTaskId taskId, CsrUint16 subOrigin, CsrSize /* DEBUG: Similar to INFO, but dedicated to events that occur more frequently. */ #if defined(CSR_LOG_ENABLE) && !defined(CSR_LOG_LEVEL_TEXT_DEBUG_DISABLE) -void CsrLogTextDebug(CsrLogTextTaskId taskId, CsrUint16 subOrigin, const CsrCharString *formatString, ...); -void CsrLogTextBufferDebug(CsrLogTextTaskId taskId, CsrUint16 subOrigin, CsrSize bufferLength, const void *buffer, const CsrCharString *formatString, ...); +void CsrLogTextDebug(CsrLogTextTaskId taskId, u16 subOrigin, const CsrCharString *formatString, ...); +void CsrLogTextBufferDebug(CsrLogTextTaskId taskId, u16 subOrigin, CsrSize bufferLength, const void *buffer, const CsrCharString *formatString, ...); #define CSR_LOG_TEXT_DEBUG(taskId_subOrigin_formatString_varargs) CsrLogTextDebug taskId_subOrigin_formatString_varargs #define CSR_LOG_TEXT_CONDITIONAL_DEBUG(condition, logtextargs) {if (condition) {CSR_LOG_TEXT_DEBUG(logtextargs);}} #define CSR_LOG_TEXT_BUFFER_DEBUG(taskId_subOrigin_length_buffer_formatString_varargs) CsrLogTextBufferDebug taskId_subOrigin_length_buffer_formatString_varargs diff --git a/drivers/staging/csr/csr_macro.h b/drivers/staging/csr/csr_macro.h index e8de0a7bab9..7656e2ac5d5 100644 --- a/drivers/staging/csr/csr_macro.h +++ b/drivers/staging/csr/csr_macro.h @@ -31,7 +31,7 @@ extern "C" { /*------------------------------------------------------------------*/ /* Endian conversion */ /*------------------------------------------------------------------*/ -#define CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr) (((CsrUint16) ((u8 *) (ptr))[0]) | ((CsrUint16) ((u8 *) (ptr))[1]) << 8) +#define CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr) (((u16) ((u8 *) (ptr))[0]) | ((u16) ((u8 *) (ptr))[1]) << 8) #define CSR_GET_UINT32_FROM_LITTLE_ENDIAN(ptr) (((CsrUint32) ((u8 *) (ptr))[0]) | ((CsrUint32) ((u8 *) (ptr))[1]) << 8 | \ ((CsrUint32) ((u8 *) (ptr))[2]) << 16 | ((CsrUint32) ((u8 *) (ptr))[3]) << 24) #define CSR_COPY_UINT16_TO_LITTLE_ENDIAN(uint, ptr) ((u8 *) (ptr))[0] = ((u8) ((uint) & 0x00FF)); \ @@ -40,7 +40,7 @@ extern "C" { ((u8 *) (ptr))[1] = ((u8) (((uint) >> 8) & 0x000000FF)); \ ((u8 *) (ptr))[2] = ((u8) (((uint) >> 16) & 0x000000FF)); \ ((u8 *) (ptr))[3] = ((u8) (((uint) >> 24) & 0x000000FF)) -#define CSR_GET_UINT16_FROM_BIG_ENDIAN(ptr) (((CsrUint16) ((u8 *) (ptr))[1]) | ((CsrUint16) ((u8 *) (ptr))[0]) << 8) +#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_UINT32_FROM_BIG_ENDIAN(ptr) (((CsrUint32) ((u8 *) (ptr))[3]) | ((CsrUint32) ((u8 *) (ptr))[2]) << 8 | \ @@ -66,8 +66,8 @@ extern "C" { (output) = ((u8) (input));(input) += 2 #define CSR_CONVERT_16_FROM_XAP(output, input) \ - (output) = (CsrUint16) ((((CsrUint16) (input)[1]) << 8) | \ - ((CsrUint16) (input)[0]));(input) += 2 + (output) = (u16) ((((u16) (input)[1]) << 8) | \ + ((u16) (input)[0]));(input) += 2 #define CSR_CONVERT_32_FROM_XAP(output, input) \ (output) = (((CsrUint32) (input)[1]) << 24) | \ diff --git a/drivers/staging/csr/csr_msgconv.c b/drivers/staging/csr/csr_msgconv.c index 3f57b042c8f..b2aeb7a184c 100644 --- a/drivers/staging/csr/csr_msgconv.c +++ b/drivers/staging/csr/csr_msgconv.c @@ -18,7 +18,7 @@ static CsrMsgConvEntry *converter; -CsrMsgConvPrimEntry *CsrMsgConvFind(CsrUint16 primType) +CsrMsgConvPrimEntry *CsrMsgConvFind(u16 primType) { CsrMsgConvPrimEntry *ptr = NULL; @@ -41,7 +41,7 @@ CsrMsgConvPrimEntry *CsrMsgConvFind(CsrUint16 primType) return ptr; } -static const CsrMsgConvMsgEntry *find_msg_converter(CsrMsgConvPrimEntry *ptr, CsrUint16 msgType) +static const CsrMsgConvMsgEntry *find_msg_converter(CsrMsgConvPrimEntry *ptr, u16 msgType) { const CsrMsgConvMsgEntry *cv = ptr->conv; if (ptr->lookupFunc) @@ -71,7 +71,7 @@ static const CsrMsgConvMsgEntry *find_msg_converter(CsrMsgConvPrimEntry *ptr, Cs return cv; } -static void *deserialize_data(CsrUint16 primType, +static void *deserialize_data(u16 primType, CsrSize length, u8 *data) { @@ -83,7 +83,7 @@ static void *deserialize_data(CsrUint16 primType, if (ptr) { const CsrMsgConvMsgEntry *cv; - CsrUint16 msgId = 0; + u16 msgId = 0; CsrSize offset = 0; CsrUint16Des(&msgId, data, &offset); @@ -105,7 +105,7 @@ static void *deserialize_data(CsrUint16 primType, return ret; } -static CsrSize sizeof_message(CsrUint16 primType, void *msg) +static CsrSize sizeof_message(u16 primType, void *msg) { CsrMsgConvPrimEntry *ptr = CsrMsgConvFind(primType); CsrSize ret; @@ -113,7 +113,7 @@ static CsrSize sizeof_message(CsrUint16 primType, void *msg) if (ptr) { const CsrMsgConvMsgEntry *cv; - CsrUint16 msgId = *(CsrUint16 *) msg; + u16 msgId = *(u16 *) msg; cv = find_msg_converter(ptr, msgId); if (cv) @@ -133,7 +133,7 @@ static CsrSize sizeof_message(CsrUint16 primType, void *msg) return ret; } -static CsrBool free_message(CsrUint16 primType, u8 *data) +static CsrBool free_message(u16 primType, u8 *data) { CsrMsgConvPrimEntry *ptr; CsrBool ret; @@ -143,7 +143,7 @@ static CsrBool free_message(CsrUint16 primType, u8 *data) if (ptr) { const CsrMsgConvMsgEntry *cv; - CsrUint16 msgId = *(CsrUint16 *) data; + u16 msgId = *(u16 *) data; cv = find_msg_converter(ptr, msgId); if (cv) @@ -164,7 +164,7 @@ static CsrBool free_message(CsrUint16 primType, u8 *data) return ret; } -static u8 *serialize_message(CsrUint16 primType, +static u8 *serialize_message(u16 primType, void *msg, CsrSize *length, u8 *buffer) @@ -180,7 +180,7 @@ static u8 *serialize_message(CsrUint16 primType, { const CsrMsgConvMsgEntry *cv; - cv = find_msg_converter(ptr, *(CsrUint16 *) msg); + cv = find_msg_converter(ptr, *(u16 *) msg); if (cv) { ret = cv->serFunc(buffer, length, msg); @@ -198,12 +198,12 @@ static u8 *serialize_message(CsrUint16 primType, return ret; } -CsrSize CsrMsgConvSizeof(CsrUint16 primType, void *msg) +CsrSize CsrMsgConvSizeof(u16 primType, void *msg) { return sizeof_message(primType, msg); } -u8 *CsrMsgConvSerialize(u8 *buffer, CsrSize maxBufferOffset, CsrSize *offset, CsrUint16 primType, void *msg) +u8 *CsrMsgConvSerialize(u8 *buffer, CsrSize maxBufferOffset, CsrSize *offset, u16 primType, void *msg) { if (converter) { @@ -221,7 +221,7 @@ u8 *CsrMsgConvSerialize(u8 *buffer, CsrSize maxBufferOffset, CsrSize *offset, Cs } /* Insert profile converter at head of converter list. */ -void CsrMsgConvInsert(CsrUint16 primType, const CsrMsgConvMsgEntry *ce) +void CsrMsgConvInsert(u16 primType, const CsrMsgConvMsgEntry *ce) { CsrMsgConvPrimEntry *pc; pc = CsrMsgConvFind(primType); @@ -242,7 +242,7 @@ void CsrMsgConvInsert(CsrUint16 primType, const CsrMsgConvMsgEntry *ce) } EXPORT_SYMBOL_GPL(CsrMsgConvInsert); -CsrMsgConvMsgEntry *CsrMsgConvFindEntry(CsrUint16 primType, CsrUint16 msgType) +CsrMsgConvMsgEntry *CsrMsgConvFindEntry(u16 primType, u16 msgType) { CsrMsgConvPrimEntry *ptr = CsrMsgConvFind(primType); if (ptr) @@ -253,18 +253,18 @@ CsrMsgConvMsgEntry *CsrMsgConvFindEntry(CsrUint16 primType, CsrUint16 msgType) } EXPORT_SYMBOL_GPL(CsrMsgConvFindEntry); -CsrMsgConvMsgEntry *CsrMsgConvFindEntryByMsg(CsrUint16 primType, const void *msg) +CsrMsgConvMsgEntry *CsrMsgConvFindEntryByMsg(u16 primType, const void *msg) { CsrMsgConvPrimEntry *ptr = CsrMsgConvFind(primType); if (ptr && msg) { - CsrUint16 msgType = *((CsrUint16 *) msg); + u16 msgType = *((u16 *) msg); return (CsrMsgConvMsgEntry *) find_msg_converter(ptr, msgType); } return NULL; } -void CsrMsgConvCustomLookupRegister(CsrUint16 primType, CsrMsgCustomLookupFunc *lookupFunc) +void CsrMsgConvCustomLookupRegister(u16 primType, CsrMsgCustomLookupFunc *lookupFunc) { CsrMsgConvPrimEntry *ptr = CsrMsgConvFind(primType); if (ptr) diff --git a/drivers/staging/csr/csr_msgconv.h b/drivers/staging/csr/csr_msgconv.h index dd4853d5ce6..7438f9578f0 100644 --- a/drivers/staging/csr/csr_msgconv.h +++ b/drivers/staging/csr/csr_msgconv.h @@ -28,7 +28,7 @@ typedef void *(CsrMsgDeserializeFunc)(u8 *buffer, CsrSize length); /* Converter entry for one message type */ typedef struct CsrMsgConvMsgEntry { - CsrUint16 msgType; + u16 msgType; CsrMsgSizeofFunc *sizeofFunc; CsrMsgSerializeFunc *serFunc; CsrMsgDeserializeFunc *deserFunc; @@ -36,12 +36,12 @@ typedef struct CsrMsgConvMsgEntry } CsrMsgConvMsgEntry; /* Optional lookup function */ -typedef CsrMsgConvMsgEntry *(CsrMsgCustomLookupFunc)(CsrMsgConvMsgEntry *ce, CsrUint16 msgType); +typedef CsrMsgConvMsgEntry *(CsrMsgCustomLookupFunc)(CsrMsgConvMsgEntry *ce, u16 msgType); /* All converter entries for one specific primitive */ typedef struct CsrMsgConvPrimEntry { - CsrUint16 primType; + u16 primType; const CsrMsgConvMsgEntry *conv; CsrMsgCustomLookupFunc *lookupFunc; struct CsrMsgConvPrimEntry *next; @@ -50,21 +50,21 @@ typedef struct CsrMsgConvPrimEntry typedef struct { CsrMsgConvPrimEntry *profile_converters; - void *(*deserialize_data)(CsrUint16 primType, CsrSize length, u8 * data); - CsrBool (*free_message)(CsrUint16 primType, u8 *data); - CsrSize (*sizeof_message)(CsrUint16 primType, void *msg); - u8 *(*serialize_message)(CsrUint16 primType, void *msg, + void *(*deserialize_data)(u16 primType, CsrSize length, u8 * data); + CsrBool (*free_message)(u16 primType, u8 *data); + CsrSize (*sizeof_message)(u16 primType, void *msg); + u8 *(*serialize_message)(u16 primType, void *msg, CsrSize * length, u8 * buffer); } CsrMsgConvEntry; -CsrSize CsrMsgConvSizeof(CsrUint16 primType, void *msg); -u8 *CsrMsgConvSerialize(u8 *buffer, CsrSize maxBufferOffset, CsrSize *offset, CsrUint16 primType, void *msg); -void CsrMsgConvCustomLookupRegister(CsrUint16 primType, CsrMsgCustomLookupFunc *lookupFunc); -void CsrMsgConvInsert(CsrUint16 primType, const CsrMsgConvMsgEntry *ce); -CsrMsgConvPrimEntry *CsrMsgConvFind(CsrUint16 primType); -CsrMsgConvMsgEntry *CsrMsgConvFindEntry(CsrUint16 primType, CsrUint16 msgType); -CsrMsgConvMsgEntry *CsrMsgConvFindEntryByMsg(CsrUint16 primType, const void *msg); +CsrSize CsrMsgConvSizeof(u16 primType, void *msg); +u8 *CsrMsgConvSerialize(u8 *buffer, CsrSize maxBufferOffset, CsrSize *offset, u16 primType, void *msg); +void CsrMsgConvCustomLookupRegister(u16 primType, CsrMsgCustomLookupFunc *lookupFunc); +void CsrMsgConvInsert(u16 primType, const CsrMsgConvMsgEntry *ce); +CsrMsgConvPrimEntry *CsrMsgConvFind(u16 primType); +CsrMsgConvMsgEntry *CsrMsgConvFindEntry(u16 primType, u16 msgType); +CsrMsgConvMsgEntry *CsrMsgConvFindEntryByMsg(u16 primType, const void *msg); CsrMsgConvEntry *CsrMsgConvGet(void); CsrMsgConvEntry *CsrMsgConvInit(void); #ifdef ENABLE_SHUTDOWN @@ -79,7 +79,7 @@ CsrUint32 CsrUtf16StringSerLen(const CsrUtf16String *str); /* Prototypes for primitive type serializers */ void CsrUint8Ser(u8 *buffer, CsrSize *offset, u8 value); -void CsrUint16Ser(u8 *buffer, CsrSize *offset, CsrUint16 value); +void CsrUint16Ser(u8 *buffer, CsrSize *offset, u16 value); void CsrUint32Ser(u8 *buffer, CsrSize *offset, CsrUint32 value); void CsrMemCpySer(u8 *buffer, CsrSize *offset, const void *value, CsrSize length); void CsrCharStringSer(u8 *buffer, CsrSize *offset, const CsrCharString *value); @@ -89,7 +89,7 @@ void CsrVoidPtrSer(u8 *buffer, CsrSize *offset, void *ptr); void CsrSizeSer(u8 *buffer, CsrSize *offset, CsrSize value); void CsrUint8Des(u8 *value, u8 *buffer, CsrSize *offset); -void CsrUint16Des(CsrUint16 *value, u8 *buffer, CsrSize *offset); +void CsrUint16Des(u16 *value, u8 *buffer, CsrSize *offset); void CsrUint32Des(CsrUint32 *value, u8 *buffer, CsrSize *offset); void CsrMemCpyDes(void *value, u8 *buffer, CsrSize *offset, CsrSize length); void CsrCharStringDes(CsrCharString **value, u8 *buffer, CsrSize *offset); diff --git a/drivers/staging/csr/csr_panic.c b/drivers/staging/csr/csr_panic.c index 87c72ad50f8..0b78a725cee 100644 --- a/drivers/staging/csr/csr_panic.c +++ b/drivers/staging/csr/csr_panic.c @@ -15,7 +15,7 @@ #include "csr_types.h" #include "csr_panic.h" -void CsrPanic(u8 tech, CsrUint16 reason, const char *p) +void CsrPanic(u8 tech, u16 reason, const char *p) { BUG_ON(1); } diff --git a/drivers/staging/csr/csr_panic.h b/drivers/staging/csr/csr_panic.h index 2b7166873e8..e993baf5058 100644 --- a/drivers/staging/csr/csr_panic.h +++ b/drivers/staging/csr/csr_panic.h @@ -46,7 +46,7 @@ extern "C" { /* Panic interface used by technologies */ /* DEPRECATED - replaced by csr_log_text.h */ -void CsrPanic(u8 tech, CsrUint16 reason, const char *p); +void CsrPanic(u8 tech, u16 reason, const char *p); #ifdef __cplusplus } diff --git a/drivers/staging/csr/csr_prim_defs.h b/drivers/staging/csr/csr_prim_defs.h index 02ab9139194..7d47578f18e 100644 --- a/drivers/staging/csr/csr_prim_defs.h +++ b/drivers/staging/csr/csr_prim_defs.h @@ -18,44 +18,44 @@ extern "C" { /************************************************************************************ * Segmentation of primitives in upstream and downstream segment ************************************************************************************/ -typedef CsrUint16 CsrPrim; +typedef u16 CsrPrim; #define CSR_PRIM_UPSTREAM ((CsrPrim) (0x8000)) /************************************************************************************ * Primitive definitions for Synergy framework ************************************************************************************/ -#define CSR_SYNERGY_EVENT_CLASS_BASE ((CsrUint16) (0x0600)) +#define CSR_SYNERGY_EVENT_CLASS_BASE ((u16) (0x0600)) -#define CSR_HCI_PRIM ((CsrUint16) (0x0000 | CSR_SYNERGY_EVENT_CLASS_BASE)) -#define CSR_BCCMD_PRIM ((CsrUint16) (0x0001 | CSR_SYNERGY_EVENT_CLASS_BASE)) -#define CSR_HQ_PRIM ((CsrUint16) (0x0002 | CSR_SYNERGY_EVENT_CLASS_BASE)) -#define CSR_VM_PRIM ((CsrUint16) (0x0003 | CSR_SYNERGY_EVENT_CLASS_BASE)) -#define CSR_TM_BLUECORE_PRIM ((CsrUint16) (0x0004 | CSR_SYNERGY_EVENT_CLASS_BASE)) -#define CSR_FP_PRIM ((CsrUint16) (0x0005 | CSR_SYNERGY_EVENT_CLASS_BASE)) -#define CSR_IP_SOCKET_PRIM ((CsrUint16) (0x0006 | CSR_SYNERGY_EVENT_CLASS_BASE)) -#define CSR_IP_ETHER_PRIM ((CsrUint16) (0x0007 | CSR_SYNERGY_EVENT_CLASS_BASE)) -#define CSR_IP_IFCONFIG_PRIM ((CsrUint16) (0x0008 | CSR_SYNERGY_EVENT_CLASS_BASE)) -#define CSR_IP_INTERNAL_PRIM ((CsrUint16) (0x0009 | CSR_SYNERGY_EVENT_CLASS_BASE)) -#define CSR_FSAL_PRIM ((CsrUint16) (0x000A | CSR_SYNERGY_EVENT_CLASS_BASE)) -#define CSR_DATA_STORE_PRIM ((CsrUint16) (0x000B | CSR_SYNERGY_EVENT_CLASS_BASE)) -#define CSR_AM_PRIM ((CsrUint16) (0x000C | CSR_SYNERGY_EVENT_CLASS_BASE)) -#define CSR_TLS_PRIM ((CsrUint16) (0x000D | CSR_SYNERGY_EVENT_CLASS_BASE)) -#define CSR_DHCP_SERVER_PRIM ((CsrUint16) (0x000E | CSR_SYNERGY_EVENT_CLASS_BASE)) -#define CSR_TFTP_PRIM ((CsrUint16) (0x000F | CSR_SYNERGY_EVENT_CLASS_BASE)) -#define CSR_DSPM_PRIM ((CsrUint16) (0x0010 | CSR_SYNERGY_EVENT_CLASS_BASE)) -#define CSR_TLS_INTERNAL_PRIM ((CsrUint16) (0x0011 | CSR_SYNERGY_EVENT_CLASS_BASE)) +#define CSR_HCI_PRIM ((u16) (0x0000 | CSR_SYNERGY_EVENT_CLASS_BASE)) +#define CSR_BCCMD_PRIM ((u16) (0x0001 | CSR_SYNERGY_EVENT_CLASS_BASE)) +#define CSR_HQ_PRIM ((u16) (0x0002 | CSR_SYNERGY_EVENT_CLASS_BASE)) +#define CSR_VM_PRIM ((u16) (0x0003 | CSR_SYNERGY_EVENT_CLASS_BASE)) +#define CSR_TM_BLUECORE_PRIM ((u16) (0x0004 | CSR_SYNERGY_EVENT_CLASS_BASE)) +#define CSR_FP_PRIM ((u16) (0x0005 | CSR_SYNERGY_EVENT_CLASS_BASE)) +#define CSR_IP_SOCKET_PRIM ((u16) (0x0006 | CSR_SYNERGY_EVENT_CLASS_BASE)) +#define CSR_IP_ETHER_PRIM ((u16) (0x0007 | CSR_SYNERGY_EVENT_CLASS_BASE)) +#define CSR_IP_IFCONFIG_PRIM ((u16) (0x0008 | CSR_SYNERGY_EVENT_CLASS_BASE)) +#define CSR_IP_INTERNAL_PRIM ((u16) (0x0009 | CSR_SYNERGY_EVENT_CLASS_BASE)) +#define CSR_FSAL_PRIM ((u16) (0x000A | CSR_SYNERGY_EVENT_CLASS_BASE)) +#define CSR_DATA_STORE_PRIM ((u16) (0x000B | CSR_SYNERGY_EVENT_CLASS_BASE)) +#define CSR_AM_PRIM ((u16) (0x000C | CSR_SYNERGY_EVENT_CLASS_BASE)) +#define CSR_TLS_PRIM ((u16) (0x000D | CSR_SYNERGY_EVENT_CLASS_BASE)) +#define CSR_DHCP_SERVER_PRIM ((u16) (0x000E | CSR_SYNERGY_EVENT_CLASS_BASE)) +#define CSR_TFTP_PRIM ((u16) (0x000F | CSR_SYNERGY_EVENT_CLASS_BASE)) +#define CSR_DSPM_PRIM ((u16) (0x0010 | CSR_SYNERGY_EVENT_CLASS_BASE)) +#define CSR_TLS_INTERNAL_PRIM ((u16) (0x0011 | CSR_SYNERGY_EVENT_CLASS_BASE)) #define NUMBER_OF_CSR_FW_EVENTS (CSR_DSPM_PRIM - CSR_SYNERGY_EVENT_CLASS_BASE + 1) -#define CSR_SYNERGY_EVENT_CLASS_MISC_BASE ((CsrUint16) (0x06A0)) +#define CSR_SYNERGY_EVENT_CLASS_MISC_BASE ((u16) (0x06A0)) -#define CSR_UI_PRIM ((CsrUint16) (0x0000 | CSR_SYNERGY_EVENT_CLASS_MISC_BASE)) -#define CSR_APP_PRIM ((CsrUint16) (0x0001 | CSR_SYNERGY_EVENT_CLASS_MISC_BASE)) -#define CSR_SDIO_PROBE_PRIM ((CsrUint16) (0x0002 | CSR_SYNERGY_EVENT_CLASS_MISC_BASE)) +#define CSR_UI_PRIM ((u16) (0x0000 | CSR_SYNERGY_EVENT_CLASS_MISC_BASE)) +#define CSR_APP_PRIM ((u16) (0x0001 | CSR_SYNERGY_EVENT_CLASS_MISC_BASE)) +#define CSR_SDIO_PROBE_PRIM ((u16) (0x0002 | CSR_SYNERGY_EVENT_CLASS_MISC_BASE)) #define NUMBER_OF_CSR_FW_MISC_EVENTS (CSR_SDIO_PROBE_PRIM - CSR_SYNERGY_EVENT_CLASS_MISC_BASE + 1) -#define CSR_ENV_PRIM ((CsrUint16) (0x00FF | CSR_SYNERGY_EVENT_CLASS_MISC_BASE)) +#define CSR_ENV_PRIM ((u16) (0x00FF | CSR_SYNERGY_EVENT_CLASS_MISC_BASE)) #ifdef __cplusplus } diff --git a/drivers/staging/csr/csr_result.h b/drivers/staging/csr/csr_result.h index 249b4990c47..68fb7599bb8 100644 --- a/drivers/staging/csr/csr_result.h +++ b/drivers/staging/csr/csr_result.h @@ -16,7 +16,7 @@ extern "C" { #endif -typedef CsrUint16 CsrResult; +typedef u16 CsrResult; #define CSR_RESULT_SUCCESS ((CsrResult) 0x0000) #define CSR_RESULT_FAILURE ((CsrResult) 0xFFFF) diff --git a/drivers/staging/csr/csr_sched.h b/drivers/staging/csr/csr_sched.h index 2f982bbfb72..944b7c13a05 100644 --- a/drivers/staging/csr/csr_sched.h +++ b/drivers/staging/csr/csr_sched.h @@ -20,10 +20,10 @@ extern "C" { typedef CsrUint32 CsrSchedIdentifier; /* A task identifier */ -typedef CsrUint16 CsrSchedTaskId; +typedef u16 CsrSchedTaskId; /* A queue identifier */ -typedef CsrUint16 CsrSchedQid; +typedef u16 CsrSchedQid; #define CSR_SCHED_QID_INVALID ((CsrSchedQid) 0xFFFF) /* A message identifier */ @@ -50,7 +50,7 @@ typedef void (*schedEntryFunction_t)(void **inst); /* * Background interrupt definitions */ -typedef CsrUint16 CsrSchedBgint; +typedef u16 CsrSchedBgint; #define CSR_SCHED_BGINT_INVALID ((CsrSchedBgint) 0xFFFF) typedef void (*CsrSchedBgintHandler)(void *); @@ -133,14 +133,14 @@ void CsrSchedBgintSet(CsrSchedBgint bgint); *----------------------------------------------------------------------------*/ #if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER) void CsrSchedMessagePutStringLog(CsrSchedQid q, - CsrUint16 mi, + u16 mi, void *mv, CsrUint32 line, const CsrCharString *file); #define CsrSchedMessagePut(q, mi, mv) CsrSchedMessagePutStringLog((q), (mi), (mv), __LINE__, __FILE__) #else void CsrSchedMessagePut(CsrSchedQid q, - CsrUint16 mi, + u16 mi, void *mv); #endif @@ -164,14 +164,14 @@ void CsrSchedMessagePut(CsrSchedQid q, * *----------------------------------------------------------------------------*/ #if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER) -void CsrSchedMessageBroadcastStringLog(CsrUint16 mi, +void CsrSchedMessageBroadcastStringLog(u16 mi, void *(*msg_build_func)(void *), void *msg_build_ptr, CsrUint32 line, const CsrCharString *file); #define CsrSchedMessageBroadcast(mi, fn, ptr) CsrSchedMessageBroadcastStringLog((mi), (fn), (ptr), __LINE__, __FILE__) #else -void CsrSchedMessageBroadcast(CsrUint16 mi, +void CsrSchedMessageBroadcast(u16 mi, void *(*msg_build_func)(void *), void *msg_build_ptr); #endif @@ -182,7 +182,7 @@ void CsrSchedMessageBroadcast(CsrUint16 mi, * * DESCRIPTION * Obtains a message from the message queue belonging to the calling task. - * The message consists of one or both of a CsrUint16 and a void *. + * The message consists of one or both of a u16 and a void *. * * RETURNS * CsrBool - TRUE if a message has been obtained from the queue, else FALSE. @@ -193,7 +193,7 @@ void CsrSchedMessageBroadcast(CsrUint16 mi, * them message is discarded. * *----------------------------------------------------------------------------*/ -CsrBool CsrSchedMessageGet(CsrUint16 *pmi, void **pmv); +CsrBool CsrSchedMessageGet(u16 *pmi, void **pmv); /*----------------------------------------------------------------------------* * NAME @@ -219,16 +219,16 @@ CsrBool CsrSchedMessageGet(CsrUint16 *pmi, void **pmv); *----------------------------------------------------------------------------*/ #if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER) CsrSchedTid CsrSchedTimerSetStringLog(CsrTime delay, - void (*fn)(CsrUint16 mi, void *mv), - CsrUint16 fniarg, + void (*fn)(u16 mi, void *mv), + u16 fniarg, void *fnvarg, CsrUint32 line, const CsrCharString *file); #define CsrSchedTimerSet(d, fn, fni, fnv) CsrSchedTimerSetStringLog((d), (fn), (fni), (fnv), __LINE__, __FILE__) #else CsrSchedTid CsrSchedTimerSet(CsrTime delay, - void (*fn)(CsrUint16 mi, void *mv), - CsrUint16 fniarg, + void (*fn)(u16 mi, void *mv), + u16 fniarg, void *fnvarg); #endif @@ -246,14 +246,14 @@ CsrSchedTid CsrSchedTimerSet(CsrTime delay, *----------------------------------------------------------------------------*/ #if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER) CsrBool CsrSchedTimerCancelStringLog(CsrSchedTid eventid, - CsrUint16 *pmi, + u16 *pmi, void **pmv, CsrUint32 line, const CsrCharString *file); #define CsrSchedTimerCancel(e, pmi, pmv) CsrSchedTimerCancelStringLog((e), (pmi), (pmv), __LINE__, __FILE__) #else CsrBool CsrSchedTimerCancel(CsrSchedTid eventid, - CsrUint16 *pmi, + u16 *pmi, void **pmv); #endif diff --git a/drivers/staging/csr/csr_sdio.h b/drivers/staging/csr/csr_sdio.h index 2ce4f167d1b..0b24f55aa0b 100644 --- a/drivers/staging/csr/csr_sdio.h +++ b/drivers/staging/csr/csr_sdio.h @@ -52,8 +52,8 @@ extern "C" { *----------------------------------------------------------------------------*/ typedef struct { - CsrUint16 manfId; /* Vendor ID to match or CSR_SDIO_ANY_MANF_ID */ - CsrUint16 cardId; /* Device ID to match or CSR_SDIO_ANY_CARD_ID */ + u16 manfId; /* Vendor ID to match or CSR_SDIO_ANY_MANF_ID */ + u16 cardId; /* Device ID to match or CSR_SDIO_ANY_CARD_ID */ u8 sdioFunction; /* SDIO Function number to match or CSR_SDIO_ANY_SDIO_FUNCTION */ u8 sdioInterface; /* SDIO Standard Interface Code to match or CSR_SDIO_ANY_SDIO_INTERFACE */ } CsrSdioFunctionId; @@ -84,7 +84,7 @@ typedef struct typedef struct { CsrSdioFunctionId sdioId; - CsrUint16 blockSize; /* Actual configured block size, or 0 if unconfigured */ + u16 blockSize; /* Actual configured block size, or 0 if unconfigured */ CsrUint32 features; /* Bit mask with any of CSR_SDIO_FEATURE_* set */ void *device; /* Handle of device containing the function */ void *driverData; /* For use by the Function Driver */ @@ -434,7 +434,7 @@ void CsrSdioResumeAcknowledge(CsrSdioFunction *function, CsrResult result); * (after the second operation) is in the valid range. * *----------------------------------------------------------------------------*/ -CsrResult CsrSdioBlockSizeSet(CsrSdioFunction *function, CsrUint16 blockSize); +CsrResult CsrSdioBlockSizeSet(CsrSdioFunction *function, u16 blockSize); /*----------------------------------------------------------------------------* * NAME @@ -563,10 +563,10 @@ void CsrSdioWrite8Async(CsrSdioFunction *function, CsrUint32 address, u8 data, C * the callback function. * *----------------------------------------------------------------------------*/ -CsrResult CsrSdioRead16(CsrSdioFunction *function, CsrUint32 address, CsrUint16 *data); -CsrResult CsrSdioWrite16(CsrSdioFunction *function, CsrUint32 address, CsrUint16 data); -void CsrSdioRead16Async(CsrSdioFunction *function, CsrUint32 address, CsrUint16 *data, CsrSdioAsyncCallback callback); -void CsrSdioWrite16Async(CsrSdioFunction *function, CsrUint32 address, CsrUint16 data, CsrSdioAsyncCallback callback); +CsrResult CsrSdioRead16(CsrSdioFunction *function, CsrUint32 address, u16 *data); +CsrResult CsrSdioWrite16(CsrSdioFunction *function, CsrUint32 address, u16 data); +void CsrSdioRead16Async(CsrSdioFunction *function, CsrUint32 address, u16 *data, CsrSdioAsyncCallback callback); +void CsrSdioWrite16Async(CsrSdioFunction *function, CsrUint32 address, u16 data, CsrSdioAsyncCallback callback); /*----------------------------------------------------------------------------* * NAME diff --git a/drivers/staging/csr/csr_serialize_primitive_types.c b/drivers/staging/csr/csr_serialize_primitive_types.c index 41bd4bec9eb..3b20b7d6304 100644 --- a/drivers/staging/csr/csr_serialize_primitive_types.c +++ b/drivers/staging/csr/csr_serialize_primitive_types.c @@ -23,7 +23,7 @@ void CsrUint8Des(u8 *value, u8 *buffer, CsrSize *offset) } EXPORT_SYMBOL_GPL(CsrUint8Des); -void CsrUint16Des(CsrUint16 *value, u8 *buffer, CsrSize *offset) +void CsrUint16Des(u16 *value, u8 *buffer, CsrSize *offset) { *value = (buffer[*offset + 0] << 0) | (buffer[*offset + 1] << 8); @@ -95,7 +95,7 @@ void CsrUint8Ser(u8 *buffer, CsrSize *offset, u8 value) } EXPORT_SYMBOL_GPL(CsrUint8Ser); -void CsrUint16Ser(u8 *buffer, CsrSize *offset, CsrUint16 value) +void CsrUint16Ser(u8 *buffer, CsrSize *offset, u16 value) { buffer[*offset + 0] = (u8) ((value >> 0) & 0xFF); buffer[*offset + 1] = (u8) ((value >> 8) & 0xFF); @@ -150,7 +150,7 @@ void CsrUtf16StringSer(u8 *buffer, CsrSize *offset, const CsrUtf16String *value) for (i = 0; i < length; i++) { - CsrUint16Ser(buffer, offset, (CsrUint16) value[i]); + CsrUint16Ser(buffer, offset, (u16) value[i]); } } else diff --git a/drivers/staging/csr/csr_time.h b/drivers/staging/csr/csr_time.h index 0ede47e911f..032942712b6 100644 --- a/drivers/staging/csr/csr_time.h +++ b/drivers/staging/csr/csr_time.h @@ -43,7 +43,7 @@ typedef CsrUint32 CsrTime; typedef struct { CsrUint32 sec; - CsrUint16 msec; + u16 msec; } CsrTimeUtc; diff --git a/drivers/staging/csr/csr_types.h b/drivers/staging/csr/csr_types.h index e2950602081..0e5abe54497 100644 --- a/drivers/staging/csr/csr_types.h +++ b/drivers/staging/csr/csr_types.h @@ -33,7 +33,6 @@ typedef uintptr_t CsrUintptr; /* Unsigned integer large enough to hold any poi typedef ptrdiff_t CsrIntptr; /* intptr_t is not defined in kernel. Use the equivalent ptrdiff_t. */ /* Unsigned fixed width types */ -typedef uint16_t CsrUint16; typedef uint32_t CsrUint32; /* Signed fixed width types */ @@ -46,7 +45,7 @@ typedef u8 CsrBool; /* String types */ typedef char CsrCharString; typedef u8 CsrUtf8String; -typedef CsrUint16 CsrUtf16String; /* 16-bit UTF16 strings */ +typedef u16 CsrUtf16String; /* 16-bit UTF16 strings */ typedef CsrUint32 CsrUint24; /* diff --git a/drivers/staging/csr/csr_unicode.h b/drivers/staging/csr/csr_unicode.h index 3d86de424b9..64519c0d311 100644 --- a/drivers/staging/csr/csr_unicode.h +++ b/drivers/staging/csr/csr_unicode.h @@ -28,8 +28,8 @@ CsrUtf16String *CsrUtf82Utf16String(const CsrUtf8String *utf8String); CsrUtf16String *CsrUtf16StrCpy(CsrUtf16String *target, const CsrUtf16String *source); CsrUtf16String *CsrUtf16StringDuplicate(const CsrUtf16String *source); -CsrUint16 CsrUtf16StrICmp(const CsrUtf16String *string1, const CsrUtf16String *string2); -CsrUint16 CsrUtf16StrNICmp(const CsrUtf16String *string1, const CsrUtf16String *string2, CsrUint32 count); +u16 CsrUtf16StrICmp(const CsrUtf16String *string1, const CsrUtf16String *string2); +u16 CsrUtf16StrNICmp(const CsrUtf16String *string1, const CsrUtf16String *string2, CsrUint32 count); CsrUtf16String *CsrUtf16MemCpy(CsrUtf16String *dest, const CsrUtf16String *src, CsrUint32 count); CsrUtf16String *CsrUtf16ConcatenateTexts(const CsrUtf16String *inputText1, const CsrUtf16String *inputText2, diff --git a/drivers/staging/csr/csr_utf16.c b/drivers/staging/csr/csr_utf16.c index 6f709da0769..7e724da7808 100644 --- a/drivers/staging/csr/csr_utf16.c +++ b/drivers/staging/csr/csr_utf16.c @@ -75,7 +75,7 @@ static const CsrUint32 offsetsFromUtf8[4] = *********************************************************************************/ CsrUtf16String *CsrUint32ToUtf16String(CsrUint32 number) { - CsrUint16 count, noOfDigits; + u16 count, noOfDigits; CsrUtf16String *output; CsrUint32 tempNumber; @@ -115,10 +115,10 @@ CsrUtf16String *CsrUint32ToUtf16String(CsrUint32 number) *********************************************************************************/ CsrUint32 CsrUtf16StringToUint32(const CsrUtf16String *unicodeString) { - CsrUint16 numLen, count; + u16 numLen, count; CsrUint32 newNumber = 0; - numLen = (CsrUint16) CsrUtf16StrLen(unicodeString); + numLen = (u16) CsrUtf16StrLen(unicodeString); if ((numLen > 10) || (numLen == 0) || (unicodeString == NULL)) /*CSRMAX number is 4.294.967.295 */ { @@ -673,15 +673,15 @@ CsrUtf16String *CsrUtf82Utf16String(const CsrUtf8String *utf8String) ch -= offsetsFromUtf8[extraBytes2Read]; - if (ch <= 0xFFFF) /* Character can be encoded in one CsrUint16 */ + if (ch <= 0xFFFF) /* Character can be encoded in one u16 */ { - *dest++ = (CsrUint16) ch; + *dest++ = (u16) ch; } - else /* The character needs two CsrUint16 */ + else /* The character needs two u16 */ { ch -= UNI_HALF_BASE; - *dest++ = (CsrUint16) ((ch >> UNI_HALF_SHIFT) | UNI_SUR_HIGH_START); - *dest++ = (CsrUint16) ((ch & 0x03FF) | UNI_SUR_LOW_START); + *dest++ = (u16) ((ch >> UNI_HALF_SHIFT) | UNI_SUR_HIGH_START); + *dest++ = (u16) ((ch & 0x03FF) | UNI_SUR_LOW_START); } } } @@ -753,7 +753,7 @@ CsrUtf16String *CsrUtf16StringDuplicate(const CsrUtf16String *source) * Output: 0: if the strings are identical. * *********************************************************************************/ -CsrUint16 CsrUtf16StrICmp(const CsrUtf16String *string1, const CsrUtf16String *string2) +u16 CsrUtf16StrICmp(const CsrUtf16String *string1, const CsrUtf16String *string2) { while (*string1 || *string2) { @@ -781,7 +781,7 @@ CsrUint16 CsrUtf16StrICmp(const CsrUtf16String *string1, const CsrUtf16String *s * Output: 0: if the strings are identical. * *********************************************************************************/ -CsrUint16 CsrUtf16StrNICmp(const CsrUtf16String *string1, const CsrUtf16String *string2, CsrUint32 count) +u16 CsrUtf16StrNICmp(const CsrUtf16String *string1, const CsrUtf16String *string2, CsrUint32 count) { while ((*string1 || *string2) && count--) { diff --git a/drivers/staging/csr/csr_util.c b/drivers/staging/csr/csr_util.c index 83721fe8654..32c114b9825 100644 --- a/drivers/staging/csr/csr_util.c +++ b/drivers/staging/csr/csr_util.c @@ -55,7 +55,7 @@ u8 CsrBitCountDense(CsrUint32 n) /*------------------------------------------------------------------*/ CsrBool CsrHexStrToUint8(const CsrCharString *string, u8 *returnValue) { - CsrUint16 currentIndex = 0; + u16 currentIndex = 0; *returnValue = 0; if ((string[currentIndex] == '0') && (CSR_TOUPPER(string[currentIndex + 1]) == 'X')) { @@ -77,9 +77,9 @@ CsrBool CsrHexStrToUint8(const CsrCharString *string, u8 *returnValue) return FALSE; } -CsrBool CsrHexStrToUint16(const CsrCharString *string, CsrUint16 *returnValue) +CsrBool CsrHexStrToUint16(const CsrCharString *string, u16 *returnValue) { - CsrUint16 currentIndex = 0; + u16 currentIndex = 0; *returnValue = 0; if ((string[currentIndex] == '0') && (CSR_TOUPPER(string[currentIndex + 1]) == 'X')) { @@ -89,7 +89,7 @@ CsrBool CsrHexStrToUint16(const CsrCharString *string, CsrUint16 *returnValue) { while (((string[currentIndex] >= '0') && (string[currentIndex] <= '9')) || ((CSR_TOUPPER(string[currentIndex]) >= 'A') && (CSR_TOUPPER(string[currentIndex]) <= 'F'))) { - *returnValue = (CsrUint16) (*returnValue * 16 + (((string[currentIndex] >= '0') && (string[currentIndex] <= '9')) ? string[currentIndex] - '0' : CSR_TOUPPER(string[currentIndex]) - 'A' + 10)); + *returnValue = (u16) (*returnValue * 16 + (((string[currentIndex] >= '0') && (string[currentIndex] <= '9')) ? string[currentIndex] - '0' : CSR_TOUPPER(string[currentIndex]) - 'A' + 10)); currentIndex++; if (currentIndex >= 4) { @@ -103,7 +103,7 @@ CsrBool CsrHexStrToUint16(const CsrCharString *string, CsrUint16 *returnValue) CsrBool CsrHexStrToUint32(const CsrCharString *string, CsrUint32 *returnValue) { - CsrUint16 currentIndex = 0; + u16 currentIndex = 0; *returnValue = 0; if ((string[currentIndex] == '0') && (CSR_TOUPPER(string[currentIndex + 1]) == 'X')) { @@ -190,14 +190,14 @@ void CsrIntToBase10(CsrInt32 number, CsrCharString *str) CsrStrCpy(str, res); } -void CsrUInt16ToHex(CsrUint16 number, CsrCharString *str) +void CsrUInt16ToHex(u16 number, CsrCharString *str) { - CsrUint16 index; - CsrUint16 currentValue; + u16 index; + u16 currentValue; for (index = 0; index < 4; index++) { - currentValue = (CsrUint16) (number & 0x000F); + currentValue = (u16) (number & 0x000F); number >>= 4; str[3 - index] = (char) (currentValue > 9 ? currentValue + 55 : currentValue + '0'); } @@ -206,7 +206,7 @@ void CsrUInt16ToHex(CsrUint16 number, CsrCharString *str) void CsrUInt32ToHex(CsrUint32 number, CsrCharString *str) { - CsrUint16 index; + u16 index; CsrUint32 currentValue; for (index = 0; index < 8; index++) @@ -334,7 +334,7 @@ CsrUint32 CsrStrToInt(const CsrCharString *str) digit = 1; /* Start from the string end */ - for (i = (CsrUint16) (CsrStrLen(str) - 1); i >= 0; i--) + for (i = (u16) (CsrStrLen(str) - 1); i >= 0; i--) { /* Only convert numbers */ if ((str[i] >= '0') && (str[i] <= '9')) diff --git a/drivers/staging/csr/csr_util.h b/drivers/staging/csr/csr_util.h index e48dcbb20e3..610d35e2ee5 100644 --- a/drivers/staging/csr/csr_util.h +++ b/drivers/staging/csr/csr_util.h @@ -27,11 +27,11 @@ u8 CsrBitCountDense(CsrUint32 n); /* Base conversion */ /*------------------------------------------------------------------*/ CsrBool CsrHexStrToUint8(const CsrCharString *string, u8 *returnValue); -CsrBool CsrHexStrToUint16(const CsrCharString *string, CsrUint16 *returnValue); +CsrBool CsrHexStrToUint16(const CsrCharString *string, u16 *returnValue); CsrBool CsrHexStrToUint32(const CsrCharString *string, CsrUint32 *returnValue); CsrUint32 CsrPow(CsrUint32 base, CsrUint32 exponent); void CsrIntToBase10(CsrInt32 number, CsrCharString *str); -void CsrUInt16ToHex(CsrUint16 number, CsrCharString *str); +void CsrUInt16ToHex(u16 number, CsrCharString *str); void CsrUInt32ToHex(CsrUint32 number, CsrCharString *str); /*------------------------------------------------------------------*/ diff --git a/drivers/staging/csr/csr_wifi_fsm.h b/drivers/staging/csr/csr_wifi_fsm.h index cfdf082349e..2128034a256 100644 --- a/drivers/staging/csr/csr_wifi_fsm.h +++ b/drivers/staging/csr/csr_wifi_fsm.h @@ -66,7 +66,7 @@ typedef void (*CsrWifiFsmExternalWakupCallbackPtr)(void *context); * @return * CsrWifiFsmContext* fsm context */ -extern CsrWifiFsmContext* CsrWifiFsmInit(void *applicationContext, void *externalContext, CsrUint16 maxProcesses, CsrLogTextTaskId loggingTaskId); +extern CsrWifiFsmContext* CsrWifiFsmInit(void *applicationContext, void *externalContext, u16 maxProcesses, CsrLogTextTaskId loggingTaskId); /** * @brief @@ -143,7 +143,7 @@ extern CsrUint32 CsrWifiFsmExecute(CsrWifiFsmContext *context); * @return * void */ -extern void CsrWifiFsmSendEventExternal(CsrWifiFsmContext *context, CsrWifiFsmEvent *event, CsrUint16 source, CsrUint16 destination, CsrPrim primtype, CsrUint16 id); +extern void CsrWifiFsmSendEventExternal(CsrWifiFsmContext *context, CsrWifiFsmEvent *event, u16 source, u16 destination, CsrPrim primtype, u16 id); /** * @brief @@ -202,7 +202,7 @@ extern CsrUint32 CsrWifiFsmGetNextTimeout(CsrWifiFsmContext *context); * @return * void */ -extern void CsrWifiFsmFastForward(CsrWifiFsmContext *context, CsrUint16 ms); +extern void CsrWifiFsmFastForward(CsrWifiFsmContext *context, u16 ms); /** * @brief diff --git a/drivers/staging/csr/csr_wifi_fsm_event.h b/drivers/staging/csr/csr_wifi_fsm_event.h index ef07d8a5cfb..47ca24554b6 100644 --- a/drivers/staging/csr/csr_wifi_fsm_event.h +++ b/drivers/staging/csr/csr_wifi_fsm_event.h @@ -30,7 +30,7 @@ extern "C" { typedef struct CsrWifiFsmEvent { CsrPrim type; - CsrUint16 primtype; + u16 primtype; CsrSchedQid destination; CsrSchedQid source; diff --git a/drivers/staging/csr/csr_wifi_fsm_types.h b/drivers/staging/csr/csr_wifi_fsm_types.h index 99e60e817b9..5bc69874bc7 100644 --- a/drivers/staging/csr/csr_wifi_fsm_types.h +++ b/drivers/staging/csr/csr_wifi_fsm_types.h @@ -54,9 +54,9 @@ typedef struct CsrWifiFsmEventList typedef struct CsrWifiFsmTimerId { CsrPrim type; - CsrUint16 primtype; + u16 primtype; CsrSchedQid destination; - CsrUint16 uniqueid; + u16 uniqueid; } CsrWifiFsmTimerId; /** @@ -71,7 +71,7 @@ typedef struct CsrWifiFsmTimerId typedef struct CsrWifiFsmTimer { CsrPrim type; - CsrUint16 primtype; + u16 primtype; CsrSchedQid destination; CsrSchedQid source; @@ -109,7 +109,7 @@ typedef struct CsrWifiFsmTimerList { CsrWifiFsmTimer *first; CsrWifiFsmTimer *last; - CsrUint16 nexttimerid; + u16 nexttimerid; } CsrWifiFsmTimerList; /** @@ -171,9 +171,9 @@ typedef void (*CsrWifiFsmProcResetFnPtr)(CsrWifiFsmContext *context); * @param[in] context : External context * * @return - * CsrUint16 a valid destination OR CSR_WIFI_FSM_ENV + * u16 a valid destination OR CSR_WIFI_FSM_ENV */ -typedef CsrUint16 (*CsrWifiFsmDestLookupCallbackPtr)(void *context, const CsrWifiFsmEvent *event); +typedef u16 (*CsrWifiFsmDestLookupCallbackPtr)(void *context, const CsrWifiFsmEvent *event); #ifdef CSR_WIFI_FSM_DUMP_ENABLE @@ -223,7 +223,7 @@ typedef struct const CsrBool saveAll; const CsrWifiFsmEventEntry *eventEntryArray; /* array of transition function pointers for state */ #ifdef CSR_LOG_ENABLE - CsrUint16 stateNumber; + u16 stateNumber; const CsrCharString *stateName; #endif } CsrWifiFsmTableEntry; @@ -237,7 +237,7 @@ typedef struct */ typedef struct { - CsrUint16 numStates; /* number of states */ + u16 numStates; /* number of states */ const CsrWifiFsmTableEntry *aStateEventMatrix; /* state event matrix */ } CsrWifiFsmTransitionFunctionTable; @@ -271,12 +271,12 @@ typedef struct */ typedef struct { - CsrUint16 transitionNumber; + u16 transitionNumber; CsrWifiFsmEvent event; - CsrUint16 fromState; - CsrUint16 toState; + u16 fromState; + u16 toState; CsrWifiFsmTransitionFnPtr transitionFn; - CsrUint16 transitionCount; /* number consecutive of times this transition was seen */ + u16 transitionCount; /* number consecutive of times this transition was seen */ #ifdef CSR_LOG_ENABLE const CsrCharString *transitionName; #endif @@ -288,7 +288,7 @@ typedef struct */ typedef struct { - CsrUint16 numTransitions; + u16 numTransitions; CsrWifiFsmTransitionRecord records[CSR_WIFI_FSM_MAX_TRANSITION_HISTORY]; } CsrWifiFsmTransitionRecords; #endif @@ -304,8 +304,8 @@ typedef struct typedef struct { const CsrWifiFsmProcessStateMachine *fsmInfo; /* state machine info that is constant regardless of context */ - CsrUint16 instanceId; /* Runtime process id */ - CsrUint16 state; /* Current state */ + u16 instanceId; /* Runtime process id */ + u16 state; /* Current state */ void *params; /* Instance user data */ CsrWifiFsmEventList savedEventQueue; /* The saved event queue */ struct CsrWifiFsmInstanceEntry *subFsm; /* Sub Fsm instance data */ @@ -358,7 +358,7 @@ typedef void (*CsrWifiFsmOnTransitionFnPtr)(void *extContext, const CsrWifiFsmEv * @return * void */ -typedef void (*CsrWifiFsmOnStateChangeFnPtr)(void *extContext, CsrUint16 nextstate); +typedef void (*CsrWifiFsmOnStateChangeFnPtr)(void *extContext, u16 nextstate); /** * @brief @@ -394,8 +394,8 @@ struct CsrWifiFsmContext CsrBool useTempSaveList; /* Should the temp save list be used */ CsrWifiFsmEventList tempSaveList; /* The temp save event queue */ CsrWifiFsmEvent *eventForwardedOrSaved; /* The event that was forwarded or Saved */ - CsrUint16 maxProcesses; /* Size of instanceArray */ - CsrUint16 numProcesses; /* Current number allocated in instanceArray */ + u16 maxProcesses; /* Size of instanceArray */ + u16 numProcesses; /* Current number allocated in instanceArray */ CsrWifiFsmInstanceEntry *instanceArray; /* Array of processes for this component */ CsrWifiFsmInstanceEntry *ownerInstance; /* The Process that owns currentInstance (SubFsm support) */ CsrWifiFsmInstanceEntry *currentInstance; /* Current Process that is executing */ @@ -429,7 +429,7 @@ struct CsrWifiFsmContext CsrWifiFsmOnEventFnPtr onInvalidCallback; /* Invalid event Callback */ #endif #ifdef CSR_WIFI_FSM_DUMP_ENABLE - CsrUint16 masterTransitionNumber; /* Increments on every transition */ + u16 masterTransitionNumber; /* Increments on every transition */ #endif }; diff --git a/drivers/staging/csr/csr_wifi_hip_card.h b/drivers/staging/csr/csr_wifi_hip_card.h index fcaf27dd353..dfee5362e77 100644 --- a/drivers/staging/csr/csr_wifi_hip_card.h +++ b/drivers/staging/csr/csr_wifi_hip_card.h @@ -68,7 +68,7 @@ CsrResult CardIntEnabled(card_t *card, CsrBool *enabled); /***************************************************************************** * CardGetDataSlotSize */ -CsrUint16 CardGetDataSlotSize(card_t *card); +u16 CardGetDataSlotSize(card_t *card); /***************************************************************************** * CardWriteBulkData - @@ -93,9 +93,9 @@ void CardClearFromHostDataSlotWithoutFreeingBulkData(card_t *card, const CsrInt1 /***************************************************************************** * CardGetFreeFromHostDataSlots - */ -CsrUint16 CardGetFreeFromHostDataSlots(card_t *card); +u16 CardGetFreeFromHostDataSlots(card_t *card); -CsrUint16 CardAreAllFromHostDataSlotsEmpty(card_t *card); +u16 CardAreAllFromHostDataSlotsEmpty(card_t *card); CsrResult card_start_processor(card_t *card, enum unifi_dbg_processors_select which); @@ -112,7 +112,7 @@ CsrResult ConvertCsrSdioToCsrHipResult(card_t *card, CsrResult csrResult); #ifdef CSR_WIFI_HIP_DEBUG_OFFLINE void unifi_debug_log_to_buf(const CsrCharString *fmt, ...); void unifi_debug_string_to_buf(const CsrCharString *str); -void unifi_debug_hex_to_buf(const CsrCharString *buff, CsrUint16 length); +void unifi_debug_hex_to_buf(const CsrCharString *buff, u16 length); #endif diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio.c b/drivers/staging/csr/csr_wifi_hip_card_sdio.c index ef9c566b97f..7e75e607e33 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio.c +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio.c @@ -599,8 +599,8 @@ static void _build_sdio_config_data(sdio_config_data_t *cfg_data, static CsrResult card_hw_init(card_t *card) { CsrUint32 slut_address; - CsrUint16 initialised; - CsrUint16 finger_print; + u16 initialised; + u16 finger_print; symbol_t slut; sdio_config_data_t *cfg_data; u8 cfg_data_buf[SDIO_CONFIG_DATA_SIZE]; @@ -691,7 +691,7 @@ static CsrResult card_hw_init(card_t *card) */ while (!search_4slut_again) { - CsrUint16 s; + u16 s; CsrUint32 l; r = unifi_card_read16(card, slut_address, &s); @@ -785,7 +785,7 @@ static CsrResult card_hw_init(card_t *card) func_exit_r(CSR_WIFI_HIP_RESULT_INVALID_VALUE); return CSR_WIFI_HIP_RESULT_INVALID_VALUE; } - cfg_data->tohost_signal_padding = (CsrUint16) (card->sdio_io_block_size / cfg_data->sig_frag_size); + cfg_data->tohost_signal_padding = (u16) (card->sdio_io_block_size / cfg_data->sig_frag_size); unifi_info(card->ospriv, "SDIO block size %d requires %d padding chunks\n", card->sdio_io_block_size, cfg_data->tohost_signal_padding); r = unifi_card_write16(card, slut.obj + SDIO_TO_HOST_SIG_PADDING_OFFSET, cfg_data->tohost_signal_padding); @@ -1051,7 +1051,7 @@ static CsrResult card_wait_for_unifi_to_reset(card_t *card) } if (r == CSR_RESULT_SUCCESS) { - CsrUint16 mbox2; + u16 mbox2; CsrInt16 enabled = io_enable & (1 << card->function); if (!enabled) @@ -1236,7 +1236,7 @@ static CsrResult card_wait_for_unifi_to_disable(card_t *card) CsrResult card_wait_for_firmware_to_start(card_t *card, CsrUint32 *paddr) { CsrInt32 i; - CsrUint16 mbox0, mbox1; + u16 mbox0, mbox1; CsrResult r; func_enter(); @@ -1402,7 +1402,7 @@ CsrResult unifi_capture_panic(card_t *card) */ static CsrResult card_access_panic(card_t *card) { - CsrUint16 data_u16 = 0; + u16 data_u16 = 0; CsrInt32 i; CsrResult r, sr; @@ -1535,7 +1535,7 @@ static CsrResult card_access_panic(card_t *card) void unifi_read_panic(card_t *card) { CsrResult r; - CsrUint16 p_code, p_arg; + u16 p_code, p_arg; func_enter(); @@ -2045,7 +2045,7 @@ static CsrResult card_init_slots(card_t *card) /* Get initial signal counts from UniFi, in case it has not been reset. */ { - CsrUint16 s; + u16 s; /* Get the from-host-signals-written count */ r = unifi_card_read16(card, card->sdio_ctrl_addr + 0, &s); @@ -2219,11 +2219,11 @@ static void CardReassignDynamicReservation(card_t *card) */ static void CardCheckDynamicReservation(card_t *card, unifi_TrafficQueue queue) { - CsrUint16 q_len, active_queues = 0, excess_queue_slots, div_extra_slots, + u16 q_len, active_queues = 0, excess_queue_slots, div_extra_slots, queue_fair_share, reserved_slots = 0, q, excess_need_queues = 0, unmovable_slots = 0; CsrInt32 i; q_t *sigq; - CsrUint16 num_data_slots = card->config_data.num_fromhost_data_slots - UNIFI_RESERVED_COMMAND_SLOTS; + u16 num_data_slots = card->config_data.num_fromhost_data_slots - UNIFI_RESERVED_COMMAND_SLOTS; func_enter(); @@ -2453,7 +2453,7 @@ void CardClearFromHostDataSlotWithoutFreeingBulkData(card_t *card, const CsrInt1 #endif -CsrUint16 CardGetDataSlotSize(card_t *card) +u16 CardGetDataSlotSize(card_t *card) { return card->config_data.data_slot_size; } /* CardGetDataSlotSize() */ @@ -2472,9 +2472,9 @@ CsrUint16 CardGetDataSlotSize(card_t *card) * Number of free from-host bulk data slots. * --------------------------------------------------------------------------- */ -CsrUint16 CardGetFreeFromHostDataSlots(card_t *card) +u16 CardGetFreeFromHostDataSlots(card_t *card) { - CsrUint16 i, n = 0; + u16 i, n = 0; func_enter(); @@ -2507,9 +2507,9 @@ CsrUint16 CardGetFreeFromHostDataSlots(card_t *card) * 0 Some or all the from-host bulk data slots are in use. * --------------------------------------------------------------------------- */ -CsrUint16 CardAreAllFromHostDataSlotsEmpty(card_t *card) +u16 CardAreAllFromHostDataSlotsEmpty(card_t *card) { - CsrUint16 i; + u16 i; for (i = 0; i < card->config_data.num_fromhost_data_slots; i++) { @@ -2642,7 +2642,7 @@ static CsrResult unifi_read_chip_version(card_t *card) { CsrUint32 gbl_chip_version; CsrResult r; - CsrUint16 ver; + u16 ver; func_enter(); @@ -2700,7 +2700,7 @@ static CsrResult unifi_read_chip_version(card_t *card) static CsrResult unifi_reset_hardware(card_t *card) { CsrResult r; - CsrUint16 new_block_size = UNIFI_IO_BLOCK_SIZE; + u16 new_block_size = UNIFI_IO_BLOCK_SIZE; CsrResult csrResult; func_enter(); @@ -3402,7 +3402,7 @@ CsrResult CardIntEnabled(card_t *card, CsrBool *enabled) */ CsrResult CardWriteBulkData(card_t *card, card_signal_t *csptr, unifi_TrafficQueue queue) { - CsrUint16 i, slots[UNIFI_MAX_DATA_REFERENCES], j = 0; + u16 i, slots[UNIFI_MAX_DATA_REFERENCES], j = 0; u8 *packed_sigptr, num_slots_required = 0; bulk_data_desc_t *bulkdata = csptr->bulkdata; CsrInt16 h, nslots; @@ -3512,7 +3512,7 @@ CsrResult CardWriteBulkData(card_t *card, card_signal_t *csptr, unifi_TrafficQue * Fill in the slot number in the SIGNAL structure but * preserve the offset already in there */ - SET_PACKED_DATAREF_SLOT(packed_sigptr, i, slots[j] | (((CsrUint16)packed_sigptr[SIZEOF_SIGNAL_HEADER + (i * SIZEOF_DATAREF) + 1]) << 8)); + SET_PACKED_DATAREF_SLOT(packed_sigptr, i, slots[j] | (((u16)packed_sigptr[SIZEOF_SIGNAL_HEADER + (i * SIZEOF_DATAREF) + 1]) << 8)); SET_PACKED_DATAREF_LEN(packed_sigptr, i, bulkdata[i].data_length); /* Do not copy the data, just store the information to them */ @@ -3607,7 +3607,7 @@ bulk_data_desc_t* card_find_data_slot(card_t *card, CsrInt16 slot) static CsrResult firmware_present_in_flash(card_t *card) { CsrResult r; - CsrUint16 m1, m5; + u16 m1, m5; if (ChipHelper_HasRom(card->helper)) { @@ -4107,7 +4107,7 @@ void unifi_get_hip_qos_info(card_t *card, unifi_HipQosInfo *hipqosinfo) CsrUint32 occupied_fh; q_t *sigq; - CsrUint16 nslots, i; + u16 nslots, i; CsrMemSet(hipqosinfo, 0, sizeof(unifi_HipQosInfo)); @@ -4142,7 +4142,7 @@ void unifi_get_hip_qos_info(card_t *card, unifi_HipQosInfo *hipqosinfo) occupied_fh = (card->from_host_signals_w - count_fhr) % 128; - hipqosinfo->free_fh_fw_slots = (CsrUint16)(card->config_data.num_fromhost_sig_frags - occupied_fh); + hipqosinfo->free_fh_fw_slots = (u16)(card->config_data.num_fromhost_sig_frags - occupied_fh); } diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio.h b/drivers/staging/csr/csr_wifi_hip_card_sdio.h index 2615169d426..8c81856e5a0 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio.h +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio.h @@ -115,25 +115,25 @@ typedef struct * indicate incompatible changes. The LSB gives the minor revision number, * used to indicate changes that maintain backwards compatibility. */ - CsrUint16 version; + u16 version; /* * offset from the start of the shared data memory to the SD IO * control structure. */ - CsrUint16 sdio_ctrl_offset; + u16 sdio_ctrl_offset; /* Buffer handle of the from-host signal queue */ - CsrUint16 fromhost_sigbuf_handle; + u16 fromhost_sigbuf_handle; /* Buffer handle of the to-host signal queue */ - CsrUint16 tohost_sigbuf_handle; + u16 tohost_sigbuf_handle; /* * Maximum number of signal primitive or bulk data command fragments that may be * pending in the to-hw signal queue. */ - CsrUint16 num_fromhost_sig_frags; + u16 num_fromhost_sig_frags; /* * Number of signal primitive or bulk data command fragments that must be pending @@ -145,42 +145,42 @@ typedef struct * Note that the hw may place more signals in the to-host signal queue * than indicated by this field. */ - CsrUint16 num_tohost_sig_frags; + u16 num_tohost_sig_frags; /* * Number of to-hw bulk data slots. Slots are numbered from 0 (zero) to * one less than the value in this field */ - CsrUint16 num_fromhost_data_slots; + u16 num_fromhost_data_slots; /* * Number of frm-hw bulk data slots. Slots are numbered from 0 (zero) to * one less than the value in this field */ - CsrUint16 num_tohost_data_slots; + u16 num_tohost_data_slots; /* * Size of the bulk data slots (2 octets) * The size of the bulk data slots in octets. This will usually be * the size of the largest MSDU. The value should always be even. */ - CsrUint16 data_slot_size; + u16 data_slot_size; /* * Indicates that the host has finished the initialisation sequence. * Initialised to 0x0000 by the firmware, and set to 0x0001 by us. */ - CsrUint16 initialised; + u16 initialised; /* Added by protocol version 0x0001 */ CsrUint32 overlay_size; /* Added by protocol version 0x0300 */ - CsrUint16 data_slot_round; - CsrUint16 sig_frag_size; + u16 data_slot_round; + u16 sig_frag_size; /* Added by protocol version 0x0500 */ - CsrUint16 tohost_signal_padding; + u16 tohost_signal_padding; } sdio_config_data_t; /* @@ -200,10 +200,10 @@ typedef struct /* Structure for a bulk data transfer command */ typedef struct { - CsrUint16 cmd_and_len; /* bits 12-15 cmd, bits 0-11 len */ - CsrUint16 data_slot; /* slot number, perhaps OR'd with SLOT_DIR_TO_HOST */ - CsrUint16 offset; - CsrUint16 buffer_handle; + u16 cmd_and_len; /* bits 12-15 cmd, bits 0-11 len */ + u16 data_slot; /* slot number, perhaps OR'd with SLOT_DIR_TO_HOST */ + u16 offset; + u16 buffer_handle; } bulk_data_cmd_t; @@ -249,7 +249,7 @@ typedef struct card_signal u8 sigbuf[UNIFI_PACKED_SIGBUF_SIZE]; /* Length of the SIGNAL inside sigbuf */ - CsrUint16 signal_length; + u16 signal_length; bulk_data_desc_t bulkdata[UNIFI_MAX_DATA_REFERENCES]; } card_signal_t; @@ -264,10 +264,10 @@ typedef struct card_signal_t *q_body; /* Num elements in queue (capacity is one less than this!) */ - CsrUint16 q_length; + u16 q_length; - CsrUint16 q_wr_ptr; - CsrUint16 q_rd_ptr; + u16 q_wr_ptr; + u16 q_rd_ptr; CsrCharString name[UNIFI_QUEUE_NAME_MAX_LENGTH]; } q_t; @@ -283,9 +283,9 @@ typedef struct */ typedef struct { - CsrUint16 from_host_used_slots[UNIFI_NO_OF_TX_QS]; - CsrUint16 from_host_max_slots[UNIFI_NO_OF_TX_QS]; - CsrUint16 from_host_reserved_slots[UNIFI_NO_OF_TX_QS]; + u16 from_host_used_slots[UNIFI_NO_OF_TX_QS]; + u16 from_host_max_slots[UNIFI_NO_OF_TX_QS]; + u16 from_host_reserved_slots[UNIFI_NO_OF_TX_QS]; /* Parameters to determine if a queue was active. If number of packets sent is greater than the threshold @@ -293,11 +293,11 @@ typedef struct re reservation is done, it is important not to keep this value too low */ /* Packets sent during this interval */ - CsrUint16 packets_txed[UNIFI_NO_OF_TX_QS]; - CsrUint16 total_packets_txed; + u16 packets_txed[UNIFI_NO_OF_TX_QS]; + u16 total_packets_txed; /* Number of packets to see if slots need to be reassigned */ - CsrUint16 packets_interval; + u16 packets_interval; /* Once a queue reaches a stable state, avoid processing */ CsrBool queue_stable[UNIFI_NO_OF_TX_QS]; @@ -311,7 +311,7 @@ typedef struct * params: * const q_t *q * returns: - * CsrUint16 + * u16 */ #define CSR_WIFI_HIP_Q_SLOTS_USED(q) \ (((q)->q_wr_ptr - (q)->q_rd_ptr < 0)? \ @@ -321,7 +321,7 @@ typedef struct * params: * const q_t *q * returns: - * CsrUint16 + * u16 */ #define CSR_WIFI_HIP_Q_SLOTS_FREE(q) \ ((q)->q_length - CSR_WIFI_HIP_Q_SLOTS_USED((q)) - 1) @@ -329,7 +329,7 @@ typedef struct /* Return slot signal data pointer * params: * const q_t *q - * CsrUint16 slot + * u16 slot * returns: * card_signal_t * */ @@ -340,7 +340,7 @@ typedef struct * params: * const q_t *q * returns: - * CsrUint16 slot offset + * u16 slot offset */ #define CSR_WIFI_HIP_Q_NEXT_R_SLOT(q) \ ((q)->q_rd_ptr) @@ -349,7 +349,7 @@ typedef struct * params: * const q_t *q * returns: - * CsrUint16 slot offset + * u16 slot offset */ #define CSR_WIFI_HIP_Q_NEXT_W_SLOT(q) \ ((q)->q_wr_ptr) @@ -357,9 +357,9 @@ typedef struct /* Return updated queue pointer wrapped around its length * params: * const q_t *q - * CsrUint16 x amount to add to queue pointer + * u16 x amount to add to queue pointer * returns: - * CsrUint16 wrapped queue pointer + * u16 wrapped queue pointer */ #define CSR_WIFI_HIP_Q_WRAP(q, x) \ ((((x) >= (q)->q_length)?((x) % (q)->q_length) : (x))) @@ -415,10 +415,10 @@ struct card CsrCharString build_id_string[128]; /* Retrieve from SDIO driver. */ - CsrUint16 chip_id; + u16 chip_id; /* Read from GBL_CHIP_VERSION. */ - CsrUint16 chip_version; + u16 chip_version; /* From the SDIO driver (probably 1) */ u8 function; @@ -443,7 +443,7 @@ struct card #define card_tx_q_unpause(card, q) (card->tx_q_paused_flag[q] = 0) #define card_tx_q_pause(card, q) (card->tx_q_paused_flag[q] = 1) - CsrUint16 tx_q_paused_flag[UNIFI_TRAFFIC_Q_MAX + 1 + UNIFI_NO_OF_TX_QS]; /* defensive more than big enough */ + u16 tx_q_paused_flag[UNIFI_TRAFFIC_Q_MAX + 1 + UNIFI_NO_OF_TX_QS]; /* defensive more than big enough */ /* UDI callback for logging UniFi interactions */ udi_func_t udi_hook; @@ -507,8 +507,8 @@ struct card { u8 *buf; /* buffer area */ u8 *ptr; /* current pos */ - CsrUint16 count; /* signal count */ - CsrUint16 bufsize; + u16 count; /* signal count */ + u16 bufsize; } fh_buffer; struct sigbuf th_buffer; @@ -563,7 +563,7 @@ struct card u8 memory_resources_allocated; /* UniFi SDIO I/O Block size. */ - CsrUint16 sdio_io_block_size; + u16 sdio_io_block_size; /* Pad transfer sizes to SDIO block boundaries */ CsrBool sdio_io_block_pad; @@ -621,14 +621,14 @@ struct card /* Historic firmware panic codes */ CsrUint32 panic_data_phy_addr; CsrUint32 panic_data_mac_addr; - CsrUint16 last_phy_panic_code; - CsrUint16 last_phy_panic_arg; - CsrUint16 last_mac_panic_code; - CsrUint16 last_mac_panic_arg; + u16 last_phy_panic_code; + u16 last_phy_panic_arg; + u16 last_mac_panic_code; + u16 last_mac_panic_arg; #ifdef CSR_PRE_ALLOC_NET_DATA bulk_data_desc_t bulk_data_desc_list[BULK_DATA_PRE_ALLOC_NUM]; - CsrUint16 prealloc_netdata_r; - CsrUint16 prealloc_netdata_w; + u16 prealloc_netdata_r; + u16 prealloc_netdata_w; #endif }; /* struct card */ @@ -659,10 +659,10 @@ bulk_data_desc_t* card_find_data_slot(card_t *card, CsrInt16 slot); CsrResult unifi_read32(card_t *card, CsrUint32 unifi_addr, CsrUint32 *pdata); CsrResult unifi_readnz(card_t *card, CsrUint32 unifi_addr, - void *pdata, CsrUint16 len); + void *pdata, u16 len); CsrInt32 unifi_read_shared_count(card_t *card, CsrUint32 addr); -CsrResult unifi_writen(card_t *card, CsrUint32 unifi_addr, void *pdata, CsrUint16 len); +CsrResult unifi_writen(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len); CsrResult unifi_bulk_rw(card_t *card, CsrUint32 handle, void *pdata, CsrUint32 len, CsrInt16 direction); @@ -676,12 +676,12 @@ CsrResult unifi_write_8_or_16(card_t *card, CsrUint32 unifi_addr, u8 data); CsrResult unifi_read_direct_8_or_16(card_t *card, CsrUint32 addr, u8 *pdata); CsrResult unifi_write_direct_8_or_16(card_t *card, CsrUint32 addr, u8 data); -CsrResult unifi_read_direct16(card_t *card, CsrUint32 addr, CsrUint16 *pdata); +CsrResult unifi_read_direct16(card_t *card, CsrUint32 addr, u16 *pdata); CsrResult unifi_read_direct32(card_t *card, CsrUint32 addr, CsrUint32 *pdata); -CsrResult unifi_read_directn(card_t *card, CsrUint32 addr, void *pdata, CsrUint16 len); +CsrResult unifi_read_directn(card_t *card, CsrUint32 addr, void *pdata, u16 len); -CsrResult unifi_write_direct16(card_t *card, CsrUint32 addr, CsrUint16 data); -CsrResult unifi_write_directn(card_t *card, CsrUint32 addr, void *pdata, CsrUint16 len); +CsrResult unifi_write_direct16(card_t *card, CsrUint32 addr, u16 data); +CsrResult unifi_write_directn(card_t *card, CsrUint32 addr, void *pdata, u16 len); CsrResult sdio_read_f0(card_t *card, CsrUint32 addr, u8 *pdata); CsrResult sdio_write_f0(card_t *card, CsrUint32 addr, u8 data); @@ -692,8 +692,8 @@ void prealloc_netdata_free(card_t *card); CsrResult prealloc_netdata_alloc(card_t *card); #endif /* For diagnostic use */ -void dump(void *mem, CsrUint16 len); -void dump16(void *mem, CsrUint16 len); +void dump(void *mem, u16 len); +void dump16(void *mem, u16 len); #ifdef __cplusplus } diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c b/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c index 52a6ed3ad7e..2d3b3eadadc 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c @@ -47,14 +47,14 @@ static CsrResult handle_host_protocol(card_t *card, CsrBool *processed_something static CsrResult flush_fh_buffer(card_t *card); -static CsrResult check_fh_sig_slots(card_t *card, CsrUint16 needed, CsrInt32 *space); +static CsrResult check_fh_sig_slots(card_t *card, u16 needed, CsrInt32 *space); static CsrResult read_to_host_signals(card_t *card, CsrInt32 *processed); static CsrResult process_to_host_signals(card_t *card, CsrInt32 *processed); static CsrResult process_bulk_data_command(card_t *card, const u8 *cmdptr, - CsrInt16 cmd, CsrUint16 len); + CsrInt16 cmd, u16 len); static CsrResult process_clear_slot_command(card_t *card, const u8 *cmdptr); static CsrResult process_fh_cmd_queue(card_t *card, CsrInt32 *processed); @@ -143,14 +143,14 @@ void unifi_debug_log_to_buf(const CsrCharString *fmt, ...) * * --------------------------------------------------------------------------- */ -void unifi_debug_hex_to_buf(const CsrCharString *buff, CsrUint16 length) +void unifi_debug_hex_to_buf(const CsrCharString *buff, u16 length) { CsrCharString s[5]; - CsrUint16 i; + u16 i; for (i = 0; i < length; i = i + 2) { - CsrUInt16ToHex(*((CsrUint16 *)(buff + i)), s); + CsrUInt16ToHex(*((u16 *)(buff + i)), s); unifi_debug_string_to_buf(s); } } @@ -361,7 +361,7 @@ CsrResult unifi_bh(card_t *card, CsrUint32 *remaining) CsrBool pending; CsrInt32 iostate, j; const enum unifi_low_power_mode low_power_mode = card->low_power_mode; - CsrUint16 data_slots_used = 0; + u16 data_slots_used = 0; /* Process request to raise the maximum SDIO clock */ @@ -1029,7 +1029,7 @@ static CsrResult read_to_host_signals(card_t *card, CsrInt32 *processed) } card->th_buffer.ptr += unread_bytes; - card->th_buffer.count += (CsrUint16)unread_chunks; + card->th_buffer.count += (u16)unread_chunks; *processed = 1; @@ -1150,10 +1150,10 @@ static CsrResult process_to_host_signals(card_t *card, CsrInt32 *processed) u8 *bufptr; bulk_data_param_t data_ptrs; CsrInt16 cmd; - CsrUint16 sig_len; + u16 sig_len; CsrInt16 i; - CsrUint16 chunks_in_buf; - CsrUint16 bytes_transferred = 0; + u16 chunks_in_buf; + u16 bytes_transferred = 0; CsrResult r = CSR_RESULT_SUCCESS; *processed = 0; @@ -1205,14 +1205,14 @@ static CsrResult process_to_host_signals(card_t *card, CsrInt32 *processed) */ if (cmd == SDIO_CMD_SIGNAL) { - chunks_in_buf = GET_CHUNKS_FOR(card->config_data.sig_frag_size, (CsrUint16)(sig_len + 2)); + chunks_in_buf = GET_CHUNKS_FOR(card->config_data.sig_frag_size, (u16)(sig_len + 2)); } else { chunks_in_buf = 1; } - if (chunks_in_buf > (CsrUint16)pending) + if (chunks_in_buf > (u16)pending) { unifi_error(card->ospriv, "incomplete signal (0x%x?): need %d chunks, got %d\n", GET_SIGNAL_ID(bufptr + 2), @@ -1235,7 +1235,7 @@ static CsrResult process_to_host_signals(card_t *card, CsrInt32 *processed) for (i = 0; i < UNIFI_MAX_DATA_REFERENCES; i++) { /* Retrieve dataRefs[i].DataLength */ - CsrUint16 data_len = GET_PACKED_DATAREF_LEN(bufptr + 2, i); + u16 data_len = GET_PACKED_DATAREF_LEN(bufptr + 2, i); /* * The bulk data length in the signal can not be greater than @@ -1316,7 +1316,7 @@ static CsrResult process_to_host_signals(card_t *card, CsrInt32 *processed) { /* Get host tag and transmission status */ CsrUint32 host_tag = GET_PACKED_MA_PACKET_CONFIRM_HOST_TAG(bufptr + 2); - CsrUint16 status = GET_PACKED_MA_PACKET_CONFIRM_TRANSMISSION_STATUS(bufptr + 2); + u16 status = GET_PACKED_MA_PACKET_CONFIRM_TRANSMISSION_STATUS(bufptr + 2); unifi_trace(card->ospriv, UDBG4, "process_to_host_signals signal ID=%x host Tag=%x status=%x\n", GET_SIGNAL_ID(bufptr + 2), host_tag, status); @@ -1327,7 +1327,7 @@ static CsrResult process_to_host_signals(card_t *card, CsrInt32 *processed) if (status && (card->fh_slot_host_tag_record)) { - CsrUint16 num_fh_slots = card->config_data.num_fromhost_data_slots; + u16 num_fh_slots = card->config_data.num_fromhost_data_slots; /* search through the list of slot records and match with host tag * If a slot is not yet cleared then clear the slot from here @@ -1545,7 +1545,7 @@ static CsrResult process_to_host_signals(card_t *card, CsrInt32 *processed) */ static CsrResult process_clear_slot_command(card_t *card, const u8 *cmdptr) { - CsrUint16 data_slot; + u16 data_slot; CsrInt16 slot; data_slot = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(cmdptr + SIZEOF_UINT16); @@ -1619,7 +1619,7 @@ static CsrResult process_clear_slot_command(card_t *card, const u8 *cmdptr) * --------------------------------------------------------------------------- */ static CsrResult process_bulk_data_command(card_t *card, const u8 *cmdptr, - CsrInt16 cmd, CsrUint16 len) + CsrInt16 cmd, u16 len) { bulk_data_desc_t *bdslot; #ifdef CSR_WIFI_ALIGNMENT_WORKAROUND @@ -1839,7 +1839,7 @@ static CsrResult process_bulk_data_command(card_t *card, const u8 *cmdptr, * CSR_RESULT_SUCCESS, otherwise CSR error code on error. * --------------------------------------------------------------------------- */ -static CsrResult check_fh_sig_slots(card_t *card, CsrUint16 needed, CsrInt32 *space_fh) +static CsrResult check_fh_sig_slots(card_t *card, u16 needed, CsrInt32 *space_fh) { CsrUint32 count_fhw; CsrUint32 occupied_fh, slots_fh; @@ -1885,8 +1885,8 @@ static CsrResult check_fh_sig_slots(card_t *card, CsrUint16 needed, CsrInt32 *sp */ #define ROUND_UP_NEEDED_CHUNKS(_card, _needed_chunks) \ { \ - CsrUint16 _chunks_per_block; \ - CsrUint16 _chunks_in_last_block; \ + u16 _chunks_per_block; \ + u16 _chunks_in_last_block; \ \ if (_card->sdio_io_block_pad) \ { \ @@ -1902,7 +1902,7 @@ static CsrResult check_fh_sig_slots(card_t *card, CsrUint16 needed, CsrInt32 *sp #define ROUND_UP_SPACE_CHUNKS(_card, _space_chunks) \ { \ - CsrUint16 _chunks_per_block; \ + u16 _chunks_per_block; \ \ if (_card->sdio_io_block_pad) \ { \ @@ -1945,11 +1945,11 @@ static CsrResult process_fh_cmd_queue(card_t *card, CsrInt32 *processed) q_t *sigq = &card->fh_command_queue; CsrResult r; - CsrUint16 pending_sigs; - CsrUint16 pending_chunks; - CsrUint16 needed_chunks; + u16 pending_sigs; + u16 pending_chunks; + u16 needed_chunks; CsrInt32 space_chunks; - CsrUint16 q_index; + u16 q_index; *processed = 0; @@ -1973,7 +1973,7 @@ static CsrResult process_fh_cmd_queue(card_t *card, CsrInt32 *processed) * Note that GET_CHUNKS_FOR() needs the size of the packed * (wire-formatted) structure */ - pending_chunks += GET_CHUNKS_FOR(card->config_data.sig_frag_size, (CsrUint16)(csptr->signal_length + 2)); + pending_chunks += GET_CHUNKS_FOR(card->config_data.sig_frag_size, (u16)(csptr->signal_length + 2)); } /* @@ -2003,7 +2003,7 @@ static CsrResult process_fh_cmd_queue(card_t *card, CsrInt32 *processed) * Coalesce as many from-host signals as possible * into a single block and write using a single CMD53 */ - if (needed_chunks > (CsrUint16)space_chunks) + if (needed_chunks > (u16)space_chunks) { /* Round up to the block size if necessary */ ROUND_UP_SPACE_CHUNKS(card, space_chunks); @@ -2012,7 +2012,7 @@ static CsrResult process_fh_cmd_queue(card_t *card, CsrInt32 *processed) * If the f/w has less free chunks than those already pending * return immediately. */ - if ((CsrUint16)space_chunks <= card->fh_buffer.count) + if ((u16)space_chunks <= card->fh_buffer.count) { /* * No room in UniFi for any signals after the buffered bulk @@ -2023,17 +2023,17 @@ static CsrResult process_fh_cmd_queue(card_t *card, CsrInt32 *processed) card->generate_interrupt = 1; return CSR_RESULT_SUCCESS; } - pending_chunks = (CsrUint16)(space_chunks - card->fh_buffer.count); + pending_chunks = (u16)(space_chunks - card->fh_buffer.count); } while (pending_sigs-- && pending_chunks > 0) { card_signal_t *csptr; CsrInt16 i; - CsrUint16 sig_chunks, total_length, free_chunks_in_fh_buffer; + u16 sig_chunks, total_length, free_chunks_in_fh_buffer; bulk_data_param_t bulkdata; u8 *packed_sigptr; - CsrUint16 signal_length = 0; + u16 signal_length = 0; /* Retrieve the entry at the head of the queue */ q_index = CSR_WIFI_HIP_Q_NEXT_R_SLOT(sigq); @@ -2051,15 +2051,15 @@ static CsrResult process_fh_cmd_queue(card_t *card, CsrInt32 *processed) } /* Need space for 2-byte SDIO protocol header + signal */ - sig_chunks = GET_CHUNKS_FOR(card->config_data.sig_frag_size, (CsrUint16)(signal_length + 2)); + sig_chunks = GET_CHUNKS_FOR(card->config_data.sig_frag_size, (u16)(signal_length + 2)); free_chunks_in_fh_buffer = GET_CHUNKS_FOR(card->config_data.sig_frag_size, - (CsrUint16)((card->fh_buffer.buf + UNIFI_FH_BUF_SIZE) - card->fh_buffer.ptr)); + (u16)((card->fh_buffer.buf + UNIFI_FH_BUF_SIZE) - card->fh_buffer.ptr)); if (free_chunks_in_fh_buffer < sig_chunks) { /* No more room */ unifi_notice(card->ospriv, "proc_fh_cmd_q: no room in fh buffer for 0x%.4X, deferring\n", - (CsrUint16)(GET_SIGNAL_ID(csptr->sigbuf))); + (u16)(GET_SIGNAL_ID(csptr->sigbuf))); break; } @@ -2069,7 +2069,7 @@ static CsrResult process_fh_cmd_queue(card_t *card, CsrInt32 *processed) if (CSR_RESULT_FAILURE == CardWriteBulkData(card, csptr, UNIFI_TRAFFIC_Q_MLME)) { unifi_notice(card->ospriv, "proc_fh_cmd_q: no fh data slots for 0x%.4X, deferring\n", - (CsrUint16)(GET_SIGNAL_ID(csptr->sigbuf))); + (u16)(GET_SIGNAL_ID(csptr->sigbuf))); break; } @@ -2175,13 +2175,13 @@ static CsrResult process_fh_traffic_queue(card_t *card, CsrInt32 *processed) CsrResult r; CsrInt16 n = 0; CsrInt32 q_no; - CsrUint16 pending_sigs = 0; - CsrUint16 pending_chunks = 0; - CsrUint16 needed_chunks; + u16 pending_sigs = 0; + u16 pending_chunks = 0; + u16 needed_chunks; CsrInt32 space_chunks; - CsrUint16 q_index; + u16 q_index; CsrUint32 host_tag = 0; - CsrUint16 slot_num = 0; + u16 slot_num = 0; *processed = 0; @@ -2203,7 +2203,7 @@ static CsrResult process_fh_traffic_queue(card_t *card, CsrInt32 *processed) * Note that GET_CHUNKS_FOR() needs the size of the packed * (wire-formatted) structure */ - pending_chunks += GET_CHUNKS_FOR(card->config_data.sig_frag_size, (CsrUint16)(csptr->signal_length + 2)); + pending_chunks += GET_CHUNKS_FOR(card->config_data.sig_frag_size, (u16)(csptr->signal_length + 2)); } } @@ -2240,12 +2240,12 @@ static CsrResult process_fh_traffic_queue(card_t *card, CsrInt32 *processed) /* Coalesce as many from-host signals as possible into a single block and write using a single CMD53 */ - if (needed_chunks > (CsrUint16)space_chunks) + if (needed_chunks > (u16)space_chunks) { /* Round up to the block size if necessary */ ROUND_UP_SPACE_CHUNKS(card, space_chunks); - if ((CsrUint16)space_chunks <= card->fh_buffer.count) + if ((u16)space_chunks <= card->fh_buffer.count) { /* * No room in UniFi for any signals after the buffered bulk @@ -2257,7 +2257,7 @@ static CsrResult process_fh_traffic_queue(card_t *card, CsrInt32 *processed) return 0; } - pending_chunks = (CsrUint16)space_chunks - card->fh_buffer.count; + pending_chunks = (u16)space_chunks - card->fh_buffer.count; } q_no = UNIFI_NO_OF_TX_QS - 1; @@ -2271,10 +2271,10 @@ static CsrResult process_fh_traffic_queue(card_t *card, CsrInt32 *processed) do { card_signal_t *csptr; - CsrUint16 sig_chunks, total_length, free_chunks_in_fh_buffer; + u16 sig_chunks, total_length, free_chunks_in_fh_buffer; bulk_data_param_t bulkdata; u8 *packed_sigptr; - CsrUint16 signal_length = 0; + u16 signal_length = 0; /* if this queue is empty go to next one. */ if (CSR_WIFI_HIP_Q_SLOTS_USED(&sigq[q_no]) == 0) @@ -2299,9 +2299,9 @@ static CsrResult process_fh_traffic_queue(card_t *card, CsrInt32 *processed) } /* Need space for 2-byte SDIO protocol header + signal */ - sig_chunks = GET_CHUNKS_FOR(card->config_data.sig_frag_size, (CsrUint16)(signal_length + 2)); + sig_chunks = GET_CHUNKS_FOR(card->config_data.sig_frag_size, (u16)(signal_length + 2)); free_chunks_in_fh_buffer = GET_CHUNKS_FOR(card->config_data.sig_frag_size, - (CsrUint16)((card->fh_buffer.buf + UNIFI_FH_BUF_SIZE) - card->fh_buffer.ptr)); + (u16)((card->fh_buffer.buf + UNIFI_FH_BUF_SIZE) - card->fh_buffer.ptr)); if (free_chunks_in_fh_buffer < sig_chunks) { /* No more room */ @@ -2444,12 +2444,12 @@ static CsrResult process_fh_traffic_queue(card_t *card, CsrInt32 *processed) static CsrResult flush_fh_buffer(card_t *card) { CsrResult r; - CsrUint16 len; - CsrUint16 sig_units; - CsrUint16 data_round; - CsrUint16 chunks_in_last_block; - CsrUint16 padding_chunks; - CsrUint16 i; + u16 len; + u16 sig_units; + u16 data_round; + u16 chunks_in_last_block; + u16 padding_chunks; + u16 i; len = card->fh_buffer.ptr - card->fh_buffer.buf; diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c b/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c index d98610f3389..9953ebfd6cf 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c @@ -202,7 +202,7 @@ static CsrResult retrying_write8(card_t *card, CsrInt16 funcnum, CsrUint32 addr, static CsrResult retrying_read16(card_t *card, CsrInt16 funcnum, - CsrUint32 addr, CsrUint16 *pdata) + CsrUint32 addr, u16 *pdata) { CsrSdioFunction *sdio = card->sdio_if; CsrResult r = CSR_RESULT_SUCCESS; @@ -263,7 +263,7 @@ static CsrResult retrying_read16(card_t *card, CsrInt16 funcnum, static CsrResult retrying_write16(card_t *card, CsrInt16 funcnum, - CsrUint32 addr, CsrUint16 data) + CsrUint32 addr, u16 data) { CsrSdioFunction *sdio = card->sdio_if; CsrResult r = CSR_RESULT_SUCCESS; @@ -391,7 +391,7 @@ CsrResult sdio_write_f0(card_t *card, CsrUint32 addr, u8 data) CsrResult unifi_read_direct_8_or_16(card_t *card, CsrUint32 addr, u8 *pdata) { #ifdef CSR_WIFI_TRANSPORT_CSPI - CsrUint16 w; + u16 w; CsrResult r; r = retrying_read16(card, card->function, addr, &w); @@ -433,7 +433,7 @@ CsrResult unifi_write_direct_8_or_16(card_t *card, CsrUint32 addr, u8 data) } #ifdef CSR_WIFI_TRANSPORT_CSPI - return retrying_write16(card, card->function, addr, (CsrUint16)data); + return retrying_write16(card, card->function, addr, (u16)data); #else return retrying_write8(card, card->function, addr, data); #endif @@ -462,7 +462,7 @@ CsrResult unifi_write_direct_8_or_16(card_t *card, CsrUint32 addr, u8 data) * even address is read. * --------------------------------------------------------------------------- */ -CsrResult unifi_read_direct16(card_t *card, CsrUint32 addr, CsrUint16 *pdata) +CsrResult unifi_read_direct16(card_t *card, CsrUint32 addr, u16 *pdata) { return retrying_read16(card, card->function, addr, pdata); } /* unifi_read_direct16() */ @@ -490,7 +490,7 @@ CsrResult unifi_read_direct16(card_t *card, CsrUint32 addr, CsrUint16 *pdata) * even address is written. * --------------------------------------------------------------------------- */ -CsrResult unifi_write_direct16(card_t *card, CsrUint32 addr, CsrUint16 data) +CsrResult unifi_write_direct16(card_t *card, CsrUint32 addr, u16 data) { return retrying_write16(card, card->function, addr, data); } /* unifi_write_direct16() */ @@ -516,7 +516,7 @@ CsrResult unifi_write_direct16(card_t *card, CsrUint32 addr, CsrUint16 data) CsrResult unifi_read_direct32(card_t *card, CsrUint32 addr, CsrUint32 *pdata) { CsrResult r; - CsrUint16 w0, w1; + u16 w0, w1; r = retrying_read16(card, card->function, addr, &w0); if (r != CSR_RESULT_SUCCESS) @@ -564,12 +564,12 @@ CsrResult unifi_read_direct32(card_t *card, CsrUint32 addr, CsrUint32 *pdata) * even address is read. * --------------------------------------------------------------------------- */ -static CsrResult unifi_read_directn_match(card_t *card, CsrUint32 addr, void *pdata, CsrUint16 len, s8 m, CsrUint32 *num) +static CsrResult unifi_read_directn_match(card_t *card, CsrUint32 addr, void *pdata, u16 len, s8 m, CsrUint32 *num) { CsrResult r; CsrUint32 i; u8 *cptr; - CsrUint16 w; + u16 w; *num = 0; @@ -631,7 +631,7 @@ static CsrResult unifi_read_directn_match(card_t *card, CsrUint32 addr, void *pd * even address is read. * --------------------------------------------------------------------------- */ -CsrResult unifi_read_directn(card_t *card, CsrUint32 addr, void *pdata, CsrUint16 len) +CsrResult unifi_read_directn(card_t *card, CsrUint32 addr, void *pdata, u16 len) { CsrUint32 num; @@ -664,7 +664,7 @@ CsrResult unifi_read_directn(card_t *card, CsrUint32 addr, void *pdata, CsrUint1 * This means we must write data as pairs of bytes in reverse order. * --------------------------------------------------------------------------- */ -CsrResult unifi_write_directn(card_t *card, CsrUint32 addr, void *pdata, CsrUint16 len) +CsrResult unifi_write_directn(card_t *card, CsrUint32 addr, void *pdata, u16 len) { CsrResult r; u8 *cptr; @@ -716,7 +716,7 @@ CsrResult unifi_write_directn(card_t *card, CsrUint32 addr, void *pdata, CsrUint */ static CsrResult set_dmem_page(card_t *card, CsrUint32 dmem_addr, CsrUint32 *paddr) { - CsrUint16 page, addr; + u16 page, addr; CsrUint32 len; CsrResult r; @@ -756,7 +756,7 @@ static CsrResult set_dmem_page(card_t *card, CsrUint32 dmem_addr, CsrUint32 *pad static CsrResult set_pmem_page(card_t *card, CsrUint32 pmem_addr, enum chip_helper_window_type mem_type, CsrUint32 *paddr) { - CsrUint16 page, addr; + u16 page, addr; CsrUint32 len; CsrResult r; @@ -1064,7 +1064,7 @@ CsrResult unifi_read_8_or_16(card_t *card, CsrUint32 unifi_addr, u8 *pdata) CsrUint32 sdio_addr; CsrResult r; #ifdef CSR_WIFI_TRANSPORT_CSPI - CsrUint16 w; + u16 w; #endif r = set_page(card, unifi_addr, &sdio_addr); @@ -1115,7 +1115,7 @@ CsrResult unifi_write_8_or_16(card_t *card, CsrUint32 unifi_addr, u8 data) CsrUint32 sdio_addr; CsrResult r; #ifdef CSR_WIFI_TRANSPORT_CSPI - CsrUint16 w; + u16 w; #endif r = set_page(card, unifi_addr, &sdio_addr); @@ -1162,7 +1162,7 @@ CsrResult unifi_write_8_or_16(card_t *card, CsrUint32 unifi_addr, u8 data) * CSR_WIFI_HIP_RESULT_INVALID_VALUE a bad generic pointer was specified * --------------------------------------------------------------------------- */ -CsrResult unifi_card_read16(card_t *card, CsrUint32 unifi_addr, CsrUint16 *pdata) +CsrResult unifi_card_read16(card_t *card, CsrUint32 unifi_addr, u16 *pdata) { CsrUint32 sdio_addr; CsrResult r; @@ -1199,7 +1199,7 @@ CsrResult unifi_card_read16(card_t *card, CsrUint32 unifi_addr, CsrUint16 *pdata * CSR_WIFI_HIP_RESULT_INVALID_VALUE a bad generic pointer was specified * --------------------------------------------------------------------------- */ -CsrResult unifi_card_write16(card_t *card, CsrUint32 unifi_addr, CsrUint16 data) +CsrResult unifi_card_write16(card_t *card, CsrUint32 unifi_addr, u16 data) { CsrUint32 sdio_addr; CsrResult r; @@ -1278,7 +1278,7 @@ CsrResult unifi_read32(card_t *card, CsrUint32 unifi_addr, CsrUint32 *pdata) * CSR_WIFI_HIP_RESULT_INVALID_VALUE a bad generic pointer was specified * --------------------------------------------------------------------------- */ -CsrResult unifi_readn_match(card_t *card, CsrUint32 unifi_addr, void *pdata, CsrUint16 len, s8 match) +CsrResult unifi_readn_match(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len, s8 match) { CsrUint32 sdio_addr; CsrResult r; @@ -1295,13 +1295,13 @@ CsrResult unifi_readn_match(card_t *card, CsrUint32 unifi_addr, void *pdata, Csr } /* unifi_readn_match() */ -CsrResult unifi_card_readn(card_t *card, CsrUint32 unifi_addr, void *pdata, CsrUint16 len) +CsrResult unifi_card_readn(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len) { return unifi_readn_match(card, unifi_addr, pdata, len, -1); } /* unifi_card_readn() */ -CsrResult unifi_readnz(card_t *card, CsrUint32 unifi_addr, void *pdata, CsrUint16 len) +CsrResult unifi_readnz(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len) { return unifi_readn_match(card, unifi_addr, pdata, len, 0); } /* unifi_readnz() */ @@ -1384,7 +1384,7 @@ CsrInt32 unifi_read_shared_count(card_t *card, CsrUint32 addr) * CSR_WIFI_HIP_RESULT_INVALID_VALUE an odd length or length too big. * --------------------------------------------------------------------------- */ -CsrResult unifi_writen(card_t *card, CsrUint32 unifi_addr, void *pdata, CsrUint16 len) +CsrResult unifi_writen(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len) { CsrUint32 sdio_addr; CsrResult r; @@ -1401,7 +1401,7 @@ CsrResult unifi_writen(card_t *card, CsrUint32 unifi_addr, void *pdata, CsrUint1 static CsrResult csr_sdio_block_rw(card_t *card, CsrInt16 funcnum, CsrUint32 addr, u8 *pdata, - CsrUint16 count, CsrInt16 dir_is_write) + u16 count, CsrInt16 dir_is_write) { CsrResult csrResult; @@ -1505,7 +1505,7 @@ CsrResult unifi_bulk_rw(card_t *card, CsrUint32 handle, void *pdata, pdata, (direction == UNIFI_SDIO_READ)?"To" : "From"); if (direction == UNIFI_SDIO_WRITE) { - dump(pdata, (CsrUint16)len); + dump(pdata, (u16)len); } else { @@ -1529,7 +1529,7 @@ CsrResult unifi_bulk_rw(card_t *card, CsrUint32 handle, void *pdata, while (1) { csrResult = csr_sdio_block_rw(card, card->function, handle, - (u8 *)pdata, (CsrUint16)len, + (u8 *)pdata, (u16)len, direction); if (csrResult == CSR_SDIO_RESULT_NO_DEVICE) { @@ -1550,7 +1550,7 @@ CsrResult unifi_bulk_rw(card_t *card, CsrUint32 handle, void *pdata, { if (dump_read) { - dump(pdata, (CsrUint16)len); + dump(pdata, (u16)len); } break; } @@ -1699,7 +1699,7 @@ CsrResult unifi_bulk_rw_noretry(card_t *card, CsrUint32 handle, void *pdata, CsrResult csrResult; csrResult = csr_sdio_block_rw(card, card->function, handle, - (u8 *)pdata, (CsrUint16)len, direction); + (u8 *)pdata, (u16)len, direction); if (csrResult != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Block %s failed\n", diff --git a/drivers/staging/csr/csr_wifi_hip_chiphelper.c b/drivers/staging/csr/csr_wifi_hip_chiphelper.c index 729df88f2b3..efdbab010b6 100644 --- a/drivers/staging/csr/csr_wifi_hip_chiphelper.c +++ b/drivers/staging/csr/csr_wifi_hip_chiphelper.c @@ -58,10 +58,10 @@ static const struct chip_helper_init_values init_vals_v22_v23[] = { { 0x????, 0x???? }*/ }; -static const CsrUint16 reset_program_a_v1_or_v2[] = { +static const u16 reset_program_a_v1_or_v2[] = { 0x0000 }; -static const CsrUint16 reset_program_b_v1_or_v2[] = { +static const u16 reset_program_b_v1_or_v2[] = { 0x0010, 0xFE00, 0xA021, 0xFF00, 0x8111, 0x0009, 0x0CA4, 0x0114, 0x0280, 0x04F8, 0xFE00, 0x6F25, 0x06E0, 0x0010, 0xFC00, 0x0121, 0xFC00, 0x0225, 0xFE00, 0x7125, 0xFE00, 0x6D11, 0x03F0, 0xFE00, @@ -591,7 +591,7 @@ ChipDescript* ChipHelper_GetVersionSdio(u8 sdio_ver) } -ChipDescript* ChipHelper_GetVersionAny(CsrUint16 from_FF9A, CsrUint16 from_FE81) +ChipDescript* ChipHelper_GetVersionAny(u16 from_FF9A, u16 from_FE81) { CsrUint32 i; @@ -624,7 +624,7 @@ ChipDescript* ChipHelper_GetVersionAny(CsrUint16 from_FF9A, CsrUint16 from_FE81) } -ChipDescript* ChipHelper_GetVersionUniFi(CsrUint16 ver) +ChipDescript* ChipHelper_GetVersionUniFi(u16 ver) { return ChipHelper_GetVersionAny(0x0000, ver); } @@ -636,7 +636,7 @@ ChipDescript *ChipHelper_Null(void) } -ChipDescript* ChipHelper_GetVersionBlueCore(enum chip_helper_bluecore_age bc_age, CsrUint16 version) +ChipDescript* ChipHelper_GetVersionBlueCore(enum chip_helper_bluecore_age bc_age, u16 version) { if (bc_age == chip_helper_bluecore_pre_bc7) { @@ -664,7 +664,7 @@ CHIP_HELPER_LIST(C_DEF) /* * Map register addresses between HOST and SPI access. */ -CsrUint16 ChipHelper_MapAddress_SPI2HOST(ChipDescript *chip_help, CsrUint16 addr) +u16 ChipHelper_MapAddress_SPI2HOST(ChipDescript *chip_help, u16 addr) { CsrUint32 i; for (i = 0; i < chip_help->map.len; i++) @@ -678,7 +678,7 @@ CsrUint16 ChipHelper_MapAddress_SPI2HOST(ChipDescript *chip_help, CsrUint16 addr } -CsrUint16 ChipHelper_MapAddress_HOST2SPI(ChipDescript *chip_help, CsrUint16 addr) +u16 ChipHelper_MapAddress_HOST2SPI(ChipDescript *chip_help, u16 addr) { CsrUint32 i; for (i = 0; i < chip_help->map.len; i++) @@ -698,7 +698,7 @@ CsrUint16 ChipHelper_MapAddress_HOST2SPI(ChipDescript *chip_help, CsrUint16 addr start is unusable because something else is cluttering up the address map then that is taken into account and this function returns that address justt past that. */ -CsrUint16 ChipHelper_WINDOW_ADDRESS(ChipDescript *chip_help, +u16 ChipHelper_WINDOW_ADDRESS(ChipDescript *chip_help, enum chip_helper_window_index window) { if (window < CHIP_HELPER_WINDOW_COUNT && @@ -711,7 +711,7 @@ CsrUint16 ChipHelper_WINDOW_ADDRESS(ChipDescript *chip_help, /* This returns the size of the window minus any blocked section */ -CsrUint16 ChipHelper_WINDOW_SIZE(ChipDescript *chip_help, +u16 ChipHelper_WINDOW_SIZE(ChipDescript *chip_help, enum chip_helper_window_index window) { if (window < CHIP_HELPER_WINDOW_COUNT && @@ -747,11 +747,11 @@ CsrInt32 ChipHelper_DecodeWindow(ChipDescript *chip_help, enum chip_helper_window_index window, enum chip_helper_window_type type, CsrUint32 offset, - CsrUint16 *page, CsrUint16 *addr, CsrUint32 *len) + u16 *page, u16 *addr, CsrUint32 *len) { const struct window_info_t *win; const struct window_shift_info_t *mode; - CsrUint16 of, pg; + u16 of, pg; if (window >= CHIP_HELPER_WINDOW_COUNT) { @@ -774,8 +774,8 @@ CsrInt32 ChipHelper_DecodeWindow(ChipDescript *chip_help, return FALSE; } - pg = (CsrUint16)(offset >> mode->page_shift) + mode->page_offset; - of = (CsrUint16)(offset & ((1 << mode->page_shift) - 1)); + pg = (u16)(offset >> mode->page_shift) + mode->page_offset; + of = (u16)(offset & ((1 << mode->page_shift) - 1)); /* If 'blocked' is zero this does nothing, else decrease the page register and increase the offset until we aren't in the blocked region of the window. */ diff --git a/drivers/staging/csr/csr_wifi_hip_chiphelper.h b/drivers/staging/csr/csr_wifi_hip_chiphelper.h index 60dff8e92e0..a539c0485d7 100644 --- a/drivers/staging/csr/csr_wifi_hip_chiphelper.h +++ b/drivers/staging/csr/csr_wifi_hip_chiphelper.h @@ -133,8 +133,8 @@ enum chip_helper_fixed_registers /* Address-value pairs for defining initialisation values */ struct chip_helper_init_values { - CsrUint16 addr; - CsrUint16 value; + u16 addr; + u16 value; }; /* A block of data that should be written to the device */ @@ -142,7 +142,7 @@ struct chip_helper_reset_values { CsrUint32 gp_address; CsrUint32 len; - const CsrUint16 *data; + const u16 *data; }; /* @@ -164,11 +164,11 @@ ChipDescript* ChipHelper_Null(void); FF9A is the old GBL_CHIP_VERSION register. If the high eight bits are zero then the chip is a new (BC7 +) one and FE81 is the _new_ GBL_CHIP_VERSION register. */ -ChipDescript* ChipHelper_GetVersionAny(CsrUint16 from_FF9A, CsrUint16 from_FE81); +ChipDescript* ChipHelper_GetVersionAny(u16 from_FF9A, u16 from_FE81); /* The chip is a UniFi, but we don't know which type The parameter is the value of UNIFI_GBL_CHIP_VERSION (0xFE81) */ -ChipDescript* ChipHelper_GetVersionUniFi(CsrUint16 version); +ChipDescript* ChipHelper_GetVersionUniFi(u16 version); /* This gets the version from the SDIO device id. This only gives quite a coarse grained version, so we should update once @@ -180,7 +180,7 @@ ChipDescript* ChipHelper_GetVersionSdio(u8 sdio_version); then "version" is read from FE81. If we don't know if we're pre or post BC7 then we should use "GetVersionAny". */ ChipDescript* ChipHelper_GetVersionBlueCore(enum chip_helper_bluecore_age age, - CsrUint16 version); + u16 version); /* The main functions of this class are built with an X macro. This means we can generate the C and C++ versions from the same source @@ -198,52 +198,52 @@ ChipDescript* ChipHelper_GetVersionBlueCore(enum chip_helper_bluecore_age age, #define CHIP_HELPER_LIST(m) \ CHIP_HELPER_DEF0(m, (const CsrCharString *, FriendlyName, friendly_name)) \ CHIP_HELPER_DEF0(m, (const CsrCharString *, MarketingName, marketing_name)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, DBG_EMU_CMD, regs->dbg_emu_cmd)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, DBG_HOST_PROC_SELECT, regs->host.dbg_proc_select)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, DBG_HOST_STOP_STATUS, regs->host.dbg_stop_status)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, HOST_WINDOW1_PAGE, regs->host.window1_page)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, HOST_WINDOW2_PAGE, regs->host.window2_page)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, HOST_WINDOW3_PAGE, regs->host.window3_page)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, HOST_IO_LOG_ADDR, regs->host.io_log_addr)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, DBG_SPI_PROC_SELECT, regs->spi.dbg_proc_select)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, DBG_SPI_STOP_STATUS, regs->spi.dbg_stop_status)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, SPI_WINDOW1_PAGE, regs->spi.window1_page)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, SPI_WINDOW2_PAGE, regs->spi.window2_page)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, SPI_WINDOW3_PAGE, regs->spi.window3_page)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, SPI_IO_LOG_ADDR, regs->spi.io_log_addr)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, DBG_RESET, regs->dbg_reset)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, DBG_RESET_VALUE, regs->dbg_reset_value)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, DBG_RESET_WARN, regs->dbg_reset_warn)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, DBG_RESET_WARN_VALUE, regs->dbg_reset_warn_value)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, DBG_RESET_RESULT, regs->dbg_reset_result)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, WATCHDOG_DISABLE, regs->watchdog_disable)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, PROC_PC_SNOOP, regs->proc_pc_snoop)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, GBL_CHIP_VERSION, regs->gbl_chip_version)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, GBL_MISC_ENABLES, regs->gbl_misc_enables)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, XAP_PCH, regs->xap_pch)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, XAP_PCL, regs->xap_pcl)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, MAILBOX0, regs->mailbox0)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, MAILBOX1, regs->mailbox1)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, MAILBOX2, regs->mailbox2)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, MAILBOX3, regs->mailbox3)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, SDIO_HIP_HANDSHAKE, regs->sdio_hip_handshake)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, SDIO_HOST_INT, regs->sdio_host_int)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, COEX_STATUS, regs->coex_status)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, SHARED_IO_INTERRUPT, regs->shared_io_interrupt)) \ + CHIP_HELPER_DEF0(m, (u16, DBG_EMU_CMD, regs->dbg_emu_cmd)) \ + CHIP_HELPER_DEF0(m, (u16, DBG_HOST_PROC_SELECT, regs->host.dbg_proc_select)) \ + CHIP_HELPER_DEF0(m, (u16, DBG_HOST_STOP_STATUS, regs->host.dbg_stop_status)) \ + CHIP_HELPER_DEF0(m, (u16, HOST_WINDOW1_PAGE, regs->host.window1_page)) \ + CHIP_HELPER_DEF0(m, (u16, HOST_WINDOW2_PAGE, regs->host.window2_page)) \ + CHIP_HELPER_DEF0(m, (u16, HOST_WINDOW3_PAGE, regs->host.window3_page)) \ + CHIP_HELPER_DEF0(m, (u16, HOST_IO_LOG_ADDR, regs->host.io_log_addr)) \ + CHIP_HELPER_DEF0(m, (u16, DBG_SPI_PROC_SELECT, regs->spi.dbg_proc_select)) \ + CHIP_HELPER_DEF0(m, (u16, DBG_SPI_STOP_STATUS, regs->spi.dbg_stop_status)) \ + CHIP_HELPER_DEF0(m, (u16, SPI_WINDOW1_PAGE, regs->spi.window1_page)) \ + CHIP_HELPER_DEF0(m, (u16, SPI_WINDOW2_PAGE, regs->spi.window2_page)) \ + CHIP_HELPER_DEF0(m, (u16, SPI_WINDOW3_PAGE, regs->spi.window3_page)) \ + CHIP_HELPER_DEF0(m, (u16, SPI_IO_LOG_ADDR, regs->spi.io_log_addr)) \ + CHIP_HELPER_DEF0(m, (u16, DBG_RESET, regs->dbg_reset)) \ + CHIP_HELPER_DEF0(m, (u16, DBG_RESET_VALUE, regs->dbg_reset_value)) \ + CHIP_HELPER_DEF0(m, (u16, DBG_RESET_WARN, regs->dbg_reset_warn)) \ + CHIP_HELPER_DEF0(m, (u16, DBG_RESET_WARN_VALUE, regs->dbg_reset_warn_value)) \ + CHIP_HELPER_DEF0(m, (u16, DBG_RESET_RESULT, regs->dbg_reset_result)) \ + CHIP_HELPER_DEF0(m, (u16, WATCHDOG_DISABLE, regs->watchdog_disable)) \ + CHIP_HELPER_DEF0(m, (u16, PROC_PC_SNOOP, regs->proc_pc_snoop)) \ + CHIP_HELPER_DEF0(m, (u16, GBL_CHIP_VERSION, regs->gbl_chip_version)) \ + CHIP_HELPER_DEF0(m, (u16, GBL_MISC_ENABLES, regs->gbl_misc_enables)) \ + CHIP_HELPER_DEF0(m, (u16, XAP_PCH, regs->xap_pch)) \ + CHIP_HELPER_DEF0(m, (u16, XAP_PCL, regs->xap_pcl)) \ + CHIP_HELPER_DEF0(m, (u16, MAILBOX0, regs->mailbox0)) \ + CHIP_HELPER_DEF0(m, (u16, MAILBOX1, regs->mailbox1)) \ + CHIP_HELPER_DEF0(m, (u16, MAILBOX2, regs->mailbox2)) \ + CHIP_HELPER_DEF0(m, (u16, MAILBOX3, regs->mailbox3)) \ + CHIP_HELPER_DEF0(m, (u16, SDIO_HIP_HANDSHAKE, regs->sdio_hip_handshake)) \ + CHIP_HELPER_DEF0(m, (u16, SDIO_HOST_INT, regs->sdio_host_int)) \ + CHIP_HELPER_DEF0(m, (u16, COEX_STATUS, regs->coex_status)) \ + CHIP_HELPER_DEF0(m, (u16, SHARED_IO_INTERRUPT, regs->shared_io_interrupt)) \ CHIP_HELPER_DEF0(m, (CsrUint32, PROGRAM_MEMORY_RAM_OFFSET, prog_offset.ram)) \ CHIP_HELPER_DEF0(m, (CsrUint32, PROGRAM_MEMORY_ROM_OFFSET, prog_offset.rom)) \ CHIP_HELPER_DEF0(m, (CsrUint32, PROGRAM_MEMORY_FLASH_OFFSET, prog_offset.flash)) \ CHIP_HELPER_DEF0(m, (CsrUint32, PROGRAM_MEMORY_EXT_SRAM_OFFSET, prog_offset.ext_sram)) \ - CHIP_HELPER_DEF0(m, (CsrUint16, DATA_MEMORY_RAM_OFFSET, data_offset.ram)) \ + CHIP_HELPER_DEF0(m, (u16, DATA_MEMORY_RAM_OFFSET, data_offset.ram)) \ CHIP_HELPER_DEF0(m, (CsrInt32, HasFlash, bools.has_flash)) \ CHIP_HELPER_DEF0(m, (CsrInt32, HasExtSram, bools.has_ext_sram)) \ CHIP_HELPER_DEF0(m, (CsrInt32, HasRom, bools.has_rom)) \ CHIP_HELPER_DEF0(m, (CsrInt32, HasBt, bools.has_bt)) \ CHIP_HELPER_DEF0(m, (CsrInt32, HasWLan, bools.has_wlan)) \ - CHIP_HELPER_DEF1(m, (CsrUint16, WINDOW_ADDRESS, enum chip_helper_window_index, window)) \ - CHIP_HELPER_DEF1(m, (CsrUint16, WINDOW_SIZE, enum chip_helper_window_index, window)) \ - CHIP_HELPER_DEF1(m, (CsrUint16, MapAddress_SPI2HOST, CsrUint16, addr)) \ - CHIP_HELPER_DEF1(m, (CsrUint16, MapAddress_HOST2SPI, CsrUint16, addr)) \ + CHIP_HELPER_DEF1(m, (u16, WINDOW_ADDRESS, enum chip_helper_window_index, window)) \ + CHIP_HELPER_DEF1(m, (u16, WINDOW_SIZE, enum chip_helper_window_index, window)) \ + CHIP_HELPER_DEF1(m, (u16, MapAddress_SPI2HOST, u16, addr)) \ + CHIP_HELPER_DEF1(m, (u16, MapAddress_HOST2SPI, u16, addr)) \ CHIP_HELPER_DEF1(m, (CsrUint32, ClockStartupSequence, const struct chip_helper_init_values **, val)) \ CHIP_HELPER_DEF1(m, (CsrUint32, HostResetSequence, const struct chip_helper_reset_values **, val)) @@ -406,7 +406,7 @@ CsrInt32 ChipHelper_DecodeWindow(ChipDescript *chip_help, enum chip_helper_window_index window, enum chip_helper_window_type type, CsrUint32 offset, - CsrUint16 *page, CsrUint16 *addr, CsrUint32 *len); + u16 *page, u16 *addr, CsrUint32 *len); #ifdef __cplusplus /* Close the extern "C" */ @@ -429,7 +429,7 @@ public: /* The default constructor assume a BC7 / UF105x series chip and that the number given is the value of UNIFI_GBL_CHIP_VERSION (0xFE81) */ - ChipHelper(CsrUint16 version); + ChipHelper(u16 version); /* This returns the C interface magic token from a C++ instance. */ ChipDescript* GetDescript() const @@ -442,9 +442,9 @@ public: void ClearVersion(); /* Load this class with data for a specific chip. */ - void GetVersionAny(CsrUint16 from_FF9A, CsrUint16 from_FE81); - void GetVersionUniFi(CsrUint16 version); - void GetVersionBlueCore(chip_helper_bluecore_age age, CsrUint16 version); + void GetVersionAny(u16 from_FF9A, u16 from_FE81); + void GetVersionUniFi(u16 version); + void GetVersionBlueCore(chip_helper_bluecore_age age, u16 version); void GetVersionSdio(u8 sdio_version); /* Helpers to build the definitions of the member functions. */ @@ -460,7 +460,7 @@ public: CsrInt32 DecodeWindow(chip_helper_window_index window, chip_helper_window_type type, CsrUint32 offset, - CsrUint16 &page, CsrUint16 &addr, CsrUint32 &len) const; + u16 &page, u16 &addr, CsrUint32 &len) const; private: ChipDescript *m_desc; diff --git a/drivers/staging/csr/csr_wifi_hip_chiphelper_private.h b/drivers/staging/csr/csr_wifi_hip_chiphelper_private.h index c0e2f2afc68..aacafe1a118 100644 --- a/drivers/staging/csr/csr_wifi_hip_chiphelper_private.h +++ b/drivers/staging/csr/csr_wifi_hip_chiphelper_private.h @@ -47,11 +47,11 @@ struct val_array_t const struct chip_helper_init_values *vals; }; -/* Just a (counted) CsrUint16 array */ +/* Just a (counted) u16 array */ struct data_array_t { CsrUint32 len; - const CsrUint16 *vals; + const u16 *vals; }; struct reset_prog_t @@ -64,7 +64,7 @@ struct reset_prog_t different host transports. */ struct chip_map_address_t { - CsrUint16 spi, host; + u16 spi, host; }; struct map_array_t @@ -75,38 +75,38 @@ struct map_array_t struct chip_device_regs_per_transport_t { - CsrUint16 dbg_proc_select; - CsrUint16 dbg_stop_status; - CsrUint16 window1_page; /* PROG_PMEM1 or GW1 */ - CsrUint16 window2_page; /* PROG_PMEM2 or GW2 */ - CsrUint16 window3_page; /* SHARED or GW3 */ - CsrUint16 io_log_addr; + u16 dbg_proc_select; + u16 dbg_stop_status; + u16 window1_page; /* PROG_PMEM1 or GW1 */ + u16 window2_page; /* PROG_PMEM2 or GW2 */ + u16 window3_page; /* SHARED or GW3 */ + u16 io_log_addr; }; struct chip_device_regs_t { - CsrUint16 gbl_chip_version; - CsrUint16 gbl_misc_enables; - CsrUint16 dbg_emu_cmd; + u16 gbl_chip_version; + u16 gbl_misc_enables; + u16 dbg_emu_cmd; struct chip_device_regs_per_transport_t host; struct chip_device_regs_per_transport_t spi; - CsrUint16 dbg_reset; - CsrUint16 dbg_reset_value; - CsrUint16 dbg_reset_warn; - CsrUint16 dbg_reset_warn_value; - CsrUint16 dbg_reset_result; - CsrUint16 xap_pch; - CsrUint16 xap_pcl; - CsrUint16 proc_pc_snoop; - CsrUint16 watchdog_disable; - CsrUint16 mailbox0; - CsrUint16 mailbox1; - CsrUint16 mailbox2; - CsrUint16 mailbox3; - CsrUint16 sdio_host_int; - CsrUint16 shared_io_interrupt; - CsrUint16 sdio_hip_handshake; - CsrUint16 coex_status; /* Allows WAPI detection */ + u16 dbg_reset; + u16 dbg_reset_value; + u16 dbg_reset_warn; + u16 dbg_reset_warn_value; + u16 dbg_reset_result; + u16 xap_pch; + u16 xap_pcl; + u16 proc_pc_snoop; + u16 watchdog_disable; + u16 mailbox0; + u16 mailbox1; + u16 mailbox2; + u16 mailbox3; + u16 sdio_host_int; + u16 shared_io_interrupt; + u16 sdio_hip_handshake; + u16 coex_status; /* Allows WAPI detection */ }; /* If allowed is false then this window does not provide this @@ -119,7 +119,7 @@ struct window_shift_info_t { CsrInt32 allowed; CsrUint32 page_shift; - CsrUint16 page_offset; + u16 page_offset; }; /* Each window has an address and size. These are obvious. It then @@ -129,9 +129,9 @@ struct window_shift_info_t are unusable. */ struct window_info_t { - CsrUint16 address; - CsrUint16 size; - CsrUint16 blocked; + u16 address; + u16 size; + u16 blocked; const struct window_shift_info_t *mode; }; @@ -141,8 +141,8 @@ struct window_info_t struct chip_version_t { CsrInt32 pre_bc7; - CsrUint16 mask; - CsrUint16 result; + u16 mask; + u16 result; u8 sdio; }; @@ -193,7 +193,7 @@ struct chip_device_desc_t /* The offsets into the data address space of interesting things. */ struct { - CsrUint16 ram; + u16 ram; /* maybe add shared / page tables? */ } data_offset; diff --git a/drivers/staging/csr/csr_wifi_hip_conversions.h b/drivers/staging/csr/csr_wifi_hip_conversions.h index 212b9b7b105..58a2d724e3f 100644 --- a/drivers/staging/csr/csr_wifi_hip_conversions.h +++ b/drivers/staging/csr/csr_wifi_hip_conversions.h @@ -71,7 +71,7 @@ extern "C" { CsrInt32 get_packed_struct_size(const u8 *buf); CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig); -CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, CsrUint16 *sig_len); +CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len); #ifdef __cplusplus } diff --git a/drivers/staging/csr/csr_wifi_hip_download.c b/drivers/staging/csr/csr_wifi_hip_download.c index 4f7dae8b33c..2a3ece304f0 100644 --- a/drivers/staging/csr/csr_wifi_hip_download.c +++ b/drivers/staging/csr/csr_wifi_hip_download.c @@ -52,7 +52,7 @@ static CsrResult do_patch_convert_download(card_t *card, static CsrResult _find_in_slut(card_t *card, symbol_t *psym, CsrUint32 *pslut) { CsrUint32 slut_address; - CsrUint16 finger_print; + u16 finger_print; CsrResult r; CsrResult csrResult; @@ -121,7 +121,7 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, CsrUint32 *pslut) while (1) { - CsrUint16 id; + u16 id; CsrUint32 obj; r = unifi_card_read16(card, slut_address, &id); @@ -500,7 +500,7 @@ void* unifi_dl_fw_read_start(card_t *card, s8 is_fw) static CsrResult safe_read_shared_location(card_t *card, CsrUint32 address, u8 *pdata) { CsrResult r; - CsrUint16 limit = 1000; + u16 limit = 1000; u8 b, b2; *pdata = 0; @@ -662,7 +662,7 @@ static CsrResult send_ptdl_to_unifi(card_t *card, void *dlpriv, CsrInt32 data_len; CsrUint32 write_len; CsrResult r; - const CsrUint16 buf_size = 2 * 1024; + const u16 buf_size = 2 * 1024; offset = ptdl->dl_offset; data_len = ptdl->dl_size; @@ -757,8 +757,8 @@ static CsrResult do_patch_download(card_t *card, void *dlpriv, xbv1_t *pfwinfo, { CsrResult r; CsrInt32 i; - CsrUint16 loader_version; - CsrUint16 handle; + u16 loader_version; + u16 handle; CsrUint32 total_bytes; /* @@ -795,7 +795,7 @@ static CsrResult do_patch_download(card_t *card, void *dlpriv, xbv1_t *pfwinfo, if (card->loader_led_mask) { r = unifi_card_write16(card, boot_ctrl_addr + 2, - (CsrUint16)card->loader_led_mask); + (u16)card->loader_led_mask); if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Patch download: Failed to write LED mask\n"); diff --git a/drivers/staging/csr/csr_wifi_hip_dump.c b/drivers/staging/csr/csr_wifi_hip_dump.c index efa699f20dc..fa9b697ad13 100644 --- a/drivers/staging/csr/csr_wifi_hip_dump.c +++ b/drivers/staging/csr/csr_wifi_hip_dump.c @@ -38,12 +38,12 @@ /* Mini-coredump state */ typedef struct coredump_buf { - CsrUint16 count; /* serial number of dump */ + u16 count; /* serial number of dump */ CsrTime timestamp; /* host's system time at capture */ CsrInt16 requestor; /* request: 0=auto dump, 1=manual */ - CsrUint16 chip_ver; + u16 chip_ver; CsrUint32 fw_ver; - CsrUint16 *zone[HIP_CDUMP_NUM_ZONES]; + u16 *zone[HIP_CDUMP_NUM_ZONES]; struct coredump_buf *next; /* circular list */ struct coredump_buf *prev; /* circular list */ @@ -55,16 +55,16 @@ struct coredump_zone unifi_coredump_space_t space; /* XAP memory space this zone covers */ enum unifi_dbg_processors_select cpu; /* XAP CPU core selector */ CsrUint32 gp; /* Generic Pointer to memory zone on XAP */ - CsrUint16 offset; /* 16-bit XAP word offset of zone in memory space */ - CsrUint16 length; /* Length of zone in XAP words */ + u16 offset; /* 16-bit XAP word offset of zone in memory space */ + u16 length; /* Length of zone in XAP words */ }; static CsrResult unifi_coredump_from_sdio(card_t *card, coredump_buffer *dump_buf); static CsrResult unifi_coredump_read_zones(card_t *card, coredump_buffer *dump_buf); -static CsrResult unifi_coredump_read_zone(card_t *card, CsrUint16 *zone, +static CsrResult unifi_coredump_read_zone(card_t *card, u16 *zone, const struct coredump_zone *def); static CsrInt32 get_value_from_coredump(const coredump_buffer *dump, - const unifi_coredump_space_t space, const CsrUint16 offset); + const unifi_coredump_space_t space, const u16 offset); /* Table of chip memory zones we capture on mini-coredump */ static const struct coredump_zone zonedef_table[HIP_CDUMP_NUM_ZONES] = { @@ -190,7 +190,7 @@ CsrResult unifi_coredump_handle_request(card_t *card) CsrResult unifi_coredump_capture(card_t *card, struct unifi_coredump_req *req) { CsrResult r = CSR_RESULT_SUCCESS; - static CsrUint16 dump_seq_no = 1; + static u16 dump_seq_no = 1; CsrTime time_of_capture; func_enter(); @@ -295,10 +295,10 @@ done: */ static CsrInt32 get_value_from_coredump(const coredump_buffer *coreDump, const unifi_coredump_space_t space, - const CsrUint16 offset_in_space) + const u16 offset_in_space) { CsrInt32 r = -1; - CsrUint16 offset_in_zone; + u16 offset_in_zone; CsrUint32 zone_end_offset; CsrInt32 i; const struct coredump_zone *def = &zonedef_table[0]; @@ -430,7 +430,7 @@ CsrResult unifi_coredump_get_value(card_t *card, struct unifi_coredump_req *req) req->index, find_dump->count, i); /* Find the appropriate entry in the buffer */ - req->value = get_value_from_coredump(find_dump, req->space, (CsrUint16)req->offset); + req->value = get_value_from_coredump(find_dump, req->space, (u16)req->offset); if (req->value < 0) { r = CSR_WIFI_HIP_RESULT_RANGE; /* Un-captured register */ @@ -476,7 +476,7 @@ done: * It is assumed that the caller has already stopped the XAPs * --------------------------------------------------------------------------- */ -static CsrResult unifi_coredump_read_zone(card_t *card, CsrUint16 *zonebuf, const struct coredump_zone *def) +static CsrResult unifi_coredump_read_zone(card_t *card, u16 *zonebuf, const struct coredump_zone *def) { CsrResult r; @@ -508,7 +508,7 @@ static CsrResult unifi_coredump_read_zone(card_t *card, CsrUint16 *zonebuf, cons def->space, def->offset, def->length, def->gp, def->cpu); /* Read on-chip RAM (byte-wise) */ - r = unifi_card_readn(card, def->gp, zonebuf, (CsrUint16)(def->length * 2)); + r = unifi_card_readn(card, def->gp, zonebuf, (u16)(def->length * 2)); if (r == CSR_WIFI_HIP_RESULT_NO_DEVICE) { goto done; @@ -585,7 +585,7 @@ static CsrResult unifi_coredump_read_zones(card_t *card, coredump_buffer *dump_b */ static CsrResult unifi_coredump_from_sdio(card_t *card, coredump_buffer *dump_buf) { - CsrUint16 val; + u16 val; CsrResult r; CsrUint32 sdio_addr; @@ -661,7 +661,7 @@ static coredump_buffer* new_coredump_node(void *ospriv, coredump_buffer *prevnode) { coredump_buffer *newnode = NULL; - CsrUint16 *newzone = NULL; + u16 *newzone = NULL; CsrInt32 i; CsrUint32 zone_size; @@ -676,8 +676,8 @@ coredump_buffer* new_coredump_node(void *ospriv, coredump_buffer *prevnode) /* Allocate chip memory zone capture buffers */ for (i = 0; i < HIP_CDUMP_NUM_ZONES; i++) { - zone_size = sizeof(CsrUint16) * zonedef_table[i].length; - newzone = (CsrUint16 *)CsrMemAlloc(zone_size); + zone_size = sizeof(u16) * zonedef_table[i].length; + newzone = (u16 *)CsrMemAlloc(zone_size); newnode->zone[i] = newzone; if (newzone != NULL) { @@ -738,7 +738,7 @@ coredump_buffer* new_coredump_node(void *ospriv, coredump_buffer *prevnode) * free for capturing. * --------------------------------------------------------------------------- */ -CsrResult unifi_coredump_init(card_t *card, CsrUint16 num_dump_buffers) +CsrResult unifi_coredump_init(card_t *card, u16 num_dump_buffers) { #ifndef UNIFI_DISABLE_COREDUMP void *ospriv = card->ospriv; diff --git a/drivers/staging/csr/csr_wifi_hip_packing.c b/drivers/staging/csr/csr_wifi_hip_packing.c index e024a1fdd85..968926b1a46 100644 --- a/drivers/staging/csr/csr_wifi_hip_packing.c +++ b/drivers/staging/csr/csr_wifi_hip_packing.c @@ -38,7 +38,7 @@ CsrInt32 get_packed_struct_size(const u8 *buf) { CsrInt32 size = 0; - CsrUint16 sig_id; + u16 sig_id; sig_id = CSR_GET_UINT16_FROM_LITTLE_ENDIAN(buf); @@ -2984,7 +2984,7 @@ CsrResult read_unpack_signal(const u8 *ptr, CSR_SIGNAL *sig) * CSR_WIFI_HIP_RESULT_INVALID_VALUE if the ID of signal was not recognised. * --------------------------------------------------------------------------- */ -CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, CsrUint16 *sig_len) +CsrResult write_pack(const CSR_SIGNAL *sig, u8 *ptr, u16 *sig_len) { CsrInt16 index = 0; diff --git a/drivers/staging/csr/csr_wifi_hip_send.c b/drivers/staging/csr/csr_wifi_hip_send.c index 96bf40e85fd..5d6b18bd140 100644 --- a/drivers/staging/csr/csr_wifi_hip_send.c +++ b/drivers/staging/csr/csr_wifi_hip_send.c @@ -104,7 +104,7 @@ static CsrResult send_signal(card_t *card, const u8 *sigptr, CsrUint32 siglen, const bulk_data_param_t *bulkdata, q_t *sigq, CsrUint32 priority_q, CsrUint32 run_bh) { - CsrUint16 i, data_slot_size; + u16 i, data_slot_size; card_signal_t *csptr; CsrInt16 qe; CsrResult r; @@ -128,7 +128,7 @@ static CsrResult send_signal(card_t *card, const u8 *sigptr, CsrUint32 siglen, csptr = CSR_WIFI_HIP_Q_SLOT_DATA(sigq, qe); /* Make up the card_signal struct */ - csptr->signal_length = (CsrUint16)siglen; + csptr->signal_length = (u16)siglen; CsrMemCpy((void *)csptr->sigbuf, (void *)sigptr, siglen); for (i = 0; i < UNIFI_MAX_DATA_REFERENCES; ++i) @@ -307,7 +307,7 @@ CsrResult unifi_send_signal(card_t *card, const u8 *sigptr, CsrUint32 siglen, const bulk_data_param_t *bulkdata) { q_t *sig_soft_q; - CsrUint16 signal_id; + u16 signal_id; CsrResult r; CsrUint32 run_bh; CsrUint32 priority_q; @@ -328,7 +328,7 @@ CsrResult unifi_send_signal(card_t *card, const u8 *sigptr, CsrUint32 siglen, */ if (signal_id == CSR_MA_PACKET_REQUEST_ID) { - CsrUint16 frame_priority; + u16 frame_priority; if (card->periodic_wake_mode == UNIFI_PERIODIC_WAKE_HOST_ENABLED) { @@ -386,7 +386,7 @@ CsrResult unifi_send_signal(card_t *card, const u8 *sigptr, CsrUint32 siglen, CsrResult unifi_send_resources_available(card_t *card, const u8 *sigptr) { q_t *sig_soft_q; - CsrUint16 signal_id = GET_SIGNAL_ID(sigptr); + u16 signal_id = GET_SIGNAL_ID(sigptr); /* * If the signal is a CSR_MA_PACKET_REQUEST , @@ -394,7 +394,7 @@ CsrResult unifi_send_resources_available(card_t *card, const u8 *sigptr) */ if (signal_id == CSR_MA_PACKET_REQUEST_ID) { - CsrUint16 frame_priority; + u16 frame_priority; CsrUint32 priority_q; /* Map the frame priority to a traffic queue index. */ diff --git a/drivers/staging/csr/csr_wifi_hip_signals.c b/drivers/staging/csr/csr_wifi_hip_signals.c index 5d0be5397a4..a1b16faafbb 100644 --- a/drivers/staging/csr/csr_wifi_hip_signals.c +++ b/drivers/staging/csr/csr_wifi_hip_signals.c @@ -944,7 +944,7 @@ CsrInt32 SigGetDataRefs(CSR_SIGNAL *aSignal, CSR_DATAREF **aDataRef) } -CsrUint32 SigGetFilterPos(CsrUint16 aSigID) +CsrUint32 SigGetFilterPos(u16 aSigID) { switch (aSigID) { diff --git a/drivers/staging/csr/csr_wifi_hip_sigs.h b/drivers/staging/csr/csr_wifi_hip_sigs.h index 5d04c069b55..a649e14dc70 100644 --- a/drivers/staging/csr/csr_wifi_hip_sigs.h +++ b/drivers/staging/csr/csr_wifi_hip_sigs.h @@ -22,13 +22,13 @@ extern "C" { typedef CsrInt16 csr_place_holding_type; -typedef CsrUint16 CSR_ASSOCIATION_ID; +typedef u16 CSR_ASSOCIATION_ID; -typedef CsrUint16 CSR_AUTONOMOUS_SCAN_ID; +typedef u16 CSR_AUTONOMOUS_SCAN_ID; -typedef CsrUint16 CSR_BEACON_PERIODS; +typedef u16 CSR_BEACON_PERIODS; -typedef CsrUint16 CSR_BLACKOUT_ID; +typedef u16 CSR_BLACKOUT_ID; typedef enum CSR_BLACKOUT_SOURCE { @@ -57,9 +57,9 @@ typedef enum CSR_BOOT_LOADER_OPERATION CSR_BOOT_LOADER_IMAGE_3 = 0x13 } CSR_BOOT_LOADER_OPERATION; -typedef CsrUint16 CSR_CAPABILITY_INFORMATION; +typedef u16 CSR_CAPABILITY_INFORMATION; -typedef CsrUint16 CSR_CHANNEL_STARTING_FACTOR; +typedef u16 CSR_CHANNEL_STARTING_FACTOR; typedef CsrUint32 CSR_CIPHER_SUITE_SELECTOR; @@ -142,11 +142,11 @@ typedef enum CSR_MEMORY_SPACE CSR_BT_PROCESSOR_ROM = 0x32 } CSR_MEMORY_SPACE; -typedef CsrUint16 CSR_MICROSECONDS16; +typedef u16 CSR_MICROSECONDS16; typedef CsrUint32 CSR_MICROSECONDS32; -typedef CsrUint16 CSR_NATURAL16; +typedef u16 CSR_NATURAL16; typedef enum CSR_PS_SCHEME { @@ -161,7 +161,7 @@ typedef enum CSR_PACKET_FILTER_MODE CSR_PFM_OPT_IN = 0x0003 } CSR_PACKET_FILTER_MODE; -typedef CsrUint16 CSR_PERIODIC_ID; +typedef u16 CSR_PERIODIC_ID; typedef enum CSR_PERIODIC_SCHEDULING_MODE { @@ -344,9 +344,9 @@ typedef enum CSR_SIGNAL_ID CSR_DEBUG_GENERIC_INDICATION_ID = 0x080b } CSR_SIGNAL_ID; -typedef CsrUint16 CSR_SIMPLE_POINTER; +typedef u16 CSR_SIMPLE_POINTER; -typedef CsrUint16 CSR_STARTING_SEQUENCE_NUMBER; +typedef u16 CSR_STARTING_SEQUENCE_NUMBER; typedef enum CSR_SYMBOL_ID { @@ -377,7 +377,7 @@ typedef struct CSR_TSF_TIME u8 x[8]; } CSR_TSF_TIME; -typedef CsrUint16 CSR_TIME_UNITS; +typedef u16 CSR_TIME_UNITS; typedef enum CSR_TRANSMISSION_CONTROL { @@ -405,9 +405,9 @@ typedef enum CSR_TRANSMISSION_STATUS CSR_TX_REJECTED_DTIM_STARTED = 0x0010 } CSR_TRANSMISSION_STATUS; -typedef CsrUint16 CSR_TRIGGER_ID; +typedef u16 CSR_TRIGGER_ID; -typedef CsrUint16 CSR_TRIGGERED_ID; +typedef u16 CSR_TRIGGERED_ID; typedef enum CSR_HIP_VERSIONS { @@ -415,17 +415,17 @@ typedef enum CSR_HIP_VERSIONS CSR_HIP_VERSION = 0x0900 } CSR_HIP_VERSIONS; -typedef CsrUint16 CSR_BUFFER_HANDLE; +typedef u16 CSR_BUFFER_HANDLE; -typedef CsrUint16 CSR_CHANNEL_NUMBER; +typedef u16 CSR_CHANNEL_NUMBER; typedef struct CSR_DATA_REFERENCE { - CsrUint16 SlotNumber; - CsrUint16 DataLength; + u16 SlotNumber; + u16 DataLength; } CSR_DATAREF; -typedef CsrUint16 CSR_DIALOG_TOKEN; +typedef u16 CSR_DIALOG_TOKEN; typedef struct CSR_GENERIC_POINTER { @@ -574,11 +574,11 @@ typedef struct CSR_MLME_STOP_MEASURE_REQUEST CSR_DIALOG_TOKEN DialogToken; } CSR_MLME_STOP_MEASURE_REQUEST; -typedef CsrUint16 CSR_PROCESS_ID; +typedef u16 CSR_PROCESS_ID; -typedef CsrUint16 CSR_RATE; +typedef u16 CSR_RATE; -typedef CsrUint16 CSR_SEQUENCE_NUMBER; +typedef u16 CSR_SEQUENCE_NUMBER; typedef struct CSR_SIGNAL_PRIMITIVE_HEADER { @@ -587,9 +587,9 @@ typedef struct CSR_SIGNAL_PRIMITIVE_HEADER CSR_PROCESS_ID SenderProcessId; } CSR_SIGNAL_PRIMITIVE_HEADER; -typedef CsrUint16 CSR_TRAFFIC_WINDOW; +typedef u16 CSR_TRAFFIC_WINDOW; -typedef CsrUint16 CSR_VIF_IDENTIFIER; +typedef u16 CSR_VIF_IDENTIFIER; typedef struct CSR_DEBUG_GENERIC_CONFIRM { @@ -1416,7 +1416,7 @@ typedef struct CSR_SIGNAL_PRIMITIVE #define SIG_FILTER_SIZE 6 -CsrUint32 SigGetFilterPos(CsrUint16 aSigID); +CsrUint32 SigGetFilterPos(u16 aSigID); #ifdef __cplusplus } diff --git a/drivers/staging/csr/csr_wifi_hip_ta_sampling.c b/drivers/staging/csr/csr_wifi_hip_ta_sampling.c index 7108cf064f5..1dabd84cb2f 100644 --- a/drivers/staging/csr/csr_wifi_hip_ta_sampling.c +++ b/drivers/staging/csr/csr_wifi_hip_ta_sampling.c @@ -97,8 +97,8 @@ static enum ta_frame_identity ta_detect_protocol(card_t *card, CsrWifiRouterCtrl const u8 *sta_macaddr) { ta_data_t *tad = &card->ta_sampling; - CsrUint16 proto; - CsrUint16 source_port, dest_port; + u16 proto; + u16 source_port, dest_port; CsrWifiMacAddress srcAddress; CsrUint32 snap_hdr, oui_hdr; @@ -347,7 +347,7 @@ void unifi_ta_sample(card_t *card, const u8 *saddr, const u8 *sta_macaddr, CsrUint32 timestamp, - CsrUint16 rate) + u16 rate) { ta_data_t *tad = &card->ta_sampling; enum ta_frame_identity identity; @@ -530,7 +530,7 @@ CsrResult unifi_ta_configure(card_t *card, */ void unifi_ta_classification(card_t *card, CsrWifiRouterCtrlTrafficType traffic_type, - CsrUint16 period) + u16 period) { unifi_trace(card->ospriv, UDBG3, "Changed current ta classification to: %d\n", traffic_type); diff --git a/drivers/staging/csr/csr_wifi_hip_ta_sampling.h b/drivers/staging/csr/csr_wifi_hip_ta_sampling.h index 602943ecc1b..7183e25e9df 100644 --- a/drivers/staging/csr/csr_wifi_hip_ta_sampling.h +++ b/drivers/staging/csr/csr_wifi_hip_ta_sampling.h @@ -42,7 +42,7 @@ typedef struct ta_l4stats typedef struct ta_data { /* Current packet filter configuration */ - CsrUint16 packet_filter; + u16 packet_filter; /* Current packet custom filter configuration */ CsrWifiRouterCtrlTrafficFilter custom_filter; diff --git a/drivers/staging/csr/csr_wifi_hip_udi.c b/drivers/staging/csr/csr_wifi_hip_udi.c index b7c292c0d6a..72deb2f0b34 100644 --- a/drivers/staging/csr/csr_wifi_hip_udi.c +++ b/drivers/staging/csr/csr_wifi_hip_udi.c @@ -45,7 +45,7 @@ CsrInt32 unifi_print_status(card_t *card, CsrCharString *str, CsrInt32 *remain) { CsrCharString *p = str; sdio_config_data_t *cfg; - CsrUint16 i, n; + u16 i, n; CsrInt32 remaining = *remain; CsrInt32 written; #ifdef CSR_UNSAFE_SDIO_ACCESS @@ -65,7 +65,7 @@ CsrInt32 unifi_print_status(card_t *card, CsrCharString *str, CsrInt32 *remain) i = n = 0; written = CsrSnprintf(p, remaining, "Chip ID %u\n", - (CsrUint16)card->chip_id); + (u16)card->chip_id); UNIFI_SNPRINTF_RET(p, remaining, written); written = CsrSnprintf(p, remaining, "Chip Version %04X\n", card->chip_version); @@ -107,7 +107,7 @@ CsrInt32 unifi_print_status(card_t *card, CsrCharString *str, CsrInt32 *remain) /* Added by protocol version 0x0001 */ written = CsrSnprintf(p, remaining, "overlay_size %u\n", - (CsrUint16)cfg->overlay_size); + (u16)cfg->overlay_size); UNIFI_SNPRINTF_RET(p, remaining, written); /* Added by protocol version 0x0300 */ @@ -134,16 +134,16 @@ CsrInt32 unifi_print_status(card_t *card, CsrCharString *str, CsrInt32 *remain) UNIFI_SNPRINTF_RET(p, remaining, written); written = CsrSnprintf(p, remaining, "fhsr: %u\n", - (CsrUint16)card->from_host_signals_r); + (u16)card->from_host_signals_r); UNIFI_SNPRINTF_RET(p, remaining, written); written = CsrSnprintf(p, remaining, "fhsw: %u\n", - (CsrUint16)card->from_host_signals_w); + (u16)card->from_host_signals_w); UNIFI_SNPRINTF_RET(p, remaining, written); written = CsrSnprintf(p, remaining, "thsr: %u\n", - (CsrUint16)card->to_host_signals_r); + (u16)card->to_host_signals_r); UNIFI_SNPRINTF_RET(p, remaining, written); written = CsrSnprintf(p, remaining, "thsw: %u\n", - (CsrUint16)card->to_host_signals_w); + (u16)card->to_host_signals_w); UNIFI_SNPRINTF_RET(p, remaining, written); written = CsrSnprintf(p, remaining, "fh buffer contains: %u signals, %u bytes\n", @@ -189,7 +189,7 @@ CsrInt32 unifi_print_status(card_t *card, CsrCharString *str, CsrInt32 *remain) for (i = 0; i < n && card->from_host_data; i++) { written = CsrSnprintf(p, remaining, " %u", - (CsrUint16)card->from_host_data[i].bd.data_length); + (u16)card->from_host_data[i].bd.data_length); UNIFI_SNPRINTF_RET(p, remaining, written); } written = CsrSnprintf(p, remaining, "\n"); @@ -201,7 +201,7 @@ CsrInt32 unifi_print_status(card_t *card, CsrCharString *str, CsrInt32 *remain) for (i = 0; i < n && card->to_host_data; i++) { written = CsrSnprintf(p, remaining, " %u", - (CsrUint16)card->to_host_data[i].data_length); + (u16)card->to_host_data[i].data_length); UNIFI_SNPRINTF_RET(p, remaining, written); } diff --git a/drivers/staging/csr/csr_wifi_hip_unifi.h b/drivers/staging/csr/csr_wifi_hip_unifi.h index 1fb9d769424..cbe600d1b7b 100644 --- a/drivers/staging/csr/csr_wifi_hip_unifi.h +++ b/drivers/staging/csr/csr_wifi_hip_unifi.h @@ -148,7 +148,7 @@ typedef struct _bulk_data_desc /* Structure of an entry in the Symbol Look Up Table (SLUT). */ typedef struct _symbol { - CsrUint16 id; + u16 id; CsrUint32 obj; } symbol_t; @@ -194,10 +194,10 @@ typedef struct _bulk_data_param */ typedef struct _card_info { - CsrUint16 chip_id; - CsrUint16 chip_version; + u16 chip_id; + u16 chip_version; CsrUint32 fw_build; - CsrUint16 fw_hip_version; + u16 fw_hip_version; CsrUint32 sdio_block_size; } card_info_t; @@ -514,7 +514,7 @@ void unifi_ta_sample(card_t *card, const u8 *saddr, const u8 *sta_macaddr, CsrUint32 timestamp, - CsrUint16 rate); + u16 rate); /** * Notify the HIP core lib for a detected Traffic Classification. @@ -530,7 +530,7 @@ void unifi_ta_sample(card_t *card, */ void unifi_ta_classification(card_t *card, CsrWifiRouterCtrlTrafficType traffic_type, - CsrUint16 period); + u16 period); #endif /** @@ -545,9 +545,9 @@ void unifi_ta_classification(card_t *card, CsrResult unifi_card_hard_reset(card_t *card); -CsrResult unifi_card_readn(card_t *card, CsrUint32 unifi_addr, void *pdata, CsrUint16 len); -CsrResult unifi_card_read16(card_t *card, CsrUint32 unifi_addr, CsrUint16 *pdata); -CsrResult unifi_card_write16(card_t *card, CsrUint32 unifi_addr, CsrUint16 data); +CsrResult unifi_card_readn(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len); +CsrResult unifi_card_read16(card_t *card, CsrUint32 unifi_addr, u16 *pdata); +CsrResult unifi_card_write16(card_t *card, CsrUint32 unifi_addr, u16 data); enum unifi_dbg_processors_select @@ -660,15 +660,15 @@ void unifi_receive_event(void *ospriv, * @ingroup upperedge */ CsrResult unifi_reque_ma_packet_request(void *ospriv, CsrUint32 host_tag, - CsrUint16 status, + u16 status, bulk_data_desc_t *bulkDataDesc); #endif typedef struct { - CsrUint16 free_fh_sig_queue_slots[UNIFI_NO_OF_TX_QS]; - CsrUint16 free_fh_bulkdata_slots; - CsrUint16 free_fh_fw_slots; + u16 free_fh_sig_queue_slots[UNIFI_NO_OF_TX_QS]; + u16 free_fh_bulkdata_slots; + u16 free_fh_fw_slots; } unifi_HipQosInfo; void unifi_get_hip_qos_info(card_t *card, unifi_HipQosInfo *hipqosinfo); @@ -859,20 +859,20 @@ void unifi_request_max_sdio_clock(card_t *card); /* Functions to lookup bulk data command names. */ -const CsrCharString* lookup_bulkcmd_name(CsrUint16 id); +const CsrCharString* lookup_bulkcmd_name(u16 id); /* Function to log HIP's global debug buffer */ #ifdef CSR_WIFI_HIP_DEBUG_OFFLINE void unifi_debug_buf_dump(void); void unifi_debug_log_to_buf(const CsrCharString *fmt, ...); -void unifi_debug_hex_to_buf(const CsrCharString *buff, CsrUint16 length); +void unifi_debug_hex_to_buf(const CsrCharString *buff, u16 length); #endif /* Mini-coredump utility functions */ CsrResult unifi_coredump_get_value(card_t *card, struct unifi_coredump_req *req); CsrResult unifi_coredump_capture(card_t *card, struct unifi_coredump_req *req); CsrResult unifi_coredump_request_at_next_reset(card_t *card, s8 enable); -CsrResult unifi_coredump_init(card_t *card, CsrUint16 num_dump_buffers); +CsrResult unifi_coredump_init(card_t *card, u16 num_dump_buffers); void unifi_coredump_free(card_t *card); #ifdef __cplusplus diff --git a/drivers/staging/csr/csr_wifi_hip_unifi_signal_names.c b/drivers/staging/csr/csr_wifi_hip_unifi_signal_names.c index ee1970dae91..07aa954d5c0 100644 --- a/drivers/staging/csr/csr_wifi_hip_unifi_signal_names.c +++ b/drivers/staging/csr/csr_wifi_hip_unifi_signal_names.c @@ -29,7 +29,7 @@ static const struct sig_name Unifi_bulkcmd_names[] = { { 15, "Padding" } }; -const CsrCharString* lookup_bulkcmd_name(CsrUint16 id) +const CsrCharString* lookup_bulkcmd_name(u16 id) { if (id < 9) { diff --git a/drivers/staging/csr/csr_wifi_hip_xbv.c b/drivers/staging/csr/csr_wifi_hip_xbv.c index 8bc79aab702..cc590d79bb2 100644 --- a/drivers/staging/csr/csr_wifi_hip_xbv.c +++ b/drivers/staging/csr/csr_wifi_hip_xbv.c @@ -99,7 +99,7 @@ static CsrInt32 xbv_push(xbv1_t *fwinfo, xbv_stack_t *stack, xbv_container new_cont, CsrUint32 ioff); static CsrUint32 write_uint16(void *buf, const CsrUint32 offset, - const CsrUint16 val); + const u16 val); static CsrUint32 write_uint32(void *buf, const CsrUint32 offset, const CsrUint32 val); static CsrUint32 write_bytes(void *buf, const CsrUint32 offset, @@ -109,7 +109,7 @@ static CsrUint32 write_tag(void *buf, const CsrUint32 offset, static CsrUint32 write_chunk(void *buf, const CsrUint32 offset, const CsrCharString *tag_str, const CsrUint32 payload_len); -static CsrUint16 calc_checksum(void *buf, const CsrUint32 offset, +static u16 calc_checksum(void *buf, const CsrUint32 offset, const CsrUint32 bytes_len); static CsrUint32 calc_patch_size(const xbv1_t *fwinfo); @@ -118,7 +118,7 @@ static CsrUint32 write_xbv_header(void *buf, const CsrUint32 offset, static CsrUint32 write_ptch_header(void *buf, const CsrUint32 offset, const CsrUint32 fw_id); static CsrUint32 write_patchcmd(void *buf, const CsrUint32 offset, - const CsrUint32 dst_genaddr, const CsrUint16 len); + const CsrUint32 dst_genaddr, const u16 len); static CsrUint32 write_reset_ptdl(void *buf, const CsrUint32 offset, const xbv1_t *fwinfo, CsrUint32 fw_id); static CsrUint32 write_fwdl_to_ptdl(void *buf, const CsrUint32 offset, @@ -361,8 +361,8 @@ CsrResult xbv1_parse(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwin /* Fill in the VMEQ */ vmeq->addr = temp[0]; - vmeq->mask = (CsrUint16)temp[1]; - vmeq->value = (CsrUint16)temp[2]; + vmeq->mask = (u16)temp[1]; + vmeq->value = (u16)temp[2]; } else if (TAG_EQ(tag.t_name, "FWID")) { @@ -568,19 +568,19 @@ static CsrInt32 read_uint(card_t *card, ct_t *ct, CsrUint32 *u, CsrUint32 len) } /* read_uint() */ -static CsrUint32 write_uint16(void *buf, const CsrUint32 offset, const CsrUint16 val) +static CsrUint32 write_uint16(void *buf, const CsrUint32 offset, const u16 val) { u8 *dst = (u8 *)buf + offset; *dst++ = (u8)(val & 0xff); /* LSB first */ *dst = (u8)(val >> 8); - return sizeof(CsrUint16); + return sizeof(u16); } static CsrUint32 write_uint32(void *buf, const CsrUint32 offset, const CsrUint32 val) { - (void)write_uint16(buf, offset + 0, (CsrUint16)(val & 0xffff)); - (void)write_uint16(buf, offset + 2, (CsrUint16)(val >> 16)); + (void)write_uint16(buf, offset + 0, (u16)(val & 0xffff)); + (void)write_uint16(buf, offset + 2, (u16)(val >> 16)); return sizeof(CsrUint32); } @@ -616,18 +616,18 @@ static CsrUint32 write_chunk(void *buf, const CsrUint32 offset, const CsrCharStr } -static CsrUint16 calc_checksum(void *buf, const CsrUint32 offset, const CsrUint32 bytes_len) +static u16 calc_checksum(void *buf, const CsrUint32 offset, const CsrUint32 bytes_len) { CsrUint32 i; u8 *src = (u8 *)buf + offset; - CsrUint16 sum = 0; - CsrUint16 val; + u16 sum = 0; + u16 val; for (i = 0; i < bytes_len / 2; i++) { /* Contents copied to file is LE, host might not be */ - val = (CsrUint16) * src++; /* LSB */ - val += (CsrUint16)(*src++) << 8; /* MSB */ + val = (u16) * src++; /* LSB */ + val += (u16)(*src++) << 8; /* MSB */ sum += val; } @@ -711,11 +711,11 @@ static CsrUint32 write_ptch_header(void *buf, const CsrUint32 offset, const CsrU #define UF_MEMPUT_MAC 0x0000 #define UF_MEMPUT_PHY 0x1000 -static CsrUint32 write_patchcmd(void *buf, const CsrUint32 offset, const CsrUint32 dst_genaddr, const CsrUint16 len) +static CsrUint32 write_patchcmd(void *buf, const CsrUint32 offset, const CsrUint32 dst_genaddr, const u16 len) { CsrUint32 written = 0; CsrUint32 region = (dst_genaddr >> 28); - CsrUint16 cmd_and_len = UF_MEMPUT_MAC; + u16 cmd_and_len = UF_MEMPUT_MAC; if (region == UF_REGION_PHY) { @@ -731,8 +731,8 @@ static CsrUint32 write_patchcmd(void *buf, const CsrUint32 offset, const CsrUint written += write_uint16(buf, offset + written, cmd_and_len); /* Write the destination generic address */ - written += write_uint16(buf, offset + written, (CsrUint16)(dst_genaddr >> 16)); - written += write_uint16(buf, offset + written, (CsrUint16)(dst_genaddr & 0xffff)); + written += write_uint16(buf, offset + written, (u16)(dst_genaddr >> 16)); + written += write_uint16(buf, offset + written, (u16)(dst_genaddr & 0xffff)); /* The data payload should be appended to the command */ return written; @@ -748,7 +748,7 @@ static CsrUint32 write_fwdl_to_ptdl(void *buf, const CsrUint32 offset, fwreadfn_ CsrUint32 left = fwdl->dl_size; /* Bytes left in this fwdl */ CsrUint32 dl_addr = fwdl->dl_addr; /* Target address of fwdl image on XAP */ CsrUint32 dl_offs = fwdl->dl_offset; /* Offset of fwdl image data in source */ - CsrUint16 csum; + u16 csum; CsrUint32 csum_start_offs; /* first offset to include in checksum */ CsrUint32 sec_data_len; /* section data byte count */ CsrUint32 sec_len; /* section data + header byte count */ @@ -768,15 +768,15 @@ static CsrUint32 write_fwdl_to_ptdl(void *buf, const CsrUint32 offset, fwreadfn_ csum_start_offs = offset + written; /* Patch-chunk header: fw_id. Note that this is in XAP word order */ - written += write_uint16(buf, offset + written, (CsrUint16)(fw_id >> 16)); - written += write_uint16(buf, offset + written, (CsrUint16)(fw_id & 0xffff)); + written += write_uint16(buf, offset + written, (u16)(fw_id >> 16)); + written += write_uint16(buf, offset + written, (u16)(fw_id & 0xffff)); /* Patch-chunk header: section length in uint16s */ - written += write_uint16(buf, offset + written, (CsrUint16)(sec_len / 2)); + written += write_uint16(buf, offset + written, (u16)(sec_len / 2)); /* Write the appropriate patch command for the data's destination ptr */ - written += write_patchcmd(buf, offset + written, dl_addr, (CsrUint16)(sec_data_len / 2)); + written += write_patchcmd(buf, offset + written, dl_addr, (u16)(sec_data_len / 2)); /* Write the data itself (limited to the max chunk length) */ if (readfn(NULL, (void *)dlpriv, dl_offs, fw_buf, sec_data_len) < 0) @@ -789,7 +789,7 @@ static CsrUint32 write_fwdl_to_ptdl(void *buf, const CsrUint32 offset, fwreadfn_ fw_buf, sec_data_len); - /* CsrUint16 checksum calculated over data written */ + /* u16 checksum calculated over data written */ csum = calc_checksum(buf, csum_start_offs, written - (csum_start_offs - offset)); written += write_uint16(buf, offset + written, csum); @@ -813,7 +813,7 @@ static CsrUint32 write_fwdl_to_ptdl(void *buf, const CsrUint32 offset, fwreadfn_ static CsrUint32 write_reset_ptdl(void *buf, const CsrUint32 offset, const xbv1_t *fwinfo, CsrUint32 fw_id) { CsrUint32 written = 0; - CsrUint16 csum; + u16 csum; CsrUint32 csum_start_offs; /* first offset to include in checksum */ CsrUint32 sec_len; /* section data + header byte count */ @@ -826,11 +826,11 @@ static CsrUint32 write_reset_ptdl(void *buf, const CsrUint32 offset, const xbv1_ csum_start_offs = offset + written; /* Patch-chunk header: fw_id. Note that this is in XAP word order */ - written += write_uint16(buf, offset + written, (CsrUint16)(fw_id >> 16)); - written += write_uint16(buf, offset + written, (CsrUint16)(fw_id & 0xffff)); + written += write_uint16(buf, offset + written, (u16)(fw_id >> 16)); + written += write_uint16(buf, offset + written, (u16)(fw_id & 0xffff)); /* Patch-chunk header: section length in uint16s */ - written += write_uint16(buf, offset + written, (CsrUint16)(sec_len / 2)); + written += write_uint16(buf, offset + written, (u16)(sec_len / 2)); /* * Restart addresses to be executed on subsequent loader restart command. @@ -846,7 +846,7 @@ static CsrUint32 write_reset_ptdl(void *buf, const CsrUint32 offset, const xbv1_ written += write_uint16(buf, offset + written, (UF_PHY_START_VEC >> 16)); written += write_uint16(buf, offset + written, (UF_PHY_START_VEC & 0xffff)); - /* CsrUint16 checksum calculated over data written */ + /* u16 checksum calculated over data written */ csum = calc_checksum(buf, csum_start_offs, written - (csum_start_offs - offset)); written += write_uint16(buf, offset + written, csum); @@ -936,7 +936,7 @@ CsrInt32 xbv1_read_slut(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *f return -1; } - slut[count].id = (CsrUint16)id; + slut[count].id = (u16)id; slut[count].obj = obj; count++; } diff --git a/drivers/staging/csr/csr_wifi_hip_xbv.h b/drivers/staging/csr/csr_wifi_hip_xbv.h index fdc4560676b..f5c3e80b332 100644 --- a/drivers/staging/csr/csr_wifi_hip_xbv.h +++ b/drivers/staging/csr/csr_wifi_hip_xbv.h @@ -34,8 +34,8 @@ extern "C" { struct VMEQ { CsrUint32 addr; - CsrUint16 mask; - CsrUint16 value; + u16 mask; + u16 value; }; struct VAND diff --git a/drivers/staging/csr/csr_wifi_lib.h b/drivers/staging/csr/csr_wifi_lib.h index e1ef72b3e48..540d93cc5cc 100644 --- a/drivers/staging/csr/csr_wifi_lib.h +++ b/drivers/staging/csr/csr_wifi_lib.h @@ -39,7 +39,7 @@ extern "C" { * Allocates and fills in a message with the signature CsrWifiEvent * *----------------------------------------------------------------------------*/ -CsrWifiFsmEvent* CsrWifiEvent_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrSchedQid dst, CsrSchedQid src); +CsrWifiFsmEvent* CsrWifiEvent_struct(u16 primtype, u16 msgtype, CsrSchedQid dst, CsrSchedQid src); typedef struct { @@ -55,12 +55,12 @@ typedef struct * Allocates and fills in a message with the signature CsrWifiEventCsrUint8 * *----------------------------------------------------------------------------*/ -CsrWifiEventCsrUint8* CsrWifiEventCsrUint8_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrSchedQid dst, CsrSchedQid src, u8 value); +CsrWifiEventCsrUint8* CsrWifiEventCsrUint8_struct(u16 primtype, u16 msgtype, CsrSchedQid dst, CsrSchedQid src, u8 value); typedef struct { CsrWifiFsmEvent common; - CsrUint16 value; + u16 value; } CsrWifiEventCsrUint16; /*----------------------------------------------------------------------------* @@ -71,7 +71,7 @@ typedef struct * Allocates and fills in a message with the signature CsrWifiEventCsrUint16 * *----------------------------------------------------------------------------*/ -CsrWifiEventCsrUint16* CsrWifiEventCsrUint16_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrSchedQid dst, CsrSchedQid src, CsrUint16 value); +CsrWifiEventCsrUint16* CsrWifiEventCsrUint16_struct(u16 primtype, u16 msgtype, CsrSchedQid dst, CsrSchedQid src, u16 value); typedef struct { @@ -87,12 +87,12 @@ typedef struct * Allocates and fills in a message with the signature CsrWifiEventCsrUint32 * *----------------------------------------------------------------------------*/ -CsrWifiEventCsrUint32* CsrWifiEventCsrUint32_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrSchedQid dst, CsrSchedQid src, CsrUint32 value); +CsrWifiEventCsrUint32* CsrWifiEventCsrUint32_struct(u16 primtype, u16 msgtype, CsrSchedQid dst, CsrSchedQid src, CsrUint32 value); typedef struct { CsrWifiFsmEvent common; - CsrUint16 value16; + u16 value16; u8 value8; } CsrWifiEventCsrUint16CsrUint8; @@ -104,7 +104,7 @@ typedef struct * Allocates and fills in a message with the signature CsrWifiEventCsrUint16CsrUint8 * *----------------------------------------------------------------------------*/ -CsrWifiEventCsrUint16CsrUint8* CsrWifiEventCsrUint16CsrUint8_struct(CsrUint16 primtype, CsrUint16 msgtype, CsrSchedQid dst, CsrSchedQid src, CsrUint16 value16, u8 value8); +CsrWifiEventCsrUint16CsrUint8* CsrWifiEventCsrUint16CsrUint8_struct(u16 primtype, u16 msgtype, CsrSchedQid dst, CsrSchedQid src, u16 value16, u8 value8); #ifdef __cplusplus } diff --git a/drivers/staging/csr/csr_wifi_msgconv.h b/drivers/staging/csr/csr_wifi_msgconv.h index 6029a21d573..72da857742a 100644 --- a/drivers/staging/csr/csr_wifi_msgconv.h +++ b/drivers/staging/csr/csr_wifi_msgconv.h @@ -21,11 +21,11 @@ extern "C" { #endif -void CsrUint16SerBigEndian(u8 *ptr, CsrSize *len, CsrUint16 v); +void CsrUint16SerBigEndian(u8 *ptr, CsrSize *len, u16 v); void CsrUint24SerBigEndian(u8 *ptr, CsrSize *len, CsrUint32 v); void CsrUint32SerBigEndian(u8 *ptr, CsrSize *len, CsrUint32 v); -void CsrUint16DesBigEndian(CsrUint16 *v, u8 *buffer, CsrSize *offset); +void CsrUint16DesBigEndian(u16 *v, u8 *buffer, CsrSize *offset); void CsrUint24DesBigEndian(CsrUint32 *v, u8 *buffer, CsrSize *offset); void CsrUint32DesBigEndian(CsrUint32 *v, u8 *buffer, CsrSize *offset); diff --git a/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c b/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c index 83b3727d47d..37574093148 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c +++ b/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c @@ -43,11 +43,11 @@ static CsrMsgConvMsgEntry csrwifinmeap_conv_lut[] = { { 0, NULL, NULL, NULL, NULL }, }; -CsrMsgConvMsgEntry* CsrWifiNmeApConverterLookup(CsrMsgConvMsgEntry *ce, CsrUint16 msgType) +CsrMsgConvMsgEntry* CsrWifiNmeApConverterLookup(CsrMsgConvMsgEntry *ce, u16 msgType) { if (msgType & CSR_PRIM_UPSTREAM) { - CsrUint16 idx = (msgType & ~CSR_PRIM_UPSTREAM) + CSR_WIFI_NME_AP_PRIM_DOWNSTREAM_COUNT; + u16 idx = (msgType & ~CSR_PRIM_UPSTREAM) + CSR_WIFI_NME_AP_PRIM_DOWNSTREAM_COUNT; if (idx < (CSR_WIFI_NME_AP_PRIM_UPSTREAM_COUNT + CSR_WIFI_NME_AP_PRIM_DOWNSTREAM_COUNT) && csrwifinmeap_conv_lut[idx].msgType == msgType) { diff --git a/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c index 8a95f3ceeff..68123968ae9 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c +++ b/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c @@ -25,7 +25,7 @@ * eventClass: only the value CSR_WIFI_NME_AP_PRIM will be handled * message: the message to free *----------------------------------------------------------------------------*/ -void CsrWifiNmeApFreeDownstreamMessageContents(CsrUint16 eventClass, void *message) +void CsrWifiNmeApFreeDownstreamMessageContents(u16 eventClass, void *message) { if (eventClass != CSR_WIFI_NME_AP_PRIM) { @@ -65,7 +65,7 @@ void CsrWifiNmeApFreeDownstreamMessageContents(CsrUint16 eventClass, void *messa break; } { - CsrUint16 i3; + u16 i3; for (i3 = 0; i3 < p->p2pGoParam.operatingChanList.channelEntryListCount; i3++) { CsrPmemFree(p->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel); diff --git a/drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c index 7740dc3a40b..d9ebce3e961 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c +++ b/drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c @@ -25,7 +25,7 @@ * eventClass: only the value CSR_WIFI_NME_AP_PRIM will be handled * message: the message to free *----------------------------------------------------------------------------*/ -void CsrWifiNmeApFreeUpstreamMessageContents(CsrUint16 eventClass, void *message) +void CsrWifiNmeApFreeUpstreamMessageContents(u16 eventClass, void *message) { if (eventClass != CSR_WIFI_NME_AP_PRIM) { diff --git a/drivers/staging/csr/csr_wifi_nme_ap_lib.h b/drivers/staging/csr/csr_wifi_nme_ap_lib.h index 2deebdb3877..4523065ef8e 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_lib.h +++ b/drivers/staging/csr/csr_wifi_nme_ap_lib.h @@ -46,7 +46,7 @@ extern "C" { * PARAMETERS * Deallocates the resources in a CSR_WIFI_NME_AP upstream message *----------------------------------------------------------------------------*/ -void CsrWifiNmeApFreeUpstreamMessageContents(CsrUint16 eventClass, void *message); +void CsrWifiNmeApFreeUpstreamMessageContents(u16 eventClass, void *message); /*----------------------------------------------------------------------------* * CsrWifiNmeApFreeDownstreamMessageContents @@ -58,7 +58,7 @@ void CsrWifiNmeApFreeUpstreamMessageContents(CsrUint16 eventClass, void *message * PARAMETERS * Deallocates the resources in a CSR_WIFI_NME_AP downstream message *----------------------------------------------------------------------------*/ -void CsrWifiNmeApFreeDownstreamMessageContents(CsrUint16 eventClass, void *message); +void CsrWifiNmeApFreeDownstreamMessageContents(u16 eventClass, void *message); /*----------------------------------------------------------------------------* * Enum to string functions diff --git a/drivers/staging/csr/csr_wifi_nme_ap_prim.h b/drivers/staging/csr/csr_wifi_nme_ap_prim.h index 5e08d53982f..616a899b8eb 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_prim.h +++ b/drivers/staging/csr/csr_wifi_nme_ap_prim.h @@ -77,10 +77,10 @@ typedef u8 CsrWifiNmeApPersCredentialType; *******************************************************************************/ typedef struct { - CsrUint16 apGroupkeyTimeout; + u16 apGroupkeyTimeout; CsrBool apStrictGtkRekey; - CsrUint16 apGmkTimeout; - CsrUint16 apResponseTimeout; + u16 apGmkTimeout; + u16 apResponseTimeout; u8 apRetransLimit; } CsrWifiNmeApConfig; @@ -222,7 +222,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeWpsDpid selectedDevicePasswordId; CsrWifiSmeWpsConfigType selectedConfigMethod; u8 pin[8]; @@ -254,7 +254,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeApType apType; CsrBool cloakSsid; CsrWifiSsid ssid; @@ -282,7 +282,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; } CsrWifiNmeApStopReq; /******************************************************************************* @@ -332,7 +332,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiMacAddress staMacAddress; CsrBool keepBlocking; } CsrWifiNmeApStaRemoveReq; @@ -373,7 +373,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiNmeApWpsRegisterCfm; @@ -395,7 +395,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiSsid ssid; } CsrWifiNmeApStartCfm; @@ -419,7 +419,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiNmeApStopCfm; @@ -443,7 +443,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeApType apType; CsrResult status; } CsrWifiNmeApStopInd; @@ -488,7 +488,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeMediaStatus mediaStatus; CsrWifiMacAddress peerMacAddress; CsrWifiMacAddress peerDeviceAddress; diff --git a/drivers/staging/csr/csr_wifi_nme_ap_serialize.c b/drivers/staging/csr/csr_wifi_nme_ap_serialize.c index cdf33a68823..b79b8e8da1f 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_serialize.c +++ b/drivers/staging/csr/csr_wifi_nme_ap_serialize.c @@ -32,15 +32,15 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 104) */ - bufferSize += 2; /* CsrUint16 primitive->apConfig.apGroupkeyTimeout */ + bufferSize += 2; /* u16 primitive->apConfig.apGroupkeyTimeout */ bufferSize += 1; /* CsrBool primitive->apConfig.apStrictGtkRekey */ - bufferSize += 2; /* CsrUint16 primitive->apConfig.apGmkTimeout */ - bufferSize += 2; /* CsrUint16 primitive->apConfig.apResponseTimeout */ + bufferSize += 2; /* u16 primitive->apConfig.apGmkTimeout */ + bufferSize += 2; /* u16 primitive->apConfig.apResponseTimeout */ bufferSize += 1; /* u8 primitive->apConfig.apRetransLimit */ bufferSize += 1; /* CsrWifiSmeApPhySupportMask primitive->apMacConfig.phySupportedBitmap */ - bufferSize += 2; /* CsrUint16 primitive->apMacConfig.beaconInterval */ + bufferSize += 2; /* u16 primitive->apMacConfig.beaconInterval */ bufferSize += 1; /* u8 primitive->apMacConfig.dtimPeriod */ - bufferSize += 2; /* CsrUint16 primitive->apMacConfig.maxListenInterval */ + bufferSize += 2; /* u16 primitive->apMacConfig.maxListenInterval */ bufferSize += 1; /* u8 primitive->apMacConfig.supportedRatesCount */ bufferSize += 20; /* u8 primitive->apMacConfig.supportedRates[20] */ bufferSize += 1; /* CsrWifiSmePreambleType primitive->apMacConfig.preamble */ @@ -48,31 +48,31 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg) bufferSize += 1; /* CsrWifiSmeCtsProtectionType primitive->apMacConfig.ctsProtectionType */ bufferSize += 1; /* CsrBool primitive->apMacConfig.wmmEnabled */ { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 4; i2++) { bufferSize += 1; /* u8 primitive->apMacConfig.wmmApParams[i2].cwMin */ bufferSize += 1; /* u8 primitive->apMacConfig.wmmApParams[i2].cwMax */ bufferSize += 1; /* u8 primitive->apMacConfig.wmmApParams[i2].aifs */ - bufferSize += 2; /* CsrUint16 primitive->apMacConfig.wmmApParams[i2].txopLimit */ + bufferSize += 2; /* u16 primitive->apMacConfig.wmmApParams[i2].txopLimit */ bufferSize += 1; /* CsrBool primitive->apMacConfig.wmmApParams[i2].admissionControlMandatory */ } } { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 4; i2++) { bufferSize += 1; /* u8 primitive->apMacConfig.wmmApBcParams[i2].cwMin */ bufferSize += 1; /* u8 primitive->apMacConfig.wmmApBcParams[i2].cwMax */ bufferSize += 1; /* u8 primitive->apMacConfig.wmmApBcParams[i2].aifs */ - bufferSize += 2; /* CsrUint16 primitive->apMacConfig.wmmApBcParams[i2].txopLimit */ + bufferSize += 2; /* u16 primitive->apMacConfig.wmmApBcParams[i2].txopLimit */ bufferSize += 1; /* CsrBool primitive->apMacConfig.wmmApBcParams[i2].admissionControlMandatory */ } } bufferSize += 1; /* CsrWifiSmeApAccessType primitive->apMacConfig.accessType */ bufferSize += 1; /* u8 primitive->apMacConfig.macAddressListCount */ { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < primitive->apMacConfig.macAddressListCount; i2++) { bufferSize += 6; /* u8 primitive->apMacConfig.macAddressList[i2].a[6] */ @@ -93,50 +93,50 @@ u8* CsrWifiNmeApConfigSetReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiNmeApConfigSetReq *primitive = (CsrWifiNmeApConfigSetReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->apConfig.apGroupkeyTimeout); + CsrUint16Ser(ptr, len, (u16) primitive->apConfig.apGroupkeyTimeout); CsrUint8Ser(ptr, len, (u8) primitive->apConfig.apStrictGtkRekey); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->apConfig.apGmkTimeout); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->apConfig.apResponseTimeout); + CsrUint16Ser(ptr, len, (u16) primitive->apConfig.apGmkTimeout); + CsrUint16Ser(ptr, len, (u16) primitive->apConfig.apResponseTimeout); CsrUint8Ser(ptr, len, (u8) primitive->apConfig.apRetransLimit); CsrUint8Ser(ptr, len, (u8) primitive->apMacConfig.phySupportedBitmap); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->apMacConfig.beaconInterval); + CsrUint16Ser(ptr, len, (u16) primitive->apMacConfig.beaconInterval); CsrUint8Ser(ptr, len, (u8) primitive->apMacConfig.dtimPeriod); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->apMacConfig.maxListenInterval); + CsrUint16Ser(ptr, len, (u16) primitive->apMacConfig.maxListenInterval); CsrUint8Ser(ptr, len, (u8) primitive->apMacConfig.supportedRatesCount); - CsrMemCpySer(ptr, len, (const void *) primitive->apMacConfig.supportedRates, ((CsrUint16) (20))); + CsrMemCpySer(ptr, len, (const void *) primitive->apMacConfig.supportedRates, ((u16) (20))); CsrUint8Ser(ptr, len, (u8) primitive->apMacConfig.preamble); CsrUint8Ser(ptr, len, (u8) primitive->apMacConfig.shortSlotTimeEnabled); CsrUint8Ser(ptr, len, (u8) primitive->apMacConfig.ctsProtectionType); CsrUint8Ser(ptr, len, (u8) primitive->apMacConfig.wmmEnabled); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 4; i2++) { CsrUint8Ser(ptr, len, (u8) primitive->apMacConfig.wmmApParams[i2].cwMin); CsrUint8Ser(ptr, len, (u8) primitive->apMacConfig.wmmApParams[i2].cwMax); CsrUint8Ser(ptr, len, (u8) primitive->apMacConfig.wmmApParams[i2].aifs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->apMacConfig.wmmApParams[i2].txopLimit); + CsrUint16Ser(ptr, len, (u16) primitive->apMacConfig.wmmApParams[i2].txopLimit); CsrUint8Ser(ptr, len, (u8) primitive->apMacConfig.wmmApParams[i2].admissionControlMandatory); } } { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 4; i2++) { CsrUint8Ser(ptr, len, (u8) primitive->apMacConfig.wmmApBcParams[i2].cwMin); CsrUint8Ser(ptr, len, (u8) primitive->apMacConfig.wmmApBcParams[i2].cwMax); CsrUint8Ser(ptr, len, (u8) primitive->apMacConfig.wmmApBcParams[i2].aifs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->apMacConfig.wmmApBcParams[i2].txopLimit); + CsrUint16Ser(ptr, len, (u16) primitive->apMacConfig.wmmApBcParams[i2].txopLimit); CsrUint8Ser(ptr, len, (u8) primitive->apMacConfig.wmmApBcParams[i2].admissionControlMandatory); } } CsrUint8Ser(ptr, len, (u8) primitive->apMacConfig.accessType); CsrUint8Ser(ptr, len, (u8) primitive->apMacConfig.macAddressListCount); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < primitive->apMacConfig.macAddressListCount; i2++) { - CsrMemCpySer(ptr, len, (const void *) primitive->apMacConfig.macAddressList[i2].a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->apMacConfig.macAddressList[i2].a, ((u16) (6))); } } CsrUint8Ser(ptr, len, (u8) primitive->apMacConfig.apHtParams.greenfieldSupported); @@ -156,40 +156,40 @@ void* CsrWifiNmeApConfigSetReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->apConfig.apGroupkeyTimeout, buffer, &offset); + CsrUint16Des((u16 *) &primitive->apConfig.apGroupkeyTimeout, buffer, &offset); CsrUint8Des((u8 *) &primitive->apConfig.apStrictGtkRekey, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->apConfig.apGmkTimeout, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->apConfig.apResponseTimeout, buffer, &offset); + CsrUint16Des((u16 *) &primitive->apConfig.apGmkTimeout, buffer, &offset); + CsrUint16Des((u16 *) &primitive->apConfig.apResponseTimeout, buffer, &offset); CsrUint8Des((u8 *) &primitive->apConfig.apRetransLimit, buffer, &offset); CsrUint8Des((u8 *) &primitive->apMacConfig.phySupportedBitmap, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->apMacConfig.beaconInterval, buffer, &offset); + CsrUint16Des((u16 *) &primitive->apMacConfig.beaconInterval, buffer, &offset); CsrUint8Des((u8 *) &primitive->apMacConfig.dtimPeriod, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->apMacConfig.maxListenInterval, buffer, &offset); + CsrUint16Des((u16 *) &primitive->apMacConfig.maxListenInterval, buffer, &offset); CsrUint8Des((u8 *) &primitive->apMacConfig.supportedRatesCount, buffer, &offset); - CsrMemCpyDes(primitive->apMacConfig.supportedRates, buffer, &offset, ((CsrUint16) (20))); + CsrMemCpyDes(primitive->apMacConfig.supportedRates, buffer, &offset, ((u16) (20))); CsrUint8Des((u8 *) &primitive->apMacConfig.preamble, buffer, &offset); CsrUint8Des((u8 *) &primitive->apMacConfig.shortSlotTimeEnabled, buffer, &offset); CsrUint8Des((u8 *) &primitive->apMacConfig.ctsProtectionType, buffer, &offset); CsrUint8Des((u8 *) &primitive->apMacConfig.wmmEnabled, buffer, &offset); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 4; i2++) { CsrUint8Des((u8 *) &primitive->apMacConfig.wmmApParams[i2].cwMin, buffer, &offset); CsrUint8Des((u8 *) &primitive->apMacConfig.wmmApParams[i2].cwMax, buffer, &offset); CsrUint8Des((u8 *) &primitive->apMacConfig.wmmApParams[i2].aifs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->apMacConfig.wmmApParams[i2].txopLimit, buffer, &offset); + CsrUint16Des((u16 *) &primitive->apMacConfig.wmmApParams[i2].txopLimit, buffer, &offset); CsrUint8Des((u8 *) &primitive->apMacConfig.wmmApParams[i2].admissionControlMandatory, buffer, &offset); } } { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 4; i2++) { CsrUint8Des((u8 *) &primitive->apMacConfig.wmmApBcParams[i2].cwMin, buffer, &offset); CsrUint8Des((u8 *) &primitive->apMacConfig.wmmApBcParams[i2].cwMax, buffer, &offset); CsrUint8Des((u8 *) &primitive->apMacConfig.wmmApBcParams[i2].aifs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->apMacConfig.wmmApBcParams[i2].txopLimit, buffer, &offset); + CsrUint16Des((u16 *) &primitive->apMacConfig.wmmApBcParams[i2].txopLimit, buffer, &offset); CsrUint8Des((u8 *) &primitive->apMacConfig.wmmApBcParams[i2].admissionControlMandatory, buffer, &offset); } } @@ -201,10 +201,10 @@ void* CsrWifiNmeApConfigSetReqDes(u8 *buffer, CsrSize length) primitive->apMacConfig.macAddressList = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->apMacConfig.macAddressListCount); } { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < primitive->apMacConfig.macAddressListCount; i2++) { - CsrMemCpyDes(primitive->apMacConfig.macAddressList[i2].a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->apMacConfig.macAddressList[i2].a, buffer, &offset, ((u16) (6))); } } CsrUint8Des((u8 *) &primitive->apMacConfig.apHtParams.greenfieldSupported, buffer, &offset); @@ -231,7 +231,7 @@ CsrSize CsrWifiNmeApWpsRegisterReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 17) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrWifiSmeWpsDpid primitive->selectedDevicePasswordId */ bufferSize += 2; /* CsrWifiSmeWpsConfigType primitive->selectedConfigMethod */ bufferSize += 8; /* u8 primitive->pin[8] */ @@ -244,10 +244,10 @@ u8* CsrWifiNmeApWpsRegisterReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiNmeApWpsRegisterReq *primitive = (CsrWifiNmeApWpsRegisterReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->selectedDevicePasswordId); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->selectedConfigMethod); - CsrMemCpySer(ptr, len, (const void *) primitive->pin, ((CsrUint16) (8))); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->selectedDevicePasswordId); + CsrUint16Ser(ptr, len, (u16) primitive->selectedConfigMethod); + CsrMemCpySer(ptr, len, (const void *) primitive->pin, ((u16) (8))); return(ptr); } @@ -259,10 +259,10 @@ void* CsrWifiNmeApWpsRegisterReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->selectedDevicePasswordId, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->selectedConfigMethod, buffer, &offset); - CsrMemCpyDes(primitive->pin, buffer, &offset, ((CsrUint16) (8))); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->selectedDevicePasswordId, buffer, &offset); + CsrUint16Des((u16 *) &primitive->selectedConfigMethod, buffer, &offset); + CsrMemCpyDes(primitive->pin, buffer, &offset, ((u16) (8))); return primitive; } @@ -274,7 +274,7 @@ CsrSize CsrWifiNmeApStartReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 112) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiSmeApType primitive->apType */ bufferSize += 1; /* CsrBool primitive->cloakSsid */ bufferSize += 32; /* u8 primitive->ssid.ssid[32] */ @@ -319,11 +319,11 @@ CsrSize CsrWifiNmeApStartReqSizeof(void *msg) switch (primitive->apCredentials.nmeAuthType.authTypePersonal.pskOrPassphrase) { case CSR_WIFI_NME_AP_CREDENTIAL_TYPE_PSK: - bufferSize += 2; /* CsrUint16 primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.psk.encryptionMode */ + bufferSize += 2; /* u16 primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.psk.encryptionMode */ bufferSize += 32; /* u8 primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.psk.psk[32] */ break; case CSR_WIFI_NME_AP_CREDENTIAL_TYPE_PASSPHRASE: - bufferSize += 2; /* CsrUint16 primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.encryptionMode */ + bufferSize += 2; /* u16 primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.encryptionMode */ bufferSize += (primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase?CsrStrLen(primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase) : 0) + 1; /* CsrCharString* primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase (0 byte len + 1 for NULL Term) */ break; default: @@ -338,7 +338,7 @@ CsrSize CsrWifiNmeApStartReqSizeof(void *msg) bufferSize += 3; /* u8 primitive->p2pGoParam.operatingChanList.country[3] */ bufferSize += 1; /* u8 primitive->p2pGoParam.operatingChanList.channelEntryListCount */ { - CsrUint16 i3; + u16 i3; for (i3 = 0; i3 < primitive->p2pGoParam.operatingChanList.channelEntryListCount; i3++) { bufferSize += 1; /* u8 primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingClass */ @@ -360,10 +360,10 @@ u8* CsrWifiNmeApStartReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiNmeApStartReq *primitive = (CsrWifiNmeApStartReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->apType); CsrUint8Ser(ptr, len, (u8) primitive->cloakSsid); - CsrMemCpySer(ptr, len, (const void *) primitive->ssid.ssid, ((CsrUint16) (32))); + CsrMemCpySer(ptr, len, (const void *) primitive->ssid.ssid, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->ssid.length); CsrUint8Ser(ptr, len, (u8) primitive->ifIndex); CsrUint8Ser(ptr, len, (u8) primitive->channel); @@ -380,18 +380,18 @@ u8* CsrWifiNmeApStartReqSer(u8 *ptr, CsrSize *len, void *msg) case CSR_WIFI_SME_CREDENTIAL_TYPE_WEP128: CsrUint8Ser(ptr, len, (u8) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.wepAuthType); CsrUint8Ser(ptr, len, (u8) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.selectedWepKey); - CsrMemCpySer(ptr, len, (const void *) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.key1, ((CsrUint16) (13))); - CsrMemCpySer(ptr, len, (const void *) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.key2, ((CsrUint16) (13))); - CsrMemCpySer(ptr, len, (const void *) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.key3, ((CsrUint16) (13))); - CsrMemCpySer(ptr, len, (const void *) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.key4, ((CsrUint16) (13))); + CsrMemCpySer(ptr, len, (const void *) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.key1, ((u16) (13))); + CsrMemCpySer(ptr, len, (const void *) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.key2, ((u16) (13))); + CsrMemCpySer(ptr, len, (const void *) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.key3, ((u16) (13))); + CsrMemCpySer(ptr, len, (const void *) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.key4, ((u16) (13))); break; case CSR_WIFI_SME_CREDENTIAL_TYPE_WEP64: CsrUint8Ser(ptr, len, (u8) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.wepAuthType); CsrUint8Ser(ptr, len, (u8) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.selectedWepKey); - CsrMemCpySer(ptr, len, (const void *) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.key1, ((CsrUint16) (5))); - CsrMemCpySer(ptr, len, (const void *) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.key2, ((CsrUint16) (5))); - CsrMemCpySer(ptr, len, (const void *) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.key3, ((CsrUint16) (5))); - CsrMemCpySer(ptr, len, (const void *) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.key4, ((CsrUint16) (5))); + CsrMemCpySer(ptr, len, (const void *) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.key1, ((u16) (5))); + CsrMemCpySer(ptr, len, (const void *) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.key2, ((u16) (5))); + CsrMemCpySer(ptr, len, (const void *) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.key3, ((u16) (5))); + CsrMemCpySer(ptr, len, (const void *) primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.key4, ((u16) (5))); break; default: break; @@ -399,17 +399,17 @@ u8* CsrWifiNmeApStartReqSer(u8 *ptr, CsrSize *len, void *msg) break; case CSR_WIFI_SME_AP_AUTH_TYPE_PERSONAL: CsrUint8Ser(ptr, len, (u8) primitive->apCredentials.nmeAuthType.authTypePersonal.authSupport); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->apCredentials.nmeAuthType.authTypePersonal.rsnCapabilities); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->apCredentials.nmeAuthType.authTypePersonal.wapiCapabilities); + CsrUint16Ser(ptr, len, (u16) primitive->apCredentials.nmeAuthType.authTypePersonal.rsnCapabilities); + CsrUint16Ser(ptr, len, (u16) primitive->apCredentials.nmeAuthType.authTypePersonal.wapiCapabilities); CsrUint8Ser(ptr, len, (u8) primitive->apCredentials.nmeAuthType.authTypePersonal.pskOrPassphrase); switch (primitive->apCredentials.nmeAuthType.authTypePersonal.pskOrPassphrase) { case CSR_WIFI_NME_AP_CREDENTIAL_TYPE_PSK: - CsrUint16Ser(ptr, len, (CsrUint16) primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.psk.encryptionMode); - CsrMemCpySer(ptr, len, (const void *) primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.psk.psk, ((CsrUint16) (32))); + CsrUint16Ser(ptr, len, (u16) primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.psk.encryptionMode); + CsrMemCpySer(ptr, len, (const void *) primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.psk.psk, ((u16) (32))); break; case CSR_WIFI_NME_AP_CREDENTIAL_TYPE_PASSPHRASE: - CsrUint16Ser(ptr, len, (CsrUint16) primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.encryptionMode); + CsrUint16Ser(ptr, len, (u16) primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.encryptionMode); CsrCharStringSer(ptr, len, primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase); break; default: @@ -421,17 +421,17 @@ u8* CsrWifiNmeApStartReqSer(u8 *ptr, CsrSize *len, void *msg) } CsrUint8Ser(ptr, len, (u8) primitive->maxConnections); CsrUint8Ser(ptr, len, (u8) primitive->p2pGoParam.groupCapability); - CsrMemCpySer(ptr, len, (const void *) primitive->p2pGoParam.operatingChanList.country, ((CsrUint16) (3))); + CsrMemCpySer(ptr, len, (const void *) primitive->p2pGoParam.operatingChanList.country, ((u16) (3))); CsrUint8Ser(ptr, len, (u8) primitive->p2pGoParam.operatingChanList.channelEntryListCount); { - CsrUint16 i3; + u16 i3; for (i3 = 0; i3 < primitive->p2pGoParam.operatingChanList.channelEntryListCount; i3++) { CsrUint8Ser(ptr, len, (u8) primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingClass); CsrUint8Ser(ptr, len, (u8) primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount); if (primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount) { - CsrMemCpySer(ptr, len, (const void *) primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel, ((CsrUint16) (primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount))); + CsrMemCpySer(ptr, len, (const void *) primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel, ((u16) (primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount))); } } } @@ -451,10 +451,10 @@ void* CsrWifiNmeApStartReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->apType, buffer, &offset); CsrUint8Des((u8 *) &primitive->cloakSsid, buffer, &offset); - CsrMemCpyDes(primitive->ssid.ssid, buffer, &offset, ((CsrUint16) (32))); + CsrMemCpyDes(primitive->ssid.ssid, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->ssid.length, buffer, &offset); CsrUint8Des((u8 *) &primitive->ifIndex, buffer, &offset); CsrUint8Des((u8 *) &primitive->channel, buffer, &offset); @@ -471,18 +471,18 @@ void* CsrWifiNmeApStartReqDes(u8 *buffer, CsrSize length) case CSR_WIFI_SME_CREDENTIAL_TYPE_WEP128: CsrUint8Des((u8 *) &primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.wepAuthType, buffer, &offset); CsrUint8Des((u8 *) &primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.selectedWepKey, buffer, &offset); - CsrMemCpyDes(primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.key1, buffer, &offset, ((CsrUint16) (13))); - CsrMemCpyDes(primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.key2, buffer, &offset, ((CsrUint16) (13))); - CsrMemCpyDes(primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.key3, buffer, &offset, ((CsrUint16) (13))); - CsrMemCpyDes(primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.key4, buffer, &offset, ((CsrUint16) (13))); + CsrMemCpyDes(primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.key1, buffer, &offset, ((u16) (13))); + CsrMemCpyDes(primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.key2, buffer, &offset, ((u16) (13))); + CsrMemCpyDes(primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.key3, buffer, &offset, ((u16) (13))); + CsrMemCpyDes(primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep128Key.key4, buffer, &offset, ((u16) (13))); break; case CSR_WIFI_SME_CREDENTIAL_TYPE_WEP64: CsrUint8Des((u8 *) &primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.wepAuthType, buffer, &offset); CsrUint8Des((u8 *) &primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.selectedWepKey, buffer, &offset); - CsrMemCpyDes(primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.key1, buffer, &offset, ((CsrUint16) (5))); - CsrMemCpyDes(primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.key2, buffer, &offset, ((CsrUint16) (5))); - CsrMemCpyDes(primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.key3, buffer, &offset, ((CsrUint16) (5))); - CsrMemCpyDes(primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.key4, buffer, &offset, ((CsrUint16) (5))); + CsrMemCpyDes(primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.key1, buffer, &offset, ((u16) (5))); + CsrMemCpyDes(primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.key2, buffer, &offset, ((u16) (5))); + CsrMemCpyDes(primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.key3, buffer, &offset, ((u16) (5))); + CsrMemCpyDes(primitive->apCredentials.nmeAuthType.authwep.wepCredentials.wep64Key.key4, buffer, &offset, ((u16) (5))); break; default: break; @@ -490,17 +490,17 @@ void* CsrWifiNmeApStartReqDes(u8 *buffer, CsrSize length) break; case CSR_WIFI_SME_AP_AUTH_TYPE_PERSONAL: CsrUint8Des((u8 *) &primitive->apCredentials.nmeAuthType.authTypePersonal.authSupport, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->apCredentials.nmeAuthType.authTypePersonal.rsnCapabilities, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->apCredentials.nmeAuthType.authTypePersonal.wapiCapabilities, buffer, &offset); + CsrUint16Des((u16 *) &primitive->apCredentials.nmeAuthType.authTypePersonal.rsnCapabilities, buffer, &offset); + CsrUint16Des((u16 *) &primitive->apCredentials.nmeAuthType.authTypePersonal.wapiCapabilities, buffer, &offset); CsrUint8Des((u8 *) &primitive->apCredentials.nmeAuthType.authTypePersonal.pskOrPassphrase, buffer, &offset); switch (primitive->apCredentials.nmeAuthType.authTypePersonal.pskOrPassphrase) { case CSR_WIFI_NME_AP_CREDENTIAL_TYPE_PSK: - CsrUint16Des((CsrUint16 *) &primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.psk.encryptionMode, buffer, &offset); - CsrMemCpyDes(primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.psk.psk, buffer, &offset, ((CsrUint16) (32))); + CsrUint16Des((u16 *) &primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.psk.encryptionMode, buffer, &offset); + CsrMemCpyDes(primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.psk.psk, buffer, &offset, ((u16) (32))); break; case CSR_WIFI_NME_AP_CREDENTIAL_TYPE_PASSPHRASE: - CsrUint16Des((CsrUint16 *) &primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.encryptionMode, buffer, &offset); + CsrUint16Des((u16 *) &primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.encryptionMode, buffer, &offset); CsrCharStringDes(&primitive->apCredentials.nmeAuthType.authTypePersonal.authPers_credentials.passphrase.passphrase, buffer, &offset); break; default: @@ -512,7 +512,7 @@ void* CsrWifiNmeApStartReqDes(u8 *buffer, CsrSize length) } CsrUint8Des((u8 *) &primitive->maxConnections, buffer, &offset); CsrUint8Des((u8 *) &primitive->p2pGoParam.groupCapability, buffer, &offset); - CsrMemCpyDes(primitive->p2pGoParam.operatingChanList.country, buffer, &offset, ((CsrUint16) (3))); + CsrMemCpyDes(primitive->p2pGoParam.operatingChanList.country, buffer, &offset, ((u16) (3))); CsrUint8Des((u8 *) &primitive->p2pGoParam.operatingChanList.channelEntryListCount, buffer, &offset); primitive->p2pGoParam.operatingChanList.channelEntryList = NULL; if (primitive->p2pGoParam.operatingChanList.channelEntryListCount) @@ -520,7 +520,7 @@ void* CsrWifiNmeApStartReqDes(u8 *buffer, CsrSize length) primitive->p2pGoParam.operatingChanList.channelEntryList = (CsrWifiSmeApP2pOperatingChanEntry *)CsrPmemAlloc(sizeof(CsrWifiSmeApP2pOperatingChanEntry) * primitive->p2pGoParam.operatingChanList.channelEntryListCount); } { - CsrUint16 i3; + u16 i3; for (i3 = 0; i3 < primitive->p2pGoParam.operatingChanList.channelEntryListCount; i3++) { CsrUint8Des((u8 *) &primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingClass, buffer, &offset); @@ -528,7 +528,7 @@ void* CsrWifiNmeApStartReqDes(u8 *buffer, CsrSize length) if (primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount) { primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel = (u8 *)CsrPmemAlloc(primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount); - CsrMemCpyDes(primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel, buffer, &offset, ((CsrUint16) (primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount))); + CsrMemCpyDes(primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel, buffer, &offset, ((u16) (primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount))); } else { @@ -565,7 +565,7 @@ void CsrWifiNmeApStartReqSerFree(void *voidPrimitivePointer) break; } { - CsrUint16 i3; + u16 i3; for (i3 = 0; i3 < primitive->p2pGoParam.operatingChanList.channelEntryListCount; i3++) { CsrPmemFree(primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel); @@ -582,24 +582,24 @@ CsrSize CsrWifiNmeApWmmParamUpdateReqSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 51) */ { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < 4; i1++) { bufferSize += 1; /* u8 primitive->wmmApParams[i1].cwMin */ bufferSize += 1; /* u8 primitive->wmmApParams[i1].cwMax */ bufferSize += 1; /* u8 primitive->wmmApParams[i1].aifs */ - bufferSize += 2; /* CsrUint16 primitive->wmmApParams[i1].txopLimit */ + bufferSize += 2; /* u16 primitive->wmmApParams[i1].txopLimit */ bufferSize += 1; /* CsrBool primitive->wmmApParams[i1].admissionControlMandatory */ } } { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < 4; i1++) { bufferSize += 1; /* u8 primitive->wmmApBcParams[i1].cwMin */ bufferSize += 1; /* u8 primitive->wmmApBcParams[i1].cwMax */ bufferSize += 1; /* u8 primitive->wmmApBcParams[i1].aifs */ - bufferSize += 2; /* CsrUint16 primitive->wmmApBcParams[i1].txopLimit */ + bufferSize += 2; /* u16 primitive->wmmApBcParams[i1].txopLimit */ bufferSize += 1; /* CsrBool primitive->wmmApBcParams[i1].admissionControlMandatory */ } } @@ -613,24 +613,24 @@ u8* CsrWifiNmeApWmmParamUpdateReqSer(u8 *ptr, CsrSize *len, void *msg) *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < 4; i1++) { CsrUint8Ser(ptr, len, (u8) primitive->wmmApParams[i1].cwMin); CsrUint8Ser(ptr, len, (u8) primitive->wmmApParams[i1].cwMax); CsrUint8Ser(ptr, len, (u8) primitive->wmmApParams[i1].aifs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->wmmApParams[i1].txopLimit); + CsrUint16Ser(ptr, len, (u16) primitive->wmmApParams[i1].txopLimit); CsrUint8Ser(ptr, len, (u8) primitive->wmmApParams[i1].admissionControlMandatory); } } { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < 4; i1++) { CsrUint8Ser(ptr, len, (u8) primitive->wmmApBcParams[i1].cwMin); CsrUint8Ser(ptr, len, (u8) primitive->wmmApBcParams[i1].cwMax); CsrUint8Ser(ptr, len, (u8) primitive->wmmApBcParams[i1].aifs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->wmmApBcParams[i1].txopLimit); + CsrUint16Ser(ptr, len, (u16) primitive->wmmApBcParams[i1].txopLimit); CsrUint8Ser(ptr, len, (u8) primitive->wmmApBcParams[i1].admissionControlMandatory); } } @@ -646,24 +646,24 @@ void* CsrWifiNmeApWmmParamUpdateReqDes(u8 *buffer, CsrSize length) CsrUint16Des(&primitive->common.type, buffer, &offset); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < 4; i1++) { CsrUint8Des((u8 *) &primitive->wmmApParams[i1].cwMin, buffer, &offset); CsrUint8Des((u8 *) &primitive->wmmApParams[i1].cwMax, buffer, &offset); CsrUint8Des((u8 *) &primitive->wmmApParams[i1].aifs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->wmmApParams[i1].txopLimit, buffer, &offset); + CsrUint16Des((u16 *) &primitive->wmmApParams[i1].txopLimit, buffer, &offset); CsrUint8Des((u8 *) &primitive->wmmApParams[i1].admissionControlMandatory, buffer, &offset); } } { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < 4; i1++) { CsrUint8Des((u8 *) &primitive->wmmApBcParams[i1].cwMin, buffer, &offset); CsrUint8Des((u8 *) &primitive->wmmApBcParams[i1].cwMax, buffer, &offset); CsrUint8Des((u8 *) &primitive->wmmApBcParams[i1].aifs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->wmmApBcParams[i1].txopLimit, buffer, &offset); + CsrUint16Des((u16 *) &primitive->wmmApBcParams[i1].txopLimit, buffer, &offset); CsrUint8Des((u8 *) &primitive->wmmApBcParams[i1].admissionControlMandatory, buffer, &offset); } } @@ -677,7 +677,7 @@ CsrSize CsrWifiNmeApStaRemoveReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 12) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 6; /* u8 primitive->staMacAddress.a[6] */ bufferSize += 1; /* CsrBool primitive->keepBlocking */ return bufferSize; @@ -689,8 +689,8 @@ u8* CsrWifiNmeApStaRemoveReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiNmeApStaRemoveReq *primitive = (CsrWifiNmeApStaRemoveReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrMemCpySer(ptr, len, (const void *) primitive->staMacAddress.a, ((CsrUint16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrMemCpySer(ptr, len, (const void *) primitive->staMacAddress.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->keepBlocking); return(ptr); } @@ -703,8 +703,8 @@ void* CsrWifiNmeApStaRemoveReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrMemCpyDes(primitive->staMacAddress.a, buffer, &offset, ((CsrUint16) (6))); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrMemCpyDes(primitive->staMacAddress.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->keepBlocking, buffer, &offset); return primitive; @@ -716,7 +716,7 @@ CsrSize CsrWifiNmeApWpsRegisterCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 7) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; } @@ -727,8 +727,8 @@ u8* CsrWifiNmeApWpsRegisterCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiNmeApWpsRegisterCfm *primitive = (CsrWifiNmeApWpsRegisterCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -740,8 +740,8 @@ void* CsrWifiNmeApWpsRegisterCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -752,7 +752,7 @@ CsrSize CsrWifiNmeApStartCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 40) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 32; /* u8 primitive->ssid.ssid[32] */ bufferSize += 1; /* u8 primitive->ssid.length */ @@ -765,9 +765,9 @@ u8* CsrWifiNmeApStartCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiNmeApStartCfm *primitive = (CsrWifiNmeApStartCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); - CsrMemCpySer(ptr, len, (const void *) primitive->ssid.ssid, ((CsrUint16) (32))); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); + CsrMemCpySer(ptr, len, (const void *) primitive->ssid.ssid, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->ssid.length); return(ptr); } @@ -780,9 +780,9 @@ void* CsrWifiNmeApStartCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); - CsrMemCpyDes(primitive->ssid.ssid, buffer, &offset, ((CsrUint16) (32))); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); + CsrMemCpyDes(primitive->ssid.ssid, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->ssid.length, buffer, &offset); return primitive; @@ -794,7 +794,7 @@ CsrSize CsrWifiNmeApStopCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 7) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; } @@ -805,8 +805,8 @@ u8* CsrWifiNmeApStopCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiNmeApStopCfm *primitive = (CsrWifiNmeApStopCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -818,8 +818,8 @@ void* CsrWifiNmeApStopCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -830,7 +830,7 @@ CsrSize CsrWifiNmeApStopIndSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 8) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiSmeApType primitive->apType */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; @@ -842,9 +842,9 @@ u8* CsrWifiNmeApStopIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiNmeApStopInd *primitive = (CsrWifiNmeApStopInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->apType); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -856,9 +856,9 @@ void* CsrWifiNmeApStopIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->apType, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -869,7 +869,7 @@ CsrSize CsrWifiNmeApStationIndSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 18) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiSmeMediaStatus primitive->mediaStatus */ bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */ bufferSize += 6; /* u8 primitive->peerDeviceAddress.a[6] */ @@ -882,10 +882,10 @@ u8* CsrWifiNmeApStationIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiNmeApStationInd *primitive = (CsrWifiNmeApStationInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->mediaStatus); - CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((CsrUint16) (6))); - CsrMemCpySer(ptr, len, (const void *) primitive->peerDeviceAddress.a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((u16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->peerDeviceAddress.a, ((u16) (6))); return(ptr); } @@ -897,10 +897,10 @@ void* CsrWifiNmeApStationIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->mediaStatus, buffer, &offset); - CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((CsrUint16) (6))); - CsrMemCpyDes(primitive->peerDeviceAddress.a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((u16) (6))); + CsrMemCpyDes(primitive->peerDeviceAddress.a, buffer, &offset, ((u16) (6))); return primitive; } diff --git a/drivers/staging/csr/csr_wifi_nme_lib.h b/drivers/staging/csr/csr_wifi_nme_lib.h index d7d3c03c1f3..d539d356f2d 100644 --- a/drivers/staging/csr/csr_wifi_nme_lib.h +++ b/drivers/staging/csr/csr_wifi_nme_lib.h @@ -43,7 +43,7 @@ extern "C" { * PARAMETERS * Deallocates the resources in a CSR_WIFI_NME upstream message *----------------------------------------------------------------------------*/ -void CsrWifiNmeFreeUpstreamMessageContents(CsrUint16 eventClass, void *message); +void CsrWifiNmeFreeUpstreamMessageContents(u16 eventClass, void *message); /*----------------------------------------------------------------------------* * CsrWifiNmeFreeDownstreamMessageContents @@ -55,7 +55,7 @@ void CsrWifiNmeFreeUpstreamMessageContents(CsrUint16 eventClass, void *message); * PARAMETERS * Deallocates the resources in a CSR_WIFI_NME downstream message *----------------------------------------------------------------------------*/ -void CsrWifiNmeFreeDownstreamMessageContents(CsrUint16 eventClass, void *message); +void CsrWifiNmeFreeDownstreamMessageContents(u16 eventClass, void *message); /*----------------------------------------------------------------------------* * Enum to string functions diff --git a/drivers/staging/csr/csr_wifi_nme_prim.h b/drivers/staging/csr/csr_wifi_nme_prim.h index 79187bab81c..4aff2916995 100644 --- a/drivers/staging/csr/csr_wifi_nme_prim.h +++ b/drivers/staging/csr/csr_wifi_nme_prim.h @@ -67,7 +67,7 @@ typedef void (*CsrWifiNmeFrameFreeFunction)(void *frame); - For future use. *******************************************************************************/ -typedef CsrUint16 CsrWifiNmeAuthMode; +typedef u16 CsrWifiNmeAuthMode; #define CSR_WIFI_NME_AUTH_MODE_80211_OPEN ((CsrWifiNmeAuthMode) 0x0001) #define CSR_WIFI_NME_AUTH_MODE_80211_SHARED ((CsrWifiNmeAuthMode) 0x0002) #define CSR_WIFI_NME_AUTH_MODE_8021X_WPA ((CsrWifiNmeAuthMode) 0x0004) @@ -204,7 +204,7 @@ typedef u8 CsrWifiNmeConnectionStatus; FAST/LEAP/TLS/TTLS/PEAP/etc. *******************************************************************************/ -typedef CsrUint16 CsrWifiNmeCredentialType; +typedef u16 CsrWifiNmeCredentialType; #define CSR_WIFI_NME_CREDENTIAL_TYPE_OPEN_SYSTEM ((CsrWifiNmeCredentialType) 0x0000) #define CSR_WIFI_NME_CREDENTIAL_TYPE_WEP64 ((CsrWifiNmeCredentialType) 0x0001) #define CSR_WIFI_NME_CREDENTIAL_TYPE_WEP128 ((CsrWifiNmeCredentialType) 0x0002) @@ -246,7 +246,7 @@ typedef CsrUint16 CsrWifiNmeCredentialType; - EAP-LEAP Method. *******************************************************************************/ -typedef CsrUint16 CsrWifiNmeEapMethod; +typedef u16 CsrWifiNmeEapMethod; #define CSR_WIFI_NME_EAP_METHOD_TLS ((CsrWifiNmeEapMethod) 0x0001) #define CSR_WIFI_NME_EAP_METHOD_TTLS_MSCHAPV2 ((CsrWifiNmeEapMethod) 0x0002) #define CSR_WIFI_NME_EAP_METHOD_PEAP_GTC ((CsrWifiNmeEapMethod) 0x0004) @@ -290,7 +290,7 @@ typedef CsrUint16 CsrWifiNmeEapMethod; - SMS4 key for broadcast messages. *******************************************************************************/ -typedef CsrUint16 CsrWifiNmeEncryption; +typedef u16 CsrWifiNmeEncryption; #define CSR_WIFI_NME_ENCRYPTION_CIPHER_NONE ((CsrWifiNmeEncryption) 0x0000) #define CSR_WIFI_NME_ENCRYPTION_CIPHER_PAIRWISE_WEP40 ((CsrWifiNmeEncryption) 0x0001) #define CSR_WIFI_NME_ENCRYPTION_CIPHER_PAIRWISE_WEP104 ((CsrWifiNmeEncryption) 0x0002) @@ -469,7 +469,7 @@ typedef u8 CsrWifiNmeWmmQosInfo; Mask type for use with the values defined by CsrWifiNmeEapMethod. *******************************************************************************/ -typedef CsrUint16 CsrWifiNmeEapMethodMask; +typedef u16 CsrWifiNmeEapMethodMask; /******************************************************************************* NAME @@ -479,7 +479,7 @@ typedef CsrUint16 CsrWifiNmeEapMethodMask; Mask type for use with the values defined by CsrWifiNmeEncryption *******************************************************************************/ -typedef CsrUint16 CsrWifiNmeEncryptionMask; +typedef u16 CsrWifiNmeEncryptionMask; /******************************************************************************* NAME @@ -546,7 +546,7 @@ typedef struct *******************************************************************************/ typedef struct { - CsrUint16 encryptionMode; + u16 encryptionMode; CsrCharString *passphrase; } CsrWifiNmePassphrase; @@ -565,7 +565,7 @@ typedef struct *******************************************************************************/ typedef struct { - CsrUint16 encryptionMode; + u16 encryptionMode; u8 psk[32]; } CsrWifiNmePsk; @@ -596,7 +596,7 @@ typedef struct { CsrUint32 certificateLength; u8 *certificate; - CsrUint16 privateKeyLength; + u16 privateKeyLength; u8 *privateKey; CsrUint32 caCertificateLength; u8 *caCertificate; @@ -715,7 +715,7 @@ typedef struct u8 *clientCertificate; CsrUint32 certificateAuthorityCertificateLength; u8 *certificateAuthorityCertificate; - CsrUint16 privateKeyLength; + u16 privateKeyLength; u8 *privateKey; CsrCharString *privateKeyPassword; CsrUint32 sessionLength; @@ -1035,7 +1035,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; u8 profileIdentitysCount; CsrWifiNmeProfileIdentity *profileIdentitys; } CsrWifiNmeProfileOrderSetReq; @@ -1059,7 +1059,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiNmeProfileIdentity profileIdentity; } CsrWifiNmeProfileConnectReq; @@ -1087,7 +1087,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; u8 pin[8]; CsrWifiSsid ssid; CsrWifiMacAddress bssid; @@ -1111,7 +1111,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; } CsrWifiNmeWpsCancelReq; /******************************************************************************* @@ -1130,7 +1130,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; } CsrWifiNmeConnectionStatusGetReq; /******************************************************************************* @@ -1361,7 +1361,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiNmeProfileOrderSetCfm; @@ -1397,7 +1397,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; u8 connectAttemptsCount; CsrWifiNmeConnectAttempt *connectAttempts; @@ -1426,7 +1426,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiNmeProfile profile; } CsrWifiNmeWpsCfm; @@ -1448,7 +1448,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiNmeWpsCancelCfm; @@ -1471,7 +1471,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiNmeConnectionStatus connectionStatus; } CsrWifiNmeConnectionStatusGetCfm; @@ -1499,7 +1499,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiNmeProfile profile; } CsrWifiNmeProfileUpdateInd; @@ -1531,7 +1531,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; u8 connectAttemptsCount; CsrWifiNmeConnectAttempt *connectAttempts; } CsrWifiNmeProfileDisconnectInd; diff --git a/drivers/staging/csr/csr_wifi_router_converter_init.c b/drivers/staging/csr/csr_wifi_router_converter_init.c index 6ff59c01e14..048b146fe81 100644 --- a/drivers/staging/csr/csr_wifi_router_converter_init.c +++ b/drivers/staging/csr/csr_wifi_router_converter_init.c @@ -37,11 +37,11 @@ static CsrMsgConvMsgEntry csrwifirouter_conv_lut[] = { { 0, NULL, NULL, NULL, NULL }, }; -CsrMsgConvMsgEntry* CsrWifiRouterConverterLookup(CsrMsgConvMsgEntry *ce, CsrUint16 msgType) +CsrMsgConvMsgEntry* CsrWifiRouterConverterLookup(CsrMsgConvMsgEntry *ce, u16 msgType) { if (msgType & CSR_PRIM_UPSTREAM) { - CsrUint16 idx = (msgType & ~CSR_PRIM_UPSTREAM) + CSR_WIFI_ROUTER_PRIM_DOWNSTREAM_COUNT; + u16 idx = (msgType & ~CSR_PRIM_UPSTREAM) + CSR_WIFI_ROUTER_PRIM_DOWNSTREAM_COUNT; if (idx < (CSR_WIFI_ROUTER_PRIM_UPSTREAM_COUNT + CSR_WIFI_ROUTER_PRIM_DOWNSTREAM_COUNT) && csrwifirouter_conv_lut[idx].msgType == msgType) { diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c b/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c index 32d0bb632d9..7c3289ab71d 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c +++ b/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c @@ -90,11 +90,11 @@ static CsrMsgConvMsgEntry csrwifirouterctrl_conv_lut[] = { { 0, NULL, NULL, NULL, NULL }, }; -CsrMsgConvMsgEntry* CsrWifiRouterCtrlConverterLookup(CsrMsgConvMsgEntry *ce, CsrUint16 msgType) +CsrMsgConvMsgEntry* CsrWifiRouterCtrlConverterLookup(CsrMsgConvMsgEntry *ce, u16 msgType) { if (msgType & CSR_PRIM_UPSTREAM) { - CsrUint16 idx = (msgType & ~CSR_PRIM_UPSTREAM) + CSR_WIFI_ROUTER_CTRL_PRIM_DOWNSTREAM_COUNT; + u16 idx = (msgType & ~CSR_PRIM_UPSTREAM) + CSR_WIFI_ROUTER_CTRL_PRIM_DOWNSTREAM_COUNT; if (idx < (CSR_WIFI_ROUTER_CTRL_PRIM_UPSTREAM_COUNT + CSR_WIFI_ROUTER_CTRL_PRIM_DOWNSTREAM_COUNT) && csrwifirouterctrl_conv_lut[idx].msgType == msgType) { diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c index d161fad8460..2329dc3af8a 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c +++ b/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c @@ -25,7 +25,7 @@ * eventClass: only the value CSR_WIFI_ROUTER_CTRL_PRIM will be handled * message: the message to free *----------------------------------------------------------------------------*/ -void CsrWifiRouterCtrlFreeDownstreamMessageContents(CsrUint16 eventClass, void *message) +void CsrWifiRouterCtrlFreeDownstreamMessageContents(u16 eventClass, void *message) { if (eventClass != CSR_WIFI_ROUTER_CTRL_PRIM) { diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c index b6bf11d566d..8f1ce3d93e8 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c +++ b/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c @@ -25,7 +25,7 @@ * eventClass: only the value CSR_WIFI_ROUTER_CTRL_PRIM will be handled * message: the message to free *----------------------------------------------------------------------------*/ -void CsrWifiRouterCtrlFreeUpstreamMessageContents(CsrUint16 eventClass, void *message) +void CsrWifiRouterCtrlFreeUpstreamMessageContents(u16 eventClass, void *message) { if (eventClass != CSR_WIFI_ROUTER_CTRL_PRIM) { diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h index 6c7e9743757..e7117ee0ebd 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h +++ b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h @@ -39,7 +39,7 @@ extern "C" { * PARAMETERS * Deallocates the resources in a CSR_WIFI_ROUTER_CTRL upstream message *----------------------------------------------------------------------------*/ -void CsrWifiRouterCtrlFreeUpstreamMessageContents(CsrUint16 eventClass, void *message); +void CsrWifiRouterCtrlFreeUpstreamMessageContents(u16 eventClass, void *message); /*----------------------------------------------------------------------------* * CsrWifiRouterCtrlFreeDownstreamMessageContents @@ -51,7 +51,7 @@ void CsrWifiRouterCtrlFreeUpstreamMessageContents(CsrUint16 eventClass, void *me * PARAMETERS * Deallocates the resources in a CSR_WIFI_ROUTER_CTRL downstream message *----------------------------------------------------------------------------*/ -void CsrWifiRouterCtrlFreeDownstreamMessageContents(CsrUint16 eventClass, void *message); +void CsrWifiRouterCtrlFreeDownstreamMessageContents(u16 eventClass, void *message); /*----------------------------------------------------------------------------* * Enum to string functions diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_prim.h b/drivers/staging/csr/csr_wifi_router_ctrl_prim.h index acf10ef1e77..37ba5ea258e 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_prim.h +++ b/drivers/staging/csr/csr_wifi_router_ctrl_prim.h @@ -34,8 +34,8 @@ typedef CsrResult (*CsrWifiRouterCtrlRawSdioFirmwareDownload)(CsrUint32 length, typedef CsrResult (*CsrWifiRouterCtrlRawSdioReset)(void); typedef CsrResult (*CsrWifiRouterCtrlRawSdioCoreDumpPrepare)(CsrBool suspendSme); typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteBlockRead)(u8 func, CsrUint32 address, u8 *pdata, CsrUint32 length); -typedef CsrResult (*CsrWifiRouterCtrlRawSdioGpRead16)(u8 func, CsrUint32 address, CsrUint16 *pdata); -typedef CsrResult (*CsrWifiRouterCtrlRawSdioGpWrite16)(u8 func, CsrUint32 address, CsrUint16 data); +typedef CsrResult (*CsrWifiRouterCtrlRawSdioGpRead16)(u8 func, CsrUint32 address, u16 *pdata); +typedef CsrResult (*CsrWifiRouterCtrlRawSdioGpWrite16)(u8 func, CsrUint32 address, u16 data); /******************************************************************************* @@ -114,7 +114,7 @@ typedef u8 CsrWifiRouterCtrlListAction; - *******************************************************************************/ -typedef CsrUint16 CsrWifiRouterCtrlLowPowerMode; +typedef u16 CsrWifiRouterCtrlLowPowerMode; #define CSR_WIFI_ROUTER_CTRL_LOW_POWER_MODE_DISABLED ((CsrWifiRouterCtrlLowPowerMode) 0x0000) #define CSR_WIFI_ROUTER_CTRL_LOW_POWER_MODE_ENABLED ((CsrWifiRouterCtrlLowPowerMode) 0x0001) @@ -203,7 +203,7 @@ typedef u8 CsrWifiRouterCtrlPeerStatus; - *******************************************************************************/ -typedef CsrUint16 CsrWifiRouterCtrlPortAction; +typedef u16 CsrWifiRouterCtrlPortAction; #define CSR_WIFI_ROUTER_CTRL_PORT_ACTION_8021X_PORT_OPEN ((CsrWifiRouterCtrlPortAction) 0x0000) #define CSR_WIFI_ROUTER_CTRL_PORT_ACTION_8021X_PORT_CLOSED_DISCARD ((CsrWifiRouterCtrlPortAction) 0x0001) #define CSR_WIFI_ROUTER_CTRL_PORT_ACTION_8021X_PORT_CLOSED_BLOCK ((CsrWifiRouterCtrlPortAction) 0x0002) @@ -242,7 +242,7 @@ typedef CsrUint16 CsrWifiRouterCtrlPortAction; - *******************************************************************************/ -typedef CsrUint16 CsrWifiRouterCtrlPowersaveType; +typedef u16 CsrWifiRouterCtrlPowersaveType; #define CSR_WIFI_ROUTER_CTRL_AC_BK_PS_INFO_PRESENT ((CsrWifiRouterCtrlPowersaveType) 0x0001) #define CSR_WIFI_ROUTER_CTRL_AC_BE_PS_INFO_PRESENT ((CsrWifiRouterCtrlPowersaveType) 0x0002) #define CSR_WIFI_ROUTER_CTRL_AC_VI_PS_INFO_PRESENT ((CsrWifiRouterCtrlPowersaveType) 0x0004) @@ -270,7 +270,7 @@ typedef CsrUint16 CsrWifiRouterCtrlPowersaveType; - *******************************************************************************/ -typedef CsrUint16 CsrWifiRouterCtrlProtocolDirection; +typedef u16 CsrWifiRouterCtrlProtocolDirection; #define CSR_WIFI_ROUTER_CTRL_PROTOCOL_DIRECTION_RX ((CsrWifiRouterCtrlProtocolDirection) 0x0000) #define CSR_WIFI_ROUTER_CTRL_PROTOCOL_DIRECTION_TX ((CsrWifiRouterCtrlProtocolDirection) 0x0001) @@ -290,7 +290,7 @@ typedef CsrUint16 CsrWifiRouterCtrlProtocolDirection; - *******************************************************************************/ -typedef CsrUint16 CsrWifiRouterCtrlQoSControl; +typedef u16 CsrWifiRouterCtrlQoSControl; #define CSR_WIFI_ROUTER_CTRL_QOS_CONTROL_OFF ((CsrWifiRouterCtrlQoSControl) 0x0000) #define CSR_WIFI_ROUTER_CTRL_QOS_CONTROL_WMM_ON ((CsrWifiRouterCtrlQoSControl) 0x0001) #define CSR_WIFI_ROUTER_CTRL_QOS_CONTROL_80211_ON ((CsrWifiRouterCtrlQoSControl) 0x0002) @@ -336,7 +336,7 @@ typedef u8 CsrWifiRouterCtrlQueueConfig; - *******************************************************************************/ -typedef CsrUint16 CsrWifiRouterCtrlTrafficConfigType; +typedef u16 CsrWifiRouterCtrlTrafficConfigType; #define CSR_WIFI_ROUTER_CTRL_TRAFFIC_CONFIG_TYPE_RESET ((CsrWifiRouterCtrlTrafficConfigType) 0x0000) #define CSR_WIFI_ROUTER_CTRL_TRAFFIC_CONFIG_TYPE_FILTER ((CsrWifiRouterCtrlTrafficConfigType) 0x0001) #define CSR_WIFI_ROUTER_CTRL_TRAFFIC_CONFIG_TYPE_CLS ((CsrWifiRouterCtrlTrafficConfigType) 0x0002) @@ -367,7 +367,7 @@ typedef CsrUint16 CsrWifiRouterCtrlTrafficConfigType; - *******************************************************************************/ -typedef CsrUint16 CsrWifiRouterCtrlTrafficPacketType; +typedef u16 CsrWifiRouterCtrlTrafficPacketType; #define CSR_WIFI_ROUTER_CTRL_TRAFFIC_PACKET_TYPE_NONE ((CsrWifiRouterCtrlTrafficPacketType) 0x0000) #define CSR_WIFI_ROUTER_CTRL_TRAFFIC_PACKET_TYPE_EAPOL ((CsrWifiRouterCtrlTrafficPacketType) 0x0001) #define CSR_WIFI_ROUTER_CTRL_TRAFFIC_PACKET_TYPE_DHCP ((CsrWifiRouterCtrlTrafficPacketType) 0x0002) @@ -421,7 +421,7 @@ typedef CsrUint32 CsrWifiRouterCtrlPeerRecordHandle; CsrWifiRouterCtrlPowersaveType *******************************************************************************/ -typedef CsrUint16 CsrWifiRouterCtrlPowersaveTypeMask; +typedef u16 CsrWifiRouterCtrlPowersaveTypeMask; /******************************************************************************* NAME @@ -440,7 +440,7 @@ typedef u8 CsrWifiRouterCtrlQueueConfigMask; DESCRIPTION *******************************************************************************/ -typedef CsrUint16 CsrWifiRouterCtrlRequestorInfo; +typedef u16 CsrWifiRouterCtrlRequestorInfo; /******************************************************************************* NAME @@ -491,7 +491,7 @@ typedef struct CsrBool wmmOrQosEnabled; CsrWifiRouterCtrlPowersaveTypeMask powersaveMode; u8 maxSpLength; - CsrUint16 listenIntervalInTus; + u16 listenIntervalInTus; } CsrWifiRouterCtrlStaInfo; /******************************************************************************* @@ -582,7 +582,7 @@ typedef struct *******************************************************************************/ typedef struct { - CsrUint16 packetFilter; + u16 packetFilter; CsrWifiRouterCtrlTrafficFilter customFilter; } CsrWifiRouterCtrlTrafficConfig; @@ -708,11 +708,11 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 mlmeCommandLength; + u16 mlmeCommandLength; u8 *mlmeCommand; - CsrUint16 dataRef1Length; + u16 dataRef1Length; u8 *dataRef1; - CsrUint16 dataRef2Length; + u16 dataRef2Length; u8 *dataRef2; } CsrWifiRouterCtrlHipReq; @@ -733,7 +733,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlRequestorInfo clientData; CsrWifiRouterCtrlMediaStatus mediaStatus; } CsrWifiRouterCtrlMediaStatusReq; @@ -758,7 +758,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlRequestorInfo clientData; CsrResult status; CsrWifiRouterCtrlListAction action; @@ -786,7 +786,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlRequestorInfo clientData; CsrWifiRouterCtrlPortAction uncontrolledPortAction; CsrWifiRouterCtrlPortAction controlledPortAction; @@ -812,7 +812,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlRequestorInfo clientData; CsrWifiRouterCtrlQoSControl control; CsrWifiRouterCtrlQueueConfigMask queueConfig; @@ -856,9 +856,9 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 tclasLength; + u16 tclasLength; u8 *tclas; } CsrWifiRouterCtrlTclasAddReq; @@ -936,9 +936,9 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 tclasLength; + u16 tclasLength; u8 *tclas; } CsrWifiRouterCtrlTclasDelReq; @@ -960,10 +960,10 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlRequestorInfo clientData; CsrWifiRouterCtrlTrafficType trafficType; - CsrUint16 period; + u16 period; } CsrWifiRouterCtrlTrafficClassificationReq; /******************************************************************************* @@ -984,7 +984,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlRequestorInfo clientData; CsrWifiRouterCtrlTrafficConfigType trafficConfigType; CsrWifiRouterCtrlTrafficConfig config; @@ -1070,7 +1070,7 @@ typedef struct CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; CsrResult status; - CsrUint16 numInterfaceAddress; + u16 numInterfaceAddress; CsrWifiMacAddress stationMacAddress[2]; CsrWifiRouterCtrlSmeVersions smeVersions; CsrBool scheduledInterrupt; @@ -1092,7 +1092,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlRequestorInfo clientData; } CsrWifiRouterCtrlM4TransmitReq; @@ -1122,7 +1122,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlRequestorInfo clientData; CsrWifiRouterCtrlMode mode; CsrWifiMacAddress bssid; @@ -1149,10 +1149,10 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlRequestorInfo clientData; CsrWifiMacAddress peerMacAddress; - CsrUint16 associationId; + u16 associationId; CsrWifiRouterCtrlStaInfo staInfo; } CsrWifiRouterCtrlPeerAddReq; @@ -1173,7 +1173,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlRequestorInfo clientData; CsrWifiRouterCtrlPeerRecordHandle peerRecordHandle; } CsrWifiRouterCtrlPeerDelReq; @@ -1196,7 +1196,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlRequestorInfo clientData; CsrWifiRouterCtrlPeerRecordHandle peerRecordHandle; CsrWifiRouterCtrlPowersaveTypeMask powersaveMode; @@ -1242,14 +1242,14 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlRequestorInfo clientData; CsrWifiMacAddress macAddress; CsrWifiRouterCtrlTrafficStreamId trafficStreamID; CsrWifiRouterCtrlBlockAckRole role; - CsrUint16 bufferSize; - CsrUint16 timeout; - CsrUint16 ssn; + u16 bufferSize; + u16 timeout; + u16 ssn; } CsrWifiRouterCtrlBlockAckEnableReq; /******************************************************************************* @@ -1271,7 +1271,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlRequestorInfo clientData; CsrWifiMacAddress macAddress; CsrWifiRouterCtrlTrafficStreamId trafficStreamID; @@ -1297,10 +1297,10 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; - CsrUint16 signalLength; + u16 interfaceTag; + u16 signalLength; u8 *signal; - CsrUint16 dataLength; + u16 dataLength; u8 *data; } CsrWifiRouterCtrlWapiRxPktReq; @@ -1320,7 +1320,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; u8 status; } CsrWifiRouterCtrlWapiMulticastFilterReq; @@ -1340,7 +1340,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; u8 status; } CsrWifiRouterCtrlWapiUnicastFilterReq; @@ -1361,8 +1361,8 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; - CsrUint16 dataLength; + u16 interfaceTag; + u16 dataLength; u8 *data; } CsrWifiRouterCtrlWapiUnicastTxPktReq; @@ -1382,7 +1382,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrBool isWapiConnected; } CsrWifiRouterCtrlWapiFilterReq; @@ -1407,11 +1407,11 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 mlmeCommandLength; + u16 mlmeCommandLength; u8 *mlmeCommand; - CsrUint16 dataRef1Length; + u16 dataRef1Length; u8 *dataRef1; - CsrUint16 dataRef2Length; + u16 dataRef2Length; u8 *dataRef2; } CsrWifiRouterCtrlHipInd; @@ -1435,7 +1435,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlListAction action; u8 setAddressesCount; CsrWifiMacAddress *setAddresses; @@ -1460,7 +1460,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiMacAddress macAddress; } CsrWifiRouterCtrlPortConfigureCfm; @@ -1525,7 +1525,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiRouterCtrlTclasAddCfm; @@ -1603,7 +1603,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiRouterCtrlTclasDelCfm; @@ -1627,7 +1627,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlTrafficPacketType packetType; CsrWifiRouterCtrlProtocolDirection direction; CsrWifiMacAddress srcAddress; @@ -1651,7 +1651,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlTrafficStats stats; } CsrWifiRouterCtrlTrafficSampleInd; @@ -1753,7 +1753,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiMacAddress peerMacAddress; } CsrWifiRouterCtrlM4ReadyToSendInd; @@ -1776,7 +1776,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiMacAddress peerMacAddress; CsrResult status; } CsrWifiRouterCtrlM4TransmittedInd; @@ -1800,7 +1800,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiMacAddress peerMacAddress; CsrBool unicastPdu; } CsrWifiRouterCtrlMicFailureInd; @@ -1824,7 +1824,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiMacAddress peerMacAddress; CsrWifiRouterCtrlPeerStatus peerStatus; } CsrWifiRouterCtrlConnectedInd; @@ -1849,7 +1849,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiMacAddress peerMacAddress; CsrWifiRouterCtrlPeerRecordHandle peerRecordHandle; CsrResult status; @@ -1873,7 +1873,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiRouterCtrlPeerDelCfm; @@ -1895,7 +1895,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiMacAddress peerMacAddress; } CsrWifiRouterCtrlUnexpectedFrameInd; @@ -1917,7 +1917,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiRouterCtrlPeerUpdateCfm; @@ -1941,8 +1941,8 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 commandQueueSize; - CsrUint16 trafficQueueSize; + u16 commandQueueSize; + u16 trafficQueueSize; } CsrWifiRouterCtrlCapabilitiesCfm; /******************************************************************************* @@ -1963,7 +1963,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiRouterCtrlBlockAckEnableCfm; @@ -1985,7 +1985,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiRouterCtrlBlockAckDisableCfm; @@ -2009,7 +2009,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlTrafficStreamId trafficStreamID; CsrWifiMacAddress peerMacAddress; CsrResult status; @@ -2033,7 +2033,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiMacAddress staAddress; } CsrWifiRouterCtrlStaInactiveInd; @@ -2058,10 +2058,10 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; - CsrUint16 signalLength; + u16 interfaceTag; + u16 signalLength; u8 *signal; - CsrUint16 dataLength; + u16 dataLength; u8 *data; } CsrWifiRouterCtrlWapiRxMicCheckInd; @@ -2084,7 +2084,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterCtrlMode mode; CsrResult status; } CsrWifiRouterCtrlModeSetCfm; @@ -2108,8 +2108,8 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint16 interfaceTag; - CsrUint16 dataLength; + u16 interfaceTag; + u16 dataLength; u8 *data; } CsrWifiRouterCtrlWapiUnicastTxEncryptInd; diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c index 7aa96e365f2..f46a5362462 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c +++ b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c @@ -41,8 +41,8 @@ u8* CsrWifiRouterCtrlConfigurePowerModeReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlConfigurePowerModeReq *primitive = (CsrWifiRouterCtrlConfigurePowerModeReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->mode); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->mode); CsrUint8Ser(ptr, len, (u8) primitive->wakeHost); return(ptr); } @@ -55,8 +55,8 @@ void* CsrWifiRouterCtrlConfigurePowerModeReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->mode, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->mode, buffer, &offset); CsrUint8Des((u8 *) &primitive->wakeHost, buffer, &offset); return primitive; @@ -69,11 +69,11 @@ CsrSize CsrWifiRouterCtrlHipReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 12) */ - bufferSize += 2; /* CsrUint16 primitive->mlmeCommandLength */ + bufferSize += 2; /* u16 primitive->mlmeCommandLength */ bufferSize += primitive->mlmeCommandLength; /* u8 primitive->mlmeCommand */ - bufferSize += 2; /* CsrUint16 primitive->dataRef1Length */ + bufferSize += 2; /* u16 primitive->dataRef1Length */ bufferSize += primitive->dataRef1Length; /* u8 primitive->dataRef1 */ - bufferSize += 2; /* CsrUint16 primitive->dataRef2Length */ + bufferSize += 2; /* u16 primitive->dataRef2Length */ bufferSize += primitive->dataRef2Length; /* u8 primitive->dataRef2 */ return bufferSize; } @@ -84,20 +84,20 @@ u8* CsrWifiRouterCtrlHipReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlHipReq *primitive = (CsrWifiRouterCtrlHipReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->mlmeCommandLength); + CsrUint16Ser(ptr, len, (u16) primitive->mlmeCommandLength); if (primitive->mlmeCommandLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->mlmeCommand, ((CsrUint16) (primitive->mlmeCommandLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->mlmeCommand, ((u16) (primitive->mlmeCommandLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->dataRef1Length); + CsrUint16Ser(ptr, len, (u16) primitive->dataRef1Length); if (primitive->dataRef1Length) { - CsrMemCpySer(ptr, len, (const void *) primitive->dataRef1, ((CsrUint16) (primitive->dataRef1Length))); + CsrMemCpySer(ptr, len, (const void *) primitive->dataRef1, ((u16) (primitive->dataRef1Length))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->dataRef2Length); + CsrUint16Ser(ptr, len, (u16) primitive->dataRef2Length); if (primitive->dataRef2Length) { - CsrMemCpySer(ptr, len, (const void *) primitive->dataRef2, ((CsrUint16) (primitive->dataRef2Length))); + CsrMemCpySer(ptr, len, (const void *) primitive->dataRef2, ((u16) (primitive->dataRef2Length))); } return(ptr); } @@ -110,31 +110,31 @@ void* CsrWifiRouterCtrlHipReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->mlmeCommandLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->mlmeCommandLength, buffer, &offset); if (primitive->mlmeCommandLength) { primitive->mlmeCommand = (u8 *)CsrPmemAlloc(primitive->mlmeCommandLength); - CsrMemCpyDes(primitive->mlmeCommand, buffer, &offset, ((CsrUint16) (primitive->mlmeCommandLength))); + CsrMemCpyDes(primitive->mlmeCommand, buffer, &offset, ((u16) (primitive->mlmeCommandLength))); } else { primitive->mlmeCommand = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->dataRef1Length, buffer, &offset); + CsrUint16Des((u16 *) &primitive->dataRef1Length, buffer, &offset); if (primitive->dataRef1Length) { primitive->dataRef1 = (u8 *)CsrPmemAlloc(primitive->dataRef1Length); - CsrMemCpyDes(primitive->dataRef1, buffer, &offset, ((CsrUint16) (primitive->dataRef1Length))); + CsrMemCpyDes(primitive->dataRef1, buffer, &offset, ((u16) (primitive->dataRef1Length))); } else { primitive->dataRef1 = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->dataRef2Length, buffer, &offset); + CsrUint16Des((u16 *) &primitive->dataRef2Length, buffer, &offset); if (primitive->dataRef2Length) { primitive->dataRef2 = (u8 *)CsrPmemAlloc(primitive->dataRef2Length); - CsrMemCpyDes(primitive->dataRef2, buffer, &offset, ((CsrUint16) (primitive->dataRef2Length))); + CsrMemCpyDes(primitive->dataRef2, buffer, &offset, ((u16) (primitive->dataRef2Length))); } else { @@ -160,7 +160,7 @@ CsrSize CsrWifiRouterCtrlMediaStatusReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 8) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 1; /* CsrWifiRouterCtrlMediaStatus primitive->mediaStatus */ return bufferSize; @@ -172,8 +172,8 @@ u8* CsrWifiRouterCtrlMediaStatusReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlMediaStatusReq *primitive = (CsrWifiRouterCtrlMediaStatusReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); CsrUint8Ser(ptr, len, (u8) primitive->mediaStatus); return(ptr); } @@ -186,8 +186,8 @@ void* CsrWifiRouterCtrlMediaStatusReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); CsrUint8Des((u8 *) &primitive->mediaStatus, buffer, &offset); return primitive; @@ -200,13 +200,13 @@ CsrSize CsrWifiRouterCtrlMulticastAddressResSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 17) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 1; /* CsrWifiRouterCtrlListAction primitive->action */ bufferSize += 1; /* u8 primitive->getAddressesCount */ { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->getAddressesCount; i1++) { bufferSize += 6; /* u8 primitive->getAddresses[i1].a[6] */ @@ -221,16 +221,16 @@ u8* CsrWifiRouterCtrlMulticastAddressResSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlMulticastAddressRes *primitive = (CsrWifiRouterCtrlMulticastAddressRes *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint8Ser(ptr, len, (u8) primitive->action); CsrUint8Ser(ptr, len, (u8) primitive->getAddressesCount); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->getAddressesCount; i1++) { - CsrMemCpySer(ptr, len, (const void *) primitive->getAddresses[i1].a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->getAddresses[i1].a, ((u16) (6))); } } return(ptr); @@ -244,9 +244,9 @@ void* CsrWifiRouterCtrlMulticastAddressResDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint8Des((u8 *) &primitive->action, buffer, &offset); CsrUint8Des((u8 *) &primitive->getAddressesCount, buffer, &offset); primitive->getAddresses = NULL; @@ -255,10 +255,10 @@ void* CsrWifiRouterCtrlMulticastAddressResDes(u8 *buffer, CsrSize length) primitive->getAddresses = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->getAddressesCount); } { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->getAddressesCount; i1++) { - CsrMemCpyDes(primitive->getAddresses[i1].a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->getAddresses[i1].a, buffer, &offset, ((u16) (6))); } } @@ -279,7 +279,7 @@ CsrSize CsrWifiRouterCtrlPortConfigureReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 18) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 2; /* CsrWifiRouterCtrlPortAction primitive->uncontrolledPortAction */ bufferSize += 2; /* CsrWifiRouterCtrlPortAction primitive->controlledPortAction */ @@ -294,11 +294,11 @@ u8* CsrWifiRouterCtrlPortConfigureReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlPortConfigureReq *primitive = (CsrWifiRouterCtrlPortConfigureReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->uncontrolledPortAction); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->controlledPortAction); - CsrMemCpySer(ptr, len, (const void *) primitive->macAddress.a, ((CsrUint16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->uncontrolledPortAction); + CsrUint16Ser(ptr, len, (u16) primitive->controlledPortAction); + CsrMemCpySer(ptr, len, (const void *) primitive->macAddress.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->setProtection); return(ptr); } @@ -311,11 +311,11 @@ void* CsrWifiRouterCtrlPortConfigureReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->uncontrolledPortAction, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->controlledPortAction, buffer, &offset); - CsrMemCpyDes(primitive->macAddress.a, buffer, &offset, ((CsrUint16) (6))); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->uncontrolledPortAction, buffer, &offset); + CsrUint16Des((u16 *) &primitive->controlledPortAction, buffer, &offset); + CsrMemCpyDes(primitive->macAddress.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->setProtection, buffer, &offset); return primitive; @@ -327,7 +327,7 @@ CsrSize CsrWifiRouterCtrlQosControlReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 10) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 2; /* CsrWifiRouterCtrlQoSControl primitive->control */ bufferSize += 1; /* CsrWifiRouterCtrlQueueConfigMask primitive->queueConfig */ @@ -340,9 +340,9 @@ u8* CsrWifiRouterCtrlQosControlReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlQosControlReq *primitive = (CsrWifiRouterCtrlQosControlReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->control); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->control); CsrUint8Ser(ptr, len, (u8) primitive->queueConfig); return(ptr); } @@ -355,9 +355,9 @@ void* CsrWifiRouterCtrlQosControlReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->control, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->control, buffer, &offset); CsrUint8Des((u8 *) &primitive->queueConfig, buffer, &offset); return primitive; @@ -380,8 +380,8 @@ u8* CsrWifiRouterCtrlSuspendResSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlSuspendRes *primitive = (CsrWifiRouterCtrlSuspendRes *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -393,8 +393,8 @@ void* CsrWifiRouterCtrlSuspendResDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -406,9 +406,9 @@ CsrSize CsrWifiRouterCtrlTclasAddReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 10) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->tclasLength */ + bufferSize += 2; /* u16 primitive->tclasLength */ bufferSize += primitive->tclasLength; /* u8 primitive->tclas */ return bufferSize; } @@ -419,12 +419,12 @@ u8* CsrWifiRouterCtrlTclasAddReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlTclasAddReq *primitive = (CsrWifiRouterCtrlTclasAddReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->tclasLength); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->tclasLength); if (primitive->tclasLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->tclas, ((CsrUint16) (primitive->tclasLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->tclas, ((u16) (primitive->tclasLength))); } return(ptr); } @@ -437,13 +437,13 @@ void* CsrWifiRouterCtrlTclasAddReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->tclasLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->tclasLength, buffer, &offset); if (primitive->tclasLength) { primitive->tclas = (u8 *)CsrPmemAlloc(primitive->tclasLength); - CsrMemCpyDes(primitive->tclas, buffer, &offset, ((CsrUint16) (primitive->tclasLength))); + CsrMemCpyDes(primitive->tclas, buffer, &offset, ((u16) (primitive->tclasLength))); } else { @@ -478,8 +478,8 @@ u8* CsrWifiRouterCtrlResumeResSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlResumeRes *primitive = (CsrWifiRouterCtrlResumeRes *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -491,8 +491,8 @@ void* CsrWifiRouterCtrlResumeResDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -504,9 +504,9 @@ CsrSize CsrWifiRouterCtrlTclasDelReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 10) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->tclasLength */ + bufferSize += 2; /* u16 primitive->tclasLength */ bufferSize += primitive->tclasLength; /* u8 primitive->tclas */ return bufferSize; } @@ -517,12 +517,12 @@ u8* CsrWifiRouterCtrlTclasDelReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlTclasDelReq *primitive = (CsrWifiRouterCtrlTclasDelReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->tclasLength); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->tclasLength); if (primitive->tclasLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->tclas, ((CsrUint16) (primitive->tclasLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->tclas, ((u16) (primitive->tclasLength))); } return(ptr); } @@ -535,13 +535,13 @@ void* CsrWifiRouterCtrlTclasDelReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->tclasLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->tclasLength, buffer, &offset); if (primitive->tclasLength) { primitive->tclas = (u8 *)CsrPmemAlloc(primitive->tclasLength); - CsrMemCpyDes(primitive->tclas, buffer, &offset, ((CsrUint16) (primitive->tclasLength))); + CsrMemCpyDes(primitive->tclas, buffer, &offset, ((u16) (primitive->tclasLength))); } else { @@ -565,10 +565,10 @@ CsrSize CsrWifiRouterCtrlTrafficClassificationReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 10) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 1; /* CsrWifiRouterCtrlTrafficType primitive->trafficType */ - bufferSize += 2; /* CsrUint16 primitive->period */ + bufferSize += 2; /* u16 primitive->period */ return bufferSize; } @@ -578,10 +578,10 @@ u8* CsrWifiRouterCtrlTrafficClassificationReqSer(u8 *ptr, CsrSize *len, void *ms CsrWifiRouterCtrlTrafficClassificationReq *primitive = (CsrWifiRouterCtrlTrafficClassificationReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); CsrUint8Ser(ptr, len, (u8) primitive->trafficType); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->period); + CsrUint16Ser(ptr, len, (u16) primitive->period); return(ptr); } @@ -593,10 +593,10 @@ void* CsrWifiRouterCtrlTrafficClassificationReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); CsrUint8Des((u8 *) &primitive->trafficType, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->period, buffer, &offset); + CsrUint16Des((u16 *) &primitive->period, buffer, &offset); return primitive; } @@ -607,10 +607,10 @@ CsrSize CsrWifiRouterCtrlTrafficConfigReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 24) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 2; /* CsrWifiRouterCtrlTrafficConfigType primitive->trafficConfigType */ - bufferSize += 2; /* CsrUint16 primitive->config.packetFilter */ + bufferSize += 2; /* u16 primitive->config.packetFilter */ bufferSize += 4; /* CsrUint32 primitive->config.customFilter.etherType */ bufferSize += 1; /* u8 primitive->config.customFilter.ipType */ bufferSize += 4; /* CsrUint32 primitive->config.customFilter.udpSourcePort */ @@ -624,10 +624,10 @@ u8* CsrWifiRouterCtrlTrafficConfigReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlTrafficConfigReq *primitive = (CsrWifiRouterCtrlTrafficConfigReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->trafficConfigType); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->config.packetFilter); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->trafficConfigType); + CsrUint16Ser(ptr, len, (u16) primitive->config.packetFilter); CsrUint32Ser(ptr, len, (CsrUint32) primitive->config.customFilter.etherType); CsrUint8Ser(ptr, len, (u8) primitive->config.customFilter.ipType); CsrUint32Ser(ptr, len, (CsrUint32) primitive->config.customFilter.udpSourcePort); @@ -643,10 +643,10 @@ void* CsrWifiRouterCtrlTrafficConfigReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->trafficConfigType, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->config.packetFilter, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->trafficConfigType, buffer, &offset); + CsrUint16Des((u16 *) &primitive->config.packetFilter, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->config.customFilter.etherType, buffer, &offset); CsrUint8Des((u8 *) &primitive->config.customFilter.ipType, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->config.customFilter.udpSourcePort, buffer, &offset); @@ -674,11 +674,11 @@ u8* CsrWifiRouterCtrlWifiOnReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlWifiOnReq *primitive = (CsrWifiRouterCtrlWifiOnReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); CsrUint32Ser(ptr, len, (CsrUint32) primitive->dataLength); if (primitive->dataLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->data, ((CsrUint16) (primitive->dataLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->data, ((u16) (primitive->dataLength))); } return(ptr); } @@ -691,12 +691,12 @@ void* CsrWifiRouterCtrlWifiOnReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->dataLength, buffer, &offset); if (primitive->dataLength) { primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); - CsrMemCpyDes(primitive->data, buffer, &offset, ((CsrUint16) (primitive->dataLength))); + CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); } else { @@ -723,9 +723,9 @@ CsrSize CsrWifiRouterCtrlWifiOnResSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 30) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 2; /* CsrResult primitive->status */ - bufferSize += 2; /* CsrUint16 primitive->numInterfaceAddress */ + bufferSize += 2; /* u16 primitive->numInterfaceAddress */ { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < 2; i1++) { bufferSize += 6; /* u8 primitive->stationMacAddress[i1].a[6] */ @@ -744,14 +744,14 @@ u8* CsrWifiRouterCtrlWifiOnResSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlWifiOnRes *primitive = (CsrWifiRouterCtrlWifiOnRes *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->numInterfaceAddress); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->numInterfaceAddress); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < 2; i1++) { - CsrMemCpySer(ptr, len, (const void *) primitive->stationMacAddress[i1].a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->stationMacAddress[i1].a, ((u16) (6))); } } CsrUint32Ser(ptr, len, (CsrUint32) primitive->smeVersions.firmwarePatch); @@ -769,14 +769,14 @@ void* CsrWifiRouterCtrlWifiOnResDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->numInterfaceAddress, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->numInterfaceAddress, buffer, &offset); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < 2; i1++) { - CsrMemCpyDes(primitive->stationMacAddress[i1].a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->stationMacAddress[i1].a, buffer, &offset, ((u16) (6))); } } CsrUint32Des((CsrUint32 *) &primitive->smeVersions.firmwarePatch, buffer, &offset); @@ -801,7 +801,7 @@ CsrSize CsrWifiRouterCtrlM4TransmitReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 7) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ return bufferSize; } @@ -812,8 +812,8 @@ u8* CsrWifiRouterCtrlM4TransmitReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlM4TransmitReq *primitive = (CsrWifiRouterCtrlM4TransmitReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); return(ptr); } @@ -825,8 +825,8 @@ void* CsrWifiRouterCtrlM4TransmitReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); return primitive; } @@ -837,7 +837,7 @@ CsrSize CsrWifiRouterCtrlModeSetReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 16) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 1; /* CsrWifiRouterCtrlMode primitive->mode */ bufferSize += 6; /* u8 primitive->bssid.a[6] */ @@ -852,10 +852,10 @@ u8* CsrWifiRouterCtrlModeSetReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlModeSetReq *primitive = (CsrWifiRouterCtrlModeSetReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); CsrUint8Ser(ptr, len, (u8) primitive->mode); - CsrMemCpySer(ptr, len, (const void *) primitive->bssid.a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->bssid.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->protection); CsrUint8Ser(ptr, len, (u8) primitive->intraBssDistEnabled); return(ptr); @@ -869,10 +869,10 @@ void* CsrWifiRouterCtrlModeSetReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); CsrUint8Des((u8 *) &primitive->mode, buffer, &offset); - CsrMemCpyDes(primitive->bssid.a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->bssid.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->protection, buffer, &offset); CsrUint8Des((u8 *) &primitive->intraBssDistEnabled, buffer, &offset); @@ -885,14 +885,14 @@ CsrSize CsrWifiRouterCtrlPeerAddReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 21) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */ - bufferSize += 2; /* CsrUint16 primitive->associationId */ + bufferSize += 2; /* u16 primitive->associationId */ bufferSize += 1; /* CsrBool primitive->staInfo.wmmOrQosEnabled */ bufferSize += 2; /* CsrWifiRouterCtrlPowersaveTypeMask primitive->staInfo.powersaveMode */ bufferSize += 1; /* u8 primitive->staInfo.maxSpLength */ - bufferSize += 2; /* CsrUint16 primitive->staInfo.listenIntervalInTus */ + bufferSize += 2; /* u16 primitive->staInfo.listenIntervalInTus */ return bufferSize; } @@ -902,14 +902,14 @@ u8* CsrWifiRouterCtrlPeerAddReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlPeerAddReq *primitive = (CsrWifiRouterCtrlPeerAddReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((CsrUint16) (6))); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->associationId); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((u16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->associationId); CsrUint8Ser(ptr, len, (u8) primitive->staInfo.wmmOrQosEnabled); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->staInfo.powersaveMode); + CsrUint16Ser(ptr, len, (u16) primitive->staInfo.powersaveMode); CsrUint8Ser(ptr, len, (u8) primitive->staInfo.maxSpLength); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->staInfo.listenIntervalInTus); + CsrUint16Ser(ptr, len, (u16) primitive->staInfo.listenIntervalInTus); return(ptr); } @@ -921,14 +921,14 @@ void* CsrWifiRouterCtrlPeerAddReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((CsrUint16) (6))); - CsrUint16Des((CsrUint16 *) &primitive->associationId, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((u16) (6))); + CsrUint16Des((u16 *) &primitive->associationId, buffer, &offset); CsrUint8Des((u8 *) &primitive->staInfo.wmmOrQosEnabled, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->staInfo.powersaveMode, buffer, &offset); + CsrUint16Des((u16 *) &primitive->staInfo.powersaveMode, buffer, &offset); CsrUint8Des((u8 *) &primitive->staInfo.maxSpLength, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->staInfo.listenIntervalInTus, buffer, &offset); + CsrUint16Des((u16 *) &primitive->staInfo.listenIntervalInTus, buffer, &offset); return primitive; } @@ -939,7 +939,7 @@ CsrSize CsrWifiRouterCtrlPeerDelReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 11) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 4; /* CsrWifiRouterCtrlPeerRecordHandle primitive->peerRecordHandle */ return bufferSize; @@ -951,8 +951,8 @@ u8* CsrWifiRouterCtrlPeerDelReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlPeerDelReq *primitive = (CsrWifiRouterCtrlPeerDelReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); CsrUint32Ser(ptr, len, (CsrUint32) primitive->peerRecordHandle); return(ptr); } @@ -965,8 +965,8 @@ void* CsrWifiRouterCtrlPeerDelReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->peerRecordHandle, buffer, &offset); return primitive; @@ -978,7 +978,7 @@ CsrSize CsrWifiRouterCtrlPeerUpdateReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 4; /* CsrWifiRouterCtrlPeerRecordHandle primitive->peerRecordHandle */ bufferSize += 2; /* CsrWifiRouterCtrlPowersaveTypeMask primitive->powersaveMode */ @@ -991,10 +991,10 @@ u8* CsrWifiRouterCtrlPeerUpdateReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlPeerUpdateReq *primitive = (CsrWifiRouterCtrlPeerUpdateReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); CsrUint32Ser(ptr, len, (CsrUint32) primitive->peerRecordHandle); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->powersaveMode); + CsrUint16Ser(ptr, len, (u16) primitive->powersaveMode); return(ptr); } @@ -1006,10 +1006,10 @@ void* CsrWifiRouterCtrlPeerUpdateReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->peerRecordHandle, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->powersaveMode, buffer, &offset); + CsrUint16Des((u16 *) &primitive->powersaveMode, buffer, &offset); return primitive; } @@ -1020,14 +1020,14 @@ CsrSize CsrWifiRouterCtrlBlockAckEnableReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 21) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 6; /* u8 primitive->macAddress.a[6] */ bufferSize += 1; /* CsrWifiRouterCtrlTrafficStreamId primitive->trafficStreamID */ bufferSize += 1; /* CsrWifiRouterCtrlBlockAckRole primitive->role */ - bufferSize += 2; /* CsrUint16 primitive->bufferSize */ - bufferSize += 2; /* CsrUint16 primitive->timeout */ - bufferSize += 2; /* CsrUint16 primitive->ssn */ + bufferSize += 2; /* u16 primitive->bufferSize */ + bufferSize += 2; /* u16 primitive->timeout */ + bufferSize += 2; /* u16 primitive->ssn */ return bufferSize; } @@ -1037,14 +1037,14 @@ u8* CsrWifiRouterCtrlBlockAckEnableReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlBlockAckEnableReq *primitive = (CsrWifiRouterCtrlBlockAckEnableReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrMemCpySer(ptr, len, (const void *) primitive->macAddress.a, ((CsrUint16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrMemCpySer(ptr, len, (const void *) primitive->macAddress.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->trafficStreamID); CsrUint8Ser(ptr, len, (u8) primitive->role); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->bufferSize); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->timeout); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->ssn); + CsrUint16Ser(ptr, len, (u16) primitive->bufferSize); + CsrUint16Ser(ptr, len, (u16) primitive->timeout); + CsrUint16Ser(ptr, len, (u16) primitive->ssn); return(ptr); } @@ -1056,14 +1056,14 @@ void* CsrWifiRouterCtrlBlockAckEnableReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrMemCpyDes(primitive->macAddress.a, buffer, &offset, ((CsrUint16) (6))); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrMemCpyDes(primitive->macAddress.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->trafficStreamID, buffer, &offset); CsrUint8Des((u8 *) &primitive->role, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->bufferSize, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->timeout, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->ssn, buffer, &offset); + CsrUint16Des((u16 *) &primitive->bufferSize, buffer, &offset); + CsrUint16Des((u16 *) &primitive->timeout, buffer, &offset); + CsrUint16Des((u16 *) &primitive->ssn, buffer, &offset); return primitive; } @@ -1074,7 +1074,7 @@ CsrSize CsrWifiRouterCtrlBlockAckDisableReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 15) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 6; /* u8 primitive->macAddress.a[6] */ bufferSize += 1; /* CsrWifiRouterCtrlTrafficStreamId primitive->trafficStreamID */ @@ -1088,9 +1088,9 @@ u8* CsrWifiRouterCtrlBlockAckDisableReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlBlockAckDisableReq *primitive = (CsrWifiRouterCtrlBlockAckDisableReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrMemCpySer(ptr, len, (const void *) primitive->macAddress.a, ((CsrUint16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrMemCpySer(ptr, len, (const void *) primitive->macAddress.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->trafficStreamID); CsrUint8Ser(ptr, len, (u8) primitive->role); return(ptr); @@ -1104,9 +1104,9 @@ void* CsrWifiRouterCtrlBlockAckDisableReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrMemCpyDes(primitive->macAddress.a, buffer, &offset, ((CsrUint16) (6))); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrMemCpyDes(primitive->macAddress.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->trafficStreamID, buffer, &offset); CsrUint8Des((u8 *) &primitive->role, buffer, &offset); @@ -1120,10 +1120,10 @@ CsrSize CsrWifiRouterCtrlWapiRxPktReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 11) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ - bufferSize += 2; /* CsrUint16 primitive->signalLength */ + bufferSize += 2; /* u16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->signalLength */ bufferSize += primitive->signalLength; /* u8 primitive->signal */ - bufferSize += 2; /* CsrUint16 primitive->dataLength */ + bufferSize += 2; /* u16 primitive->dataLength */ bufferSize += primitive->dataLength; /* u8 primitive->data */ return bufferSize; } @@ -1134,16 +1134,16 @@ u8* CsrWifiRouterCtrlWapiRxPktReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlWapiRxPktReq *primitive = (CsrWifiRouterCtrlWapiRxPktReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->signalLength); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->signalLength); if (primitive->signalLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->signal, ((CsrUint16) (primitive->signalLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->signal, ((u16) (primitive->signalLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->dataLength); + CsrUint16Ser(ptr, len, (u16) primitive->dataLength); if (primitive->dataLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->data, ((CsrUint16) (primitive->dataLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->data, ((u16) (primitive->dataLength))); } return(ptr); } @@ -1156,22 +1156,22 @@ void* CsrWifiRouterCtrlWapiRxPktReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->signalLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->signalLength, buffer, &offset); if (primitive->signalLength) { primitive->signal = (u8 *)CsrPmemAlloc(primitive->signalLength); - CsrMemCpyDes(primitive->signal, buffer, &offset, ((CsrUint16) (primitive->signalLength))); + CsrMemCpyDes(primitive->signal, buffer, &offset, ((u16) (primitive->signalLength))); } else { primitive->signal = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->dataLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->dataLength, buffer, &offset); if (primitive->dataLength) { primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); - CsrMemCpyDes(primitive->data, buffer, &offset, ((CsrUint16) (primitive->dataLength))); + CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); } else { @@ -1197,8 +1197,8 @@ CsrSize CsrWifiRouterCtrlWapiUnicastTxPktReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 8) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ - bufferSize += 2; /* CsrUint16 primitive->dataLength */ + bufferSize += 2; /* u16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->dataLength */ bufferSize += primitive->dataLength; /* u8 primitive->data */ return bufferSize; } @@ -1209,11 +1209,11 @@ u8* CsrWifiRouterCtrlWapiUnicastTxPktReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlWapiUnicastTxPktReq *primitive = (CsrWifiRouterCtrlWapiUnicastTxPktReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->dataLength); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->dataLength); if (primitive->dataLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->data, ((CsrUint16) (primitive->dataLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->data, ((u16) (primitive->dataLength))); } return(ptr); } @@ -1226,12 +1226,12 @@ void* CsrWifiRouterCtrlWapiUnicastTxPktReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->dataLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->dataLength, buffer, &offset); if (primitive->dataLength) { primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); - CsrMemCpyDes(primitive->data, buffer, &offset, ((CsrUint16) (primitive->dataLength))); + CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); } else { @@ -1256,11 +1256,11 @@ CsrSize CsrWifiRouterCtrlHipIndSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 12) */ - bufferSize += 2; /* CsrUint16 primitive->mlmeCommandLength */ + bufferSize += 2; /* u16 primitive->mlmeCommandLength */ bufferSize += primitive->mlmeCommandLength; /* u8 primitive->mlmeCommand */ - bufferSize += 2; /* CsrUint16 primitive->dataRef1Length */ + bufferSize += 2; /* u16 primitive->dataRef1Length */ bufferSize += primitive->dataRef1Length; /* u8 primitive->dataRef1 */ - bufferSize += 2; /* CsrUint16 primitive->dataRef2Length */ + bufferSize += 2; /* u16 primitive->dataRef2Length */ bufferSize += primitive->dataRef2Length; /* u8 primitive->dataRef2 */ return bufferSize; } @@ -1271,20 +1271,20 @@ u8* CsrWifiRouterCtrlHipIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlHipInd *primitive = (CsrWifiRouterCtrlHipInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->mlmeCommandLength); + CsrUint16Ser(ptr, len, (u16) primitive->mlmeCommandLength); if (primitive->mlmeCommandLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->mlmeCommand, ((CsrUint16) (primitive->mlmeCommandLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->mlmeCommand, ((u16) (primitive->mlmeCommandLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->dataRef1Length); + CsrUint16Ser(ptr, len, (u16) primitive->dataRef1Length); if (primitive->dataRef1Length) { - CsrMemCpySer(ptr, len, (const void *) primitive->dataRef1, ((CsrUint16) (primitive->dataRef1Length))); + CsrMemCpySer(ptr, len, (const void *) primitive->dataRef1, ((u16) (primitive->dataRef1Length))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->dataRef2Length); + CsrUint16Ser(ptr, len, (u16) primitive->dataRef2Length); if (primitive->dataRef2Length) { - CsrMemCpySer(ptr, len, (const void *) primitive->dataRef2, ((CsrUint16) (primitive->dataRef2Length))); + CsrMemCpySer(ptr, len, (const void *) primitive->dataRef2, ((u16) (primitive->dataRef2Length))); } return(ptr); } @@ -1297,31 +1297,31 @@ void* CsrWifiRouterCtrlHipIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->mlmeCommandLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->mlmeCommandLength, buffer, &offset); if (primitive->mlmeCommandLength) { primitive->mlmeCommand = (u8 *)CsrPmemAlloc(primitive->mlmeCommandLength); - CsrMemCpyDes(primitive->mlmeCommand, buffer, &offset, ((CsrUint16) (primitive->mlmeCommandLength))); + CsrMemCpyDes(primitive->mlmeCommand, buffer, &offset, ((u16) (primitive->mlmeCommandLength))); } else { primitive->mlmeCommand = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->dataRef1Length, buffer, &offset); + CsrUint16Des((u16 *) &primitive->dataRef1Length, buffer, &offset); if (primitive->dataRef1Length) { primitive->dataRef1 = (u8 *)CsrPmemAlloc(primitive->dataRef1Length); - CsrMemCpyDes(primitive->dataRef1, buffer, &offset, ((CsrUint16) (primitive->dataRef1Length))); + CsrMemCpyDes(primitive->dataRef1, buffer, &offset, ((u16) (primitive->dataRef1Length))); } else { primitive->dataRef1 = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->dataRef2Length, buffer, &offset); + CsrUint16Des((u16 *) &primitive->dataRef2Length, buffer, &offset); if (primitive->dataRef2Length) { primitive->dataRef2 = (u8 *)CsrPmemAlloc(primitive->dataRef2Length); - CsrMemCpyDes(primitive->dataRef2, buffer, &offset, ((CsrUint16) (primitive->dataRef2Length))); + CsrMemCpyDes(primitive->dataRef2, buffer, &offset, ((u16) (primitive->dataRef2Length))); } else { @@ -1349,11 +1349,11 @@ CsrSize CsrWifiRouterCtrlMulticastAddressIndSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 15) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiRouterCtrlListAction primitive->action */ bufferSize += 1; /* u8 primitive->setAddressesCount */ { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->setAddressesCount; i1++) { bufferSize += 6; /* u8 primitive->setAddresses[i1].a[6] */ @@ -1368,15 +1368,15 @@ u8* CsrWifiRouterCtrlMulticastAddressIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlMulticastAddressInd *primitive = (CsrWifiRouterCtrlMulticastAddressInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->action); CsrUint8Ser(ptr, len, (u8) primitive->setAddressesCount); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->setAddressesCount; i1++) { - CsrMemCpySer(ptr, len, (const void *) primitive->setAddresses[i1].a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->setAddresses[i1].a, ((u16) (6))); } } return(ptr); @@ -1390,8 +1390,8 @@ void* CsrWifiRouterCtrlMulticastAddressIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->action, buffer, &offset); CsrUint8Des((u8 *) &primitive->setAddressesCount, buffer, &offset); primitive->setAddresses = NULL; @@ -1400,10 +1400,10 @@ void* CsrWifiRouterCtrlMulticastAddressIndDes(u8 *buffer, CsrSize length) primitive->setAddresses = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->setAddressesCount); } { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->setAddressesCount; i1++) { - CsrMemCpyDes(primitive->setAddresses[i1].a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->setAddresses[i1].a, buffer, &offset, ((u16) (6))); } } @@ -1425,7 +1425,7 @@ CsrSize CsrWifiRouterCtrlPortConfigureCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 15) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 6; /* u8 primitive->macAddress.a[6] */ return bufferSize; @@ -1437,10 +1437,10 @@ u8* CsrWifiRouterCtrlPortConfigureCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlPortConfigureCfm *primitive = (CsrWifiRouterCtrlPortConfigureCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); - CsrMemCpySer(ptr, len, (const void *) primitive->macAddress.a, ((CsrUint16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); + CsrMemCpySer(ptr, len, (const void *) primitive->macAddress.a, ((u16) (6))); return(ptr); } @@ -1452,10 +1452,10 @@ void* CsrWifiRouterCtrlPortConfigureCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); - CsrMemCpyDes(primitive->macAddress.a, buffer, &offset, ((CsrUint16) (6))); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); + CsrMemCpyDes(primitive->macAddress.a, buffer, &offset, ((u16) (6))); return primitive; } @@ -1478,7 +1478,7 @@ u8* CsrWifiRouterCtrlSuspendIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlSuspendInd *primitive = (CsrWifiRouterCtrlSuspendInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); CsrUint8Ser(ptr, len, (u8) primitive->hardSuspend); CsrUint8Ser(ptr, len, (u8) primitive->d3Suspend); return(ptr); @@ -1492,7 +1492,7 @@ void* CsrWifiRouterCtrlSuspendIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); CsrUint8Des((u8 *) &primitive->hardSuspend, buffer, &offset); CsrUint8Des((u8 *) &primitive->d3Suspend, buffer, &offset); @@ -1506,7 +1506,7 @@ CsrSize CsrWifiRouterCtrlTclasAddCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 9) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; } @@ -1517,9 +1517,9 @@ u8* CsrWifiRouterCtrlTclasAddCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlTclasAddCfm *primitive = (CsrWifiRouterCtrlTclasAddCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -1531,9 +1531,9 @@ void* CsrWifiRouterCtrlTclasAddCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -1555,8 +1555,8 @@ u8* CsrWifiRouterCtrlRawSdioDeinitialiseCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlRawSdioDeinitialiseCfm *primitive = (CsrWifiRouterCtrlRawSdioDeinitialiseCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->result); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->result); return(ptr); } @@ -1568,8 +1568,8 @@ void* CsrWifiRouterCtrlRawSdioDeinitialiseCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->result, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->result, buffer, &offset); return primitive; } @@ -1599,8 +1599,8 @@ u8* CsrWifiRouterCtrlRawSdioInitialiseCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlRawSdioInitialiseCfm *primitive = (CsrWifiRouterCtrlRawSdioInitialiseCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->result); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->result); CsrUint32Ser(ptr, len, 0); /* Special for Function Pointers... primitive->byteRead */ CsrUint32Ser(ptr, len, 0); /* Special for Function Pointers... primitive->byteWrite */ CsrUint32Ser(ptr, len, 0); /* Special for Function Pointers... primitive->firmwareDownload */ @@ -1620,8 +1620,8 @@ void* CsrWifiRouterCtrlRawSdioInitialiseCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->result, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->result, buffer, &offset); primitive->byteRead = NULL; /* Special for Function Pointers... */ offset += 4; primitive->byteWrite = NULL; /* Special for Function Pointers... */ @@ -1649,7 +1649,7 @@ CsrSize CsrWifiRouterCtrlTclasDelCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 9) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; } @@ -1660,9 +1660,9 @@ u8* CsrWifiRouterCtrlTclasDelCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlTclasDelCfm *primitive = (CsrWifiRouterCtrlTclasDelCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -1674,9 +1674,9 @@ void* CsrWifiRouterCtrlTclasDelCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -1688,7 +1688,7 @@ CsrSize CsrWifiRouterCtrlTrafficProtocolIndSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 17) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrWifiRouterCtrlTrafficPacketType primitive->packetType */ bufferSize += 2; /* CsrWifiRouterCtrlProtocolDirection primitive->direction */ bufferSize += 6; /* u8 primitive->srcAddress.a[6] */ @@ -1701,11 +1701,11 @@ u8* CsrWifiRouterCtrlTrafficProtocolIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlTrafficProtocolInd *primitive = (CsrWifiRouterCtrlTrafficProtocolInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->packetType); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->direction); - CsrMemCpySer(ptr, len, (const void *) primitive->srcAddress.a, ((CsrUint16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->packetType); + CsrUint16Ser(ptr, len, (u16) primitive->direction); + CsrMemCpySer(ptr, len, (const void *) primitive->srcAddress.a, ((u16) (6))); return(ptr); } @@ -1717,11 +1717,11 @@ void* CsrWifiRouterCtrlTrafficProtocolIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->packetType, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->direction, buffer, &offset); - CsrMemCpyDes(primitive->srcAddress.a, buffer, &offset, ((CsrUint16) (6))); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->packetType, buffer, &offset); + CsrUint16Des((u16 *) &primitive->direction, buffer, &offset); + CsrMemCpyDes(primitive->srcAddress.a, buffer, &offset, ((u16) (6))); return primitive; } @@ -1733,7 +1733,7 @@ CsrSize CsrWifiRouterCtrlTrafficSampleIndSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 38) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 4; /* CsrUint32 primitive->stats.rxMeanRate */ bufferSize += 4; /* CsrUint32 primitive->stats.rxFramesNum */ bufferSize += 4; /* CsrUint32 primitive->stats.txFramesNum */ @@ -1749,14 +1749,14 @@ u8* CsrWifiRouterCtrlTrafficSampleIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlTrafficSampleInd *primitive = (CsrWifiRouterCtrlTrafficSampleInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint32Ser(ptr, len, (CsrUint32) primitive->stats.rxMeanRate); CsrUint32Ser(ptr, len, (CsrUint32) primitive->stats.rxFramesNum); CsrUint32Ser(ptr, len, (CsrUint32) primitive->stats.txFramesNum); CsrUint32Ser(ptr, len, (CsrUint32) primitive->stats.rxBytesCount); CsrUint32Ser(ptr, len, (CsrUint32) primitive->stats.txBytesCount); - CsrMemCpySer(ptr, len, (const void *) primitive->stats.intervals, ((CsrUint16) (11))); + CsrMemCpySer(ptr, len, (const void *) primitive->stats.intervals, ((u16) (11))); return(ptr); } @@ -1768,14 +1768,14 @@ void* CsrWifiRouterCtrlTrafficSampleIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->stats.rxMeanRate, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->stats.rxFramesNum, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->stats.txFramesNum, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->stats.rxBytesCount, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->stats.txBytesCount, buffer, &offset); - CsrMemCpyDes(primitive->stats.intervals, buffer, &offset, ((CsrUint16) (11))); + CsrMemCpyDes(primitive->stats.intervals, buffer, &offset, ((u16) (11))); return primitive; } @@ -1804,8 +1804,8 @@ u8* CsrWifiRouterCtrlWifiOnIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlWifiOnInd *primitive = (CsrWifiRouterCtrlWifiOnInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint32Ser(ptr, len, (CsrUint32) primitive->versions.chipId); CsrUint32Ser(ptr, len, (CsrUint32) primitive->versions.chipVersion); CsrUint32Ser(ptr, len, (CsrUint32) primitive->versions.firmwareBuild); @@ -1823,8 +1823,8 @@ void* CsrWifiRouterCtrlWifiOnIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->versions.chipId, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->versions.chipVersion, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->versions.firmwareBuild, buffer, &offset); @@ -1860,8 +1860,8 @@ u8* CsrWifiRouterCtrlWifiOnCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlWifiOnCfm *primitive = (CsrWifiRouterCtrlWifiOnCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -1873,8 +1873,8 @@ void* CsrWifiRouterCtrlWifiOnCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -1886,7 +1886,7 @@ CsrSize CsrWifiRouterCtrlM4ReadyToSendIndSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */ return bufferSize; } @@ -1897,9 +1897,9 @@ u8* CsrWifiRouterCtrlM4ReadyToSendIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlM4ReadyToSendInd *primitive = (CsrWifiRouterCtrlM4ReadyToSendInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((CsrUint16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((u16) (6))); return(ptr); } @@ -1911,9 +1911,9 @@ void* CsrWifiRouterCtrlM4ReadyToSendIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((CsrUint16) (6))); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((u16) (6))); return primitive; } @@ -1925,7 +1925,7 @@ CsrSize CsrWifiRouterCtrlM4TransmittedIndSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 15) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; @@ -1937,10 +1937,10 @@ u8* CsrWifiRouterCtrlM4TransmittedIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlM4TransmittedInd *primitive = (CsrWifiRouterCtrlM4TransmittedInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((CsrUint16) (6))); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((u16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -1952,10 +1952,10 @@ void* CsrWifiRouterCtrlM4TransmittedIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((CsrUint16) (6))); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((u16) (6))); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -1967,7 +1967,7 @@ CsrSize CsrWifiRouterCtrlMicFailureIndSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 14) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */ bufferSize += 1; /* CsrBool primitive->unicastPdu */ return bufferSize; @@ -1979,9 +1979,9 @@ u8* CsrWifiRouterCtrlMicFailureIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlMicFailureInd *primitive = (CsrWifiRouterCtrlMicFailureInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((CsrUint16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->unicastPdu); return(ptr); } @@ -1994,9 +1994,9 @@ void* CsrWifiRouterCtrlMicFailureIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((CsrUint16) (6))); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->unicastPdu, buffer, &offset); return primitive; @@ -2009,7 +2009,7 @@ CsrSize CsrWifiRouterCtrlConnectedIndSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 14) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */ bufferSize += 1; /* CsrWifiRouterCtrlPeerStatus primitive->peerStatus */ return bufferSize; @@ -2021,9 +2021,9 @@ u8* CsrWifiRouterCtrlConnectedIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlConnectedInd *primitive = (CsrWifiRouterCtrlConnectedInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((CsrUint16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->peerStatus); return(ptr); } @@ -2036,9 +2036,9 @@ void* CsrWifiRouterCtrlConnectedIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((CsrUint16) (6))); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->peerStatus, buffer, &offset); return primitive; @@ -2051,7 +2051,7 @@ CsrSize CsrWifiRouterCtrlPeerAddCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 19) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */ bufferSize += 4; /* CsrWifiRouterCtrlPeerRecordHandle primitive->peerRecordHandle */ bufferSize += 2; /* CsrResult primitive->status */ @@ -2064,11 +2064,11 @@ u8* CsrWifiRouterCtrlPeerAddCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlPeerAddCfm *primitive = (CsrWifiRouterCtrlPeerAddCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((CsrUint16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((u16) (6))); CsrUint32Ser(ptr, len, (CsrUint32) primitive->peerRecordHandle); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -2080,11 +2080,11 @@ void* CsrWifiRouterCtrlPeerAddCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((CsrUint16) (6))); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((u16) (6))); CsrUint32Des((CsrUint32 *) &primitive->peerRecordHandle, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -2096,7 +2096,7 @@ CsrSize CsrWifiRouterCtrlPeerDelCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 9) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; } @@ -2107,9 +2107,9 @@ u8* CsrWifiRouterCtrlPeerDelCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlPeerDelCfm *primitive = (CsrWifiRouterCtrlPeerDelCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -2121,9 +2121,9 @@ void* CsrWifiRouterCtrlPeerDelCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -2135,7 +2135,7 @@ CsrSize CsrWifiRouterCtrlUnexpectedFrameIndSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */ return bufferSize; } @@ -2146,9 +2146,9 @@ u8* CsrWifiRouterCtrlUnexpectedFrameIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlUnexpectedFrameInd *primitive = (CsrWifiRouterCtrlUnexpectedFrameInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((CsrUint16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((u16) (6))); return(ptr); } @@ -2160,9 +2160,9 @@ void* CsrWifiRouterCtrlUnexpectedFrameIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((CsrUint16) (6))); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((u16) (6))); return primitive; } @@ -2174,7 +2174,7 @@ CsrSize CsrWifiRouterCtrlPeerUpdateCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 9) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; } @@ -2185,9 +2185,9 @@ u8* CsrWifiRouterCtrlPeerUpdateCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlPeerUpdateCfm *primitive = (CsrWifiRouterCtrlPeerUpdateCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -2199,9 +2199,9 @@ void* CsrWifiRouterCtrlPeerUpdateCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -2213,8 +2213,8 @@ CsrSize CsrWifiRouterCtrlCapabilitiesCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 9) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->commandQueueSize */ - bufferSize += 2; /* CsrUint16 primitive->trafficQueueSize */ + bufferSize += 2; /* u16 primitive->commandQueueSize */ + bufferSize += 2; /* u16 primitive->trafficQueueSize */ return bufferSize; } @@ -2224,9 +2224,9 @@ u8* CsrWifiRouterCtrlCapabilitiesCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlCapabilitiesCfm *primitive = (CsrWifiRouterCtrlCapabilitiesCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->commandQueueSize); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->trafficQueueSize); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->commandQueueSize); + CsrUint16Ser(ptr, len, (u16) primitive->trafficQueueSize); return(ptr); } @@ -2238,9 +2238,9 @@ void* CsrWifiRouterCtrlCapabilitiesCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->commandQueueSize, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->trafficQueueSize, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->commandQueueSize, buffer, &offset); + CsrUint16Des((u16 *) &primitive->trafficQueueSize, buffer, &offset); return primitive; } @@ -2252,7 +2252,7 @@ CsrSize CsrWifiRouterCtrlBlockAckEnableCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 9) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; } @@ -2263,9 +2263,9 @@ u8* CsrWifiRouterCtrlBlockAckEnableCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlBlockAckEnableCfm *primitive = (CsrWifiRouterCtrlBlockAckEnableCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -2277,9 +2277,9 @@ void* CsrWifiRouterCtrlBlockAckEnableCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -2291,7 +2291,7 @@ CsrSize CsrWifiRouterCtrlBlockAckDisableCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 9) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; } @@ -2302,9 +2302,9 @@ u8* CsrWifiRouterCtrlBlockAckDisableCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlBlockAckDisableCfm *primitive = (CsrWifiRouterCtrlBlockAckDisableCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -2316,9 +2316,9 @@ void* CsrWifiRouterCtrlBlockAckDisableCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -2330,7 +2330,7 @@ CsrSize CsrWifiRouterCtrlBlockAckErrorIndSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 16) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiRouterCtrlTrafficStreamId primitive->trafficStreamID */ bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */ bufferSize += 2; /* CsrResult primitive->status */ @@ -2343,11 +2343,11 @@ u8* CsrWifiRouterCtrlBlockAckErrorIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlBlockAckErrorInd *primitive = (CsrWifiRouterCtrlBlockAckErrorInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->trafficStreamID); - CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((CsrUint16) (6))); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((u16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -2359,11 +2359,11 @@ void* CsrWifiRouterCtrlBlockAckErrorIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->trafficStreamID, buffer, &offset); - CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((CsrUint16) (6))); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((u16) (6))); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -2375,7 +2375,7 @@ CsrSize CsrWifiRouterCtrlStaInactiveIndSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 6; /* u8 primitive->staAddress.a[6] */ return bufferSize; } @@ -2386,9 +2386,9 @@ u8* CsrWifiRouterCtrlStaInactiveIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlStaInactiveInd *primitive = (CsrWifiRouterCtrlStaInactiveInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrMemCpySer(ptr, len, (const void *) primitive->staAddress.a, ((CsrUint16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrMemCpySer(ptr, len, (const void *) primitive->staAddress.a, ((u16) (6))); return(ptr); } @@ -2400,9 +2400,9 @@ void* CsrWifiRouterCtrlStaInactiveIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrMemCpyDes(primitive->staAddress.a, buffer, &offset, ((CsrUint16) (6))); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrMemCpyDes(primitive->staAddress.a, buffer, &offset, ((u16) (6))); return primitive; } @@ -2415,10 +2415,10 @@ CsrSize CsrWifiRouterCtrlWapiRxMicCheckIndSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ - bufferSize += 2; /* CsrUint16 primitive->signalLength */ + bufferSize += 2; /* u16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->signalLength */ bufferSize += primitive->signalLength; /* u8 primitive->signal */ - bufferSize += 2; /* CsrUint16 primitive->dataLength */ + bufferSize += 2; /* u16 primitive->dataLength */ bufferSize += primitive->dataLength; /* u8 primitive->data */ return bufferSize; } @@ -2429,17 +2429,17 @@ u8* CsrWifiRouterCtrlWapiRxMicCheckIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlWapiRxMicCheckInd *primitive = (CsrWifiRouterCtrlWapiRxMicCheckInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->signalLength); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->signalLength); if (primitive->signalLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->signal, ((CsrUint16) (primitive->signalLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->signal, ((u16) (primitive->signalLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->dataLength); + CsrUint16Ser(ptr, len, (u16) primitive->dataLength); if (primitive->dataLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->data, ((CsrUint16) (primitive->dataLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->data, ((u16) (primitive->dataLength))); } return(ptr); } @@ -2452,23 +2452,23 @@ void* CsrWifiRouterCtrlWapiRxMicCheckIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->signalLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->signalLength, buffer, &offset); if (primitive->signalLength) { primitive->signal = (u8 *)CsrPmemAlloc(primitive->signalLength); - CsrMemCpyDes(primitive->signal, buffer, &offset, ((CsrUint16) (primitive->signalLength))); + CsrMemCpyDes(primitive->signal, buffer, &offset, ((u16) (primitive->signalLength))); } else { primitive->signal = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->dataLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->dataLength, buffer, &offset); if (primitive->dataLength) { primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); - CsrMemCpyDes(primitive->data, buffer, &offset, ((CsrUint16) (primitive->dataLength))); + CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); } else { @@ -2494,7 +2494,7 @@ CsrSize CsrWifiRouterCtrlModeSetCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 10) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiRouterCtrlMode primitive->mode */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; @@ -2506,10 +2506,10 @@ u8* CsrWifiRouterCtrlModeSetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterCtrlModeSetCfm *primitive = (CsrWifiRouterCtrlModeSetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->mode); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -2521,10 +2521,10 @@ void* CsrWifiRouterCtrlModeSetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->mode, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -2537,8 +2537,8 @@ CsrSize CsrWifiRouterCtrlWapiUnicastTxEncryptIndSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 10) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ - bufferSize += 2; /* CsrUint16 primitive->dataLength */ + bufferSize += 2; /* u16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->dataLength */ bufferSize += primitive->dataLength; /* u8 primitive->data */ return bufferSize; } @@ -2549,12 +2549,12 @@ u8* CsrWifiRouterCtrlWapiUnicastTxEncryptIndSer(u8 *ptr, CsrSize *len, void *msg CsrWifiRouterCtrlWapiUnicastTxEncryptInd *primitive = (CsrWifiRouterCtrlWapiUnicastTxEncryptInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->clientData); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->dataLength); + CsrUint16Ser(ptr, len, (u16) primitive->clientData); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->dataLength); if (primitive->dataLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->data, ((CsrUint16) (primitive->dataLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->data, ((u16) (primitive->dataLength))); } return(ptr); } @@ -2567,13 +2567,13 @@ void* CsrWifiRouterCtrlWapiUnicastTxEncryptIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->clientData, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->dataLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->dataLength, buffer, &offset); if (primitive->dataLength) { primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); - CsrMemCpyDes(primitive->data, buffer, &offset, ((CsrUint16) (primitive->dataLength))); + CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); } else { diff --git a/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c index 9ae6cff640e..24d4ae20990 100644 --- a/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c +++ b/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c @@ -25,7 +25,7 @@ * eventClass: only the value CSR_WIFI_ROUTER_PRIM will be handled * message: the message to free *----------------------------------------------------------------------------*/ -void CsrWifiRouterFreeDownstreamMessageContents(CsrUint16 eventClass, void *message) +void CsrWifiRouterFreeDownstreamMessageContents(u16 eventClass, void *message) { if (eventClass != CSR_WIFI_ROUTER_PRIM) { diff --git a/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c index 19d9c23f6dd..2faaaace9da 100644 --- a/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c +++ b/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c @@ -25,7 +25,7 @@ * eventClass: only the value CSR_WIFI_ROUTER_PRIM will be handled * message: the message to free *----------------------------------------------------------------------------*/ -void CsrWifiRouterFreeUpstreamMessageContents(CsrUint16 eventClass, void *message) +void CsrWifiRouterFreeUpstreamMessageContents(u16 eventClass, void *message) { if (eventClass != CSR_WIFI_ROUTER_PRIM) { diff --git a/drivers/staging/csr/csr_wifi_router_lib.h b/drivers/staging/csr/csr_wifi_router_lib.h index 553e7d36e35..4d1fb2794dc 100644 --- a/drivers/staging/csr/csr_wifi_router_lib.h +++ b/drivers/staging/csr/csr_wifi_router_lib.h @@ -39,7 +39,7 @@ extern "C" { * PARAMETERS * Deallocates the resources in a CSR_WIFI_ROUTER upstream message *----------------------------------------------------------------------------*/ -void CsrWifiRouterFreeUpstreamMessageContents(CsrUint16 eventClass, void *message); +void CsrWifiRouterFreeUpstreamMessageContents(u16 eventClass, void *message); /*----------------------------------------------------------------------------* * CsrWifiRouterFreeDownstreamMessageContents @@ -51,7 +51,7 @@ void CsrWifiRouterFreeUpstreamMessageContents(CsrUint16 eventClass, void *messag * PARAMETERS * Deallocates the resources in a CSR_WIFI_ROUTER downstream message *----------------------------------------------------------------------------*/ -void CsrWifiRouterFreeDownstreamMessageContents(CsrUint16 eventClass, void *message); +void CsrWifiRouterFreeDownstreamMessageContents(u16 eventClass, void *message); /*----------------------------------------------------------------------------* * Enum to string functions diff --git a/drivers/staging/csr/csr_wifi_router_prim.h b/drivers/staging/csr/csr_wifi_router_prim.h index 182cbfc3dd3..b05ce1a5fba 100644 --- a/drivers/staging/csr/csr_wifi_router_prim.h +++ b/drivers/staging/csr/csr_wifi_router_prim.h @@ -116,7 +116,7 @@ typedef CsrUint32 CsrWifiRouterOui; - See IEEE 802.11 Standard *******************************************************************************/ -typedef CsrUint16 CsrWifiRouterPriority; +typedef u16 CsrWifiRouterPriority; #define CSR_WIFI_ROUTER_PRIORITY_QOS_UP0 ((CsrWifiRouterPriority) 0x0000) #define CSR_WIFI_ROUTER_PRIORITY_QOS_UP1 ((CsrWifiRouterPriority) 0x0001) #define CSR_WIFI_ROUTER_PRIORITY_QOS_UP2 ((CsrWifiRouterPriority) 0x0002) @@ -180,9 +180,9 @@ typedef CsrUint16 CsrWifiRouterPriority; typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiRouterEncapsulation encapsulation; - CsrUint16 protocol; + u16 protocol; CsrUint32 oui; } CsrWifiRouterMaPacketSubscribeReq; @@ -203,7 +203,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; u8 subscriptionHandle; } CsrWifiRouterMaPacketUnsubscribeReq; @@ -242,9 +242,9 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; u8 subscriptionHandle; - CsrUint16 frameLength; + u16 frameLength; u8 *frame; CsrWifiRouterFrameFreeFunction freeFunction; CsrWifiRouterPriority priority; @@ -271,7 +271,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; u8 subscriptionHandle; CsrResult result; } CsrWifiRouterMaPacketRes; @@ -304,7 +304,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrUint32 hostTag; CsrWifiRouterPriority priority; CsrWifiMacAddress peerMacAddress; @@ -331,10 +331,10 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; u8 subscriptionHandle; CsrResult status; - CsrUint16 allocOffset; + u16 allocOffset; } CsrWifiRouterMaPacketSubscribeCfm; /******************************************************************************* @@ -355,7 +355,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiRouterMaPacketUnsubscribeCfm; @@ -379,10 +379,10 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult result; CsrUint32 hostTag; - CsrUint16 rate; + u16 rate; } CsrWifiRouterMaPacketCfm; /******************************************************************************* @@ -410,15 +410,15 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; u8 subscriptionHandle; CsrResult result; - CsrUint16 frameLength; + u16 frameLength; u8 *frame; CsrWifiRouterFrameFreeFunction freeFunction; CsrInt16 rssi; CsrInt16 snr; - CsrUint16 rate; + u16 rate; } CsrWifiRouterMaPacketInd; diff --git a/drivers/staging/csr/csr_wifi_router_serialize.c b/drivers/staging/csr/csr_wifi_router_serialize.c index e744db885b8..e488564782e 100644 --- a/drivers/staging/csr/csr_wifi_router_serialize.c +++ b/drivers/staging/csr/csr_wifi_router_serialize.c @@ -29,9 +29,9 @@ CsrSize CsrWifiRouterMaPacketSubscribeReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 12) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiRouterEncapsulation primitive->encapsulation */ - bufferSize += 2; /* CsrUint16 primitive->protocol */ + bufferSize += 2; /* u16 primitive->protocol */ bufferSize += 4; /* CsrUint32 primitive->oui */ return bufferSize; } @@ -42,9 +42,9 @@ u8* CsrWifiRouterMaPacketSubscribeReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterMaPacketSubscribeReq *primitive = (CsrWifiRouterMaPacketSubscribeReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->encapsulation); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->protocol); + CsrUint16Ser(ptr, len, (u16) primitive->protocol); CsrUint32Ser(ptr, len, (CsrUint32) primitive->oui); return(ptr); } @@ -57,9 +57,9 @@ void* CsrWifiRouterMaPacketSubscribeReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->encapsulation, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->protocol, buffer, &offset); + CsrUint16Des((u16 *) &primitive->protocol, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->oui, buffer, &offset); return primitive; @@ -72,9 +72,9 @@ CsrSize CsrWifiRouterMaPacketReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 20) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* u8 primitive->subscriptionHandle */ - bufferSize += 2; /* CsrUint16 primitive->frameLength */ + bufferSize += 2; /* u16 primitive->frameLength */ bufferSize += primitive->frameLength; /* u8 primitive->frame */ bufferSize += 4; /* CsrWifiRouterFrameFreeFunction primitive->freeFunction */ bufferSize += 2; /* CsrWifiRouterPriority primitive->priority */ @@ -89,15 +89,15 @@ u8* CsrWifiRouterMaPacketReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterMaPacketReq *primitive = (CsrWifiRouterMaPacketReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->subscriptionHandle); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->frameLength); + CsrUint16Ser(ptr, len, (u16) primitive->frameLength); if (primitive->frameLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->frame, ((CsrUint16) (primitive->frameLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->frame, ((u16) (primitive->frameLength))); } CsrUint32Ser(ptr, len, 0); /* Special for Function Pointers... primitive->freeFunction */ - CsrUint16Ser(ptr, len, (CsrUint16) primitive->priority); + CsrUint16Ser(ptr, len, (u16) primitive->priority); CsrUint32Ser(ptr, len, (CsrUint32) primitive->hostTag); CsrUint8Ser(ptr, len, (u8) primitive->cfmRequested); return(ptr); @@ -111,13 +111,13 @@ void* CsrWifiRouterMaPacketReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->subscriptionHandle, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->frameLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->frameLength, buffer, &offset); if (primitive->frameLength) { primitive->frame = (u8 *)CsrPmemAlloc(primitive->frameLength); - CsrMemCpyDes(primitive->frame, buffer, &offset, ((CsrUint16) (primitive->frameLength))); + CsrMemCpyDes(primitive->frame, buffer, &offset, ((u16) (primitive->frameLength))); } else { @@ -125,7 +125,7 @@ void* CsrWifiRouterMaPacketReqDes(u8 *buffer, CsrSize length) } primitive->freeFunction = NULL; /* Special for Function Pointers... */ offset += 4; - CsrUint16Des((CsrUint16 *) &primitive->priority, buffer, &offset); + CsrUint16Des((u16 *) &primitive->priority, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->hostTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->cfmRequested, buffer, &offset); @@ -146,7 +146,7 @@ CsrSize CsrWifiRouterMaPacketResSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 8) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* u8 primitive->subscriptionHandle */ bufferSize += 2; /* CsrResult primitive->result */ return bufferSize; @@ -158,9 +158,9 @@ u8* CsrWifiRouterMaPacketResSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterMaPacketRes *primitive = (CsrWifiRouterMaPacketRes *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->subscriptionHandle); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->result); + CsrUint16Ser(ptr, len, (u16) primitive->result); return(ptr); } @@ -172,9 +172,9 @@ void* CsrWifiRouterMaPacketResDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->subscriptionHandle, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->result, buffer, &offset); + CsrUint16Des((u16 *) &primitive->result, buffer, &offset); return primitive; } @@ -185,7 +185,7 @@ CsrSize CsrWifiRouterMaPacketCancelReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 17) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 4; /* CsrUint32 primitive->hostTag */ bufferSize += 2; /* CsrWifiRouterPriority primitive->priority */ bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */ @@ -198,10 +198,10 @@ u8* CsrWifiRouterMaPacketCancelReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterMaPacketCancelReq *primitive = (CsrWifiRouterMaPacketCancelReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint32Ser(ptr, len, (CsrUint32) primitive->hostTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->priority); - CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((CsrUint16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->priority); + CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((u16) (6))); return(ptr); } @@ -213,10 +213,10 @@ void* CsrWifiRouterMaPacketCancelReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->hostTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->priority, buffer, &offset); - CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((CsrUint16) (6))); + CsrUint16Des((u16 *) &primitive->priority, buffer, &offset); + CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((u16) (6))); return primitive; } @@ -227,10 +227,10 @@ CsrSize CsrWifiRouterMaPacketSubscribeCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 10) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* u8 primitive->subscriptionHandle */ bufferSize += 2; /* CsrResult primitive->status */ - bufferSize += 2; /* CsrUint16 primitive->allocOffset */ + bufferSize += 2; /* u16 primitive->allocOffset */ return bufferSize; } @@ -240,10 +240,10 @@ u8* CsrWifiRouterMaPacketSubscribeCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterMaPacketSubscribeCfm *primitive = (CsrWifiRouterMaPacketSubscribeCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->subscriptionHandle); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->allocOffset); + CsrUint16Ser(ptr, len, (u16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->allocOffset); return(ptr); } @@ -255,10 +255,10 @@ void* CsrWifiRouterMaPacketSubscribeCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->subscriptionHandle, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->allocOffset, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->allocOffset, buffer, &offset); return primitive; } @@ -269,7 +269,7 @@ CsrSize CsrWifiRouterMaPacketUnsubscribeCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 7) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; } @@ -280,8 +280,8 @@ u8* CsrWifiRouterMaPacketUnsubscribeCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterMaPacketUnsubscribeCfm *primitive = (CsrWifiRouterMaPacketUnsubscribeCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -293,8 +293,8 @@ void* CsrWifiRouterMaPacketUnsubscribeCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -305,10 +305,10 @@ CsrSize CsrWifiRouterMaPacketCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->result */ bufferSize += 4; /* CsrUint32 primitive->hostTag */ - bufferSize += 2; /* CsrUint16 primitive->rate */ + bufferSize += 2; /* u16 primitive->rate */ return bufferSize; } @@ -318,10 +318,10 @@ u8* CsrWifiRouterMaPacketCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterMaPacketCfm *primitive = (CsrWifiRouterMaPacketCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->result); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->result); CsrUint32Ser(ptr, len, (CsrUint32) primitive->hostTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->rate); + CsrUint16Ser(ptr, len, (u16) primitive->rate); return(ptr); } @@ -333,10 +333,10 @@ void* CsrWifiRouterMaPacketCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->result, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->result, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->hostTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->rate, buffer, &offset); + CsrUint16Des((u16 *) &primitive->rate, buffer, &offset); return primitive; } @@ -348,15 +348,15 @@ CsrSize CsrWifiRouterMaPacketIndSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 21) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* u8 primitive->subscriptionHandle */ bufferSize += 2; /* CsrResult primitive->result */ - bufferSize += 2; /* CsrUint16 primitive->frameLength */ + bufferSize += 2; /* u16 primitive->frameLength */ bufferSize += primitive->frameLength; /* u8 primitive->frame */ bufferSize += 4; /* CsrWifiRouterFrameFreeFunction primitive->freeFunction */ bufferSize += 2; /* CsrInt16 primitive->rssi */ bufferSize += 2; /* CsrInt16 primitive->snr */ - bufferSize += 2; /* CsrUint16 primitive->rate */ + bufferSize += 2; /* u16 primitive->rate */ return bufferSize; } @@ -366,18 +366,18 @@ u8* CsrWifiRouterMaPacketIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiRouterMaPacketInd *primitive = (CsrWifiRouterMaPacketInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->subscriptionHandle); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->result); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->frameLength); + CsrUint16Ser(ptr, len, (u16) primitive->result); + CsrUint16Ser(ptr, len, (u16) primitive->frameLength); if (primitive->frameLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->frame, ((CsrUint16) (primitive->frameLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->frame, ((u16) (primitive->frameLength))); } CsrUint32Ser(ptr, len, 0); /* Special for Function Pointers... primitive->freeFunction */ - CsrUint16Ser(ptr, len, (CsrUint16) primitive->rssi); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->snr); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->rate); + CsrUint16Ser(ptr, len, (u16) primitive->rssi); + CsrUint16Ser(ptr, len, (u16) primitive->snr); + CsrUint16Ser(ptr, len, (u16) primitive->rate); return(ptr); } @@ -389,14 +389,14 @@ void* CsrWifiRouterMaPacketIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->subscriptionHandle, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->result, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->frameLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->result, buffer, &offset); + CsrUint16Des((u16 *) &primitive->frameLength, buffer, &offset); if (primitive->frameLength) { primitive->frame = (u8 *)CsrPmemAlloc(primitive->frameLength); - CsrMemCpyDes(primitive->frame, buffer, &offset, ((CsrUint16) (primitive->frameLength))); + CsrMemCpyDes(primitive->frame, buffer, &offset, ((u16) (primitive->frameLength))); } else { @@ -404,9 +404,9 @@ void* CsrWifiRouterMaPacketIndDes(u8 *buffer, CsrSize length) } primitive->freeFunction = NULL; /* Special for Function Pointers... */ offset += 4; - CsrUint16Des((CsrUint16 *) &primitive->rssi, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->snr, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->rate, buffer, &offset); + CsrUint16Des((u16 *) &primitive->rssi, buffer, &offset); + CsrUint16Des((u16 *) &primitive->snr, buffer, &offset); + CsrUint16Des((u16 *) &primitive->rate, buffer, &offset); return primitive; } diff --git a/drivers/staging/csr/csr_wifi_router_transport.c b/drivers/staging/csr/csr_wifi_router_transport.c index 45bee240deb..3247b5890f6 100644 --- a/drivers/staging/csr/csr_wifi_router_transport.c +++ b/drivers/staging/csr/csr_wifi_router_transport.c @@ -64,10 +64,10 @@ void CsrWifiRouterTransportDeinit(unifi_priv_t *priv) void CsrWifiRouterTransportRecv(unifi_priv_t *priv, u8* buffer, CsrSize bufferLength) { CsrMsgConvMsgEntry* msgEntry; - CsrUint16 primType; + u16 primType; CsrSchedQid src; CsrSchedQid dest; - CsrUint16 msgType; + u16 msgType; CsrSize offset = 0; CsrWifiFsmEvent* msg; @@ -96,13 +96,13 @@ void CsrWifiRouterTransportRecv(unifi_priv_t *priv, u8* buffer, CsrSize bufferLe if (req.dataRef1Length) { - CsrUint16 dr1Offset = (bufferLength - req.dataRef2Length) - req.dataRef1Length; + u16 dr1Offset = (bufferLength - req.dataRef2Length) - req.dataRef1Length; req.dataRef1 = &buffer[dr1Offset]; } if (req.dataRef2Length) { - CsrUint16 dr2Offset = bufferLength - req.dataRef2Length; + u16 dr2Offset = bufferLength - req.dataRef2Length; req.dataRef2 = &buffer[dr2Offset]; } @@ -159,7 +159,7 @@ void CsrWifiRouterTransportRecv(unifi_priv_t *priv, u8* buffer, CsrSize bufferLe CsrPmemFree(msg); } -static void CsrWifiRouterTransportSerialiseAndSend(CsrUint16 primType, void* msg) +static void CsrWifiRouterTransportSerialiseAndSend(u16 primType, void* msg) { CsrWifiFsmEvent* evt = (CsrWifiFsmEvent*)msg; CsrMsgConvMsgEntry* msgEntry; @@ -198,9 +198,9 @@ static void CsrWifiRouterTransportSerialiseAndSend(CsrUint16 primType, void* msg } #if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER) -void CsrSchedMessagePutStringLog(CsrSchedQid q, CsrUint16 mi, void *mv, CsrUint32 line, CsrCharString *file) +void CsrSchedMessagePutStringLog(CsrSchedQid q, u16 mi, void *mv, CsrUint32 line, CsrCharString *file) #else -void CsrSchedMessagePut(CsrSchedQid q, CsrUint16 mi, void *mv) +void CsrSchedMessagePut(CsrSchedQid q, u16 mi, void *mv) #endif { CsrWifiFsmEvent* evt = (CsrWifiFsmEvent*)mv; diff --git a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c index 0e5e20116e0..b81e51a8c4f 100644 --- a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c +++ b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c @@ -30,9 +30,9 @@ void CsrUint24Des(CsrUint32 *v, u8 *buffer, CsrSize *offset) /* Big endian :e.g WSC, TCLAS */ -void CsrUint16DesBigEndian(CsrUint16 *v, u8 *buffer, CsrSize *offset) +void CsrUint16DesBigEndian(u16 *v, u8 *buffer, CsrSize *offset) { - CsrUint16 val; + u16 val; val = (buffer[(*offset)] << 8) | (buffer[(*offset) + 1]); *offset += 2; @@ -79,7 +79,7 @@ void CsrUint24Ser(u8 *ptr, CsrSize *len, CsrUint32 v) /* Big endian :e.g WSC, TCLAS */ -void CsrUint16SerBigEndian(u8 *ptr, CsrSize *len, CsrUint16 v) +void CsrUint16SerBigEndian(u8 *ptr, CsrSize *len, u16 v) { ptr[(*len)] = (u8)((v & 0xff00) >> 8); ptr[(*len) + 1] = (u8)((v & 0x00ff)); diff --git a/drivers/staging/csr/csr_wifi_sme_ap_lib.h b/drivers/staging/csr/csr_wifi_sme_ap_lib.h index bb9e79f95ec..06e4130ef78 100644 --- a/drivers/staging/csr/csr_wifi_sme_ap_lib.h +++ b/drivers/staging/csr/csr_wifi_sme_ap_lib.h @@ -43,7 +43,7 @@ extern "C" { * PARAMETERS * Deallocates the resources in a CSR_WIFI_SME_AP upstream message *----------------------------------------------------------------------------*/ -void CsrWifiSmeApFreeUpstreamMessageContents(CsrUint16 eventClass, void *message); +void CsrWifiSmeApFreeUpstreamMessageContents(u16 eventClass, void *message); /*----------------------------------------------------------------------------* * CsrWifiSmeApFreeDownstreamMessageContents @@ -55,7 +55,7 @@ void CsrWifiSmeApFreeUpstreamMessageContents(CsrUint16 eventClass, void *message * PARAMETERS * Deallocates the resources in a CSR_WIFI_SME_AP downstream message *----------------------------------------------------------------------------*/ -void CsrWifiSmeApFreeDownstreamMessageContents(CsrUint16 eventClass, void *message); +void CsrWifiSmeApFreeDownstreamMessageContents(u16 eventClass, void *message); /*----------------------------------------------------------------------------* * Enum to string functions @@ -525,7 +525,7 @@ extern const CsrCharString *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM msg__->secIeLength = (secIeLength__); \ msg__->secIe = (secIe__); \ msg__->groupKeyId = (groupKeyId__); \ - CsrMemCpy(msg__->seqNumber, (seqNumber__), sizeof(CsrUint16) * 8); + CsrMemCpy(msg__->seqNumber, (seqNumber__), sizeof(u16) * 8); #define CsrWifiSmeApStaNotifyIndSendTo(dst__, src__, interfaceTag__, mediaStatus__, peerMacAddress__, peerDeviceAddress__, disassocReason__, deauthReason__, WpsRegistration__, secIeLength__, secIe__, groupKeyId__, seqNumber__) \ { \ diff --git a/drivers/staging/csr/csr_wifi_sme_ap_prim.h b/drivers/staging/csr/csr_wifi_sme_ap_prim.h index be275afa01b..363c10bdaf6 100644 --- a/drivers/staging/csr/csr_wifi_sme_ap_prim.h +++ b/drivers/staging/csr/csr_wifi_sme_ap_prim.h @@ -181,7 +181,7 @@ typedef u8 CsrWifiSmeApPhySupportMask; Set to 0 for the current release *******************************************************************************/ -typedef CsrUint16 CsrWifiSmeApRsnCapabilities; +typedef u16 CsrWifiSmeApRsnCapabilities; /******************************************************************************* NAME @@ -191,7 +191,7 @@ typedef CsrUint16 CsrWifiSmeApRsnCapabilities; Mask type for use with the values defined by CsrWifiSmeApRsnCapabilities *******************************************************************************/ -typedef CsrUint16 CsrWifiSmeApRsnCapabilitiesMask; +typedef u16 CsrWifiSmeApRsnCapabilitiesMask; /******************************************************************************* NAME @@ -202,7 +202,7 @@ typedef CsrUint16 CsrWifiSmeApRsnCapabilitiesMask; current release *******************************************************************************/ -typedef CsrUint16 CsrWifiSmeApWapiCapabilities; +typedef u16 CsrWifiSmeApWapiCapabilities; /******************************************************************************* NAME @@ -212,7 +212,7 @@ typedef CsrUint16 CsrWifiSmeApWapiCapabilities; Mask type for use with the values defined by CsrWifiSmeApWapiCapabilities *******************************************************************************/ -typedef CsrUint16 CsrWifiSmeApWapiCapabilitiesMask; +typedef u16 CsrWifiSmeApWapiCapabilitiesMask; /******************************************************************************* @@ -383,9 +383,9 @@ typedef struct typedef struct { CsrWifiSmeApPhySupportMask phySupportedBitmap; - CsrUint16 beaconInterval; + u16 beaconInterval; u8 dtimPeriod; - CsrUint16 maxListenInterval; + u16 maxListenInterval; u8 supportedRatesCount; u8 supportedRates[20]; CsrWifiSmePreambleType preamble; @@ -550,7 +550,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; u8 initialPresence; CsrWifiSmeApType apType; CsrBool cloakSsid; @@ -579,7 +579,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; } CsrWifiSmeApBeaconingStopReq; /******************************************************************************* @@ -600,7 +600,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeWpsDpid SelectedDevicePasswordId; CsrWifiSmeWpsConfigType SelectedconfigMethod; } CsrWifiSmeApWpsRegistrationStartedReq; @@ -621,7 +621,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; } CsrWifiSmeApWpsRegistrationFinishedReq; /******************************************************************************* @@ -643,7 +643,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeWmmAcParams wmmApParams[4]; CsrWifiSmeWmmAcParams wmmApBcParams[4]; } CsrWifiSmeApWmmParamUpdateReq; @@ -671,7 +671,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeIEEE80211Reason deauthReason; CsrWifiSmeIEEE80211Reason disassocReason; CsrWifiMacAddress peerMacaddress; @@ -715,7 +715,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; } CsrWifiSmeApActiveBaGetReq; /******************************************************************************* @@ -736,7 +736,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeIEEE80211Reason reason; CsrWifiSmeApBaSession baSession; } CsrWifiSmeApBaDeleteReq; @@ -761,9 +761,9 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; - CsrUint16 secIeLength; + u16 secIeLength; u8 *secIe; } CsrWifiSmeApBeaconingStartCfm; @@ -784,7 +784,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiSmeApBeaconingStopCfm; @@ -815,7 +815,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeMediaStatus mediaStatus; CsrWifiMacAddress peerMacAddress; CsrWifiMacAddress peerDeviceAddress; @@ -825,7 +825,7 @@ typedef struct u8 secIeLength; u8 *secIe; u8 groupKeyId; - CsrUint16 seqNumber[8]; + u16 seqNumber[8]; } CsrWifiSmeApStaNotifyInd; /******************************************************************************* @@ -846,7 +846,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiMacAddress peerMacAddress; } CsrWifiSmeApStaConnectStartInd; @@ -867,7 +867,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiSmeApWpsRegistrationStartedCfm; @@ -888,7 +888,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiSmeApWpsRegistrationFinishedCfm; @@ -909,7 +909,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiSmeApWmmParamUpdateCfm; @@ -931,7 +931,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiMacAddress peerMacaddress; } CsrWifiSmeApStaDisconnectCfm; @@ -976,7 +976,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeApType apType; CsrResult status; } CsrWifiSmeApErrorInd; @@ -1001,9 +1001,9 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; - CsrUint16 activeBaCount; + u16 activeBaCount; CsrWifiSmeApBaSession *activeBaSessions; } CsrWifiSmeApActiveBaGetCfm; @@ -1025,7 +1025,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiSmeApBaSession baSession; } CsrWifiSmeApBaDeleteCfm; diff --git a/drivers/staging/csr/csr_wifi_sme_converter_init.c b/drivers/staging/csr/csr_wifi_sme_converter_init.c index 6897a77faf2..18373afcfdd 100644 --- a/drivers/staging/csr/csr_wifi_sme_converter_init.c +++ b/drivers/staging/csr/csr_wifi_sme_converter_init.c @@ -156,11 +156,11 @@ static CsrMsgConvMsgEntry csrwifisme_conv_lut[] = { { 0, NULL, NULL, NULL, NULL }, }; -CsrMsgConvMsgEntry* CsrWifiSmeConverterLookup(CsrMsgConvMsgEntry *ce, CsrUint16 msgType) +CsrMsgConvMsgEntry* CsrWifiSmeConverterLookup(CsrMsgConvMsgEntry *ce, u16 msgType) { if (msgType & CSR_PRIM_UPSTREAM) { - CsrUint16 idx = (msgType & ~CSR_PRIM_UPSTREAM) + CSR_WIFI_SME_PRIM_DOWNSTREAM_COUNT; + u16 idx = (msgType & ~CSR_PRIM_UPSTREAM) + CSR_WIFI_SME_PRIM_DOWNSTREAM_COUNT; if (idx < (CSR_WIFI_SME_PRIM_UPSTREAM_COUNT + CSR_WIFI_SME_PRIM_DOWNSTREAM_COUNT) && csrwifisme_conv_lut[idx].msgType == msgType) { diff --git a/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c index 93e75e5ace1..826ef3a9b82 100644 --- a/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c +++ b/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c @@ -25,7 +25,7 @@ * eventClass: only the value CSR_WIFI_SME_PRIM will be handled * message: the message to free *----------------------------------------------------------------------------*/ -void CsrWifiSmeFreeDownstreamMessageContents(CsrUint16 eventClass, void *message) +void CsrWifiSmeFreeDownstreamMessageContents(u16 eventClass, void *message) { if (eventClass != CSR_WIFI_SME_PRIM) { @@ -132,7 +132,7 @@ void CsrWifiSmeFreeDownstreamMessageContents(CsrUint16 eventClass, void *message { CsrWifiSmeWifiFlightmodeReq *p = (CsrWifiSmeWifiFlightmodeReq *)message; { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < p->mibFilesCount; i1++) { CsrPmemFree(p->mibFiles[i1].data); @@ -147,7 +147,7 @@ void CsrWifiSmeFreeDownstreamMessageContents(CsrUint16 eventClass, void *message { CsrWifiSmeWifiOnReq *p = (CsrWifiSmeWifiOnReq *)message; { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < p->mibFilesCount; i1++) { CsrPmemFree(p->mibFiles[i1].data); diff --git a/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c index c32bf6877bf..c34b57e960d 100644 --- a/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c +++ b/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c @@ -25,7 +25,7 @@ * eventClass: only the value CSR_WIFI_SME_PRIM will be handled * message: the message to free *----------------------------------------------------------------------------*/ -void CsrWifiSmeFreeUpstreamMessageContents(CsrUint16 eventClass, void *message) +void CsrWifiSmeFreeUpstreamMessageContents(u16 eventClass, void *message) { if (eventClass != CSR_WIFI_SME_PRIM) { @@ -161,7 +161,7 @@ void CsrWifiSmeFreeUpstreamMessageContents(CsrUint16 eventClass, void *message) { case CSR_WIFI_SME_P2P_ROLE_GO: { - CsrUint16 i4; + u16 i4; for (i4 = 0; i4 < p->result.deviceInfo.groupInfo.p2pClientInfoCount; i4++) { CsrPmemFree(p->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType); @@ -184,7 +184,7 @@ void CsrWifiSmeFreeUpstreamMessageContents(CsrUint16 eventClass, void *message) { CsrWifiSmeScanResultsGetCfm *p = (CsrWifiSmeScanResultsGetCfm *)message; { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < p->scanResultsCount; i1++) { CsrPmemFree(p->scanResults[i1].informationElements); @@ -193,7 +193,7 @@ void CsrWifiSmeFreeUpstreamMessageContents(CsrUint16 eventClass, void *message) { case CSR_WIFI_SME_P2P_ROLE_GO: { - CsrUint16 i4; + u16 i4; for (i4 = 0; i4 < p->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount; i4++) { CsrPmemFree(p->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType); diff --git a/drivers/staging/csr/csr_wifi_sme_lib.h b/drivers/staging/csr/csr_wifi_sme_lib.h index 63ac5dfcf28..1c05f03cf95 100644 --- a/drivers/staging/csr/csr_wifi_sme_lib.h +++ b/drivers/staging/csr/csr_wifi_sme_lib.h @@ -49,7 +49,7 @@ extern "C" { * PARAMETERS * Deallocates the resources in a CSR_WIFI_SME upstream message *----------------------------------------------------------------------------*/ -void CsrWifiSmeFreeUpstreamMessageContents(CsrUint16 eventClass, void *message); +void CsrWifiSmeFreeUpstreamMessageContents(u16 eventClass, void *message); /*----------------------------------------------------------------------------* * CsrWifiSmeFreeDownstreamMessageContents @@ -61,7 +61,7 @@ void CsrWifiSmeFreeUpstreamMessageContents(CsrUint16 eventClass, void *message); * PARAMETERS * Deallocates the resources in a CSR_WIFI_SME downstream message *----------------------------------------------------------------------------*/ -void CsrWifiSmeFreeDownstreamMessageContents(CsrUint16 eventClass, void *message); +void CsrWifiSmeFreeDownstreamMessageContents(u16 eventClass, void *message); /*----------------------------------------------------------------------------* * Enum to string functions diff --git a/drivers/staging/csr/csr_wifi_sme_prim.h b/drivers/staging/csr/csr_wifi_sme_prim.h index 700f268ca76..731f4bf0819 100644 --- a/drivers/staging/csr/csr_wifi_sme_prim.h +++ b/drivers/staging/csr/csr_wifi_sme_prim.h @@ -161,7 +161,7 @@ typedef u8 CsrWifiSmeAmpStatus; - For future use. *******************************************************************************/ -typedef CsrUint16 CsrWifiSmeAuthMode; +typedef u16 CsrWifiSmeAuthMode; #define CSR_WIFI_SME_AUTH_MODE_80211_OPEN ((CsrWifiSmeAuthMode) 0x0001) #define CSR_WIFI_SME_AUTH_MODE_80211_SHARED ((CsrWifiSmeAuthMode) 0x0002) #define CSR_WIFI_SME_AUTH_MODE_8021X_WPA ((CsrWifiSmeAuthMode) 0x0004) @@ -368,7 +368,7 @@ typedef u8 CsrWifiSmeD3AutoScanMode; - Selects SMS4 for broadcast messages *******************************************************************************/ -typedef CsrUint16 CsrWifiSmeEncryption; +typedef u16 CsrWifiSmeEncryption; #define CSR_WIFI_SME_ENCRYPTION_CIPHER_NONE ((CsrWifiSmeEncryption) 0x0000) #define CSR_WIFI_SME_ENCRYPTION_CIPHER_PAIRWISE_WEP40 ((CsrWifiSmeEncryption) 0x0001) #define CSR_WIFI_SME_ENCRYPTION_CIPHER_PAIRWISE_WEP104 ((CsrWifiSmeEncryption) 0x0002) @@ -525,7 +525,7 @@ typedef u8 CsrWifiSmeHostPowerMode; - See IEEE 802.11 Standard *******************************************************************************/ -typedef CsrUint16 CsrWifiSmeIEEE80211Reason; +typedef u16 CsrWifiSmeIEEE80211Reason; #define CSR_WIFI_SME_IEEE80211_REASON_SUCCESS ((CsrWifiSmeIEEE80211Reason) 0x0000) #define CSR_WIFI_SME_IEEE80211_REASON_UNSPECIFIED_REASON ((CsrWifiSmeIEEE80211Reason) 0x0001) #define CSR_WIFI_SME_IEEE80211_REASON_AUTHENTICATION_NOT_VALID ((CsrWifiSmeIEEE80211Reason) 0x0002) @@ -712,7 +712,7 @@ typedef CsrUint16 CsrWifiSmeIEEE80211Reason; - See IEEE 802.11 Standard *******************************************************************************/ -typedef CsrUint16 CsrWifiSmeIEEE80211Result; +typedef u16 CsrWifiSmeIEEE80211Result; #define CSR_WIFI_SME_IEEE80211_RESULT_SUCCESS ((CsrWifiSmeIEEE80211Result) 0x0000) #define CSR_WIFI_SME_IEEE80211_RESULT_UNSPECIFIED_FAILURE ((CsrWifiSmeIEEE80211Result) 0x0001) #define CSR_WIFI_SME_IEEE80211_RESULT_REFUSED_CAPABILITIES_MISMATCH ((CsrWifiSmeIEEE80211Result) 0x000a) @@ -1534,7 +1534,7 @@ typedef u8 CsrWifiSmeWmmQosInfo; - Physical Display : Attached to the device *******************************************************************************/ -typedef CsrUint16 CsrWifiSmeWpsConfigType; +typedef u16 CsrWifiSmeWpsConfigType; #define CSR_WIFI_WPS_CONFIG_LABEL ((CsrWifiSmeWpsConfigType) 0x0004) #define CSR_WIFI_WPS_CONFIG_DISPLAY ((CsrWifiSmeWpsConfigType) 0x0008) #define CSR_WIFI_WPS_CONFIG_EXT_NFC ((CsrWifiSmeWpsConfigType) 0x0010) @@ -1806,7 +1806,7 @@ typedef u8 CsrWifiSmeWpsDeviceSubCategory; negotiation procedure *******************************************************************************/ -typedef CsrUint16 CsrWifiSmeWpsDpid; +typedef u16 CsrWifiSmeWpsDpid; #define CSR_WIFI_SME_WPS_DPID_PIN ((CsrWifiSmeWpsDpid) 0x0000) #define CSR_WIFI_SME_WPS_DPID_USER ((CsrWifiSmeWpsDpid) 0x0001) #define CSR_WIFI_SME_WPS_DPID_MACHINE ((CsrWifiSmeWpsDpid) 0x0002) @@ -1842,7 +1842,7 @@ typedef u8 CsrWifiSmeWpsRegistration; Mask type for use with the values defined by CsrWifiSmeAuthMode *******************************************************************************/ -typedef CsrUint16 CsrWifiSmeAuthModeMask; +typedef u16 CsrWifiSmeAuthModeMask; /******************************************************************************* NAME @@ -1852,7 +1852,7 @@ typedef CsrUint16 CsrWifiSmeAuthModeMask; Mask type for use with the values defined by CsrWifiSmeEncryption *******************************************************************************/ -typedef CsrUint16 CsrWifiSmeEncryptionMask; +typedef u16 CsrWifiSmeEncryptionMask; /******************************************************************************* NAME @@ -1922,7 +1922,7 @@ typedef u8 CsrWifiSmeWmmQosInfoMask; Mask type for use with the values defined by CsrWifiSmeWpsConfigType *******************************************************************************/ -typedef CsrUint16 CsrWifiSmeWpsConfigTypeMask; +typedef u16 CsrWifiSmeWpsConfigTypeMask; /******************************************************************************* @@ -1944,10 +1944,10 @@ typedef CsrUint16 CsrWifiSmeWpsConfigTypeMask; *******************************************************************************/ typedef struct { - CsrUint16 atimWindowTu; - CsrUint16 beaconPeriodTu; - CsrUint16 joinOnlyAttempts; - CsrUint16 joinAttemptIntervalMs; + u16 atimWindowTu; + u16 beaconPeriodTu; + u16 joinOnlyAttempts; + u16 joinAttemptIntervalMs; } CsrWifiSmeAdHocConfig; /******************************************************************************* @@ -1966,8 +1966,8 @@ typedef struct typedef struct { u8 listenChannel; - CsrUint16 availabilityDuration; - CsrUint16 avalabilityPeriod; + u16 availabilityDuration; + u16 avalabilityPeriod; } CsrWifiSmeAvailabilityConfig; /******************************************************************************* @@ -2039,18 +2039,18 @@ typedef struct { CsrBool coexEnableSchemeManagement; CsrBool coexPeriodicWakeHost; - CsrUint16 coexTrafficBurstyLatencyMs; - CsrUint16 coexTrafficContinuousLatencyMs; - CsrUint16 coexObexBlackoutDurationMs; - CsrUint16 coexObexBlackoutPeriodMs; - CsrUint16 coexA2dpBrBlackoutDurationMs; - CsrUint16 coexA2dpBrBlackoutPeriodMs; - CsrUint16 coexA2dpEdrBlackoutDurationMs; - CsrUint16 coexA2dpEdrBlackoutPeriodMs; - CsrUint16 coexPagingBlackoutDurationMs; - CsrUint16 coexPagingBlackoutPeriodMs; - CsrUint16 coexInquiryBlackoutDurationMs; - CsrUint16 coexInquiryBlackoutPeriodMs; + u16 coexTrafficBurstyLatencyMs; + u16 coexTrafficContinuousLatencyMs; + u16 coexObexBlackoutDurationMs; + u16 coexObexBlackoutPeriodMs; + u16 coexA2dpBrBlackoutDurationMs; + u16 coexA2dpBrBlackoutPeriodMs; + u16 coexA2dpEdrBlackoutDurationMs; + u16 coexA2dpEdrBlackoutPeriodMs; + u16 coexPagingBlackoutDurationMs; + u16 coexPagingBlackoutPeriodMs; + u16 coexInquiryBlackoutDurationMs; + u16 coexInquiryBlackoutPeriodMs; } CsrWifiSmeCoexConfig; /******************************************************************************* @@ -2167,7 +2167,7 @@ typedef struct *******************************************************************************/ typedef struct { - CsrUint16 length; + u16 length; u8 *data; } CsrWifiSmeDataBlock; @@ -2233,9 +2233,9 @@ typedef struct { CsrBool unifiFixMaxTxDataRate; u8 unifiFixTxDataRate; - CsrUint16 dot11RtsThreshold; - CsrUint16 dot11FragmentationThreshold; - CsrUint16 dot11CurrentTxPowerLevel; + u16 dot11RtsThreshold; + u16 dot11FragmentationThreshold; + u16 dot11CurrentTxPowerLevel; } CsrWifiSmeMibConfig; /******************************************************************************* @@ -2255,8 +2255,8 @@ typedef struct typedef struct { u8 listenChannel; - CsrUint16 availabilityDuration; - CsrUint16 avalabilityPeriod; + u16 availabilityDuration; + u16 avalabilityPeriod; } CsrWifiSmeP2pProfileIdentity; /******************************************************************************* @@ -2402,12 +2402,12 @@ typedef struct *******************************************************************************/ typedef struct { - CsrUint16 intervalSeconds; - CsrUint16 validitySeconds; - CsrUint16 minActiveChannelTimeTu; - CsrUint16 maxActiveChannelTimeTu; - CsrUint16 minPassiveChannelTimeTu; - CsrUint16 maxPassiveChannelTimeTu; + u16 intervalSeconds; + u16 validitySeconds; + u16 minActiveChannelTimeTu; + u16 maxActiveChannelTimeTu; + u16 minPassiveChannelTimeTu; + u16 maxPassiveChannelTimeTu; } CsrWifiSmeScanConfigData; /******************************************************************************* @@ -2488,7 +2488,7 @@ typedef struct u8 cwMin; u8 cwMax; u8 aifs; - CsrUint16 txopLimit; + u16 txopLimit; CsrBool admissionControlMandatory; } CsrWifiSmeWmmAcParams; @@ -2542,9 +2542,9 @@ typedef struct *******************************************************************************/ typedef struct { - CsrUint16 version; - CsrUint16 configMethods; - CsrUint16 devicePassworId; + u16 version; + u16 configMethods; + u16 devicePassworId; } CsrWifiSmeWpsInfo; /******************************************************************************* @@ -2598,10 +2598,10 @@ typedef struct { CsrBool hasTrafficData; CsrWifiSmeTrafficType currentTrafficType; - CsrUint16 currentPeriodMs; + u16 currentPeriodMs; CsrWifiSmePowerSaveLevel currentPowerSave; - CsrUint16 currentCoexPeriodMs; - CsrUint16 currentCoexLatencyMs; + u16 currentCoexPeriodMs; + u16 currentCoexLatencyMs; CsrBool hasBtDevice; CsrUint32 currentBlackoutDurationUs; CsrUint32 currentBlackoutPeriodUs; @@ -2674,7 +2674,7 @@ typedef struct CsrWifiSme80211PrivacyMode privacyMode; CsrWifiSmeAuthModeMask authModeMask; CsrWifiSmeEncryptionMask encryptionModeMask; - CsrUint16 mlmeAssociateReqInformationElementsLength; + u16 mlmeAssociateReqInformationElementsLength; u8 *mlmeAssociateReqInformationElements; CsrWifiSmeWmmQosInfoMask wmmQosInfo; CsrBool adhocJoinOnly; @@ -2749,31 +2749,31 @@ typedef struct CsrWifiMacAddress bssid; CsrWifiSme80211NetworkType networkType80211; u8 channelNumber; - CsrUint16 channelFrequency; + u16 channelFrequency; CsrWifiSmeAuthMode authMode; CsrWifiSmeEncryption pairwiseCipher; CsrWifiSmeEncryption groupCipher; CsrWifiSmeRadioIF ifIndex; - CsrUint16 atimWindowTu; - CsrUint16 beaconPeriodTu; + u16 atimWindowTu; + u16 beaconPeriodTu; CsrBool reassociation; - CsrUint16 beaconFrameLength; + u16 beaconFrameLength; u8 *beaconFrame; - CsrUint16 associationReqFrameLength; + u16 associationReqFrameLength; u8 *associationReqFrame; - CsrUint16 associationRspFrameLength; + u16 associationRspFrameLength; u8 *associationRspFrame; - CsrUint16 assocScanInfoElementsLength; + u16 assocScanInfoElementsLength; u8 *assocScanInfoElements; - CsrUint16 assocReqCapabilities; - CsrUint16 assocReqListenIntervalTu; + u16 assocReqCapabilities; + u16 assocReqListenIntervalTu; CsrWifiMacAddress assocReqApAddress; - CsrUint16 assocReqInfoElementsLength; + u16 assocReqInfoElementsLength; u8 *assocReqInfoElements; CsrWifiSmeIEEE80211Result assocRspResult; - CsrUint16 assocRspCapabilityInfo; - CsrUint16 assocRspAssociationId; - CsrUint16 assocRspInfoElementsLength; + u16 assocRspCapabilityInfo; + u16 assocRspAssociationId; + u16 assocRspInfoElementsLength; u8 *assocRspInfoElements; } CsrWifiSmeConnectionInfo; @@ -2890,7 +2890,7 @@ typedef struct typedef struct { CsrWifiSmeHostPowerMode powerMode; - CsrUint16 applicationDataPeriodMs; + u16 applicationDataPeriodMs; } CsrWifiSmeHostConfig; /******************************************************************************* @@ -2926,7 +2926,7 @@ typedef struct CsrWifiSmeKeyType keyType; u8 keyIndex; CsrBool wepTxKey; - CsrUint16 keyRsc[8]; + u16 keyRsc[8]; CsrBool authenticator; CsrWifiMacAddress address; u8 keyLength; @@ -3000,7 +3000,7 @@ typedef struct typedef struct { CsrWifiSmePowerSaveLevel powerSaveLevel; - CsrUint16 listenIntervalTu; + u16 listenIntervalTu; CsrBool rxDtims; CsrWifiSmeD3AutoScanMode d3AutoScanMode; u8 clientTrafficWindow; @@ -3042,7 +3042,7 @@ typedef struct CsrBool disableSmoothRoaming; CsrBool disableRoamScans; u8 reconnectLimit; - CsrUint16 reconnectLimitIntervalMs; + u16 reconnectLimitIntervalMs; CsrWifiSmeScanConfigData roamScanCfg[3]; } CsrWifiSmeRoamingConfig; @@ -3086,14 +3086,14 @@ typedef struct { CsrWifiSmeScanConfigData scanCfg[4]; CsrBool disableAutonomousScans; - CsrUint16 maxResults; + u16 maxResults; s8 highRssiThreshold; s8 lowRssiThreshold; s8 deltaRssiThreshold; s8 highSnrThreshold; s8 lowSnrThreshold; s8 deltaSnrThreshold; - CsrUint16 passiveChannelListCount; + u16 passiveChannelListCount; u8 *passiveChannelList; } CsrWifiSmeScanConfig; @@ -3144,15 +3144,15 @@ typedef struct CsrInt16 rssi; CsrInt16 snr; CsrWifiSmeRadioIF ifIndex; - CsrUint16 beaconPeriodTu; + u16 beaconPeriodTu; CsrWifiSmeTsfTime timeStamp; CsrWifiSmeTsfTime localTime; - CsrUint16 channelFrequency; - CsrUint16 capabilityInformation; + u16 channelFrequency; + u16 capabilityInformation; u8 channelNumber; CsrWifiSmeBasicUsability usability; CsrWifiSmeBssType bssType; - CsrUint16 informationElementsLength; + u16 informationElementsLength; u8 *informationElements; CsrWifiSmeP2pRole p2pDeviceRole; union { @@ -3562,7 +3562,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeListAction action; u8 setAddressCount; CsrWifiMacAddress *setAddresses; @@ -3606,7 +3606,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 calibrationDataLength; + u16 calibrationDataLength; u8 *calibrationData; } CsrWifiSmeCalibrationDataSetReq; @@ -3627,7 +3627,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; } CsrWifiSmeCcxConfigGetReq; /******************************************************************************* @@ -3648,7 +3648,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeCcxConfig ccxConfig; } CsrWifiSmeCcxConfigSetReq; @@ -3758,7 +3758,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeConnectionConfig connectionConfig; } CsrWifiSmeConnectReq; @@ -3778,7 +3778,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; } CsrWifiSmeConnectionConfigGetReq; /******************************************************************************* @@ -3797,7 +3797,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; } CsrWifiSmeConnectionInfoGetReq; /******************************************************************************* @@ -3816,7 +3816,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; } CsrWifiSmeConnectionStatsGetReq; /******************************************************************************* @@ -3853,7 +3853,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; } CsrWifiSmeDisconnectReq; /******************************************************************************* @@ -3894,7 +3894,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; } CsrWifiSmeHostConfigGetReq; /******************************************************************************* @@ -3916,7 +3916,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeHostConfig hostConfig; } CsrWifiSmeHostConfigSetReq; @@ -3943,7 +3943,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeListAction action; CsrWifiSmeKey key; } CsrWifiSmeKeyReq; @@ -3964,7 +3964,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; } CsrWifiSmeLinkQualityGetReq; /******************************************************************************* @@ -4023,7 +4023,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 mibAttributeLength; + u16 mibAttributeLength; u8 *mibAttribute; } CsrWifiSmeMibGetNextReq; @@ -4046,7 +4046,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 mibAttributeLength; + u16 mibAttributeLength; u8 *mibAttribute; } CsrWifiSmeMibGetReq; @@ -4077,7 +4077,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 mibAttributeLength; + u16 mibAttributeLength; u8 *mibAttribute; } CsrWifiSmeMibSetReq; @@ -4107,7 +4107,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeListAction action; u8 setAddressesCount; CsrWifiMacAddress *setAddresses; @@ -4157,8 +4157,8 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; - CsrUint16 filterLength; + u16 interfaceTag; + u16 filterLength; u8 *filter; CsrWifiSmePacketFilterMode mode; CsrWifiIp4Address arpFilterAddress; @@ -4209,7 +4209,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeListAction action; u8 setPmkidsCount; CsrWifiSmePmkid *setPmkids; @@ -4284,7 +4284,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; } CsrWifiSmeRoamingConfigGetReq; /******************************************************************************* @@ -4304,7 +4304,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeRoamingConfig roamingConfig; } CsrWifiSmeRoamingConfigSetReq; @@ -4404,9 +4404,9 @@ typedef struct CsrBool forceScan; CsrWifiSmeBssType bssType; CsrWifiSmeScanType scanType; - CsrUint16 channelListCount; + u16 channelListCount; u8 *channelList; - CsrUint16 probeIeLength; + u16 probeIeLength; u8 *probeIe; } CsrWifiSmeScanFullReq; @@ -4471,7 +4471,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; } CsrWifiSmeSmeStaConfigGetReq; /******************************************************************************* @@ -4491,7 +4491,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeStaConfig smeConfig; } CsrWifiSmeSmeStaConfigSetReq; @@ -4558,14 +4558,14 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeListAction action; CsrUint32 transactionId; CsrBool strict; CsrWifiSmeTspecCtrlMask ctrlMask; - CsrUint16 tspecLength; + u16 tspecLength; u8 *tspec; - CsrUint16 tclasLength; + u16 tclasLength; u8 *tclas; } CsrWifiSmeTspecReq; @@ -4631,7 +4631,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiMacAddress address; - CsrUint16 mibFilesCount; + u16 mibFilesCount; CsrWifiSmeDataBlock *mibFiles; } CsrWifiSmeWifiFlightmodeReq; @@ -4691,7 +4691,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiMacAddress address; - CsrUint16 mibFilesCount; + u16 mibFilesCount; CsrWifiSmeDataBlock *mibFiles; } CsrWifiSmeWifiOnReq; @@ -4922,7 +4922,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiSmeConnectionInfo connectionInfo; CsrWifiSmeIEEE80211Reason deauthReason; @@ -4947,7 +4947,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiMacAddress address; CsrWifiSsid ssid; } CsrWifiSmeAssociationStartInd; @@ -4977,7 +4977,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiSmeListAction action; u8 getAddressCount; @@ -5005,7 +5005,7 @@ typedef struct { CsrWifiFsmEvent common; CsrResult status; - CsrUint16 calibrationDataLength; + u16 calibrationDataLength; u8 *calibrationData; } CsrWifiSmeCalibrationDataGetCfm; @@ -5046,7 +5046,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiSmeCcxConfig ccxConfig; } CsrWifiSmeCcxConfigGetCfm; @@ -5068,7 +5068,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiSmeCcxConfigSetCfm; @@ -5154,7 +5154,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiSmeConnectCfm; @@ -5176,7 +5176,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiSmeConnectionConfig connectionConfig; } CsrWifiSmeConnectionConfigGetCfm; @@ -5199,7 +5199,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiSmeConnectionInfo connectionInfo; } CsrWifiSmeConnectionInfoGetCfm; @@ -5228,7 +5228,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeLinkQuality linkQuality; } CsrWifiSmeConnectionQualityInd; @@ -5250,7 +5250,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiSmeConnectionStats connectionStats; } CsrWifiSmeConnectionStatsGetCfm; @@ -5296,7 +5296,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiSmeDisconnectCfm; @@ -5338,7 +5338,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiSmeHostConfig hostConfig; } CsrWifiSmeHostConfigGetCfm; @@ -5360,7 +5360,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiSmeHostConfigSetCfm; @@ -5407,7 +5407,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiSmeListAction action; CsrWifiSmeKeyType keyType; @@ -5432,7 +5432,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiSmeLinkQuality linkQuality; } CsrWifiSmeLinkQualityGetCfm; @@ -5467,7 +5467,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeMediaStatus mediaStatus; CsrWifiSmeConnectionInfo connectionInfo; CsrWifiSmeIEEE80211Reason disassocReason; @@ -5534,7 +5534,7 @@ typedef struct { CsrWifiFsmEvent common; CsrResult status; - CsrUint16 mibAttributeLength; + u16 mibAttributeLength; u8 *mibAttribute; } CsrWifiSmeMibGetCfm; @@ -5561,7 +5561,7 @@ typedef struct { CsrWifiFsmEvent common; CsrResult status; - CsrUint16 mibAttributeLength; + u16 mibAttributeLength; u8 *mibAttribute; } CsrWifiSmeMibGetNextCfm; @@ -5607,9 +5607,9 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrBool secondFailure; - CsrUint16 count; + u16 count; CsrWifiMacAddress address; CsrWifiSmeKeyType keyType; } CsrWifiSmeMicFailureInd; @@ -5638,7 +5638,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiSmeListAction action; u8 getAddressesCount; @@ -5662,7 +5662,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiSmePacketFilterSetCfm; @@ -5708,7 +5708,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; u8 pmkidCandidatesCount; CsrWifiSmePmkidCandidate *pmkidCandidates; } CsrWifiSmePmkidCandidateListInd; @@ -5737,7 +5737,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiSmeListAction action; u8 getPmkidsCount; @@ -5827,7 +5827,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiSmeRoamCompleteInd; @@ -5867,7 +5867,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeRoamReason roamReason; CsrWifiSmeIEEE80211Reason reason80211; } CsrWifiSmeRoamStartInd; @@ -5890,7 +5890,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiSmeRoamingConfig roamingConfig; } CsrWifiSmeRoamingConfigGetCfm; @@ -5912,7 +5912,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiSmeRoamingConfigSetCfm; @@ -6036,7 +6036,7 @@ typedef struct { CsrWifiFsmEvent common; CsrResult status; - CsrUint16 scanResultsCount; + u16 scanResultsCount; CsrWifiSmeScanResult *scanResults; } CsrWifiSmeScanResultsGetCfm; @@ -6058,7 +6058,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrWifiSmeStaConfig smeConfig; } CsrWifiSmeSmeStaConfigGetCfm; @@ -6080,7 +6080,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; } CsrWifiSmeSmeStaConfigSetCfm; @@ -6128,10 +6128,10 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrUint32 transactionId; CsrWifiSmeTspecResultCode tspecResultCode; - CsrUint16 tspecLength; + u16 tspecLength; u8 *tspec; } CsrWifiSmeTspecInd; @@ -6158,11 +6158,11 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrResult status; CsrUint32 transactionId; CsrWifiSmeTspecResultCode tspecResultCode; - CsrUint16 tspecLength; + u16 tspecLength; u8 *tspec; } CsrWifiSmeTspecCfm; @@ -6399,7 +6399,7 @@ typedef struct { CsrWifiFsmEvent common; CsrResult status; - CsrUint16 numInterfaces; + u16 numInterfaces; u8 capBitmap[2]; } CsrWifiSmeInterfaceCapabilityGetCfm; @@ -6487,7 +6487,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiSmeAmpStatus ampStatus; } CsrWifiSmeAmpStatusChangeInd; diff --git a/drivers/staging/csr/csr_wifi_sme_serialize.c b/drivers/staging/csr/csr_wifi_sme_serialize.c index f35f8368525..0e3096e969f 100644 --- a/drivers/staging/csr/csr_wifi_sme_serialize.c +++ b/drivers/staging/csr/csr_wifi_sme_serialize.c @@ -29,10 +29,10 @@ CsrSize CsrWifiSmeAdhocConfigSetReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 11) */ - bufferSize += 2; /* CsrUint16 primitive->adHocConfig.atimWindowTu */ - bufferSize += 2; /* CsrUint16 primitive->adHocConfig.beaconPeriodTu */ - bufferSize += 2; /* CsrUint16 primitive->adHocConfig.joinOnlyAttempts */ - bufferSize += 2; /* CsrUint16 primitive->adHocConfig.joinAttemptIntervalMs */ + bufferSize += 2; /* u16 primitive->adHocConfig.atimWindowTu */ + bufferSize += 2; /* u16 primitive->adHocConfig.beaconPeriodTu */ + bufferSize += 2; /* u16 primitive->adHocConfig.joinOnlyAttempts */ + bufferSize += 2; /* u16 primitive->adHocConfig.joinAttemptIntervalMs */ return bufferSize; } @@ -42,10 +42,10 @@ u8* CsrWifiSmeAdhocConfigSetReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeAdhocConfigSetReq *primitive = (CsrWifiSmeAdhocConfigSetReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->adHocConfig.atimWindowTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->adHocConfig.beaconPeriodTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->adHocConfig.joinOnlyAttempts); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->adHocConfig.joinAttemptIntervalMs); + CsrUint16Ser(ptr, len, (u16) primitive->adHocConfig.atimWindowTu); + CsrUint16Ser(ptr, len, (u16) primitive->adHocConfig.beaconPeriodTu); + CsrUint16Ser(ptr, len, (u16) primitive->adHocConfig.joinOnlyAttempts); + CsrUint16Ser(ptr, len, (u16) primitive->adHocConfig.joinAttemptIntervalMs); return(ptr); } @@ -57,10 +57,10 @@ void* CsrWifiSmeAdhocConfigSetReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->adHocConfig.atimWindowTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->adHocConfig.beaconPeriodTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->adHocConfig.joinOnlyAttempts, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->adHocConfig.joinAttemptIntervalMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->adHocConfig.atimWindowTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->adHocConfig.beaconPeriodTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->adHocConfig.joinOnlyAttempts, buffer, &offset); + CsrUint16Des((u16 *) &primitive->adHocConfig.joinAttemptIntervalMs, buffer, &offset); return primitive; } @@ -72,11 +72,11 @@ CsrSize CsrWifiSmeBlacklistReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiSmeListAction primitive->action */ bufferSize += 1; /* u8 primitive->setAddressCount */ { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->setAddressCount; i1++) { bufferSize += 6; /* u8 primitive->setAddresses[i1].a[6] */ @@ -91,14 +91,14 @@ u8* CsrWifiSmeBlacklistReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeBlacklistReq *primitive = (CsrWifiSmeBlacklistReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->action); CsrUint8Ser(ptr, len, (u8) primitive->setAddressCount); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->setAddressCount; i1++) { - CsrMemCpySer(ptr, len, (const void *) primitive->setAddresses[i1].a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->setAddresses[i1].a, ((u16) (6))); } } return(ptr); @@ -112,7 +112,7 @@ void* CsrWifiSmeBlacklistReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->action, buffer, &offset); CsrUint8Des((u8 *) &primitive->setAddressCount, buffer, &offset); primitive->setAddresses = NULL; @@ -121,10 +121,10 @@ void* CsrWifiSmeBlacklistReqDes(u8 *buffer, CsrSize length) primitive->setAddresses = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->setAddressCount); } { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->setAddressCount; i1++) { - CsrMemCpyDes(primitive->setAddresses[i1].a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->setAddresses[i1].a, buffer, &offset, ((u16) (6))); } } @@ -146,7 +146,7 @@ CsrSize CsrWifiSmeCalibrationDataSetReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 6) */ - bufferSize += 2; /* CsrUint16 primitive->calibrationDataLength */ + bufferSize += 2; /* u16 primitive->calibrationDataLength */ bufferSize += primitive->calibrationDataLength; /* u8 primitive->calibrationData */ return bufferSize; } @@ -157,10 +157,10 @@ u8* CsrWifiSmeCalibrationDataSetReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeCalibrationDataSetReq *primitive = (CsrWifiSmeCalibrationDataSetReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->calibrationDataLength); + CsrUint16Ser(ptr, len, (u16) primitive->calibrationDataLength); if (primitive->calibrationDataLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->calibrationData, ((CsrUint16) (primitive->calibrationDataLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->calibrationData, ((u16) (primitive->calibrationDataLength))); } return(ptr); } @@ -173,11 +173,11 @@ void* CsrWifiSmeCalibrationDataSetReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->calibrationDataLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->calibrationDataLength, buffer, &offset); if (primitive->calibrationDataLength) { primitive->calibrationData = (u8 *)CsrPmemAlloc(primitive->calibrationDataLength); - CsrMemCpyDes(primitive->calibrationData, buffer, &offset, ((CsrUint16) (primitive->calibrationDataLength))); + CsrMemCpyDes(primitive->calibrationData, buffer, &offset, ((u16) (primitive->calibrationDataLength))); } else { @@ -201,7 +201,7 @@ CsrSize CsrWifiSmeCcxConfigSetReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 9) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* u8 primitive->ccxConfig.keepAliveTimeMs */ bufferSize += 1; /* CsrBool primitive->ccxConfig.apRoamingEnabled */ bufferSize += 1; /* u8 primitive->ccxConfig.measurementsMask */ @@ -215,7 +215,7 @@ u8* CsrWifiSmeCcxConfigSetReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeCcxConfigSetReq *primitive = (CsrWifiSmeCcxConfigSetReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->ccxConfig.keepAliveTimeMs); CsrUint8Ser(ptr, len, (u8) primitive->ccxConfig.apRoamingEnabled); CsrUint8Ser(ptr, len, (u8) primitive->ccxConfig.measurementsMask); @@ -231,7 +231,7 @@ void* CsrWifiSmeCcxConfigSetReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->ccxConfig.keepAliveTimeMs, buffer, &offset); CsrUint8Des((u8 *) &primitive->ccxConfig.apRoamingEnabled, buffer, &offset); CsrUint8Des((u8 *) &primitive->ccxConfig.measurementsMask, buffer, &offset); @@ -248,18 +248,18 @@ CsrSize CsrWifiSmeCoexConfigSetReqSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 29) */ bufferSize += 1; /* CsrBool primitive->coexConfig.coexEnableSchemeManagement */ bufferSize += 1; /* CsrBool primitive->coexConfig.coexPeriodicWakeHost */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexTrafficBurstyLatencyMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexTrafficContinuousLatencyMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexObexBlackoutDurationMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexObexBlackoutPeriodMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexA2dpBrBlackoutDurationMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexA2dpBrBlackoutPeriodMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexA2dpEdrBlackoutDurationMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexA2dpEdrBlackoutPeriodMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexPagingBlackoutDurationMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexPagingBlackoutPeriodMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexInquiryBlackoutDurationMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexInquiryBlackoutPeriodMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexTrafficBurstyLatencyMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexTrafficContinuousLatencyMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexObexBlackoutDurationMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexObexBlackoutPeriodMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexA2dpBrBlackoutDurationMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexA2dpBrBlackoutPeriodMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexA2dpEdrBlackoutDurationMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexA2dpEdrBlackoutPeriodMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexPagingBlackoutDurationMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexPagingBlackoutPeriodMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexInquiryBlackoutDurationMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexInquiryBlackoutPeriodMs */ return bufferSize; } @@ -271,18 +271,18 @@ u8* CsrWifiSmeCoexConfigSetReqSer(u8 *ptr, CsrSize *len, void *msg) CsrUint16Ser(ptr, len, primitive->common.type); CsrUint8Ser(ptr, len, (u8) primitive->coexConfig.coexEnableSchemeManagement); CsrUint8Ser(ptr, len, (u8) primitive->coexConfig.coexPeriodicWakeHost); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexTrafficBurstyLatencyMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexTrafficContinuousLatencyMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexObexBlackoutDurationMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexObexBlackoutPeriodMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexA2dpBrBlackoutDurationMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexA2dpBrBlackoutPeriodMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexA2dpEdrBlackoutDurationMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexA2dpEdrBlackoutPeriodMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexPagingBlackoutDurationMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexPagingBlackoutPeriodMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexInquiryBlackoutDurationMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexInquiryBlackoutPeriodMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexTrafficBurstyLatencyMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexTrafficContinuousLatencyMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexObexBlackoutDurationMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexObexBlackoutPeriodMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexA2dpBrBlackoutDurationMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexA2dpBrBlackoutPeriodMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexA2dpEdrBlackoutDurationMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexA2dpEdrBlackoutPeriodMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexPagingBlackoutDurationMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexPagingBlackoutPeriodMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexInquiryBlackoutDurationMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexInquiryBlackoutPeriodMs); return(ptr); } @@ -296,18 +296,18 @@ void* CsrWifiSmeCoexConfigSetReqDes(u8 *buffer, CsrSize length) CsrUint16Des(&primitive->common.type, buffer, &offset); CsrUint8Des((u8 *) &primitive->coexConfig.coexEnableSchemeManagement, buffer, &offset); CsrUint8Des((u8 *) &primitive->coexConfig.coexPeriodicWakeHost, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexTrafficBurstyLatencyMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexTrafficContinuousLatencyMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexObexBlackoutDurationMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexObexBlackoutPeriodMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexA2dpBrBlackoutDurationMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexA2dpBrBlackoutPeriodMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexA2dpEdrBlackoutDurationMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexA2dpEdrBlackoutPeriodMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexPagingBlackoutDurationMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexPagingBlackoutPeriodMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexInquiryBlackoutDurationMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexInquiryBlackoutPeriodMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexTrafficBurstyLatencyMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexTrafficContinuousLatencyMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexObexBlackoutDurationMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexObexBlackoutPeriodMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexA2dpBrBlackoutDurationMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexA2dpBrBlackoutPeriodMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexA2dpEdrBlackoutDurationMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexA2dpEdrBlackoutPeriodMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexPagingBlackoutDurationMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexPagingBlackoutPeriodMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexInquiryBlackoutDurationMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexInquiryBlackoutPeriodMs, buffer, &offset); return primitive; } @@ -319,7 +319,7 @@ CsrSize CsrWifiSmeConnectReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 57) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 32; /* u8 primitive->connectionConfig.ssid.ssid[32] */ bufferSize += 1; /* u8 primitive->connectionConfig.ssid.length */ bufferSize += 6; /* u8 primitive->connectionConfig.bssid.a[6] */ @@ -328,7 +328,7 @@ CsrSize CsrWifiSmeConnectReqSizeof(void *msg) bufferSize += 1; /* CsrWifiSme80211PrivacyMode primitive->connectionConfig.privacyMode */ bufferSize += 2; /* CsrWifiSmeAuthModeMask primitive->connectionConfig.authModeMask */ bufferSize += 2; /* CsrWifiSmeEncryptionMask primitive->connectionConfig.encryptionModeMask */ - bufferSize += 2; /* CsrUint16 primitive->connectionConfig.mlmeAssociateReqInformationElementsLength */ + bufferSize += 2; /* u16 primitive->connectionConfig.mlmeAssociateReqInformationElementsLength */ bufferSize += primitive->connectionConfig.mlmeAssociateReqInformationElementsLength; /* u8 primitive->connectionConfig.mlmeAssociateReqInformationElements */ bufferSize += 1; /* CsrWifiSmeWmmQosInfoMask primitive->connectionConfig.wmmQosInfo */ bufferSize += 1; /* CsrBool primitive->connectionConfig.adhocJoinOnly */ @@ -342,19 +342,19 @@ u8* CsrWifiSmeConnectReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeConnectReq *primitive = (CsrWifiSmeConnectReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrMemCpySer(ptr, len, (const void *) primitive->connectionConfig.ssid.ssid, ((CsrUint16) (32))); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionConfig.ssid.ssid, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->connectionConfig.ssid.length); - CsrMemCpySer(ptr, len, (const void *) primitive->connectionConfig.bssid.a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionConfig.bssid.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->connectionConfig.bssType); CsrUint8Ser(ptr, len, (u8) primitive->connectionConfig.ifIndex); CsrUint8Ser(ptr, len, (u8) primitive->connectionConfig.privacyMode); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionConfig.authModeMask); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionConfig.encryptionModeMask); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionConfig.mlmeAssociateReqInformationElementsLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionConfig.authModeMask); + CsrUint16Ser(ptr, len, (u16) primitive->connectionConfig.encryptionModeMask); + CsrUint16Ser(ptr, len, (u16) primitive->connectionConfig.mlmeAssociateReqInformationElementsLength); if (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionConfig.mlmeAssociateReqInformationElements, ((CsrUint16) (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionConfig.mlmeAssociateReqInformationElements, ((u16) (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength))); } CsrUint8Ser(ptr, len, (u8) primitive->connectionConfig.wmmQosInfo); CsrUint8Ser(ptr, len, (u8) primitive->connectionConfig.adhocJoinOnly); @@ -370,20 +370,20 @@ void* CsrWifiSmeConnectReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrMemCpyDes(primitive->connectionConfig.ssid.ssid, buffer, &offset, ((CsrUint16) (32))); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrMemCpyDes(primitive->connectionConfig.ssid.ssid, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->connectionConfig.ssid.length, buffer, &offset); - CsrMemCpyDes(primitive->connectionConfig.bssid.a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->connectionConfig.bssid.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->connectionConfig.bssType, buffer, &offset); CsrUint8Des((u8 *) &primitive->connectionConfig.ifIndex, buffer, &offset); CsrUint8Des((u8 *) &primitive->connectionConfig.privacyMode, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionConfig.authModeMask, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionConfig.encryptionModeMask, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionConfig.mlmeAssociateReqInformationElementsLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionConfig.authModeMask, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionConfig.encryptionModeMask, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionConfig.mlmeAssociateReqInformationElementsLength, buffer, &offset); if (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength) { primitive->connectionConfig.mlmeAssociateReqInformationElements = (u8 *)CsrPmemAlloc(primitive->connectionConfig.mlmeAssociateReqInformationElementsLength); - CsrMemCpyDes(primitive->connectionConfig.mlmeAssociateReqInformationElements, buffer, &offset, ((CsrUint16) (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength))); + CsrMemCpyDes(primitive->connectionConfig.mlmeAssociateReqInformationElements, buffer, &offset, ((u16) (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength))); } else { @@ -410,9 +410,9 @@ CsrSize CsrWifiSmeHostConfigSetReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 8) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiSmeHostPowerMode primitive->hostConfig.powerMode */ - bufferSize += 2; /* CsrUint16 primitive->hostConfig.applicationDataPeriodMs */ + bufferSize += 2; /* u16 primitive->hostConfig.applicationDataPeriodMs */ return bufferSize; } @@ -422,9 +422,9 @@ u8* CsrWifiSmeHostConfigSetReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeHostConfigSetReq *primitive = (CsrWifiSmeHostConfigSetReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->hostConfig.powerMode); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->hostConfig.applicationDataPeriodMs); + CsrUint16Ser(ptr, len, (u16) primitive->hostConfig.applicationDataPeriodMs); return(ptr); } @@ -436,9 +436,9 @@ void* CsrWifiSmeHostConfigSetReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->hostConfig.powerMode, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->hostConfig.applicationDataPeriodMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->hostConfig.applicationDataPeriodMs, buffer, &offset); return primitive; } @@ -449,16 +449,16 @@ CsrSize CsrWifiSmeKeyReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 65) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiSmeListAction primitive->action */ bufferSize += 1; /* CsrWifiSmeKeyType primitive->key.keyType */ bufferSize += 1; /* u8 primitive->key.keyIndex */ bufferSize += 1; /* CsrBool primitive->key.wepTxKey */ { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 8; i2++) { - bufferSize += 2; /* CsrUint16 primitive->key.keyRsc[8] */ + bufferSize += 2; /* u16 primitive->key.keyRsc[8] */ } } bufferSize += 1; /* CsrBool primitive->key.authenticator */ @@ -474,22 +474,22 @@ u8* CsrWifiSmeKeyReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeKeyReq *primitive = (CsrWifiSmeKeyReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->action); CsrUint8Ser(ptr, len, (u8) primitive->key.keyType); CsrUint8Ser(ptr, len, (u8) primitive->key.keyIndex); CsrUint8Ser(ptr, len, (u8) primitive->key.wepTxKey); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 8; i2++) { - CsrUint16Ser(ptr, len, (CsrUint16) primitive->key.keyRsc[i2]); + CsrUint16Ser(ptr, len, (u16) primitive->key.keyRsc[i2]); } } CsrUint8Ser(ptr, len, (u8) primitive->key.authenticator); - CsrMemCpySer(ptr, len, (const void *) primitive->key.address.a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->key.address.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->key.keyLength); - CsrMemCpySer(ptr, len, (const void *) primitive->key.key, ((CsrUint16) (32))); + CsrMemCpySer(ptr, len, (const void *) primitive->key.key, ((u16) (32))); return(ptr); } @@ -501,22 +501,22 @@ void* CsrWifiSmeKeyReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->action, buffer, &offset); CsrUint8Des((u8 *) &primitive->key.keyType, buffer, &offset); CsrUint8Des((u8 *) &primitive->key.keyIndex, buffer, &offset); CsrUint8Des((u8 *) &primitive->key.wepTxKey, buffer, &offset); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 8; i2++) { - CsrUint16Des((CsrUint16 *) &primitive->key.keyRsc[i2], buffer, &offset); + CsrUint16Des((u16 *) &primitive->key.keyRsc[i2], buffer, &offset); } } CsrUint8Des((u8 *) &primitive->key.authenticator, buffer, &offset); - CsrMemCpyDes(primitive->key.address.a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->key.address.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->key.keyLength, buffer, &offset); - CsrMemCpyDes(primitive->key.key, buffer, &offset, ((CsrUint16) (32))); + CsrMemCpyDes(primitive->key.key, buffer, &offset, ((u16) (32))); return primitive; } @@ -529,9 +529,9 @@ CsrSize CsrWifiSmeMibConfigSetReqSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 11) */ bufferSize += 1; /* CsrBool primitive->mibConfig.unifiFixMaxTxDataRate */ bufferSize += 1; /* u8 primitive->mibConfig.unifiFixTxDataRate */ - bufferSize += 2; /* CsrUint16 primitive->mibConfig.dot11RtsThreshold */ - bufferSize += 2; /* CsrUint16 primitive->mibConfig.dot11FragmentationThreshold */ - bufferSize += 2; /* CsrUint16 primitive->mibConfig.dot11CurrentTxPowerLevel */ + bufferSize += 2; /* u16 primitive->mibConfig.dot11RtsThreshold */ + bufferSize += 2; /* u16 primitive->mibConfig.dot11FragmentationThreshold */ + bufferSize += 2; /* u16 primitive->mibConfig.dot11CurrentTxPowerLevel */ return bufferSize; } @@ -543,9 +543,9 @@ u8* CsrWifiSmeMibConfigSetReqSer(u8 *ptr, CsrSize *len, void *msg) CsrUint16Ser(ptr, len, primitive->common.type); CsrUint8Ser(ptr, len, (u8) primitive->mibConfig.unifiFixMaxTxDataRate); CsrUint8Ser(ptr, len, (u8) primitive->mibConfig.unifiFixTxDataRate); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->mibConfig.dot11RtsThreshold); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->mibConfig.dot11FragmentationThreshold); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->mibConfig.dot11CurrentTxPowerLevel); + CsrUint16Ser(ptr, len, (u16) primitive->mibConfig.dot11RtsThreshold); + CsrUint16Ser(ptr, len, (u16) primitive->mibConfig.dot11FragmentationThreshold); + CsrUint16Ser(ptr, len, (u16) primitive->mibConfig.dot11CurrentTxPowerLevel); return(ptr); } @@ -559,9 +559,9 @@ void* CsrWifiSmeMibConfigSetReqDes(u8 *buffer, CsrSize length) CsrUint16Des(&primitive->common.type, buffer, &offset); CsrUint8Des((u8 *) &primitive->mibConfig.unifiFixMaxTxDataRate, buffer, &offset); CsrUint8Des((u8 *) &primitive->mibConfig.unifiFixTxDataRate, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->mibConfig.dot11RtsThreshold, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->mibConfig.dot11FragmentationThreshold, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->mibConfig.dot11CurrentTxPowerLevel, buffer, &offset); + CsrUint16Des((u16 *) &primitive->mibConfig.dot11RtsThreshold, buffer, &offset); + CsrUint16Des((u16 *) &primitive->mibConfig.dot11FragmentationThreshold, buffer, &offset); + CsrUint16Des((u16 *) &primitive->mibConfig.dot11CurrentTxPowerLevel, buffer, &offset); return primitive; } @@ -573,7 +573,7 @@ CsrSize CsrWifiSmeMibGetNextReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 6) */ - bufferSize += 2; /* CsrUint16 primitive->mibAttributeLength */ + bufferSize += 2; /* u16 primitive->mibAttributeLength */ bufferSize += primitive->mibAttributeLength; /* u8 primitive->mibAttribute */ return bufferSize; } @@ -584,10 +584,10 @@ u8* CsrWifiSmeMibGetNextReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeMibGetNextReq *primitive = (CsrWifiSmeMibGetNextReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->mibAttributeLength); + CsrUint16Ser(ptr, len, (u16) primitive->mibAttributeLength); if (primitive->mibAttributeLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->mibAttribute, ((CsrUint16) (primitive->mibAttributeLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->mibAttribute, ((u16) (primitive->mibAttributeLength))); } return(ptr); } @@ -600,11 +600,11 @@ void* CsrWifiSmeMibGetNextReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->mibAttributeLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset); if (primitive->mibAttributeLength) { primitive->mibAttribute = (u8 *)CsrPmemAlloc(primitive->mibAttributeLength); - CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((CsrUint16) (primitive->mibAttributeLength))); + CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength))); } else { @@ -629,7 +629,7 @@ CsrSize CsrWifiSmeMibGetReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 6) */ - bufferSize += 2; /* CsrUint16 primitive->mibAttributeLength */ + bufferSize += 2; /* u16 primitive->mibAttributeLength */ bufferSize += primitive->mibAttributeLength; /* u8 primitive->mibAttribute */ return bufferSize; } @@ -640,10 +640,10 @@ u8* CsrWifiSmeMibGetReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeMibGetReq *primitive = (CsrWifiSmeMibGetReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->mibAttributeLength); + CsrUint16Ser(ptr, len, (u16) primitive->mibAttributeLength); if (primitive->mibAttributeLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->mibAttribute, ((CsrUint16) (primitive->mibAttributeLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->mibAttribute, ((u16) (primitive->mibAttributeLength))); } return(ptr); } @@ -656,11 +656,11 @@ void* CsrWifiSmeMibGetReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->mibAttributeLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset); if (primitive->mibAttributeLength) { primitive->mibAttribute = (u8 *)CsrPmemAlloc(primitive->mibAttributeLength); - CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((CsrUint16) (primitive->mibAttributeLength))); + CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength))); } else { @@ -685,7 +685,7 @@ CsrSize CsrWifiSmeMibSetReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 6) */ - bufferSize += 2; /* CsrUint16 primitive->mibAttributeLength */ + bufferSize += 2; /* u16 primitive->mibAttributeLength */ bufferSize += primitive->mibAttributeLength; /* u8 primitive->mibAttribute */ return bufferSize; } @@ -696,10 +696,10 @@ u8* CsrWifiSmeMibSetReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeMibSetReq *primitive = (CsrWifiSmeMibSetReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->mibAttributeLength); + CsrUint16Ser(ptr, len, (u16) primitive->mibAttributeLength); if (primitive->mibAttributeLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->mibAttribute, ((CsrUint16) (primitive->mibAttributeLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->mibAttribute, ((u16) (primitive->mibAttributeLength))); } return(ptr); } @@ -712,11 +712,11 @@ void* CsrWifiSmeMibSetReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->mibAttributeLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset); if (primitive->mibAttributeLength) { primitive->mibAttribute = (u8 *)CsrPmemAlloc(primitive->mibAttributeLength); - CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((CsrUint16) (primitive->mibAttributeLength))); + CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength))); } else { @@ -741,11 +741,11 @@ CsrSize CsrWifiSmeMulticastAddressReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiSmeListAction primitive->action */ bufferSize += 1; /* u8 primitive->setAddressesCount */ { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->setAddressesCount; i1++) { bufferSize += 6; /* u8 primitive->setAddresses[i1].a[6] */ @@ -760,14 +760,14 @@ u8* CsrWifiSmeMulticastAddressReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeMulticastAddressReq *primitive = (CsrWifiSmeMulticastAddressReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->action); CsrUint8Ser(ptr, len, (u8) primitive->setAddressesCount); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->setAddressesCount; i1++) { - CsrMemCpySer(ptr, len, (const void *) primitive->setAddresses[i1].a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->setAddresses[i1].a, ((u16) (6))); } } return(ptr); @@ -781,7 +781,7 @@ void* CsrWifiSmeMulticastAddressReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->action, buffer, &offset); CsrUint8Des((u8 *) &primitive->setAddressesCount, buffer, &offset); primitive->setAddresses = NULL; @@ -790,10 +790,10 @@ void* CsrWifiSmeMulticastAddressReqDes(u8 *buffer, CsrSize length) primitive->setAddresses = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->setAddressesCount); } { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->setAddressesCount; i1++) { - CsrMemCpyDes(primitive->setAddresses[i1].a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->setAddresses[i1].a, buffer, &offset, ((u16) (6))); } } @@ -815,8 +815,8 @@ CsrSize CsrWifiSmePacketFilterSetReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ - bufferSize += 2; /* CsrUint16 primitive->filterLength */ + bufferSize += 2; /* u16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->filterLength */ bufferSize += primitive->filterLength; /* u8 primitive->filter */ bufferSize += 1; /* CsrWifiSmePacketFilterMode primitive->mode */ bufferSize += 4; /* u8 primitive->arpFilterAddress.a[4] */ @@ -829,14 +829,14 @@ u8* CsrWifiSmePacketFilterSetReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmePacketFilterSetReq *primitive = (CsrWifiSmePacketFilterSetReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->filterLength); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->filterLength); if (primitive->filterLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->filter, ((CsrUint16) (primitive->filterLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->filter, ((u16) (primitive->filterLength))); } CsrUint8Ser(ptr, len, (u8) primitive->mode); - CsrMemCpySer(ptr, len, (const void *) primitive->arpFilterAddress.a, ((CsrUint16) (4))); + CsrMemCpySer(ptr, len, (const void *) primitive->arpFilterAddress.a, ((u16) (4))); return(ptr); } @@ -848,19 +848,19 @@ void* CsrWifiSmePacketFilterSetReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->filterLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->filterLength, buffer, &offset); if (primitive->filterLength) { primitive->filter = (u8 *)CsrPmemAlloc(primitive->filterLength); - CsrMemCpyDes(primitive->filter, buffer, &offset, ((CsrUint16) (primitive->filterLength))); + CsrMemCpyDes(primitive->filter, buffer, &offset, ((u16) (primitive->filterLength))); } else { primitive->filter = NULL; } CsrUint8Des((u8 *) &primitive->mode, buffer, &offset); - CsrMemCpyDes(primitive->arpFilterAddress.a, buffer, &offset, ((CsrUint16) (4))); + CsrMemCpyDes(primitive->arpFilterAddress.a, buffer, &offset, ((u16) (4))); return primitive; } @@ -880,11 +880,11 @@ CsrSize CsrWifiSmePmkidReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 29) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiSmeListAction primitive->action */ bufferSize += 1; /* u8 primitive->setPmkidsCount */ { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->setPmkidsCount; i1++) { bufferSize += 6; /* u8 primitive->setPmkids[i1].bssid.a[6] */ @@ -900,15 +900,15 @@ u8* CsrWifiSmePmkidReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmePmkidReq *primitive = (CsrWifiSmePmkidReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->action); CsrUint8Ser(ptr, len, (u8) primitive->setPmkidsCount); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->setPmkidsCount; i1++) { - CsrMemCpySer(ptr, len, (const void *) primitive->setPmkids[i1].bssid.a, ((CsrUint16) (6))); - CsrMemCpySer(ptr, len, (const void *) primitive->setPmkids[i1].pmkid, ((CsrUint16) (16))); + CsrMemCpySer(ptr, len, (const void *) primitive->setPmkids[i1].bssid.a, ((u16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->setPmkids[i1].pmkid, ((u16) (16))); } } return(ptr); @@ -922,7 +922,7 @@ void* CsrWifiSmePmkidReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->action, buffer, &offset); CsrUint8Des((u8 *) &primitive->setPmkidsCount, buffer, &offset); primitive->setPmkids = NULL; @@ -931,11 +931,11 @@ void* CsrWifiSmePmkidReqDes(u8 *buffer, CsrSize length) primitive->setPmkids = (CsrWifiSmePmkid *)CsrPmemAlloc(sizeof(CsrWifiSmePmkid) * primitive->setPmkidsCount); } { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->setPmkidsCount; i1++) { - CsrMemCpyDes(primitive->setPmkids[i1].bssid.a, buffer, &offset, ((CsrUint16) (6))); - CsrMemCpyDes(primitive->setPmkids[i1].pmkid, buffer, &offset, ((CsrUint16) (16))); + CsrMemCpyDes(primitive->setPmkids[i1].bssid.a, buffer, &offset, ((u16) (6))); + CsrMemCpyDes(primitive->setPmkids[i1].pmkid, buffer, &offset, ((u16) (16))); } } @@ -957,7 +957,7 @@ CsrSize CsrWifiSmePowerConfigSetReqSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 11) */ bufferSize += 1; /* CsrWifiSmePowerSaveLevel primitive->powerConfig.powerSaveLevel */ - bufferSize += 2; /* CsrUint16 primitive->powerConfig.listenIntervalTu */ + bufferSize += 2; /* u16 primitive->powerConfig.listenIntervalTu */ bufferSize += 1; /* CsrBool primitive->powerConfig.rxDtims */ bufferSize += 1; /* CsrWifiSmeD3AutoScanMode primitive->powerConfig.d3AutoScanMode */ bufferSize += 1; /* u8 primitive->powerConfig.clientTrafficWindow */ @@ -973,7 +973,7 @@ u8* CsrWifiSmePowerConfigSetReqSer(u8 *ptr, CsrSize *len, void *msg) *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); CsrUint8Ser(ptr, len, (u8) primitive->powerConfig.powerSaveLevel); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->powerConfig.listenIntervalTu); + CsrUint16Ser(ptr, len, (u16) primitive->powerConfig.listenIntervalTu); CsrUint8Ser(ptr, len, (u8) primitive->powerConfig.rxDtims); CsrUint8Ser(ptr, len, (u8) primitive->powerConfig.d3AutoScanMode); CsrUint8Ser(ptr, len, (u8) primitive->powerConfig.clientTrafficWindow); @@ -991,7 +991,7 @@ void* CsrWifiSmePowerConfigSetReqDes(u8 *buffer, CsrSize length) CsrUint16Des(&primitive->common.type, buffer, &offset); CsrUint8Des((u8 *) &primitive->powerConfig.powerSaveLevel, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->powerConfig.listenIntervalTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->powerConfig.listenIntervalTu, buffer, &offset); CsrUint8Des((u8 *) &primitive->powerConfig.rxDtims, buffer, &offset); CsrUint8Des((u8 *) &primitive->powerConfig.d3AutoScanMode, buffer, &offset); CsrUint8Des((u8 *) &primitive->powerConfig.clientTrafficWindow, buffer, &offset); @@ -1007,9 +1007,9 @@ CsrSize CsrWifiSmeRoamingConfigSetReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 70) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 3; i2++) { bufferSize += 2; /* CsrInt16 primitive->roamingConfig.roamingBands[i2].rssiHighThreshold */ @@ -1021,17 +1021,17 @@ CsrSize CsrWifiSmeRoamingConfigSetReqSizeof(void *msg) bufferSize += 1; /* CsrBool primitive->roamingConfig.disableSmoothRoaming */ bufferSize += 1; /* CsrBool primitive->roamingConfig.disableRoamScans */ bufferSize += 1; /* u8 primitive->roamingConfig.reconnectLimit */ - bufferSize += 2; /* CsrUint16 primitive->roamingConfig.reconnectLimitIntervalMs */ + bufferSize += 2; /* u16 primitive->roamingConfig.reconnectLimitIntervalMs */ { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 3; i2++) { - bufferSize += 2; /* CsrUint16 primitive->roamingConfig.roamScanCfg[i2].intervalSeconds */ - bufferSize += 2; /* CsrUint16 primitive->roamingConfig.roamScanCfg[i2].validitySeconds */ - bufferSize += 2; /* CsrUint16 primitive->roamingConfig.roamScanCfg[i2].minActiveChannelTimeTu */ - bufferSize += 2; /* CsrUint16 primitive->roamingConfig.roamScanCfg[i2].maxActiveChannelTimeTu */ - bufferSize += 2; /* CsrUint16 primitive->roamingConfig.roamScanCfg[i2].minPassiveChannelTimeTu */ - bufferSize += 2; /* CsrUint16 primitive->roamingConfig.roamScanCfg[i2].maxPassiveChannelTimeTu */ + bufferSize += 2; /* u16 primitive->roamingConfig.roamScanCfg[i2].intervalSeconds */ + bufferSize += 2; /* u16 primitive->roamingConfig.roamScanCfg[i2].validitySeconds */ + bufferSize += 2; /* u16 primitive->roamingConfig.roamScanCfg[i2].minActiveChannelTimeTu */ + bufferSize += 2; /* u16 primitive->roamingConfig.roamScanCfg[i2].maxActiveChannelTimeTu */ + bufferSize += 2; /* u16 primitive->roamingConfig.roamScanCfg[i2].minPassiveChannelTimeTu */ + bufferSize += 2; /* u16 primitive->roamingConfig.roamScanCfg[i2].maxPassiveChannelTimeTu */ } } return bufferSize; @@ -1043,31 +1043,31 @@ u8* CsrWifiSmeRoamingConfigSetReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeRoamingConfigSetReq *primitive = (CsrWifiSmeRoamingConfigSetReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 3; i2++) { - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamingBands[i2].rssiHighThreshold); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamingBands[i2].rssiLowThreshold); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamingBands[i2].snrHighThreshold); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamingBands[i2].snrLowThreshold); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamingBands[i2].rssiHighThreshold); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamingBands[i2].rssiLowThreshold); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamingBands[i2].snrHighThreshold); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamingBands[i2].snrLowThreshold); } } CsrUint8Ser(ptr, len, (u8) primitive->roamingConfig.disableSmoothRoaming); CsrUint8Ser(ptr, len, (u8) primitive->roamingConfig.disableRoamScans); CsrUint8Ser(ptr, len, (u8) primitive->roamingConfig.reconnectLimit); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.reconnectLimitIntervalMs); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.reconnectLimitIntervalMs); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 3; i2++) { - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamScanCfg[i2].intervalSeconds); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamScanCfg[i2].validitySeconds); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamScanCfg[i2].minActiveChannelTimeTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamScanCfg[i2].maxActiveChannelTimeTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamScanCfg[i2].minPassiveChannelTimeTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamScanCfg[i2].maxPassiveChannelTimeTu); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamScanCfg[i2].intervalSeconds); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamScanCfg[i2].validitySeconds); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamScanCfg[i2].minActiveChannelTimeTu); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamScanCfg[i2].maxActiveChannelTimeTu); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamScanCfg[i2].minPassiveChannelTimeTu); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamScanCfg[i2].maxPassiveChannelTimeTu); } } return(ptr); @@ -1081,31 +1081,31 @@ void* CsrWifiSmeRoamingConfigSetReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 3; i2++) { - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamingBands[i2].rssiHighThreshold, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamingBands[i2].rssiLowThreshold, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamingBands[i2].snrHighThreshold, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamingBands[i2].snrLowThreshold, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamingBands[i2].rssiHighThreshold, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamingBands[i2].rssiLowThreshold, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamingBands[i2].snrHighThreshold, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamingBands[i2].snrLowThreshold, buffer, &offset); } } CsrUint8Des((u8 *) &primitive->roamingConfig.disableSmoothRoaming, buffer, &offset); CsrUint8Des((u8 *) &primitive->roamingConfig.disableRoamScans, buffer, &offset); CsrUint8Des((u8 *) &primitive->roamingConfig.reconnectLimit, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.reconnectLimitIntervalMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.reconnectLimitIntervalMs, buffer, &offset); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 3; i2++) { - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamScanCfg[i2].intervalSeconds, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamScanCfg[i2].validitySeconds, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamScanCfg[i2].minActiveChannelTimeTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamScanCfg[i2].maxActiveChannelTimeTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamScanCfg[i2].minPassiveChannelTimeTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamScanCfg[i2].maxPassiveChannelTimeTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamScanCfg[i2].intervalSeconds, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamScanCfg[i2].validitySeconds, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamScanCfg[i2].minActiveChannelTimeTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamScanCfg[i2].maxActiveChannelTimeTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamScanCfg[i2].minPassiveChannelTimeTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamScanCfg[i2].maxPassiveChannelTimeTu, buffer, &offset); } } @@ -1120,26 +1120,26 @@ CsrSize CsrWifiSmeScanConfigSetReqSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 63) */ { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 4; i2++) { - bufferSize += 2; /* CsrUint16 primitive->scanConfig.scanCfg[i2].intervalSeconds */ - bufferSize += 2; /* CsrUint16 primitive->scanConfig.scanCfg[i2].validitySeconds */ - bufferSize += 2; /* CsrUint16 primitive->scanConfig.scanCfg[i2].minActiveChannelTimeTu */ - bufferSize += 2; /* CsrUint16 primitive->scanConfig.scanCfg[i2].maxActiveChannelTimeTu */ - bufferSize += 2; /* CsrUint16 primitive->scanConfig.scanCfg[i2].minPassiveChannelTimeTu */ - bufferSize += 2; /* CsrUint16 primitive->scanConfig.scanCfg[i2].maxPassiveChannelTimeTu */ + bufferSize += 2; /* u16 primitive->scanConfig.scanCfg[i2].intervalSeconds */ + bufferSize += 2; /* u16 primitive->scanConfig.scanCfg[i2].validitySeconds */ + bufferSize += 2; /* u16 primitive->scanConfig.scanCfg[i2].minActiveChannelTimeTu */ + bufferSize += 2; /* u16 primitive->scanConfig.scanCfg[i2].maxActiveChannelTimeTu */ + bufferSize += 2; /* u16 primitive->scanConfig.scanCfg[i2].minPassiveChannelTimeTu */ + bufferSize += 2; /* u16 primitive->scanConfig.scanCfg[i2].maxPassiveChannelTimeTu */ } } bufferSize += 1; /* CsrBool primitive->scanConfig.disableAutonomousScans */ - bufferSize += 2; /* CsrUint16 primitive->scanConfig.maxResults */ + bufferSize += 2; /* u16 primitive->scanConfig.maxResults */ bufferSize += 1; /* s8 primitive->scanConfig.highRssiThreshold */ bufferSize += 1; /* s8 primitive->scanConfig.lowRssiThreshold */ bufferSize += 1; /* s8 primitive->scanConfig.deltaRssiThreshold */ bufferSize += 1; /* s8 primitive->scanConfig.highSnrThreshold */ bufferSize += 1; /* s8 primitive->scanConfig.lowSnrThreshold */ bufferSize += 1; /* s8 primitive->scanConfig.deltaSnrThreshold */ - bufferSize += 2; /* CsrUint16 primitive->scanConfig.passiveChannelListCount */ + bufferSize += 2; /* u16 primitive->scanConfig.passiveChannelListCount */ bufferSize += primitive->scanConfig.passiveChannelListCount; /* u8 primitive->scanConfig.passiveChannelList */ return bufferSize; } @@ -1151,29 +1151,29 @@ u8* CsrWifiSmeScanConfigSetReqSer(u8 *ptr, CsrSize *len, void *msg) *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 4; i2++) { - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanConfig.scanCfg[i2].intervalSeconds); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanConfig.scanCfg[i2].validitySeconds); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanConfig.scanCfg[i2].minActiveChannelTimeTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanConfig.scanCfg[i2].maxActiveChannelTimeTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanConfig.scanCfg[i2].minPassiveChannelTimeTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanConfig.scanCfg[i2].maxPassiveChannelTimeTu); + CsrUint16Ser(ptr, len, (u16) primitive->scanConfig.scanCfg[i2].intervalSeconds); + CsrUint16Ser(ptr, len, (u16) primitive->scanConfig.scanCfg[i2].validitySeconds); + CsrUint16Ser(ptr, len, (u16) primitive->scanConfig.scanCfg[i2].minActiveChannelTimeTu); + CsrUint16Ser(ptr, len, (u16) primitive->scanConfig.scanCfg[i2].maxActiveChannelTimeTu); + CsrUint16Ser(ptr, len, (u16) primitive->scanConfig.scanCfg[i2].minPassiveChannelTimeTu); + CsrUint16Ser(ptr, len, (u16) primitive->scanConfig.scanCfg[i2].maxPassiveChannelTimeTu); } } CsrUint8Ser(ptr, len, (u8) primitive->scanConfig.disableAutonomousScans); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanConfig.maxResults); + CsrUint16Ser(ptr, len, (u16) primitive->scanConfig.maxResults); CsrUint8Ser(ptr, len, (u8) primitive->scanConfig.highRssiThreshold); CsrUint8Ser(ptr, len, (u8) primitive->scanConfig.lowRssiThreshold); CsrUint8Ser(ptr, len, (u8) primitive->scanConfig.deltaRssiThreshold); CsrUint8Ser(ptr, len, (u8) primitive->scanConfig.highSnrThreshold); CsrUint8Ser(ptr, len, (u8) primitive->scanConfig.lowSnrThreshold); CsrUint8Ser(ptr, len, (u8) primitive->scanConfig.deltaSnrThreshold); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanConfig.passiveChannelListCount); + CsrUint16Ser(ptr, len, (u16) primitive->scanConfig.passiveChannelListCount); if (primitive->scanConfig.passiveChannelListCount) { - CsrMemCpySer(ptr, len, (const void *) primitive->scanConfig.passiveChannelList, ((CsrUint16) (primitive->scanConfig.passiveChannelListCount))); + CsrMemCpySer(ptr, len, (const void *) primitive->scanConfig.passiveChannelList, ((u16) (primitive->scanConfig.passiveChannelListCount))); } return(ptr); } @@ -1187,30 +1187,30 @@ void* CsrWifiSmeScanConfigSetReqDes(u8 *buffer, CsrSize length) CsrUint16Des(&primitive->common.type, buffer, &offset); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 4; i2++) { - CsrUint16Des((CsrUint16 *) &primitive->scanConfig.scanCfg[i2].intervalSeconds, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanConfig.scanCfg[i2].validitySeconds, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanConfig.scanCfg[i2].minActiveChannelTimeTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanConfig.scanCfg[i2].maxActiveChannelTimeTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanConfig.scanCfg[i2].minPassiveChannelTimeTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanConfig.scanCfg[i2].maxPassiveChannelTimeTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanConfig.scanCfg[i2].intervalSeconds, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanConfig.scanCfg[i2].validitySeconds, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanConfig.scanCfg[i2].minActiveChannelTimeTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanConfig.scanCfg[i2].maxActiveChannelTimeTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanConfig.scanCfg[i2].minPassiveChannelTimeTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanConfig.scanCfg[i2].maxPassiveChannelTimeTu, buffer, &offset); } } CsrUint8Des((u8 *) &primitive->scanConfig.disableAutonomousScans, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanConfig.maxResults, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanConfig.maxResults, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanConfig.highRssiThreshold, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanConfig.lowRssiThreshold, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanConfig.deltaRssiThreshold, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanConfig.highSnrThreshold, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanConfig.lowSnrThreshold, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanConfig.deltaSnrThreshold, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanConfig.passiveChannelListCount, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanConfig.passiveChannelListCount, buffer, &offset); if (primitive->scanConfig.passiveChannelListCount) { primitive->scanConfig.passiveChannelList = (u8 *)CsrPmemAlloc(primitive->scanConfig.passiveChannelListCount); - CsrMemCpyDes(primitive->scanConfig.passiveChannelList, buffer, &offset, ((CsrUint16) (primitive->scanConfig.passiveChannelListCount))); + CsrMemCpyDes(primitive->scanConfig.passiveChannelList, buffer, &offset, ((u16) (primitive->scanConfig.passiveChannelListCount))); } else { @@ -1237,7 +1237,7 @@ CsrSize CsrWifiSmeScanFullReqSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 52) */ bufferSize += 1; /* u8 primitive->ssidCount */ { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->ssidCount; i1++) { bufferSize += 32; /* u8 primitive->ssid[i1].ssid[32] */ @@ -1248,9 +1248,9 @@ CsrSize CsrWifiSmeScanFullReqSizeof(void *msg) bufferSize += 1; /* CsrBool primitive->forceScan */ bufferSize += 1; /* CsrWifiSmeBssType primitive->bssType */ bufferSize += 1; /* CsrWifiSmeScanType primitive->scanType */ - bufferSize += 2; /* CsrUint16 primitive->channelListCount */ + bufferSize += 2; /* u16 primitive->channelListCount */ bufferSize += primitive->channelListCount; /* u8 primitive->channelList */ - bufferSize += 2; /* CsrUint16 primitive->probeIeLength */ + bufferSize += 2; /* u16 primitive->probeIeLength */ bufferSize += primitive->probeIeLength; /* u8 primitive->probeIe */ return bufferSize; } @@ -1263,26 +1263,26 @@ u8* CsrWifiSmeScanFullReqSer(u8 *ptr, CsrSize *len, void *msg) CsrUint16Ser(ptr, len, primitive->common.type); CsrUint8Ser(ptr, len, (u8) primitive->ssidCount); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->ssidCount; i1++) { - CsrMemCpySer(ptr, len, (const void *) primitive->ssid[i1].ssid, ((CsrUint16) (32))); + CsrMemCpySer(ptr, len, (const void *) primitive->ssid[i1].ssid, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->ssid[i1].length); } } - CsrMemCpySer(ptr, len, (const void *) primitive->bssid.a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->bssid.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->forceScan); CsrUint8Ser(ptr, len, (u8) primitive->bssType); CsrUint8Ser(ptr, len, (u8) primitive->scanType); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->channelListCount); + CsrUint16Ser(ptr, len, (u16) primitive->channelListCount); if (primitive->channelListCount) { - CsrMemCpySer(ptr, len, (const void *) primitive->channelList, ((CsrUint16) (primitive->channelListCount))); + CsrMemCpySer(ptr, len, (const void *) primitive->channelList, ((u16) (primitive->channelListCount))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->probeIeLength); + CsrUint16Ser(ptr, len, (u16) primitive->probeIeLength); if (primitive->probeIeLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->probeIe, ((CsrUint16) (primitive->probeIeLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->probeIe, ((u16) (primitive->probeIeLength))); } return(ptr); } @@ -1302,32 +1302,32 @@ void* CsrWifiSmeScanFullReqDes(u8 *buffer, CsrSize length) primitive->ssid = (CsrWifiSsid *)CsrPmemAlloc(sizeof(CsrWifiSsid) * primitive->ssidCount); } { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->ssidCount; i1++) { - CsrMemCpyDes(primitive->ssid[i1].ssid, buffer, &offset, ((CsrUint16) (32))); + CsrMemCpyDes(primitive->ssid[i1].ssid, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->ssid[i1].length, buffer, &offset); } } - CsrMemCpyDes(primitive->bssid.a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->bssid.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->forceScan, buffer, &offset); CsrUint8Des((u8 *) &primitive->bssType, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanType, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->channelListCount, buffer, &offset); + CsrUint16Des((u16 *) &primitive->channelListCount, buffer, &offset); if (primitive->channelListCount) { primitive->channelList = (u8 *)CsrPmemAlloc(primitive->channelListCount); - CsrMemCpyDes(primitive->channelList, buffer, &offset, ((CsrUint16) (primitive->channelListCount))); + CsrMemCpyDes(primitive->channelList, buffer, &offset, ((u16) (primitive->channelListCount))); } else { primitive->channelList = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->probeIeLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->probeIeLength, buffer, &offset); if (primitive->probeIeLength) { primitive->probeIe = (u8 *)CsrPmemAlloc(primitive->probeIeLength); - CsrMemCpyDes(primitive->probeIe, buffer, &offset, ((CsrUint16) (primitive->probeIeLength))); + CsrMemCpyDes(primitive->probeIe, buffer, &offset, ((u16) (primitive->probeIeLength))); } else { @@ -1353,7 +1353,7 @@ CsrSize CsrWifiSmeSmeStaConfigSetReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 11) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* u8 primitive->smeConfig.connectionQualityRssiChangeTrigger */ bufferSize += 1; /* u8 primitive->smeConfig.connectionQualitySnrChangeTrigger */ bufferSize += 1; /* CsrWifiSmeWmmModeMask primitive->smeConfig.wmmModeMask */ @@ -1369,7 +1369,7 @@ u8* CsrWifiSmeSmeStaConfigSetReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeSmeStaConfigSetReq *primitive = (CsrWifiSmeSmeStaConfigSetReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->smeConfig.connectionQualityRssiChangeTrigger); CsrUint8Ser(ptr, len, (u8) primitive->smeConfig.connectionQualitySnrChangeTrigger); CsrUint8Ser(ptr, len, (u8) primitive->smeConfig.wmmModeMask); @@ -1387,7 +1387,7 @@ void* CsrWifiSmeSmeStaConfigSetReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->smeConfig.connectionQualityRssiChangeTrigger, buffer, &offset); CsrUint8Des((u8 *) &primitive->smeConfig.connectionQualitySnrChangeTrigger, buffer, &offset); CsrUint8Des((u8 *) &primitive->smeConfig.wmmModeMask, buffer, &offset); @@ -1405,14 +1405,14 @@ CsrSize CsrWifiSmeTspecReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 18) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiSmeListAction primitive->action */ bufferSize += 4; /* CsrUint32 primitive->transactionId */ bufferSize += 1; /* CsrBool primitive->strict */ bufferSize += 1; /* CsrWifiSmeTspecCtrlMask primitive->ctrlMask */ - bufferSize += 2; /* CsrUint16 primitive->tspecLength */ + bufferSize += 2; /* u16 primitive->tspecLength */ bufferSize += primitive->tspecLength; /* u8 primitive->tspec */ - bufferSize += 2; /* CsrUint16 primitive->tclasLength */ + bufferSize += 2; /* u16 primitive->tclasLength */ bufferSize += primitive->tclasLength; /* u8 primitive->tclas */ return bufferSize; } @@ -1423,20 +1423,20 @@ u8* CsrWifiSmeTspecReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeTspecReq *primitive = (CsrWifiSmeTspecReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->action); CsrUint32Ser(ptr, len, (CsrUint32) primitive->transactionId); CsrUint8Ser(ptr, len, (u8) primitive->strict); CsrUint8Ser(ptr, len, (u8) primitive->ctrlMask); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->tspecLength); + CsrUint16Ser(ptr, len, (u16) primitive->tspecLength); if (primitive->tspecLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->tspec, ((CsrUint16) (primitive->tspecLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->tspec, ((u16) (primitive->tspecLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->tclasLength); + CsrUint16Ser(ptr, len, (u16) primitive->tclasLength); if (primitive->tclasLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->tclas, ((CsrUint16) (primitive->tclasLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->tclas, ((u16) (primitive->tclasLength))); } return(ptr); } @@ -1449,26 +1449,26 @@ void* CsrWifiSmeTspecReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->action, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->transactionId, buffer, &offset); CsrUint8Des((u8 *) &primitive->strict, buffer, &offset); CsrUint8Des((u8 *) &primitive->ctrlMask, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->tspecLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->tspecLength, buffer, &offset); if (primitive->tspecLength) { primitive->tspec = (u8 *)CsrPmemAlloc(primitive->tspecLength); - CsrMemCpyDes(primitive->tspec, buffer, &offset, ((CsrUint16) (primitive->tspecLength))); + CsrMemCpyDes(primitive->tspec, buffer, &offset, ((u16) (primitive->tspecLength))); } else { primitive->tspec = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->tclasLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->tclasLength, buffer, &offset); if (primitive->tclasLength) { primitive->tclas = (u8 *)CsrPmemAlloc(primitive->tclasLength); - CsrMemCpyDes(primitive->tclas, buffer, &offset, ((CsrUint16) (primitive->tclasLength))); + CsrMemCpyDes(primitive->tclas, buffer, &offset, ((u16) (primitive->tclasLength))); } else { @@ -1495,12 +1495,12 @@ CsrSize CsrWifiSmeWifiFlightmodeReqSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 14) */ bufferSize += 6; /* u8 primitive->address.a[6] */ - bufferSize += 2; /* CsrUint16 primitive->mibFilesCount */ + bufferSize += 2; /* u16 primitive->mibFilesCount */ { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->mibFilesCount; i1++) { - bufferSize += 2; /* CsrUint16 primitive->mibFiles[i1].length */ + bufferSize += 2; /* u16 primitive->mibFiles[i1].length */ bufferSize += primitive->mibFiles[i1].length; /* u8 primitive->mibFiles[i1].data */ } } @@ -1513,16 +1513,16 @@ u8* CsrWifiSmeWifiFlightmodeReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeWifiFlightmodeReq *primitive = (CsrWifiSmeWifiFlightmodeReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrMemCpySer(ptr, len, (const void *) primitive->address.a, ((CsrUint16) (6))); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->mibFilesCount); + CsrMemCpySer(ptr, len, (const void *) primitive->address.a, ((u16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->mibFilesCount); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->mibFilesCount; i1++) { - CsrUint16Ser(ptr, len, (CsrUint16) primitive->mibFiles[i1].length); + CsrUint16Ser(ptr, len, (u16) primitive->mibFiles[i1].length); if (primitive->mibFiles[i1].length) { - CsrMemCpySer(ptr, len, (const void *) primitive->mibFiles[i1].data, ((CsrUint16) (primitive->mibFiles[i1].length))); + CsrMemCpySer(ptr, len, (const void *) primitive->mibFiles[i1].data, ((u16) (primitive->mibFiles[i1].length))); } } } @@ -1537,22 +1537,22 @@ void* CsrWifiSmeWifiFlightmodeReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrMemCpyDes(primitive->address.a, buffer, &offset, ((CsrUint16) (6))); - CsrUint16Des((CsrUint16 *) &primitive->mibFilesCount, buffer, &offset); + CsrMemCpyDes(primitive->address.a, buffer, &offset, ((u16) (6))); + CsrUint16Des((u16 *) &primitive->mibFilesCount, buffer, &offset); primitive->mibFiles = NULL; if (primitive->mibFilesCount) { primitive->mibFiles = (CsrWifiSmeDataBlock *)CsrPmemAlloc(sizeof(CsrWifiSmeDataBlock) * primitive->mibFilesCount); } { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->mibFilesCount; i1++) { - CsrUint16Des((CsrUint16 *) &primitive->mibFiles[i1].length, buffer, &offset); + CsrUint16Des((u16 *) &primitive->mibFiles[i1].length, buffer, &offset); if (primitive->mibFiles[i1].length) { primitive->mibFiles[i1].data = (u8 *)CsrPmemAlloc(primitive->mibFiles[i1].length); - CsrMemCpyDes(primitive->mibFiles[i1].data, buffer, &offset, ((CsrUint16) (primitive->mibFiles[i1].length))); + CsrMemCpyDes(primitive->mibFiles[i1].data, buffer, &offset, ((u16) (primitive->mibFiles[i1].length))); } else { @@ -1569,7 +1569,7 @@ void CsrWifiSmeWifiFlightmodeReqSerFree(void *voidPrimitivePointer) { CsrWifiSmeWifiFlightmodeReq *primitive = (CsrWifiSmeWifiFlightmodeReq *) voidPrimitivePointer; { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->mibFilesCount; i1++) { CsrPmemFree(primitive->mibFiles[i1].data); @@ -1587,12 +1587,12 @@ CsrSize CsrWifiSmeWifiOnReqSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 14) */ bufferSize += 6; /* u8 primitive->address.a[6] */ - bufferSize += 2; /* CsrUint16 primitive->mibFilesCount */ + bufferSize += 2; /* u16 primitive->mibFilesCount */ { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->mibFilesCount; i1++) { - bufferSize += 2; /* CsrUint16 primitive->mibFiles[i1].length */ + bufferSize += 2; /* u16 primitive->mibFiles[i1].length */ bufferSize += primitive->mibFiles[i1].length; /* u8 primitive->mibFiles[i1].data */ } } @@ -1605,16 +1605,16 @@ u8* CsrWifiSmeWifiOnReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeWifiOnReq *primitive = (CsrWifiSmeWifiOnReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrMemCpySer(ptr, len, (const void *) primitive->address.a, ((CsrUint16) (6))); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->mibFilesCount); + CsrMemCpySer(ptr, len, (const void *) primitive->address.a, ((u16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->mibFilesCount); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->mibFilesCount; i1++) { - CsrUint16Ser(ptr, len, (CsrUint16) primitive->mibFiles[i1].length); + CsrUint16Ser(ptr, len, (u16) primitive->mibFiles[i1].length); if (primitive->mibFiles[i1].length) { - CsrMemCpySer(ptr, len, (const void *) primitive->mibFiles[i1].data, ((CsrUint16) (primitive->mibFiles[i1].length))); + CsrMemCpySer(ptr, len, (const void *) primitive->mibFiles[i1].data, ((u16) (primitive->mibFiles[i1].length))); } } } @@ -1629,22 +1629,22 @@ void* CsrWifiSmeWifiOnReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrMemCpyDes(primitive->address.a, buffer, &offset, ((CsrUint16) (6))); - CsrUint16Des((CsrUint16 *) &primitive->mibFilesCount, buffer, &offset); + CsrMemCpyDes(primitive->address.a, buffer, &offset, ((u16) (6))); + CsrUint16Des((u16 *) &primitive->mibFilesCount, buffer, &offset); primitive->mibFiles = NULL; if (primitive->mibFilesCount) { primitive->mibFiles = (CsrWifiSmeDataBlock *)CsrPmemAlloc(sizeof(CsrWifiSmeDataBlock) * primitive->mibFilesCount); } { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->mibFilesCount; i1++) { - CsrUint16Des((CsrUint16 *) &primitive->mibFiles[i1].length, buffer, &offset); + CsrUint16Des((u16 *) &primitive->mibFiles[i1].length, buffer, &offset); if (primitive->mibFiles[i1].length) { primitive->mibFiles[i1].data = (u8 *)CsrPmemAlloc(primitive->mibFiles[i1].length); - CsrMemCpyDes(primitive->mibFiles[i1].data, buffer, &offset, ((CsrUint16) (primitive->mibFiles[i1].length))); + CsrMemCpyDes(primitive->mibFiles[i1].data, buffer, &offset, ((u16) (primitive->mibFiles[i1].length))); } else { @@ -1661,7 +1661,7 @@ void CsrWifiSmeWifiOnReqSerFree(void *voidPrimitivePointer) { CsrWifiSmeWifiOnReq *primitive = (CsrWifiSmeWifiOnReq *) voidPrimitivePointer; { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->mibFilesCount; i1++) { CsrPmemFree(primitive->mibFiles[i1].data); @@ -1680,7 +1680,7 @@ CsrSize CsrWifiSmeCloakedSsidsSetReqSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 37) */ bufferSize += 1; /* u8 primitive->cloakedSsids.cloakedSsidsCount */ { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < primitive->cloakedSsids.cloakedSsidsCount; i2++) { bufferSize += 32; /* u8 primitive->cloakedSsids.cloakedSsids[i2].ssid[32] */ @@ -1698,10 +1698,10 @@ u8* CsrWifiSmeCloakedSsidsSetReqSer(u8 *ptr, CsrSize *len, void *msg) CsrUint16Ser(ptr, len, primitive->common.type); CsrUint8Ser(ptr, len, (u8) primitive->cloakedSsids.cloakedSsidsCount); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < primitive->cloakedSsids.cloakedSsidsCount; i2++) { - CsrMemCpySer(ptr, len, (const void *) primitive->cloakedSsids.cloakedSsids[i2].ssid, ((CsrUint16) (32))); + CsrMemCpySer(ptr, len, (const void *) primitive->cloakedSsids.cloakedSsids[i2].ssid, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->cloakedSsids.cloakedSsids[i2].length); } } @@ -1723,10 +1723,10 @@ void* CsrWifiSmeCloakedSsidsSetReqDes(u8 *buffer, CsrSize length) primitive->cloakedSsids.cloakedSsids = (CsrWifiSsid *)CsrPmemAlloc(sizeof(CsrWifiSsid) * primitive->cloakedSsids.cloakedSsidsCount); } { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < primitive->cloakedSsids.cloakedSsidsCount; i2++) { - CsrMemCpyDes(primitive->cloakedSsids.cloakedSsids[i2].ssid, buffer, &offset, ((CsrUint16) (32))); + CsrMemCpyDes(primitive->cloakedSsids.cloakedSsids[i2].ssid, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->cloakedSsids.cloakedSsids[i2].length, buffer, &offset); } } @@ -1762,7 +1762,7 @@ u8* CsrWifiSmeSmeCommonConfigSetReqSer(u8 *ptr, CsrSize *len, void *msg) *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); CsrUint8Ser(ptr, len, (u8) primitive->deviceConfig.trustLevel); - CsrMemCpySer(ptr, len, (const void *) primitive->deviceConfig.countryCode, ((CsrUint16) (2))); + CsrMemCpySer(ptr, len, (const void *) primitive->deviceConfig.countryCode, ((u16) (2))); CsrUint8Ser(ptr, len, (u8) primitive->deviceConfig.firmwareDriverInterface); CsrUint8Ser(ptr, len, (u8) primitive->deviceConfig.enableStrictDraftN); return(ptr); @@ -1777,7 +1777,7 @@ void* CsrWifiSmeSmeCommonConfigSetReqDes(u8 *buffer, CsrSize length) CsrUint16Des(&primitive->common.type, buffer, &offset); CsrUint8Des((u8 *) &primitive->deviceConfig.trustLevel, buffer, &offset); - CsrMemCpyDes(primitive->deviceConfig.countryCode, buffer, &offset, ((CsrUint16) (2))); + CsrMemCpyDes(primitive->deviceConfig.countryCode, buffer, &offset, ((u16) (2))); CsrUint8Des((u8 *) &primitive->deviceConfig.firmwareDriverInterface, buffer, &offset); CsrUint8Des((u8 *) &primitive->deviceConfig.enableStrictDraftN, buffer, &offset); @@ -1805,7 +1805,7 @@ CsrSize CsrWifiSmeWpsConfigurationReqSizeof(void *msg) bufferSize += 8; /* u8 primitive->wpsConfig.primDeviceType.deviceDetails[8] */ bufferSize += 1; /* u8 primitive->wpsConfig.secondaryDeviceTypeCount */ { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < primitive->wpsConfig.secondaryDeviceTypeCount; i2++) { bufferSize += 8; /* u8 primitive->wpsConfig.secondaryDeviceType[i2].deviceDetails[8] */ @@ -1824,28 +1824,28 @@ u8* CsrWifiSmeWpsConfigurationReqSer(u8 *ptr, CsrSize *len, void *msg) *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); CsrUint8Ser(ptr, len, (u8) primitive->wpsConfig.wpsVersion); - CsrMemCpySer(ptr, len, (const void *) primitive->wpsConfig.uuid, ((CsrUint16) (16))); - CsrMemCpySer(ptr, len, (const void *) primitive->wpsConfig.deviceName, ((CsrUint16) (32))); + CsrMemCpySer(ptr, len, (const void *) primitive->wpsConfig.uuid, ((u16) (16))); + CsrMemCpySer(ptr, len, (const void *) primitive->wpsConfig.deviceName, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->wpsConfig.deviceNameLength); - CsrMemCpySer(ptr, len, (const void *) primitive->wpsConfig.manufacturer, ((CsrUint16) (64))); + CsrMemCpySer(ptr, len, (const void *) primitive->wpsConfig.manufacturer, ((u16) (64))); CsrUint8Ser(ptr, len, (u8) primitive->wpsConfig.manufacturerLength); - CsrMemCpySer(ptr, len, (const void *) primitive->wpsConfig.modelName, ((CsrUint16) (32))); + CsrMemCpySer(ptr, len, (const void *) primitive->wpsConfig.modelName, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->wpsConfig.modelNameLength); - CsrMemCpySer(ptr, len, (const void *) primitive->wpsConfig.modelNumber, ((CsrUint16) (32))); + CsrMemCpySer(ptr, len, (const void *) primitive->wpsConfig.modelNumber, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->wpsConfig.modelNumberLength); - CsrMemCpySer(ptr, len, (const void *) primitive->wpsConfig.serialNumber, ((CsrUint16) (32))); - CsrMemCpySer(ptr, len, (const void *) primitive->wpsConfig.primDeviceType.deviceDetails, ((CsrUint16) (8))); + CsrMemCpySer(ptr, len, (const void *) primitive->wpsConfig.serialNumber, ((u16) (32))); + CsrMemCpySer(ptr, len, (const void *) primitive->wpsConfig.primDeviceType.deviceDetails, ((u16) (8))); CsrUint8Ser(ptr, len, (u8) primitive->wpsConfig.secondaryDeviceTypeCount); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < primitive->wpsConfig.secondaryDeviceTypeCount; i2++) { - CsrMemCpySer(ptr, len, (const void *) primitive->wpsConfig.secondaryDeviceType[i2].deviceDetails, ((CsrUint16) (8))); + CsrMemCpySer(ptr, len, (const void *) primitive->wpsConfig.secondaryDeviceType[i2].deviceDetails, ((u16) (8))); } } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->wpsConfig.configMethods); + CsrUint16Ser(ptr, len, (u16) primitive->wpsConfig.configMethods); CsrUint8Ser(ptr, len, (u8) primitive->wpsConfig.rfBands); - CsrMemCpySer(ptr, len, (const void *) primitive->wpsConfig.osVersion, ((CsrUint16) (4))); + CsrMemCpySer(ptr, len, (const void *) primitive->wpsConfig.osVersion, ((u16) (4))); return(ptr); } @@ -1858,17 +1858,17 @@ void* CsrWifiSmeWpsConfigurationReqDes(u8 *buffer, CsrSize length) CsrUint16Des(&primitive->common.type, buffer, &offset); CsrUint8Des((u8 *) &primitive->wpsConfig.wpsVersion, buffer, &offset); - CsrMemCpyDes(primitive->wpsConfig.uuid, buffer, &offset, ((CsrUint16) (16))); - CsrMemCpyDes(primitive->wpsConfig.deviceName, buffer, &offset, ((CsrUint16) (32))); + CsrMemCpyDes(primitive->wpsConfig.uuid, buffer, &offset, ((u16) (16))); + CsrMemCpyDes(primitive->wpsConfig.deviceName, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->wpsConfig.deviceNameLength, buffer, &offset); - CsrMemCpyDes(primitive->wpsConfig.manufacturer, buffer, &offset, ((CsrUint16) (64))); + CsrMemCpyDes(primitive->wpsConfig.manufacturer, buffer, &offset, ((u16) (64))); CsrUint8Des((u8 *) &primitive->wpsConfig.manufacturerLength, buffer, &offset); - CsrMemCpyDes(primitive->wpsConfig.modelName, buffer, &offset, ((CsrUint16) (32))); + CsrMemCpyDes(primitive->wpsConfig.modelName, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->wpsConfig.modelNameLength, buffer, &offset); - CsrMemCpyDes(primitive->wpsConfig.modelNumber, buffer, &offset, ((CsrUint16) (32))); + CsrMemCpyDes(primitive->wpsConfig.modelNumber, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->wpsConfig.modelNumberLength, buffer, &offset); - CsrMemCpyDes(primitive->wpsConfig.serialNumber, buffer, &offset, ((CsrUint16) (32))); - CsrMemCpyDes(primitive->wpsConfig.primDeviceType.deviceDetails, buffer, &offset, ((CsrUint16) (8))); + CsrMemCpyDes(primitive->wpsConfig.serialNumber, buffer, &offset, ((u16) (32))); + CsrMemCpyDes(primitive->wpsConfig.primDeviceType.deviceDetails, buffer, &offset, ((u16) (8))); CsrUint8Des((u8 *) &primitive->wpsConfig.secondaryDeviceTypeCount, buffer, &offset); primitive->wpsConfig.secondaryDeviceType = NULL; if (primitive->wpsConfig.secondaryDeviceTypeCount) @@ -1876,15 +1876,15 @@ void* CsrWifiSmeWpsConfigurationReqDes(u8 *buffer, CsrSize length) primitive->wpsConfig.secondaryDeviceType = (CsrWifiSmeWpsDeviceType *)CsrPmemAlloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->wpsConfig.secondaryDeviceTypeCount); } { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < primitive->wpsConfig.secondaryDeviceTypeCount; i2++) { - CsrMemCpyDes(primitive->wpsConfig.secondaryDeviceType[i2].deviceDetails, buffer, &offset, ((CsrUint16) (8))); + CsrMemCpyDes(primitive->wpsConfig.secondaryDeviceType[i2].deviceDetails, buffer, &offset, ((u16) (8))); } } - CsrUint16Des((CsrUint16 *) &primitive->wpsConfig.configMethods, buffer, &offset); + CsrUint16Des((u16 *) &primitive->wpsConfig.configMethods, buffer, &offset); CsrUint8Des((u8 *) &primitive->wpsConfig.rfBands, buffer, &offset); - CsrMemCpyDes(primitive->wpsConfig.osVersion, buffer, &offset, ((CsrUint16) (4))); + CsrMemCpyDes(primitive->wpsConfig.osVersion, buffer, &offset, ((u16) (4))); return primitive; } @@ -1918,7 +1918,7 @@ u8* CsrWifiSmeSetReqSer(u8 *ptr, CsrSize *len, void *msg) CsrUint32Ser(ptr, len, (CsrUint32) primitive->dataLength); if (primitive->dataLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->data, ((CsrUint16) (primitive->dataLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->data, ((u16) (primitive->dataLength))); } return(ptr); } @@ -1935,7 +1935,7 @@ void* CsrWifiSmeSetReqDes(u8 *buffer, CsrSize length) if (primitive->dataLength) { primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); - CsrMemCpyDes(primitive->data, buffer, &offset, ((CsrUint16) (primitive->dataLength))); + CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); } else { @@ -1960,10 +1960,10 @@ CsrSize CsrWifiSmeAdhocConfigGetCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */ bufferSize += 2; /* CsrResult primitive->status */ - bufferSize += 2; /* CsrUint16 primitive->adHocConfig.atimWindowTu */ - bufferSize += 2; /* CsrUint16 primitive->adHocConfig.beaconPeriodTu */ - bufferSize += 2; /* CsrUint16 primitive->adHocConfig.joinOnlyAttempts */ - bufferSize += 2; /* CsrUint16 primitive->adHocConfig.joinAttemptIntervalMs */ + bufferSize += 2; /* u16 primitive->adHocConfig.atimWindowTu */ + bufferSize += 2; /* u16 primitive->adHocConfig.beaconPeriodTu */ + bufferSize += 2; /* u16 primitive->adHocConfig.joinOnlyAttempts */ + bufferSize += 2; /* u16 primitive->adHocConfig.joinAttemptIntervalMs */ return bufferSize; } @@ -1973,11 +1973,11 @@ u8* CsrWifiSmeAdhocConfigGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeAdhocConfigGetCfm *primitive = (CsrWifiSmeAdhocConfigGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->adHocConfig.atimWindowTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->adHocConfig.beaconPeriodTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->adHocConfig.joinOnlyAttempts); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->adHocConfig.joinAttemptIntervalMs); + CsrUint16Ser(ptr, len, (u16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->adHocConfig.atimWindowTu); + CsrUint16Ser(ptr, len, (u16) primitive->adHocConfig.beaconPeriodTu); + CsrUint16Ser(ptr, len, (u16) primitive->adHocConfig.joinOnlyAttempts); + CsrUint16Ser(ptr, len, (u16) primitive->adHocConfig.joinAttemptIntervalMs); return(ptr); } @@ -1989,11 +1989,11 @@ void* CsrWifiSmeAdhocConfigGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->adHocConfig.atimWindowTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->adHocConfig.beaconPeriodTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->adHocConfig.joinOnlyAttempts, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->adHocConfig.joinAttemptIntervalMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->adHocConfig.atimWindowTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->adHocConfig.beaconPeriodTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->adHocConfig.joinOnlyAttempts, buffer, &offset); + CsrUint16Des((u16 *) &primitive->adHocConfig.joinAttemptIntervalMs, buffer, &offset); return primitive; } @@ -2005,38 +2005,38 @@ CsrSize CsrWifiSmeAssociationCompleteIndSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 98) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 32; /* u8 primitive->connectionInfo.ssid.ssid[32] */ bufferSize += 1; /* u8 primitive->connectionInfo.ssid.length */ bufferSize += 6; /* u8 primitive->connectionInfo.bssid.a[6] */ bufferSize += 1; /* CsrWifiSme80211NetworkType primitive->connectionInfo.networkType80211 */ bufferSize += 1; /* u8 primitive->connectionInfo.channelNumber */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.channelFrequency */ + bufferSize += 2; /* u16 primitive->connectionInfo.channelFrequency */ bufferSize += 2; /* CsrWifiSmeAuthMode primitive->connectionInfo.authMode */ bufferSize += 2; /* CsrWifiSmeEncryption primitive->connectionInfo.pairwiseCipher */ bufferSize += 2; /* CsrWifiSmeEncryption primitive->connectionInfo.groupCipher */ bufferSize += 1; /* CsrWifiSmeRadioIF primitive->connectionInfo.ifIndex */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.atimWindowTu */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.beaconPeriodTu */ + bufferSize += 2; /* u16 primitive->connectionInfo.atimWindowTu */ + bufferSize += 2; /* u16 primitive->connectionInfo.beaconPeriodTu */ bufferSize += 1; /* CsrBool primitive->connectionInfo.reassociation */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.beaconFrameLength */ + bufferSize += 2; /* u16 primitive->connectionInfo.beaconFrameLength */ bufferSize += primitive->connectionInfo.beaconFrameLength; /* u8 primitive->connectionInfo.beaconFrame */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.associationReqFrameLength */ + bufferSize += 2; /* u16 primitive->connectionInfo.associationReqFrameLength */ bufferSize += primitive->connectionInfo.associationReqFrameLength; /* u8 primitive->connectionInfo.associationReqFrame */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.associationRspFrameLength */ + bufferSize += 2; /* u16 primitive->connectionInfo.associationRspFrameLength */ bufferSize += primitive->connectionInfo.associationRspFrameLength; /* u8 primitive->connectionInfo.associationRspFrame */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocScanInfoElementsLength */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocScanInfoElementsLength */ bufferSize += primitive->connectionInfo.assocScanInfoElementsLength; /* u8 primitive->connectionInfo.assocScanInfoElements */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocReqCapabilities */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocReqListenIntervalTu */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocReqCapabilities */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocReqListenIntervalTu */ bufferSize += 6; /* u8 primitive->connectionInfo.assocReqApAddress.a[6] */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocReqInfoElementsLength */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocReqInfoElementsLength */ bufferSize += primitive->connectionInfo.assocReqInfoElementsLength; /* u8 primitive->connectionInfo.assocReqInfoElements */ bufferSize += 2; /* CsrWifiSmeIEEE80211Result primitive->connectionInfo.assocRspResult */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocRspCapabilityInfo */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocRspAssociationId */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocRspInfoElementsLength */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocRspCapabilityInfo */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocRspAssociationId */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocRspInfoElementsLength */ bufferSize += primitive->connectionInfo.assocRspInfoElementsLength; /* u8 primitive->connectionInfo.assocRspInfoElements */ bufferSize += 2; /* CsrWifiSmeIEEE80211Reason primitive->deauthReason */ return bufferSize; @@ -2048,58 +2048,58 @@ u8* CsrWifiSmeAssociationCompleteIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeAssociationCompleteInd *primitive = (CsrWifiSmeAssociationCompleteInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.ssid.ssid, ((CsrUint16) (32))); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.ssid.ssid, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->connectionInfo.ssid.length); - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.bssid.a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.bssid.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->connectionInfo.networkType80211); CsrUint8Ser(ptr, len, (u8) primitive->connectionInfo.channelNumber); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.channelFrequency); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.authMode); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.pairwiseCipher); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.groupCipher); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.channelFrequency); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.authMode); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.pairwiseCipher); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.groupCipher); CsrUint8Ser(ptr, len, (u8) primitive->connectionInfo.ifIndex); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.atimWindowTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.beaconPeriodTu); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.atimWindowTu); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.beaconPeriodTu); CsrUint8Ser(ptr, len, (u8) primitive->connectionInfo.reassociation); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.beaconFrameLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.beaconFrameLength); if (primitive->connectionInfo.beaconFrameLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.beaconFrame, ((CsrUint16) (primitive->connectionInfo.beaconFrameLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.beaconFrame, ((u16) (primitive->connectionInfo.beaconFrameLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.associationReqFrameLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.associationReqFrameLength); if (primitive->connectionInfo.associationReqFrameLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.associationReqFrame, ((CsrUint16) (primitive->connectionInfo.associationReqFrameLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.associationReqFrame, ((u16) (primitive->connectionInfo.associationReqFrameLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.associationRspFrameLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.associationRspFrameLength); if (primitive->connectionInfo.associationRspFrameLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.associationRspFrame, ((CsrUint16) (primitive->connectionInfo.associationRspFrameLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.associationRspFrame, ((u16) (primitive->connectionInfo.associationRspFrameLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocScanInfoElementsLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocScanInfoElementsLength); if (primitive->connectionInfo.assocScanInfoElementsLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocScanInfoElements, ((CsrUint16) (primitive->connectionInfo.assocScanInfoElementsLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocScanInfoElements, ((u16) (primitive->connectionInfo.assocScanInfoElementsLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocReqCapabilities); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocReqListenIntervalTu); - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocReqApAddress.a, ((CsrUint16) (6))); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocReqInfoElementsLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocReqCapabilities); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocReqListenIntervalTu); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocReqApAddress.a, ((u16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocReqInfoElementsLength); if (primitive->connectionInfo.assocReqInfoElementsLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocReqInfoElements, ((CsrUint16) (primitive->connectionInfo.assocReqInfoElementsLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocReqInfoElements, ((u16) (primitive->connectionInfo.assocReqInfoElementsLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocRspResult); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocRspCapabilityInfo); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocRspAssociationId); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocRspInfoElementsLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocRspResult); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocRspCapabilityInfo); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocRspAssociationId); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocRspInfoElementsLength); if (primitive->connectionInfo.assocRspInfoElementsLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocRspInfoElements, ((CsrUint16) (primitive->connectionInfo.assocRspInfoElementsLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocRspInfoElements, ((u16) (primitive->connectionInfo.assocRspInfoElementsLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->deauthReason); + CsrUint16Ser(ptr, len, (u16) primitive->deauthReason); return(ptr); } @@ -2111,88 +2111,88 @@ void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); - CsrMemCpyDes(primitive->connectionInfo.ssid.ssid, buffer, &offset, ((CsrUint16) (32))); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); + CsrMemCpyDes(primitive->connectionInfo.ssid.ssid, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->connectionInfo.ssid.length, buffer, &offset); - CsrMemCpyDes(primitive->connectionInfo.bssid.a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->connectionInfo.bssid.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->connectionInfo.networkType80211, buffer, &offset); CsrUint8Des((u8 *) &primitive->connectionInfo.channelNumber, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.channelFrequency, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.authMode, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.pairwiseCipher, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.groupCipher, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.channelFrequency, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.authMode, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.pairwiseCipher, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.groupCipher, buffer, &offset); CsrUint8Des((u8 *) &primitive->connectionInfo.ifIndex, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.atimWindowTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.beaconPeriodTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.atimWindowTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.beaconPeriodTu, buffer, &offset); CsrUint8Des((u8 *) &primitive->connectionInfo.reassociation, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.beaconFrameLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.beaconFrameLength, buffer, &offset); if (primitive->connectionInfo.beaconFrameLength) { primitive->connectionInfo.beaconFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.beaconFrameLength); - CsrMemCpyDes(primitive->connectionInfo.beaconFrame, buffer, &offset, ((CsrUint16) (primitive->connectionInfo.beaconFrameLength))); + CsrMemCpyDes(primitive->connectionInfo.beaconFrame, buffer, &offset, ((u16) (primitive->connectionInfo.beaconFrameLength))); } else { primitive->connectionInfo.beaconFrame = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.associationReqFrameLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.associationReqFrameLength, buffer, &offset); if (primitive->connectionInfo.associationReqFrameLength) { primitive->connectionInfo.associationReqFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.associationReqFrameLength); - CsrMemCpyDes(primitive->connectionInfo.associationReqFrame, buffer, &offset, ((CsrUint16) (primitive->connectionInfo.associationReqFrameLength))); + CsrMemCpyDes(primitive->connectionInfo.associationReqFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationReqFrameLength))); } else { primitive->connectionInfo.associationReqFrame = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.associationRspFrameLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.associationRspFrameLength, buffer, &offset); if (primitive->connectionInfo.associationRspFrameLength) { primitive->connectionInfo.associationRspFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.associationRspFrameLength); - CsrMemCpyDes(primitive->connectionInfo.associationRspFrame, buffer, &offset, ((CsrUint16) (primitive->connectionInfo.associationRspFrameLength))); + CsrMemCpyDes(primitive->connectionInfo.associationRspFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationRspFrameLength))); } else { primitive->connectionInfo.associationRspFrame = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocScanInfoElementsLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocScanInfoElementsLength, buffer, &offset); if (primitive->connectionInfo.assocScanInfoElementsLength) { primitive->connectionInfo.assocScanInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocScanInfoElementsLength); - CsrMemCpyDes(primitive->connectionInfo.assocScanInfoElements, buffer, &offset, ((CsrUint16) (primitive->connectionInfo.assocScanInfoElementsLength))); + CsrMemCpyDes(primitive->connectionInfo.assocScanInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocScanInfoElementsLength))); } else { primitive->connectionInfo.assocScanInfoElements = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocReqCapabilities, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocReqListenIntervalTu, buffer, &offset); - CsrMemCpyDes(primitive->connectionInfo.assocReqApAddress.a, buffer, &offset, ((CsrUint16) (6))); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocReqInfoElementsLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocReqCapabilities, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocReqListenIntervalTu, buffer, &offset); + CsrMemCpyDes(primitive->connectionInfo.assocReqApAddress.a, buffer, &offset, ((u16) (6))); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocReqInfoElementsLength, buffer, &offset); if (primitive->connectionInfo.assocReqInfoElementsLength) { primitive->connectionInfo.assocReqInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocReqInfoElementsLength); - CsrMemCpyDes(primitive->connectionInfo.assocReqInfoElements, buffer, &offset, ((CsrUint16) (primitive->connectionInfo.assocReqInfoElementsLength))); + CsrMemCpyDes(primitive->connectionInfo.assocReqInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocReqInfoElementsLength))); } else { primitive->connectionInfo.assocReqInfoElements = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocRspResult, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocRspCapabilityInfo, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocRspAssociationId, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocRspInfoElementsLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspResult, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspCapabilityInfo, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspAssociationId, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspInfoElementsLength, buffer, &offset); if (primitive->connectionInfo.assocRspInfoElementsLength) { primitive->connectionInfo.assocRspInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocRspInfoElementsLength); - CsrMemCpyDes(primitive->connectionInfo.assocRspInfoElements, buffer, &offset, ((CsrUint16) (primitive->connectionInfo.assocRspInfoElementsLength))); + CsrMemCpyDes(primitive->connectionInfo.assocRspInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocRspInfoElementsLength))); } else { primitive->connectionInfo.assocRspInfoElements = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->deauthReason, buffer, &offset); + CsrUint16Des((u16 *) &primitive->deauthReason, buffer, &offset); return primitive; } @@ -2216,7 +2216,7 @@ CsrSize CsrWifiSmeAssociationStartIndSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 44) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 6; /* u8 primitive->address.a[6] */ bufferSize += 32; /* u8 primitive->ssid.ssid[32] */ bufferSize += 1; /* u8 primitive->ssid.length */ @@ -2229,9 +2229,9 @@ u8* CsrWifiSmeAssociationStartIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeAssociationStartInd *primitive = (CsrWifiSmeAssociationStartInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrMemCpySer(ptr, len, (const void *) primitive->address.a, ((CsrUint16) (6))); - CsrMemCpySer(ptr, len, (const void *) primitive->ssid.ssid, ((CsrUint16) (32))); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrMemCpySer(ptr, len, (const void *) primitive->address.a, ((u16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->ssid.ssid, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->ssid.length); return(ptr); } @@ -2244,9 +2244,9 @@ void* CsrWifiSmeAssociationStartIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrMemCpyDes(primitive->address.a, buffer, &offset, ((CsrUint16) (6))); - CsrMemCpyDes(primitive->ssid.ssid, buffer, &offset, ((CsrUint16) (32))); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrMemCpyDes(primitive->address.a, buffer, &offset, ((u16) (6))); + CsrMemCpyDes(primitive->ssid.ssid, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->ssid.length, buffer, &offset); return primitive; @@ -2259,12 +2259,12 @@ CsrSize CsrWifiSmeBlacklistCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 15) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 1; /* CsrWifiSmeListAction primitive->action */ bufferSize += 1; /* u8 primitive->getAddressCount */ { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->getAddressCount; i1++) { bufferSize += 6; /* u8 primitive->getAddresses[i1].a[6] */ @@ -2279,15 +2279,15 @@ u8* CsrWifiSmeBlacklistCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeBlacklistCfm *primitive = (CsrWifiSmeBlacklistCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint8Ser(ptr, len, (u8) primitive->action); CsrUint8Ser(ptr, len, (u8) primitive->getAddressCount); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->getAddressCount; i1++) { - CsrMemCpySer(ptr, len, (const void *) primitive->getAddresses[i1].a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->getAddresses[i1].a, ((u16) (6))); } } return(ptr); @@ -2301,8 +2301,8 @@ void* CsrWifiSmeBlacklistCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint8Des((u8 *) &primitive->action, buffer, &offset); CsrUint8Des((u8 *) &primitive->getAddressCount, buffer, &offset); primitive->getAddresses = NULL; @@ -2311,10 +2311,10 @@ void* CsrWifiSmeBlacklistCfmDes(u8 *buffer, CsrSize length) primitive->getAddresses = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->getAddressCount); } { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->getAddressCount; i1++) { - CsrMemCpyDes(primitive->getAddresses[i1].a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->getAddresses[i1].a, buffer, &offset, ((u16) (6))); } } @@ -2337,7 +2337,7 @@ CsrSize CsrWifiSmeCalibrationDataGetCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 8) */ bufferSize += 2; /* CsrResult primitive->status */ - bufferSize += 2; /* CsrUint16 primitive->calibrationDataLength */ + bufferSize += 2; /* u16 primitive->calibrationDataLength */ bufferSize += primitive->calibrationDataLength; /* u8 primitive->calibrationData */ return bufferSize; } @@ -2348,11 +2348,11 @@ u8* CsrWifiSmeCalibrationDataGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeCalibrationDataGetCfm *primitive = (CsrWifiSmeCalibrationDataGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->calibrationDataLength); + CsrUint16Ser(ptr, len, (u16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->calibrationDataLength); if (primitive->calibrationDataLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->calibrationData, ((CsrUint16) (primitive->calibrationDataLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->calibrationData, ((u16) (primitive->calibrationDataLength))); } return(ptr); } @@ -2365,12 +2365,12 @@ void* CsrWifiSmeCalibrationDataGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->calibrationDataLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->calibrationDataLength, buffer, &offset); if (primitive->calibrationDataLength) { primitive->calibrationData = (u8 *)CsrPmemAlloc(primitive->calibrationDataLength); - CsrMemCpyDes(primitive->calibrationData, buffer, &offset, ((CsrUint16) (primitive->calibrationDataLength))); + CsrMemCpyDes(primitive->calibrationData, buffer, &offset, ((u16) (primitive->calibrationDataLength))); } else { @@ -2394,7 +2394,7 @@ CsrSize CsrWifiSmeCcxConfigGetCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 11) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 1; /* u8 primitive->ccxConfig.keepAliveTimeMs */ bufferSize += 1; /* CsrBool primitive->ccxConfig.apRoamingEnabled */ @@ -2409,8 +2409,8 @@ u8* CsrWifiSmeCcxConfigGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeCcxConfigGetCfm *primitive = (CsrWifiSmeCcxConfigGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint8Ser(ptr, len, (u8) primitive->ccxConfig.keepAliveTimeMs); CsrUint8Ser(ptr, len, (u8) primitive->ccxConfig.apRoamingEnabled); CsrUint8Ser(ptr, len, (u8) primitive->ccxConfig.measurementsMask); @@ -2426,8 +2426,8 @@ void* CsrWifiSmeCcxConfigGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint8Des((u8 *) &primitive->ccxConfig.keepAliveTimeMs, buffer, &offset); CsrUint8Des((u8 *) &primitive->ccxConfig.apRoamingEnabled, buffer, &offset); CsrUint8Des((u8 *) &primitive->ccxConfig.measurementsMask, buffer, &offset); @@ -2442,7 +2442,7 @@ CsrSize CsrWifiSmeCcxConfigSetCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 7) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; } @@ -2453,8 +2453,8 @@ u8* CsrWifiSmeCcxConfigSetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeCcxConfigSetCfm *primitive = (CsrWifiSmeCcxConfigSetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -2466,8 +2466,8 @@ void* CsrWifiSmeCcxConfigSetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -2481,18 +2481,18 @@ CsrSize CsrWifiSmeCoexConfigGetCfmSizeof(void *msg) bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 1; /* CsrBool primitive->coexConfig.coexEnableSchemeManagement */ bufferSize += 1; /* CsrBool primitive->coexConfig.coexPeriodicWakeHost */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexTrafficBurstyLatencyMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexTrafficContinuousLatencyMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexObexBlackoutDurationMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexObexBlackoutPeriodMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexA2dpBrBlackoutDurationMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexA2dpBrBlackoutPeriodMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexA2dpEdrBlackoutDurationMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexA2dpEdrBlackoutPeriodMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexPagingBlackoutDurationMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexPagingBlackoutPeriodMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexInquiryBlackoutDurationMs */ - bufferSize += 2; /* CsrUint16 primitive->coexConfig.coexInquiryBlackoutPeriodMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexTrafficBurstyLatencyMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexTrafficContinuousLatencyMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexObexBlackoutDurationMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexObexBlackoutPeriodMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexA2dpBrBlackoutDurationMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexA2dpBrBlackoutPeriodMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexA2dpEdrBlackoutDurationMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexA2dpEdrBlackoutPeriodMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexPagingBlackoutDurationMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexPagingBlackoutPeriodMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexInquiryBlackoutDurationMs */ + bufferSize += 2; /* u16 primitive->coexConfig.coexInquiryBlackoutPeriodMs */ return bufferSize; } @@ -2502,21 +2502,21 @@ u8* CsrWifiSmeCoexConfigGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeCoexConfigGetCfm *primitive = (CsrWifiSmeCoexConfigGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint8Ser(ptr, len, (u8) primitive->coexConfig.coexEnableSchemeManagement); CsrUint8Ser(ptr, len, (u8) primitive->coexConfig.coexPeriodicWakeHost); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexTrafficBurstyLatencyMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexTrafficContinuousLatencyMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexObexBlackoutDurationMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexObexBlackoutPeriodMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexA2dpBrBlackoutDurationMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexA2dpBrBlackoutPeriodMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexA2dpEdrBlackoutDurationMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexA2dpEdrBlackoutPeriodMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexPagingBlackoutDurationMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexPagingBlackoutPeriodMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexInquiryBlackoutDurationMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexConfig.coexInquiryBlackoutPeriodMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexTrafficBurstyLatencyMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexTrafficContinuousLatencyMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexObexBlackoutDurationMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexObexBlackoutPeriodMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexA2dpBrBlackoutDurationMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexA2dpBrBlackoutPeriodMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexA2dpEdrBlackoutDurationMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexA2dpEdrBlackoutPeriodMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexPagingBlackoutDurationMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexPagingBlackoutPeriodMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexInquiryBlackoutDurationMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexConfig.coexInquiryBlackoutPeriodMs); return(ptr); } @@ -2528,21 +2528,21 @@ void* CsrWifiSmeCoexConfigGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint8Des((u8 *) &primitive->coexConfig.coexEnableSchemeManagement, buffer, &offset); CsrUint8Des((u8 *) &primitive->coexConfig.coexPeriodicWakeHost, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexTrafficBurstyLatencyMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexTrafficContinuousLatencyMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexObexBlackoutDurationMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexObexBlackoutPeriodMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexA2dpBrBlackoutDurationMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexA2dpBrBlackoutPeriodMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexA2dpEdrBlackoutDurationMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexA2dpEdrBlackoutPeriodMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexPagingBlackoutDurationMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexPagingBlackoutPeriodMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexInquiryBlackoutDurationMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexConfig.coexInquiryBlackoutPeriodMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexTrafficBurstyLatencyMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexTrafficContinuousLatencyMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexObexBlackoutDurationMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexObexBlackoutPeriodMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexA2dpBrBlackoutDurationMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexA2dpBrBlackoutPeriodMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexA2dpEdrBlackoutDurationMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexA2dpEdrBlackoutPeriodMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexPagingBlackoutDurationMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexPagingBlackoutPeriodMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexInquiryBlackoutDurationMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexConfig.coexInquiryBlackoutPeriodMs, buffer, &offset); return primitive; } @@ -2556,10 +2556,10 @@ CsrSize CsrWifiSmeCoexInfoGetCfmSizeof(void *msg) bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 1; /* CsrBool primitive->coexInfo.hasTrafficData */ bufferSize += 1; /* CsrWifiSmeTrafficType primitive->coexInfo.currentTrafficType */ - bufferSize += 2; /* CsrUint16 primitive->coexInfo.currentPeriodMs */ + bufferSize += 2; /* u16 primitive->coexInfo.currentPeriodMs */ bufferSize += 1; /* CsrWifiSmePowerSaveLevel primitive->coexInfo.currentPowerSave */ - bufferSize += 2; /* CsrUint16 primitive->coexInfo.currentCoexPeriodMs */ - bufferSize += 2; /* CsrUint16 primitive->coexInfo.currentCoexLatencyMs */ + bufferSize += 2; /* u16 primitive->coexInfo.currentCoexPeriodMs */ + bufferSize += 2; /* u16 primitive->coexInfo.currentCoexLatencyMs */ bufferSize += 1; /* CsrBool primitive->coexInfo.hasBtDevice */ bufferSize += 4; /* CsrUint32 primitive->coexInfo.currentBlackoutDurationUs */ bufferSize += 4; /* CsrUint32 primitive->coexInfo.currentBlackoutPeriodUs */ @@ -2573,13 +2573,13 @@ u8* CsrWifiSmeCoexInfoGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeCoexInfoGetCfm *primitive = (CsrWifiSmeCoexInfoGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint8Ser(ptr, len, (u8) primitive->coexInfo.hasTrafficData); CsrUint8Ser(ptr, len, (u8) primitive->coexInfo.currentTrafficType); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexInfo.currentPeriodMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexInfo.currentPeriodMs); CsrUint8Ser(ptr, len, (u8) primitive->coexInfo.currentPowerSave); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexInfo.currentCoexPeriodMs); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->coexInfo.currentCoexLatencyMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexInfo.currentCoexPeriodMs); + CsrUint16Ser(ptr, len, (u16) primitive->coexInfo.currentCoexLatencyMs); CsrUint8Ser(ptr, len, (u8) primitive->coexInfo.hasBtDevice); CsrUint32Ser(ptr, len, (CsrUint32) primitive->coexInfo.currentBlackoutDurationUs); CsrUint32Ser(ptr, len, (CsrUint32) primitive->coexInfo.currentBlackoutPeriodUs); @@ -2595,13 +2595,13 @@ void* CsrWifiSmeCoexInfoGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint8Des((u8 *) &primitive->coexInfo.hasTrafficData, buffer, &offset); CsrUint8Des((u8 *) &primitive->coexInfo.currentTrafficType, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexInfo.currentPeriodMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexInfo.currentPeriodMs, buffer, &offset); CsrUint8Des((u8 *) &primitive->coexInfo.currentPowerSave, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexInfo.currentCoexPeriodMs, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->coexInfo.currentCoexLatencyMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexInfo.currentCoexPeriodMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->coexInfo.currentCoexLatencyMs, buffer, &offset); CsrUint8Des((u8 *) &primitive->coexInfo.hasBtDevice, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->coexInfo.currentBlackoutDurationUs, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->coexInfo.currentBlackoutPeriodUs, buffer, &offset); @@ -2616,7 +2616,7 @@ CsrSize CsrWifiSmeConnectCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 7) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; } @@ -2627,8 +2627,8 @@ u8* CsrWifiSmeConnectCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeConnectCfm *primitive = (CsrWifiSmeConnectCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -2640,8 +2640,8 @@ void* CsrWifiSmeConnectCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -2653,7 +2653,7 @@ CsrSize CsrWifiSmeConnectionConfigGetCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 59) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 32; /* u8 primitive->connectionConfig.ssid.ssid[32] */ bufferSize += 1; /* u8 primitive->connectionConfig.ssid.length */ @@ -2663,7 +2663,7 @@ CsrSize CsrWifiSmeConnectionConfigGetCfmSizeof(void *msg) bufferSize += 1; /* CsrWifiSme80211PrivacyMode primitive->connectionConfig.privacyMode */ bufferSize += 2; /* CsrWifiSmeAuthModeMask primitive->connectionConfig.authModeMask */ bufferSize += 2; /* CsrWifiSmeEncryptionMask primitive->connectionConfig.encryptionModeMask */ - bufferSize += 2; /* CsrUint16 primitive->connectionConfig.mlmeAssociateReqInformationElementsLength */ + bufferSize += 2; /* u16 primitive->connectionConfig.mlmeAssociateReqInformationElementsLength */ bufferSize += primitive->connectionConfig.mlmeAssociateReqInformationElementsLength; /* u8 primitive->connectionConfig.mlmeAssociateReqInformationElements */ bufferSize += 1; /* CsrWifiSmeWmmQosInfoMask primitive->connectionConfig.wmmQosInfo */ bufferSize += 1; /* CsrBool primitive->connectionConfig.adhocJoinOnly */ @@ -2677,20 +2677,20 @@ u8* CsrWifiSmeConnectionConfigGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeConnectionConfigGetCfm *primitive = (CsrWifiSmeConnectionConfigGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); - CsrMemCpySer(ptr, len, (const void *) primitive->connectionConfig.ssid.ssid, ((CsrUint16) (32))); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionConfig.ssid.ssid, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->connectionConfig.ssid.length); - CsrMemCpySer(ptr, len, (const void *) primitive->connectionConfig.bssid.a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionConfig.bssid.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->connectionConfig.bssType); CsrUint8Ser(ptr, len, (u8) primitive->connectionConfig.ifIndex); CsrUint8Ser(ptr, len, (u8) primitive->connectionConfig.privacyMode); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionConfig.authModeMask); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionConfig.encryptionModeMask); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionConfig.mlmeAssociateReqInformationElementsLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionConfig.authModeMask); + CsrUint16Ser(ptr, len, (u16) primitive->connectionConfig.encryptionModeMask); + CsrUint16Ser(ptr, len, (u16) primitive->connectionConfig.mlmeAssociateReqInformationElementsLength); if (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionConfig.mlmeAssociateReqInformationElements, ((CsrUint16) (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionConfig.mlmeAssociateReqInformationElements, ((u16) (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength))); } CsrUint8Ser(ptr, len, (u8) primitive->connectionConfig.wmmQosInfo); CsrUint8Ser(ptr, len, (u8) primitive->connectionConfig.adhocJoinOnly); @@ -2706,21 +2706,21 @@ void* CsrWifiSmeConnectionConfigGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); - CsrMemCpyDes(primitive->connectionConfig.ssid.ssid, buffer, &offset, ((CsrUint16) (32))); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); + CsrMemCpyDes(primitive->connectionConfig.ssid.ssid, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->connectionConfig.ssid.length, buffer, &offset); - CsrMemCpyDes(primitive->connectionConfig.bssid.a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->connectionConfig.bssid.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->connectionConfig.bssType, buffer, &offset); CsrUint8Des((u8 *) &primitive->connectionConfig.ifIndex, buffer, &offset); CsrUint8Des((u8 *) &primitive->connectionConfig.privacyMode, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionConfig.authModeMask, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionConfig.encryptionModeMask, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionConfig.mlmeAssociateReqInformationElementsLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionConfig.authModeMask, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionConfig.encryptionModeMask, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionConfig.mlmeAssociateReqInformationElementsLength, buffer, &offset); if (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength) { primitive->connectionConfig.mlmeAssociateReqInformationElements = (u8 *)CsrPmemAlloc(primitive->connectionConfig.mlmeAssociateReqInformationElementsLength); - CsrMemCpyDes(primitive->connectionConfig.mlmeAssociateReqInformationElements, buffer, &offset, ((CsrUint16) (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength))); + CsrMemCpyDes(primitive->connectionConfig.mlmeAssociateReqInformationElements, buffer, &offset, ((u16) (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength))); } else { @@ -2748,38 +2748,38 @@ CsrSize CsrWifiSmeConnectionInfoGetCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 96) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 32; /* u8 primitive->connectionInfo.ssid.ssid[32] */ bufferSize += 1; /* u8 primitive->connectionInfo.ssid.length */ bufferSize += 6; /* u8 primitive->connectionInfo.bssid.a[6] */ bufferSize += 1; /* CsrWifiSme80211NetworkType primitive->connectionInfo.networkType80211 */ bufferSize += 1; /* u8 primitive->connectionInfo.channelNumber */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.channelFrequency */ + bufferSize += 2; /* u16 primitive->connectionInfo.channelFrequency */ bufferSize += 2; /* CsrWifiSmeAuthMode primitive->connectionInfo.authMode */ bufferSize += 2; /* CsrWifiSmeEncryption primitive->connectionInfo.pairwiseCipher */ bufferSize += 2; /* CsrWifiSmeEncryption primitive->connectionInfo.groupCipher */ bufferSize += 1; /* CsrWifiSmeRadioIF primitive->connectionInfo.ifIndex */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.atimWindowTu */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.beaconPeriodTu */ + bufferSize += 2; /* u16 primitive->connectionInfo.atimWindowTu */ + bufferSize += 2; /* u16 primitive->connectionInfo.beaconPeriodTu */ bufferSize += 1; /* CsrBool primitive->connectionInfo.reassociation */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.beaconFrameLength */ + bufferSize += 2; /* u16 primitive->connectionInfo.beaconFrameLength */ bufferSize += primitive->connectionInfo.beaconFrameLength; /* u8 primitive->connectionInfo.beaconFrame */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.associationReqFrameLength */ + bufferSize += 2; /* u16 primitive->connectionInfo.associationReqFrameLength */ bufferSize += primitive->connectionInfo.associationReqFrameLength; /* u8 primitive->connectionInfo.associationReqFrame */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.associationRspFrameLength */ + bufferSize += 2; /* u16 primitive->connectionInfo.associationRspFrameLength */ bufferSize += primitive->connectionInfo.associationRspFrameLength; /* u8 primitive->connectionInfo.associationRspFrame */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocScanInfoElementsLength */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocScanInfoElementsLength */ bufferSize += primitive->connectionInfo.assocScanInfoElementsLength; /* u8 primitive->connectionInfo.assocScanInfoElements */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocReqCapabilities */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocReqListenIntervalTu */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocReqCapabilities */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocReqListenIntervalTu */ bufferSize += 6; /* u8 primitive->connectionInfo.assocReqApAddress.a[6] */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocReqInfoElementsLength */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocReqInfoElementsLength */ bufferSize += primitive->connectionInfo.assocReqInfoElementsLength; /* u8 primitive->connectionInfo.assocReqInfoElements */ bufferSize += 2; /* CsrWifiSmeIEEE80211Result primitive->connectionInfo.assocRspResult */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocRspCapabilityInfo */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocRspAssociationId */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocRspInfoElementsLength */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocRspCapabilityInfo */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocRspAssociationId */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocRspInfoElementsLength */ bufferSize += primitive->connectionInfo.assocRspInfoElementsLength; /* u8 primitive->connectionInfo.assocRspInfoElements */ return bufferSize; } @@ -2790,56 +2790,56 @@ u8* CsrWifiSmeConnectionInfoGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeConnectionInfoGetCfm *primitive = (CsrWifiSmeConnectionInfoGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.ssid.ssid, ((CsrUint16) (32))); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.ssid.ssid, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->connectionInfo.ssid.length); - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.bssid.a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.bssid.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->connectionInfo.networkType80211); CsrUint8Ser(ptr, len, (u8) primitive->connectionInfo.channelNumber); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.channelFrequency); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.authMode); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.pairwiseCipher); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.groupCipher); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.channelFrequency); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.authMode); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.pairwiseCipher); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.groupCipher); CsrUint8Ser(ptr, len, (u8) primitive->connectionInfo.ifIndex); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.atimWindowTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.beaconPeriodTu); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.atimWindowTu); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.beaconPeriodTu); CsrUint8Ser(ptr, len, (u8) primitive->connectionInfo.reassociation); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.beaconFrameLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.beaconFrameLength); if (primitive->connectionInfo.beaconFrameLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.beaconFrame, ((CsrUint16) (primitive->connectionInfo.beaconFrameLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.beaconFrame, ((u16) (primitive->connectionInfo.beaconFrameLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.associationReqFrameLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.associationReqFrameLength); if (primitive->connectionInfo.associationReqFrameLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.associationReqFrame, ((CsrUint16) (primitive->connectionInfo.associationReqFrameLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.associationReqFrame, ((u16) (primitive->connectionInfo.associationReqFrameLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.associationRspFrameLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.associationRspFrameLength); if (primitive->connectionInfo.associationRspFrameLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.associationRspFrame, ((CsrUint16) (primitive->connectionInfo.associationRspFrameLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.associationRspFrame, ((u16) (primitive->connectionInfo.associationRspFrameLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocScanInfoElementsLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocScanInfoElementsLength); if (primitive->connectionInfo.assocScanInfoElementsLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocScanInfoElements, ((CsrUint16) (primitive->connectionInfo.assocScanInfoElementsLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocScanInfoElements, ((u16) (primitive->connectionInfo.assocScanInfoElementsLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocReqCapabilities); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocReqListenIntervalTu); - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocReqApAddress.a, ((CsrUint16) (6))); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocReqInfoElementsLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocReqCapabilities); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocReqListenIntervalTu); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocReqApAddress.a, ((u16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocReqInfoElementsLength); if (primitive->connectionInfo.assocReqInfoElementsLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocReqInfoElements, ((CsrUint16) (primitive->connectionInfo.assocReqInfoElementsLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocReqInfoElements, ((u16) (primitive->connectionInfo.assocReqInfoElementsLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocRspResult); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocRspCapabilityInfo); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocRspAssociationId); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocRspInfoElementsLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocRspResult); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocRspCapabilityInfo); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocRspAssociationId); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocRspInfoElementsLength); if (primitive->connectionInfo.assocRspInfoElementsLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocRspInfoElements, ((CsrUint16) (primitive->connectionInfo.assocRspInfoElementsLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocRspInfoElements, ((u16) (primitive->connectionInfo.assocRspInfoElementsLength))); } return(ptr); } @@ -2852,82 +2852,82 @@ void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); - CsrMemCpyDes(primitive->connectionInfo.ssid.ssid, buffer, &offset, ((CsrUint16) (32))); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); + CsrMemCpyDes(primitive->connectionInfo.ssid.ssid, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->connectionInfo.ssid.length, buffer, &offset); - CsrMemCpyDes(primitive->connectionInfo.bssid.a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->connectionInfo.bssid.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->connectionInfo.networkType80211, buffer, &offset); CsrUint8Des((u8 *) &primitive->connectionInfo.channelNumber, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.channelFrequency, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.authMode, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.pairwiseCipher, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.groupCipher, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.channelFrequency, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.authMode, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.pairwiseCipher, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.groupCipher, buffer, &offset); CsrUint8Des((u8 *) &primitive->connectionInfo.ifIndex, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.atimWindowTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.beaconPeriodTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.atimWindowTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.beaconPeriodTu, buffer, &offset); CsrUint8Des((u8 *) &primitive->connectionInfo.reassociation, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.beaconFrameLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.beaconFrameLength, buffer, &offset); if (primitive->connectionInfo.beaconFrameLength) { primitive->connectionInfo.beaconFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.beaconFrameLength); - CsrMemCpyDes(primitive->connectionInfo.beaconFrame, buffer, &offset, ((CsrUint16) (primitive->connectionInfo.beaconFrameLength))); + CsrMemCpyDes(primitive->connectionInfo.beaconFrame, buffer, &offset, ((u16) (primitive->connectionInfo.beaconFrameLength))); } else { primitive->connectionInfo.beaconFrame = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.associationReqFrameLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.associationReqFrameLength, buffer, &offset); if (primitive->connectionInfo.associationReqFrameLength) { primitive->connectionInfo.associationReqFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.associationReqFrameLength); - CsrMemCpyDes(primitive->connectionInfo.associationReqFrame, buffer, &offset, ((CsrUint16) (primitive->connectionInfo.associationReqFrameLength))); + CsrMemCpyDes(primitive->connectionInfo.associationReqFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationReqFrameLength))); } else { primitive->connectionInfo.associationReqFrame = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.associationRspFrameLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.associationRspFrameLength, buffer, &offset); if (primitive->connectionInfo.associationRspFrameLength) { primitive->connectionInfo.associationRspFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.associationRspFrameLength); - CsrMemCpyDes(primitive->connectionInfo.associationRspFrame, buffer, &offset, ((CsrUint16) (primitive->connectionInfo.associationRspFrameLength))); + CsrMemCpyDes(primitive->connectionInfo.associationRspFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationRspFrameLength))); } else { primitive->connectionInfo.associationRspFrame = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocScanInfoElementsLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocScanInfoElementsLength, buffer, &offset); if (primitive->connectionInfo.assocScanInfoElementsLength) { primitive->connectionInfo.assocScanInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocScanInfoElementsLength); - CsrMemCpyDes(primitive->connectionInfo.assocScanInfoElements, buffer, &offset, ((CsrUint16) (primitive->connectionInfo.assocScanInfoElementsLength))); + CsrMemCpyDes(primitive->connectionInfo.assocScanInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocScanInfoElementsLength))); } else { primitive->connectionInfo.assocScanInfoElements = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocReqCapabilities, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocReqListenIntervalTu, buffer, &offset); - CsrMemCpyDes(primitive->connectionInfo.assocReqApAddress.a, buffer, &offset, ((CsrUint16) (6))); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocReqInfoElementsLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocReqCapabilities, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocReqListenIntervalTu, buffer, &offset); + CsrMemCpyDes(primitive->connectionInfo.assocReqApAddress.a, buffer, &offset, ((u16) (6))); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocReqInfoElementsLength, buffer, &offset); if (primitive->connectionInfo.assocReqInfoElementsLength) { primitive->connectionInfo.assocReqInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocReqInfoElementsLength); - CsrMemCpyDes(primitive->connectionInfo.assocReqInfoElements, buffer, &offset, ((CsrUint16) (primitive->connectionInfo.assocReqInfoElementsLength))); + CsrMemCpyDes(primitive->connectionInfo.assocReqInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocReqInfoElementsLength))); } else { primitive->connectionInfo.assocReqInfoElements = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocRspResult, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocRspCapabilityInfo, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocRspAssociationId, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocRspInfoElementsLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspResult, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspCapabilityInfo, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspAssociationId, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspInfoElementsLength, buffer, &offset); if (primitive->connectionInfo.assocRspInfoElementsLength) { primitive->connectionInfo.assocRspInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocRspInfoElementsLength); - CsrMemCpyDes(primitive->connectionInfo.assocRspInfoElements, buffer, &offset, ((CsrUint16) (primitive->connectionInfo.assocRspInfoElementsLength))); + CsrMemCpyDes(primitive->connectionInfo.assocRspInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocRspInfoElementsLength))); } else { @@ -2956,7 +2956,7 @@ CsrSize CsrWifiSmeConnectionQualityIndSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 9) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrInt16 primitive->linkQuality.unifiRssi */ bufferSize += 2; /* CsrInt16 primitive->linkQuality.unifiSnr */ return bufferSize; @@ -2968,9 +2968,9 @@ u8* CsrWifiSmeConnectionQualityIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeConnectionQualityInd *primitive = (CsrWifiSmeConnectionQualityInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->linkQuality.unifiRssi); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->linkQuality.unifiSnr); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->linkQuality.unifiRssi); + CsrUint16Ser(ptr, len, (u16) primitive->linkQuality.unifiSnr); return(ptr); } @@ -2982,9 +2982,9 @@ void* CsrWifiSmeConnectionQualityIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->linkQuality.unifiRssi, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->linkQuality.unifiSnr, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->linkQuality.unifiRssi, buffer, &offset); + CsrUint16Des((u16 *) &primitive->linkQuality.unifiSnr, buffer, &offset); return primitive; } @@ -2995,7 +2995,7 @@ CsrSize CsrWifiSmeConnectionStatsGetCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 101) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 1; /* u8 primitive->connectionStats.unifiTxDataRate */ bufferSize += 1; /* u8 primitive->connectionStats.unifiRxDataRate */ @@ -3031,8 +3031,8 @@ u8* CsrWifiSmeConnectionStatsGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeConnectionStatsGetCfm *primitive = (CsrWifiSmeConnectionStatsGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint8Ser(ptr, len, (u8) primitive->connectionStats.unifiTxDataRate); CsrUint8Ser(ptr, len, (u8) primitive->connectionStats.unifiRxDataRate); CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11RetryCount); @@ -3069,8 +3069,8 @@ void* CsrWifiSmeConnectionStatsGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint8Des((u8 *) &primitive->connectionStats.unifiTxDataRate, buffer, &offset); CsrUint8Des((u8 *) &primitive->connectionStats.unifiRxDataRate, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11RetryCount, buffer, &offset); @@ -3106,7 +3106,7 @@ CsrSize CsrWifiSmeDisconnectCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 7) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; } @@ -3117,8 +3117,8 @@ u8* CsrWifiSmeDisconnectCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeDisconnectCfm *primitive = (CsrWifiSmeDisconnectCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -3130,8 +3130,8 @@ void* CsrWifiSmeDisconnectCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -3142,10 +3142,10 @@ CsrSize CsrWifiSmeHostConfigGetCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 10) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 1; /* CsrWifiSmeHostPowerMode primitive->hostConfig.powerMode */ - bufferSize += 2; /* CsrUint16 primitive->hostConfig.applicationDataPeriodMs */ + bufferSize += 2; /* u16 primitive->hostConfig.applicationDataPeriodMs */ return bufferSize; } @@ -3155,10 +3155,10 @@ u8* CsrWifiSmeHostConfigGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeHostConfigGetCfm *primitive = (CsrWifiSmeHostConfigGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint8Ser(ptr, len, (u8) primitive->hostConfig.powerMode); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->hostConfig.applicationDataPeriodMs); + CsrUint16Ser(ptr, len, (u16) primitive->hostConfig.applicationDataPeriodMs); return(ptr); } @@ -3170,10 +3170,10 @@ void* CsrWifiSmeHostConfigGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint8Des((u8 *) &primitive->hostConfig.powerMode, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->hostConfig.applicationDataPeriodMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->hostConfig.applicationDataPeriodMs, buffer, &offset); return primitive; } @@ -3184,7 +3184,7 @@ CsrSize CsrWifiSmeHostConfigSetCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 7) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; } @@ -3195,8 +3195,8 @@ u8* CsrWifiSmeHostConfigSetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeHostConfigSetCfm *primitive = (CsrWifiSmeHostConfigSetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -3208,8 +3208,8 @@ void* CsrWifiSmeHostConfigSetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -3231,7 +3231,7 @@ u8* CsrWifiSmeIbssStationIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeIbssStationInd *primitive = (CsrWifiSmeIbssStationInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrMemCpySer(ptr, len, (const void *) primitive->address.a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->address.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->isconnected); return(ptr); } @@ -3244,7 +3244,7 @@ void* CsrWifiSmeIbssStationIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrMemCpyDes(primitive->address.a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->address.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->isconnected, buffer, &offset); return primitive; @@ -3256,7 +3256,7 @@ CsrSize CsrWifiSmeKeyCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 15) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 1; /* CsrWifiSmeListAction primitive->action */ bufferSize += 1; /* CsrWifiSmeKeyType primitive->keyType */ @@ -3270,11 +3270,11 @@ u8* CsrWifiSmeKeyCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeKeyCfm *primitive = (CsrWifiSmeKeyCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint8Ser(ptr, len, (u8) primitive->action); CsrUint8Ser(ptr, len, (u8) primitive->keyType); - CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((u16) (6))); return(ptr); } @@ -3286,11 +3286,11 @@ void* CsrWifiSmeKeyCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint8Des((u8 *) &primitive->action, buffer, &offset); CsrUint8Des((u8 *) &primitive->keyType, buffer, &offset); - CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((u16) (6))); return primitive; } @@ -3301,7 +3301,7 @@ CsrSize CsrWifiSmeLinkQualityGetCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 11) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 2; /* CsrInt16 primitive->linkQuality.unifiRssi */ bufferSize += 2; /* CsrInt16 primitive->linkQuality.unifiSnr */ @@ -3314,10 +3314,10 @@ u8* CsrWifiSmeLinkQualityGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeLinkQualityGetCfm *primitive = (CsrWifiSmeLinkQualityGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->linkQuality.unifiRssi); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->linkQuality.unifiSnr); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->linkQuality.unifiRssi); + CsrUint16Ser(ptr, len, (u16) primitive->linkQuality.unifiSnr); return(ptr); } @@ -3329,10 +3329,10 @@ void* CsrWifiSmeLinkQualityGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->linkQuality.unifiRssi, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->linkQuality.unifiSnr, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->linkQuality.unifiRssi, buffer, &offset); + CsrUint16Des((u16 *) &primitive->linkQuality.unifiSnr, buffer, &offset); return primitive; } @@ -3344,38 +3344,38 @@ CsrSize CsrWifiSmeMediaStatusIndSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 99) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiSmeMediaStatus primitive->mediaStatus */ bufferSize += 32; /* u8 primitive->connectionInfo.ssid.ssid[32] */ bufferSize += 1; /* u8 primitive->connectionInfo.ssid.length */ bufferSize += 6; /* u8 primitive->connectionInfo.bssid.a[6] */ bufferSize += 1; /* CsrWifiSme80211NetworkType primitive->connectionInfo.networkType80211 */ bufferSize += 1; /* u8 primitive->connectionInfo.channelNumber */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.channelFrequency */ + bufferSize += 2; /* u16 primitive->connectionInfo.channelFrequency */ bufferSize += 2; /* CsrWifiSmeAuthMode primitive->connectionInfo.authMode */ bufferSize += 2; /* CsrWifiSmeEncryption primitive->connectionInfo.pairwiseCipher */ bufferSize += 2; /* CsrWifiSmeEncryption primitive->connectionInfo.groupCipher */ bufferSize += 1; /* CsrWifiSmeRadioIF primitive->connectionInfo.ifIndex */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.atimWindowTu */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.beaconPeriodTu */ + bufferSize += 2; /* u16 primitive->connectionInfo.atimWindowTu */ + bufferSize += 2; /* u16 primitive->connectionInfo.beaconPeriodTu */ bufferSize += 1; /* CsrBool primitive->connectionInfo.reassociation */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.beaconFrameLength */ + bufferSize += 2; /* u16 primitive->connectionInfo.beaconFrameLength */ bufferSize += primitive->connectionInfo.beaconFrameLength; /* u8 primitive->connectionInfo.beaconFrame */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.associationReqFrameLength */ + bufferSize += 2; /* u16 primitive->connectionInfo.associationReqFrameLength */ bufferSize += primitive->connectionInfo.associationReqFrameLength; /* u8 primitive->connectionInfo.associationReqFrame */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.associationRspFrameLength */ + bufferSize += 2; /* u16 primitive->connectionInfo.associationRspFrameLength */ bufferSize += primitive->connectionInfo.associationRspFrameLength; /* u8 primitive->connectionInfo.associationRspFrame */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocScanInfoElementsLength */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocScanInfoElementsLength */ bufferSize += primitive->connectionInfo.assocScanInfoElementsLength; /* u8 primitive->connectionInfo.assocScanInfoElements */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocReqCapabilities */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocReqListenIntervalTu */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocReqCapabilities */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocReqListenIntervalTu */ bufferSize += 6; /* u8 primitive->connectionInfo.assocReqApAddress.a[6] */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocReqInfoElementsLength */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocReqInfoElementsLength */ bufferSize += primitive->connectionInfo.assocReqInfoElementsLength; /* u8 primitive->connectionInfo.assocReqInfoElements */ bufferSize += 2; /* CsrWifiSmeIEEE80211Result primitive->connectionInfo.assocRspResult */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocRspCapabilityInfo */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocRspAssociationId */ - bufferSize += 2; /* CsrUint16 primitive->connectionInfo.assocRspInfoElementsLength */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocRspCapabilityInfo */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocRspAssociationId */ + bufferSize += 2; /* u16 primitive->connectionInfo.assocRspInfoElementsLength */ bufferSize += primitive->connectionInfo.assocRspInfoElementsLength; /* u8 primitive->connectionInfo.assocRspInfoElements */ bufferSize += 2; /* CsrWifiSmeIEEE80211Reason primitive->disassocReason */ bufferSize += 2; /* CsrWifiSmeIEEE80211Reason primitive->deauthReason */ @@ -3388,59 +3388,59 @@ u8* CsrWifiSmeMediaStatusIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeMediaStatusInd *primitive = (CsrWifiSmeMediaStatusInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->mediaStatus); - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.ssid.ssid, ((CsrUint16) (32))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.ssid.ssid, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->connectionInfo.ssid.length); - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.bssid.a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.bssid.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->connectionInfo.networkType80211); CsrUint8Ser(ptr, len, (u8) primitive->connectionInfo.channelNumber); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.channelFrequency); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.authMode); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.pairwiseCipher); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.groupCipher); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.channelFrequency); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.authMode); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.pairwiseCipher); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.groupCipher); CsrUint8Ser(ptr, len, (u8) primitive->connectionInfo.ifIndex); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.atimWindowTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.beaconPeriodTu); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.atimWindowTu); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.beaconPeriodTu); CsrUint8Ser(ptr, len, (u8) primitive->connectionInfo.reassociation); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.beaconFrameLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.beaconFrameLength); if (primitive->connectionInfo.beaconFrameLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.beaconFrame, ((CsrUint16) (primitive->connectionInfo.beaconFrameLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.beaconFrame, ((u16) (primitive->connectionInfo.beaconFrameLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.associationReqFrameLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.associationReqFrameLength); if (primitive->connectionInfo.associationReqFrameLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.associationReqFrame, ((CsrUint16) (primitive->connectionInfo.associationReqFrameLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.associationReqFrame, ((u16) (primitive->connectionInfo.associationReqFrameLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.associationRspFrameLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.associationRspFrameLength); if (primitive->connectionInfo.associationRspFrameLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.associationRspFrame, ((CsrUint16) (primitive->connectionInfo.associationRspFrameLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.associationRspFrame, ((u16) (primitive->connectionInfo.associationRspFrameLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocScanInfoElementsLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocScanInfoElementsLength); if (primitive->connectionInfo.assocScanInfoElementsLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocScanInfoElements, ((CsrUint16) (primitive->connectionInfo.assocScanInfoElementsLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocScanInfoElements, ((u16) (primitive->connectionInfo.assocScanInfoElementsLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocReqCapabilities); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocReqListenIntervalTu); - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocReqApAddress.a, ((CsrUint16) (6))); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocReqInfoElementsLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocReqCapabilities); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocReqListenIntervalTu); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocReqApAddress.a, ((u16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocReqInfoElementsLength); if (primitive->connectionInfo.assocReqInfoElementsLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocReqInfoElements, ((CsrUint16) (primitive->connectionInfo.assocReqInfoElementsLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocReqInfoElements, ((u16) (primitive->connectionInfo.assocReqInfoElementsLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocRspResult); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocRspCapabilityInfo); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocRspAssociationId); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->connectionInfo.assocRspInfoElementsLength); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocRspResult); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocRspCapabilityInfo); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocRspAssociationId); + CsrUint16Ser(ptr, len, (u16) primitive->connectionInfo.assocRspInfoElementsLength); if (primitive->connectionInfo.assocRspInfoElementsLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocRspInfoElements, ((CsrUint16) (primitive->connectionInfo.assocRspInfoElementsLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->connectionInfo.assocRspInfoElements, ((u16) (primitive->connectionInfo.assocRspInfoElementsLength))); } - CsrUint16Ser(ptr, len, (CsrUint16) primitive->disassocReason); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->deauthReason); + CsrUint16Ser(ptr, len, (u16) primitive->disassocReason); + CsrUint16Ser(ptr, len, (u16) primitive->deauthReason); return(ptr); } @@ -3452,89 +3452,89 @@ void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->mediaStatus, buffer, &offset); - CsrMemCpyDes(primitive->connectionInfo.ssid.ssid, buffer, &offset, ((CsrUint16) (32))); + CsrMemCpyDes(primitive->connectionInfo.ssid.ssid, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->connectionInfo.ssid.length, buffer, &offset); - CsrMemCpyDes(primitive->connectionInfo.bssid.a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->connectionInfo.bssid.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->connectionInfo.networkType80211, buffer, &offset); CsrUint8Des((u8 *) &primitive->connectionInfo.channelNumber, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.channelFrequency, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.authMode, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.pairwiseCipher, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.groupCipher, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.channelFrequency, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.authMode, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.pairwiseCipher, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.groupCipher, buffer, &offset); CsrUint8Des((u8 *) &primitive->connectionInfo.ifIndex, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.atimWindowTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.beaconPeriodTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.atimWindowTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.beaconPeriodTu, buffer, &offset); CsrUint8Des((u8 *) &primitive->connectionInfo.reassociation, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.beaconFrameLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.beaconFrameLength, buffer, &offset); if (primitive->connectionInfo.beaconFrameLength) { primitive->connectionInfo.beaconFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.beaconFrameLength); - CsrMemCpyDes(primitive->connectionInfo.beaconFrame, buffer, &offset, ((CsrUint16) (primitive->connectionInfo.beaconFrameLength))); + CsrMemCpyDes(primitive->connectionInfo.beaconFrame, buffer, &offset, ((u16) (primitive->connectionInfo.beaconFrameLength))); } else { primitive->connectionInfo.beaconFrame = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.associationReqFrameLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.associationReqFrameLength, buffer, &offset); if (primitive->connectionInfo.associationReqFrameLength) { primitive->connectionInfo.associationReqFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.associationReqFrameLength); - CsrMemCpyDes(primitive->connectionInfo.associationReqFrame, buffer, &offset, ((CsrUint16) (primitive->connectionInfo.associationReqFrameLength))); + CsrMemCpyDes(primitive->connectionInfo.associationReqFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationReqFrameLength))); } else { primitive->connectionInfo.associationReqFrame = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.associationRspFrameLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.associationRspFrameLength, buffer, &offset); if (primitive->connectionInfo.associationRspFrameLength) { primitive->connectionInfo.associationRspFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.associationRspFrameLength); - CsrMemCpyDes(primitive->connectionInfo.associationRspFrame, buffer, &offset, ((CsrUint16) (primitive->connectionInfo.associationRspFrameLength))); + CsrMemCpyDes(primitive->connectionInfo.associationRspFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationRspFrameLength))); } else { primitive->connectionInfo.associationRspFrame = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocScanInfoElementsLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocScanInfoElementsLength, buffer, &offset); if (primitive->connectionInfo.assocScanInfoElementsLength) { primitive->connectionInfo.assocScanInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocScanInfoElementsLength); - CsrMemCpyDes(primitive->connectionInfo.assocScanInfoElements, buffer, &offset, ((CsrUint16) (primitive->connectionInfo.assocScanInfoElementsLength))); + CsrMemCpyDes(primitive->connectionInfo.assocScanInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocScanInfoElementsLength))); } else { primitive->connectionInfo.assocScanInfoElements = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocReqCapabilities, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocReqListenIntervalTu, buffer, &offset); - CsrMemCpyDes(primitive->connectionInfo.assocReqApAddress.a, buffer, &offset, ((CsrUint16) (6))); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocReqInfoElementsLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocReqCapabilities, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocReqListenIntervalTu, buffer, &offset); + CsrMemCpyDes(primitive->connectionInfo.assocReqApAddress.a, buffer, &offset, ((u16) (6))); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocReqInfoElementsLength, buffer, &offset); if (primitive->connectionInfo.assocReqInfoElementsLength) { primitive->connectionInfo.assocReqInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocReqInfoElementsLength); - CsrMemCpyDes(primitive->connectionInfo.assocReqInfoElements, buffer, &offset, ((CsrUint16) (primitive->connectionInfo.assocReqInfoElementsLength))); + CsrMemCpyDes(primitive->connectionInfo.assocReqInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocReqInfoElementsLength))); } else { primitive->connectionInfo.assocReqInfoElements = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocRspResult, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocRspCapabilityInfo, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocRspAssociationId, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->connectionInfo.assocRspInfoElementsLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspResult, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspCapabilityInfo, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspAssociationId, buffer, &offset); + CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspInfoElementsLength, buffer, &offset); if (primitive->connectionInfo.assocRspInfoElementsLength) { primitive->connectionInfo.assocRspInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocRspInfoElementsLength); - CsrMemCpyDes(primitive->connectionInfo.assocRspInfoElements, buffer, &offset, ((CsrUint16) (primitive->connectionInfo.assocRspInfoElementsLength))); + CsrMemCpyDes(primitive->connectionInfo.assocRspInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocRspInfoElementsLength))); } else { primitive->connectionInfo.assocRspInfoElements = NULL; } - CsrUint16Des((CsrUint16 *) &primitive->disassocReason, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->deauthReason, buffer, &offset); + CsrUint16Des((u16 *) &primitive->disassocReason, buffer, &offset); + CsrUint16Des((u16 *) &primitive->deauthReason, buffer, &offset); return primitive; } @@ -3561,9 +3561,9 @@ CsrSize CsrWifiSmeMibConfigGetCfmSizeof(void *msg) bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 1; /* CsrBool primitive->mibConfig.unifiFixMaxTxDataRate */ bufferSize += 1; /* u8 primitive->mibConfig.unifiFixTxDataRate */ - bufferSize += 2; /* CsrUint16 primitive->mibConfig.dot11RtsThreshold */ - bufferSize += 2; /* CsrUint16 primitive->mibConfig.dot11FragmentationThreshold */ - bufferSize += 2; /* CsrUint16 primitive->mibConfig.dot11CurrentTxPowerLevel */ + bufferSize += 2; /* u16 primitive->mibConfig.dot11RtsThreshold */ + bufferSize += 2; /* u16 primitive->mibConfig.dot11FragmentationThreshold */ + bufferSize += 2; /* u16 primitive->mibConfig.dot11CurrentTxPowerLevel */ return bufferSize; } @@ -3573,12 +3573,12 @@ u8* CsrWifiSmeMibConfigGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeMibConfigGetCfm *primitive = (CsrWifiSmeMibConfigGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint8Ser(ptr, len, (u8) primitive->mibConfig.unifiFixMaxTxDataRate); CsrUint8Ser(ptr, len, (u8) primitive->mibConfig.unifiFixTxDataRate); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->mibConfig.dot11RtsThreshold); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->mibConfig.dot11FragmentationThreshold); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->mibConfig.dot11CurrentTxPowerLevel); + CsrUint16Ser(ptr, len, (u16) primitive->mibConfig.dot11RtsThreshold); + CsrUint16Ser(ptr, len, (u16) primitive->mibConfig.dot11FragmentationThreshold); + CsrUint16Ser(ptr, len, (u16) primitive->mibConfig.dot11CurrentTxPowerLevel); return(ptr); } @@ -3590,12 +3590,12 @@ void* CsrWifiSmeMibConfigGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint8Des((u8 *) &primitive->mibConfig.unifiFixMaxTxDataRate, buffer, &offset); CsrUint8Des((u8 *) &primitive->mibConfig.unifiFixTxDataRate, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->mibConfig.dot11RtsThreshold, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->mibConfig.dot11FragmentationThreshold, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->mibConfig.dot11CurrentTxPowerLevel, buffer, &offset); + CsrUint16Des((u16 *) &primitive->mibConfig.dot11RtsThreshold, buffer, &offset); + CsrUint16Des((u16 *) &primitive->mibConfig.dot11FragmentationThreshold, buffer, &offset); + CsrUint16Des((u16 *) &primitive->mibConfig.dot11CurrentTxPowerLevel, buffer, &offset); return primitive; } @@ -3608,7 +3608,7 @@ CsrSize CsrWifiSmeMibGetCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 8) */ bufferSize += 2; /* CsrResult primitive->status */ - bufferSize += 2; /* CsrUint16 primitive->mibAttributeLength */ + bufferSize += 2; /* u16 primitive->mibAttributeLength */ bufferSize += primitive->mibAttributeLength; /* u8 primitive->mibAttribute */ return bufferSize; } @@ -3619,11 +3619,11 @@ u8* CsrWifiSmeMibGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeMibGetCfm *primitive = (CsrWifiSmeMibGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->mibAttributeLength); + CsrUint16Ser(ptr, len, (u16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->mibAttributeLength); if (primitive->mibAttributeLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->mibAttribute, ((CsrUint16) (primitive->mibAttributeLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->mibAttribute, ((u16) (primitive->mibAttributeLength))); } return(ptr); } @@ -3636,12 +3636,12 @@ void* CsrWifiSmeMibGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->mibAttributeLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset); if (primitive->mibAttributeLength) { primitive->mibAttribute = (u8 *)CsrPmemAlloc(primitive->mibAttributeLength); - CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((CsrUint16) (primitive->mibAttributeLength))); + CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength))); } else { @@ -3667,7 +3667,7 @@ CsrSize CsrWifiSmeMibGetNextCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 8) */ bufferSize += 2; /* CsrResult primitive->status */ - bufferSize += 2; /* CsrUint16 primitive->mibAttributeLength */ + bufferSize += 2; /* u16 primitive->mibAttributeLength */ bufferSize += primitive->mibAttributeLength; /* u8 primitive->mibAttribute */ return bufferSize; } @@ -3678,11 +3678,11 @@ u8* CsrWifiSmeMibGetNextCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeMibGetNextCfm *primitive = (CsrWifiSmeMibGetNextCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->mibAttributeLength); + CsrUint16Ser(ptr, len, (u16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->mibAttributeLength); if (primitive->mibAttributeLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->mibAttribute, ((CsrUint16) (primitive->mibAttributeLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->mibAttribute, ((u16) (primitive->mibAttributeLength))); } return(ptr); } @@ -3695,12 +3695,12 @@ void* CsrWifiSmeMibGetNextCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->mibAttributeLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset); if (primitive->mibAttributeLength) { primitive->mibAttribute = (u8 *)CsrPmemAlloc(primitive->mibAttributeLength); - CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((CsrUint16) (primitive->mibAttributeLength))); + CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength))); } else { @@ -3724,9 +3724,9 @@ CsrSize CsrWifiSmeMicFailureIndSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 15) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrBool primitive->secondFailure */ - bufferSize += 2; /* CsrUint16 primitive->count */ + bufferSize += 2; /* u16 primitive->count */ bufferSize += 6; /* u8 primitive->address.a[6] */ bufferSize += 1; /* CsrWifiSmeKeyType primitive->keyType */ return bufferSize; @@ -3738,10 +3738,10 @@ u8* CsrWifiSmeMicFailureIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeMicFailureInd *primitive = (CsrWifiSmeMicFailureInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->secondFailure); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->count); - CsrMemCpySer(ptr, len, (const void *) primitive->address.a, ((CsrUint16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->count); + CsrMemCpySer(ptr, len, (const void *) primitive->address.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->keyType); return(ptr); } @@ -3754,10 +3754,10 @@ void* CsrWifiSmeMicFailureIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->secondFailure, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->count, buffer, &offset); - CsrMemCpyDes(primitive->address.a, buffer, &offset, ((CsrUint16) (6))); + CsrUint16Des((u16 *) &primitive->count, buffer, &offset); + CsrMemCpyDes(primitive->address.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->keyType, buffer, &offset); return primitive; @@ -3770,12 +3770,12 @@ CsrSize CsrWifiSmeMulticastAddressCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 15) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 1; /* CsrWifiSmeListAction primitive->action */ bufferSize += 1; /* u8 primitive->getAddressesCount */ { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->getAddressesCount; i1++) { bufferSize += 6; /* u8 primitive->getAddresses[i1].a[6] */ @@ -3790,15 +3790,15 @@ u8* CsrWifiSmeMulticastAddressCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeMulticastAddressCfm *primitive = (CsrWifiSmeMulticastAddressCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint8Ser(ptr, len, (u8) primitive->action); CsrUint8Ser(ptr, len, (u8) primitive->getAddressesCount); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->getAddressesCount; i1++) { - CsrMemCpySer(ptr, len, (const void *) primitive->getAddresses[i1].a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->getAddresses[i1].a, ((u16) (6))); } } return(ptr); @@ -3812,8 +3812,8 @@ void* CsrWifiSmeMulticastAddressCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint8Des((u8 *) &primitive->action, buffer, &offset); CsrUint8Des((u8 *) &primitive->getAddressesCount, buffer, &offset); primitive->getAddresses = NULL; @@ -3822,10 +3822,10 @@ void* CsrWifiSmeMulticastAddressCfmDes(u8 *buffer, CsrSize length) primitive->getAddresses = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->getAddressesCount); } { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->getAddressesCount; i1++) { - CsrMemCpyDes(primitive->getAddresses[i1].a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->getAddresses[i1].a, buffer, &offset, ((u16) (6))); } } @@ -3846,7 +3846,7 @@ CsrSize CsrWifiSmePacketFilterSetCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 7) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; } @@ -3857,8 +3857,8 @@ u8* CsrWifiSmePacketFilterSetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmePacketFilterSetCfm *primitive = (CsrWifiSmePacketFilterSetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -3870,8 +3870,8 @@ void* CsrWifiSmePacketFilterSetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -3893,8 +3893,8 @@ u8* CsrWifiSmePermanentMacAddressGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmePermanentMacAddressGetCfm *primitive = (CsrWifiSmePermanentMacAddressGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); - CsrMemCpySer(ptr, len, (const void *) primitive->permanentMacAddress.a, ((CsrUint16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->status); + CsrMemCpySer(ptr, len, (const void *) primitive->permanentMacAddress.a, ((u16) (6))); return(ptr); } @@ -3906,8 +3906,8 @@ void* CsrWifiSmePermanentMacAddressGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); - CsrMemCpyDes(primitive->permanentMacAddress.a, buffer, &offset, ((CsrUint16) (6))); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); + CsrMemCpyDes(primitive->permanentMacAddress.a, buffer, &offset, ((u16) (6))); return primitive; } @@ -3919,10 +3919,10 @@ CsrSize CsrWifiSmePmkidCandidateListIndSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* u8 primitive->pmkidCandidatesCount */ { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->pmkidCandidatesCount; i1++) { bufferSize += 6; /* u8 primitive->pmkidCandidates[i1].bssid.a[6] */ @@ -3938,13 +3938,13 @@ u8* CsrWifiSmePmkidCandidateListIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmePmkidCandidateListInd *primitive = (CsrWifiSmePmkidCandidateListInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->pmkidCandidatesCount); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->pmkidCandidatesCount; i1++) { - CsrMemCpySer(ptr, len, (const void *) primitive->pmkidCandidates[i1].bssid.a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->pmkidCandidates[i1].bssid.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->pmkidCandidates[i1].preAuthAllowed); } } @@ -3959,7 +3959,7 @@ void* CsrWifiSmePmkidCandidateListIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->pmkidCandidatesCount, buffer, &offset); primitive->pmkidCandidates = NULL; if (primitive->pmkidCandidatesCount) @@ -3967,10 +3967,10 @@ void* CsrWifiSmePmkidCandidateListIndDes(u8 *buffer, CsrSize length) primitive->pmkidCandidates = (CsrWifiSmePmkidCandidate *)CsrPmemAlloc(sizeof(CsrWifiSmePmkidCandidate) * primitive->pmkidCandidatesCount); } { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->pmkidCandidatesCount; i1++) { - CsrMemCpyDes(primitive->pmkidCandidates[i1].bssid.a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->pmkidCandidates[i1].bssid.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->pmkidCandidates[i1].preAuthAllowed, buffer, &offset); } } @@ -3993,12 +3993,12 @@ CsrSize CsrWifiSmePmkidCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 31) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 1; /* CsrWifiSmeListAction primitive->action */ bufferSize += 1; /* u8 primitive->getPmkidsCount */ { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->getPmkidsCount; i1++) { bufferSize += 6; /* u8 primitive->getPmkids[i1].bssid.a[6] */ @@ -4014,16 +4014,16 @@ u8* CsrWifiSmePmkidCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmePmkidCfm *primitive = (CsrWifiSmePmkidCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint8Ser(ptr, len, (u8) primitive->action); CsrUint8Ser(ptr, len, (u8) primitive->getPmkidsCount); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->getPmkidsCount; i1++) { - CsrMemCpySer(ptr, len, (const void *) primitive->getPmkids[i1].bssid.a, ((CsrUint16) (6))); - CsrMemCpySer(ptr, len, (const void *) primitive->getPmkids[i1].pmkid, ((CsrUint16) (16))); + CsrMemCpySer(ptr, len, (const void *) primitive->getPmkids[i1].bssid.a, ((u16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->getPmkids[i1].pmkid, ((u16) (16))); } } return(ptr); @@ -4037,8 +4037,8 @@ void* CsrWifiSmePmkidCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint8Des((u8 *) &primitive->action, buffer, &offset); CsrUint8Des((u8 *) &primitive->getPmkidsCount, buffer, &offset); primitive->getPmkids = NULL; @@ -4047,11 +4047,11 @@ void* CsrWifiSmePmkidCfmDes(u8 *buffer, CsrSize length) primitive->getPmkids = (CsrWifiSmePmkid *)CsrPmemAlloc(sizeof(CsrWifiSmePmkid) * primitive->getPmkidsCount); } { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->getPmkidsCount; i1++) { - CsrMemCpyDes(primitive->getPmkids[i1].bssid.a, buffer, &offset, ((CsrUint16) (6))); - CsrMemCpyDes(primitive->getPmkids[i1].pmkid, buffer, &offset, ((CsrUint16) (16))); + CsrMemCpyDes(primitive->getPmkids[i1].bssid.a, buffer, &offset, ((u16) (6))); + CsrMemCpyDes(primitive->getPmkids[i1].pmkid, buffer, &offset, ((u16) (16))); } } @@ -4074,7 +4074,7 @@ CsrSize CsrWifiSmePowerConfigGetCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */ bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 1; /* CsrWifiSmePowerSaveLevel primitive->powerConfig.powerSaveLevel */ - bufferSize += 2; /* CsrUint16 primitive->powerConfig.listenIntervalTu */ + bufferSize += 2; /* u16 primitive->powerConfig.listenIntervalTu */ bufferSize += 1; /* CsrBool primitive->powerConfig.rxDtims */ bufferSize += 1; /* CsrWifiSmeD3AutoScanMode primitive->powerConfig.d3AutoScanMode */ bufferSize += 1; /* u8 primitive->powerConfig.clientTrafficWindow */ @@ -4089,9 +4089,9 @@ u8* CsrWifiSmePowerConfigGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmePowerConfigGetCfm *primitive = (CsrWifiSmePowerConfigGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint8Ser(ptr, len, (u8) primitive->powerConfig.powerSaveLevel); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->powerConfig.listenIntervalTu); + CsrUint16Ser(ptr, len, (u16) primitive->powerConfig.listenIntervalTu); CsrUint8Ser(ptr, len, (u8) primitive->powerConfig.rxDtims); CsrUint8Ser(ptr, len, (u8) primitive->powerConfig.d3AutoScanMode); CsrUint8Ser(ptr, len, (u8) primitive->powerConfig.clientTrafficWindow); @@ -4108,9 +4108,9 @@ void* CsrWifiSmePowerConfigGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint8Des((u8 *) &primitive->powerConfig.powerSaveLevel, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->powerConfig.listenIntervalTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->powerConfig.listenIntervalTu, buffer, &offset); CsrUint8Des((u8 *) &primitive->powerConfig.rxDtims, buffer, &offset); CsrUint8Des((u8 *) &primitive->powerConfig.d3AutoScanMode, buffer, &offset); CsrUint8Des((u8 *) &primitive->powerConfig.clientTrafficWindow, buffer, &offset); @@ -4140,11 +4140,11 @@ u8* CsrWifiSmeRegulatoryDomainInfoGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeRegulatoryDomainInfoGetCfm *primitive = (CsrWifiSmeRegulatoryDomainInfoGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint8Ser(ptr, len, (u8) primitive->regDomInfo.dot11MultiDomainCapabilityImplemented); CsrUint8Ser(ptr, len, (u8) primitive->regDomInfo.dot11MultiDomainCapabilityEnabled); CsrUint8Ser(ptr, len, (u8) primitive->regDomInfo.currentRegulatoryDomain); - CsrMemCpySer(ptr, len, (const void *) primitive->regDomInfo.currentCountryCode, ((CsrUint16) (2))); + CsrMemCpySer(ptr, len, (const void *) primitive->regDomInfo.currentCountryCode, ((u16) (2))); return(ptr); } @@ -4156,11 +4156,11 @@ void* CsrWifiSmeRegulatoryDomainInfoGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint8Des((u8 *) &primitive->regDomInfo.dot11MultiDomainCapabilityImplemented, buffer, &offset); CsrUint8Des((u8 *) &primitive->regDomInfo.dot11MultiDomainCapabilityEnabled, buffer, &offset); CsrUint8Des((u8 *) &primitive->regDomInfo.currentRegulatoryDomain, buffer, &offset); - CsrMemCpyDes(primitive->regDomInfo.currentCountryCode, buffer, &offset, ((CsrUint16) (2))); + CsrMemCpyDes(primitive->regDomInfo.currentCountryCode, buffer, &offset, ((u16) (2))); return primitive; } @@ -4171,7 +4171,7 @@ CsrSize CsrWifiSmeRoamCompleteIndSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 7) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; } @@ -4182,8 +4182,8 @@ u8* CsrWifiSmeRoamCompleteIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeRoamCompleteInd *primitive = (CsrWifiSmeRoamCompleteInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -4195,8 +4195,8 @@ void* CsrWifiSmeRoamCompleteIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -4207,7 +4207,7 @@ CsrSize CsrWifiSmeRoamStartIndSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 8) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiSmeRoamReason primitive->roamReason */ bufferSize += 2; /* CsrWifiSmeIEEE80211Reason primitive->reason80211 */ return bufferSize; @@ -4219,9 +4219,9 @@ u8* CsrWifiSmeRoamStartIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeRoamStartInd *primitive = (CsrWifiSmeRoamStartInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->roamReason); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->reason80211); + CsrUint16Ser(ptr, len, (u16) primitive->reason80211); return(ptr); } @@ -4233,9 +4233,9 @@ void* CsrWifiSmeRoamStartIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->roamReason, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->reason80211, buffer, &offset); + CsrUint16Des((u16 *) &primitive->reason80211, buffer, &offset); return primitive; } @@ -4246,10 +4246,10 @@ CsrSize CsrWifiSmeRoamingConfigGetCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 72) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 3; i2++) { bufferSize += 2; /* CsrInt16 primitive->roamingConfig.roamingBands[i2].rssiHighThreshold */ @@ -4261,17 +4261,17 @@ CsrSize CsrWifiSmeRoamingConfigGetCfmSizeof(void *msg) bufferSize += 1; /* CsrBool primitive->roamingConfig.disableSmoothRoaming */ bufferSize += 1; /* CsrBool primitive->roamingConfig.disableRoamScans */ bufferSize += 1; /* u8 primitive->roamingConfig.reconnectLimit */ - bufferSize += 2; /* CsrUint16 primitive->roamingConfig.reconnectLimitIntervalMs */ + bufferSize += 2; /* u16 primitive->roamingConfig.reconnectLimitIntervalMs */ { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 3; i2++) { - bufferSize += 2; /* CsrUint16 primitive->roamingConfig.roamScanCfg[i2].intervalSeconds */ - bufferSize += 2; /* CsrUint16 primitive->roamingConfig.roamScanCfg[i2].validitySeconds */ - bufferSize += 2; /* CsrUint16 primitive->roamingConfig.roamScanCfg[i2].minActiveChannelTimeTu */ - bufferSize += 2; /* CsrUint16 primitive->roamingConfig.roamScanCfg[i2].maxActiveChannelTimeTu */ - bufferSize += 2; /* CsrUint16 primitive->roamingConfig.roamScanCfg[i2].minPassiveChannelTimeTu */ - bufferSize += 2; /* CsrUint16 primitive->roamingConfig.roamScanCfg[i2].maxPassiveChannelTimeTu */ + bufferSize += 2; /* u16 primitive->roamingConfig.roamScanCfg[i2].intervalSeconds */ + bufferSize += 2; /* u16 primitive->roamingConfig.roamScanCfg[i2].validitySeconds */ + bufferSize += 2; /* u16 primitive->roamingConfig.roamScanCfg[i2].minActiveChannelTimeTu */ + bufferSize += 2; /* u16 primitive->roamingConfig.roamScanCfg[i2].maxActiveChannelTimeTu */ + bufferSize += 2; /* u16 primitive->roamingConfig.roamScanCfg[i2].minPassiveChannelTimeTu */ + bufferSize += 2; /* u16 primitive->roamingConfig.roamScanCfg[i2].maxPassiveChannelTimeTu */ } } return bufferSize; @@ -4283,32 +4283,32 @@ u8* CsrWifiSmeRoamingConfigGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeRoamingConfigGetCfm *primitive = (CsrWifiSmeRoamingConfigGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 3; i2++) { - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamingBands[i2].rssiHighThreshold); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamingBands[i2].rssiLowThreshold); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamingBands[i2].snrHighThreshold); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamingBands[i2].snrLowThreshold); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamingBands[i2].rssiHighThreshold); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamingBands[i2].rssiLowThreshold); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamingBands[i2].snrHighThreshold); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamingBands[i2].snrLowThreshold); } } CsrUint8Ser(ptr, len, (u8) primitive->roamingConfig.disableSmoothRoaming); CsrUint8Ser(ptr, len, (u8) primitive->roamingConfig.disableRoamScans); CsrUint8Ser(ptr, len, (u8) primitive->roamingConfig.reconnectLimit); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.reconnectLimitIntervalMs); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.reconnectLimitIntervalMs); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 3; i2++) { - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamScanCfg[i2].intervalSeconds); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamScanCfg[i2].validitySeconds); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamScanCfg[i2].minActiveChannelTimeTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamScanCfg[i2].maxActiveChannelTimeTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamScanCfg[i2].minPassiveChannelTimeTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->roamingConfig.roamScanCfg[i2].maxPassiveChannelTimeTu); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamScanCfg[i2].intervalSeconds); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamScanCfg[i2].validitySeconds); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamScanCfg[i2].minActiveChannelTimeTu); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamScanCfg[i2].maxActiveChannelTimeTu); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamScanCfg[i2].minPassiveChannelTimeTu); + CsrUint16Ser(ptr, len, (u16) primitive->roamingConfig.roamScanCfg[i2].maxPassiveChannelTimeTu); } } return(ptr); @@ -4322,32 +4322,32 @@ void* CsrWifiSmeRoamingConfigGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 3; i2++) { - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamingBands[i2].rssiHighThreshold, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamingBands[i2].rssiLowThreshold, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamingBands[i2].snrHighThreshold, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamingBands[i2].snrLowThreshold, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamingBands[i2].rssiHighThreshold, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamingBands[i2].rssiLowThreshold, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamingBands[i2].snrHighThreshold, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamingBands[i2].snrLowThreshold, buffer, &offset); } } CsrUint8Des((u8 *) &primitive->roamingConfig.disableSmoothRoaming, buffer, &offset); CsrUint8Des((u8 *) &primitive->roamingConfig.disableRoamScans, buffer, &offset); CsrUint8Des((u8 *) &primitive->roamingConfig.reconnectLimit, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.reconnectLimitIntervalMs, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.reconnectLimitIntervalMs, buffer, &offset); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 3; i2++) { - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamScanCfg[i2].intervalSeconds, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamScanCfg[i2].validitySeconds, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamScanCfg[i2].minActiveChannelTimeTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamScanCfg[i2].maxActiveChannelTimeTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamScanCfg[i2].minPassiveChannelTimeTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->roamingConfig.roamScanCfg[i2].maxPassiveChannelTimeTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamScanCfg[i2].intervalSeconds, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamScanCfg[i2].validitySeconds, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamScanCfg[i2].minActiveChannelTimeTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamScanCfg[i2].maxActiveChannelTimeTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamScanCfg[i2].minPassiveChannelTimeTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->roamingConfig.roamScanCfg[i2].maxPassiveChannelTimeTu, buffer, &offset); } } @@ -4360,7 +4360,7 @@ CsrSize CsrWifiSmeRoamingConfigSetCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 7) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; } @@ -4371,8 +4371,8 @@ u8* CsrWifiSmeRoamingConfigSetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeRoamingConfigSetCfm *primitive = (CsrWifiSmeRoamingConfigSetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -4384,8 +4384,8 @@ void* CsrWifiSmeRoamingConfigSetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -4399,26 +4399,26 @@ CsrSize CsrWifiSmeScanConfigGetCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 65) */ bufferSize += 2; /* CsrResult primitive->status */ { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 4; i2++) { - bufferSize += 2; /* CsrUint16 primitive->scanConfig.scanCfg[i2].intervalSeconds */ - bufferSize += 2; /* CsrUint16 primitive->scanConfig.scanCfg[i2].validitySeconds */ - bufferSize += 2; /* CsrUint16 primitive->scanConfig.scanCfg[i2].minActiveChannelTimeTu */ - bufferSize += 2; /* CsrUint16 primitive->scanConfig.scanCfg[i2].maxActiveChannelTimeTu */ - bufferSize += 2; /* CsrUint16 primitive->scanConfig.scanCfg[i2].minPassiveChannelTimeTu */ - bufferSize += 2; /* CsrUint16 primitive->scanConfig.scanCfg[i2].maxPassiveChannelTimeTu */ + bufferSize += 2; /* u16 primitive->scanConfig.scanCfg[i2].intervalSeconds */ + bufferSize += 2; /* u16 primitive->scanConfig.scanCfg[i2].validitySeconds */ + bufferSize += 2; /* u16 primitive->scanConfig.scanCfg[i2].minActiveChannelTimeTu */ + bufferSize += 2; /* u16 primitive->scanConfig.scanCfg[i2].maxActiveChannelTimeTu */ + bufferSize += 2; /* u16 primitive->scanConfig.scanCfg[i2].minPassiveChannelTimeTu */ + bufferSize += 2; /* u16 primitive->scanConfig.scanCfg[i2].maxPassiveChannelTimeTu */ } } bufferSize += 1; /* CsrBool primitive->scanConfig.disableAutonomousScans */ - bufferSize += 2; /* CsrUint16 primitive->scanConfig.maxResults */ + bufferSize += 2; /* u16 primitive->scanConfig.maxResults */ bufferSize += 1; /* s8 primitive->scanConfig.highRssiThreshold */ bufferSize += 1; /* s8 primitive->scanConfig.lowRssiThreshold */ bufferSize += 1; /* s8 primitive->scanConfig.deltaRssiThreshold */ bufferSize += 1; /* s8 primitive->scanConfig.highSnrThreshold */ bufferSize += 1; /* s8 primitive->scanConfig.lowSnrThreshold */ bufferSize += 1; /* s8 primitive->scanConfig.deltaSnrThreshold */ - bufferSize += 2; /* CsrUint16 primitive->scanConfig.passiveChannelListCount */ + bufferSize += 2; /* u16 primitive->scanConfig.passiveChannelListCount */ bufferSize += primitive->scanConfig.passiveChannelListCount; /* u8 primitive->scanConfig.passiveChannelList */ return bufferSize; } @@ -4429,31 +4429,31 @@ u8* CsrWifiSmeScanConfigGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeScanConfigGetCfm *primitive = (CsrWifiSmeScanConfigGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->status); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 4; i2++) { - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanConfig.scanCfg[i2].intervalSeconds); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanConfig.scanCfg[i2].validitySeconds); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanConfig.scanCfg[i2].minActiveChannelTimeTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanConfig.scanCfg[i2].maxActiveChannelTimeTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanConfig.scanCfg[i2].minPassiveChannelTimeTu); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanConfig.scanCfg[i2].maxPassiveChannelTimeTu); + CsrUint16Ser(ptr, len, (u16) primitive->scanConfig.scanCfg[i2].intervalSeconds); + CsrUint16Ser(ptr, len, (u16) primitive->scanConfig.scanCfg[i2].validitySeconds); + CsrUint16Ser(ptr, len, (u16) primitive->scanConfig.scanCfg[i2].minActiveChannelTimeTu); + CsrUint16Ser(ptr, len, (u16) primitive->scanConfig.scanCfg[i2].maxActiveChannelTimeTu); + CsrUint16Ser(ptr, len, (u16) primitive->scanConfig.scanCfg[i2].minPassiveChannelTimeTu); + CsrUint16Ser(ptr, len, (u16) primitive->scanConfig.scanCfg[i2].maxPassiveChannelTimeTu); } } CsrUint8Ser(ptr, len, (u8) primitive->scanConfig.disableAutonomousScans); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanConfig.maxResults); + CsrUint16Ser(ptr, len, (u16) primitive->scanConfig.maxResults); CsrUint8Ser(ptr, len, (u8) primitive->scanConfig.highRssiThreshold); CsrUint8Ser(ptr, len, (u8) primitive->scanConfig.lowRssiThreshold); CsrUint8Ser(ptr, len, (u8) primitive->scanConfig.deltaRssiThreshold); CsrUint8Ser(ptr, len, (u8) primitive->scanConfig.highSnrThreshold); CsrUint8Ser(ptr, len, (u8) primitive->scanConfig.lowSnrThreshold); CsrUint8Ser(ptr, len, (u8) primitive->scanConfig.deltaSnrThreshold); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanConfig.passiveChannelListCount); + CsrUint16Ser(ptr, len, (u16) primitive->scanConfig.passiveChannelListCount); if (primitive->scanConfig.passiveChannelListCount) { - CsrMemCpySer(ptr, len, (const void *) primitive->scanConfig.passiveChannelList, ((CsrUint16) (primitive->scanConfig.passiveChannelListCount))); + CsrMemCpySer(ptr, len, (const void *) primitive->scanConfig.passiveChannelList, ((u16) (primitive->scanConfig.passiveChannelListCount))); } return(ptr); } @@ -4466,32 +4466,32 @@ void* CsrWifiSmeScanConfigGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < 4; i2++) { - CsrUint16Des((CsrUint16 *) &primitive->scanConfig.scanCfg[i2].intervalSeconds, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanConfig.scanCfg[i2].validitySeconds, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanConfig.scanCfg[i2].minActiveChannelTimeTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanConfig.scanCfg[i2].maxActiveChannelTimeTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanConfig.scanCfg[i2].minPassiveChannelTimeTu, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanConfig.scanCfg[i2].maxPassiveChannelTimeTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanConfig.scanCfg[i2].intervalSeconds, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanConfig.scanCfg[i2].validitySeconds, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanConfig.scanCfg[i2].minActiveChannelTimeTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanConfig.scanCfg[i2].maxActiveChannelTimeTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanConfig.scanCfg[i2].minPassiveChannelTimeTu, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanConfig.scanCfg[i2].maxPassiveChannelTimeTu, buffer, &offset); } } CsrUint8Des((u8 *) &primitive->scanConfig.disableAutonomousScans, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanConfig.maxResults, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanConfig.maxResults, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanConfig.highRssiThreshold, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanConfig.lowRssiThreshold, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanConfig.deltaRssiThreshold, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanConfig.highSnrThreshold, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanConfig.lowSnrThreshold, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanConfig.deltaSnrThreshold, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanConfig.passiveChannelListCount, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanConfig.passiveChannelListCount, buffer, &offset); if (primitive->scanConfig.passiveChannelListCount) { primitive->scanConfig.passiveChannelList = (u8 *)CsrPmemAlloc(primitive->scanConfig.passiveChannelListCount); - CsrMemCpyDes(primitive->scanConfig.passiveChannelList, buffer, &offset, ((CsrUint16) (primitive->scanConfig.passiveChannelListCount))); + CsrMemCpyDes(primitive->scanConfig.passiveChannelList, buffer, &offset, ((u16) (primitive->scanConfig.passiveChannelListCount))); } else { @@ -4522,15 +4522,15 @@ CsrSize CsrWifiSmeScanResultIndSizeof(void *msg) bufferSize += 2; /* CsrInt16 primitive->result.rssi */ bufferSize += 2; /* CsrInt16 primitive->result.snr */ bufferSize += 1; /* CsrWifiSmeRadioIF primitive->result.ifIndex */ - bufferSize += 2; /* CsrUint16 primitive->result.beaconPeriodTu */ + bufferSize += 2; /* u16 primitive->result.beaconPeriodTu */ bufferSize += 8; /* u8 primitive->result.timeStamp.data[8] */ bufferSize += 8; /* u8 primitive->result.localTime.data[8] */ - bufferSize += 2; /* CsrUint16 primitive->result.channelFrequency */ - bufferSize += 2; /* CsrUint16 primitive->result.capabilityInformation */ + bufferSize += 2; /* u16 primitive->result.channelFrequency */ + bufferSize += 2; /* u16 primitive->result.capabilityInformation */ bufferSize += 1; /* u8 primitive->result.channelNumber */ bufferSize += 1; /* CsrWifiSmeBasicUsability primitive->result.usability */ bufferSize += 1; /* CsrWifiSmeBssType primitive->result.bssType */ - bufferSize += 2; /* CsrUint16 primitive->result.informationElementsLength */ + bufferSize += 2; /* u16 primitive->result.informationElementsLength */ bufferSize += primitive->result.informationElementsLength; /* u8 primitive->result.informationElements */ bufferSize += 1; /* CsrWifiSmeP2pRole primitive->result.p2pDeviceRole */ switch (primitive->result.p2pDeviceRole) @@ -4543,7 +4543,7 @@ CsrSize CsrWifiSmeScanResultIndSizeof(void *msg) bufferSize += 6; /* u8 primitive->result.deviceInfo.groupInfo.p2pDeviceAddress.a[6] */ bufferSize += 1; /* u8 primitive->result.deviceInfo.groupInfo.p2pClientInfoCount */ { - CsrUint16 i4; + u16 i4; for (i4 = 0; i4 < primitive->result.deviceInfo.groupInfo.p2pClientInfoCount; i4++) { bufferSize += 6; /* u8 primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].p2PClientInterfaceAddress.a[6] */ @@ -4553,7 +4553,7 @@ CsrSize CsrWifiSmeScanResultIndSizeof(void *msg) bufferSize += 8; /* u8 primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.primDeviceType.deviceDetails[8] */ bufferSize += 1; /* u8 primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount */ { - CsrUint16 i6; + u16 i6; for (i6 = 0; i6 < primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount; i6++) { bufferSize += 8; /* u8 primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType[i6].deviceDetails[8] */ @@ -4574,7 +4574,7 @@ CsrSize CsrWifiSmeScanResultIndSizeof(void *msg) bufferSize += 8; /* u8 primitive->result.deviceInfo.standalonedevInfo.primDeviceType.deviceDetails[8] */ bufferSize += 1; /* u8 primitive->result.deviceInfo.standalonedevInfo.secondaryDeviceTypeCount */ { - CsrUint16 i4; + u16 i4; for (i4 = 0; i4 < primitive->result.deviceInfo.standalonedevInfo.secondaryDeviceTypeCount; i4++) { bufferSize += 8; /* u8 primitive->result.deviceInfo.standalonedevInfo.secDeviceType[i4].deviceDetails[8] */ @@ -4595,24 +4595,24 @@ u8* CsrWifiSmeScanResultIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeScanResultInd *primitive = (CsrWifiSmeScanResultInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrMemCpySer(ptr, len, (const void *) primitive->result.ssid.ssid, ((CsrUint16) (32))); + CsrMemCpySer(ptr, len, (const void *) primitive->result.ssid.ssid, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->result.ssid.length); - CsrMemCpySer(ptr, len, (const void *) primitive->result.bssid.a, ((CsrUint16) (6))); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->result.rssi); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->result.snr); + CsrMemCpySer(ptr, len, (const void *) primitive->result.bssid.a, ((u16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->result.rssi); + CsrUint16Ser(ptr, len, (u16) primitive->result.snr); CsrUint8Ser(ptr, len, (u8) primitive->result.ifIndex); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->result.beaconPeriodTu); - CsrMemCpySer(ptr, len, (const void *) primitive->result.timeStamp.data, ((CsrUint16) (8))); - CsrMemCpySer(ptr, len, (const void *) primitive->result.localTime.data, ((CsrUint16) (8))); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->result.channelFrequency); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->result.capabilityInformation); + CsrUint16Ser(ptr, len, (u16) primitive->result.beaconPeriodTu); + CsrMemCpySer(ptr, len, (const void *) primitive->result.timeStamp.data, ((u16) (8))); + CsrMemCpySer(ptr, len, (const void *) primitive->result.localTime.data, ((u16) (8))); + CsrUint16Ser(ptr, len, (u16) primitive->result.channelFrequency); + CsrUint16Ser(ptr, len, (u16) primitive->result.capabilityInformation); CsrUint8Ser(ptr, len, (u8) primitive->result.channelNumber); CsrUint8Ser(ptr, len, (u8) primitive->result.usability); CsrUint8Ser(ptr, len, (u8) primitive->result.bssType); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->result.informationElementsLength); + CsrUint16Ser(ptr, len, (u16) primitive->result.informationElementsLength); if (primitive->result.informationElementsLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->result.informationElements, ((CsrUint16) (primitive->result.informationElementsLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->result.informationElements, ((u16) (primitive->result.informationElementsLength))); } CsrUint8Ser(ptr, len, (u8) primitive->result.p2pDeviceRole); switch (primitive->result.p2pDeviceRole) @@ -4622,26 +4622,26 @@ u8* CsrWifiSmeScanResultIndSer(u8 *ptr, CsrSize *len, void *msg) break; case CSR_WIFI_SME_P2P_ROLE_GO: CsrUint8Ser(ptr, len, (u8) primitive->result.deviceInfo.groupInfo.groupCapability); - CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.groupInfo.p2pDeviceAddress.a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.groupInfo.p2pDeviceAddress.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->result.deviceInfo.groupInfo.p2pClientInfoCount); { - CsrUint16 i4; + u16 i4; for (i4 = 0; i4 < primitive->result.deviceInfo.groupInfo.p2pClientInfoCount; i4++) { - CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].p2PClientInterfaceAddress.a, ((CsrUint16) (6))); - CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceAddress.a, ((CsrUint16) (6))); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.configMethods); + CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].p2PClientInterfaceAddress.a, ((u16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceAddress.a, ((u16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.configMethods); CsrUint8Ser(ptr, len, (u8) primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.p2PDeviceCap); - CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.primDeviceType.deviceDetails, ((CsrUint16) (8))); + CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.primDeviceType.deviceDetails, ((u16) (8))); CsrUint8Ser(ptr, len, (u8) primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount); { - CsrUint16 i6; + u16 i6; for (i6 = 0; i6 < primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount; i6++) { - CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType[i6].deviceDetails, ((CsrUint16) (8))); + CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType[i6].deviceDetails, ((u16) (8))); } } - CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceName, ((CsrUint16) (32))); + CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceName, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceNameLength); } } @@ -4650,19 +4650,19 @@ u8* CsrWifiSmeScanResultIndSer(u8 *ptr, CsrSize *len, void *msg) CsrUint8Ser(ptr, len, (u8) primitive->result.deviceInfo.reservedNone.empty); break; case CSR_WIFI_SME_P2P_ROLE_STANDALONE: - CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.standalonedevInfo.deviceAddress.a, ((CsrUint16) (6))); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->result.deviceInfo.standalonedevInfo.configMethods); + CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.standalonedevInfo.deviceAddress.a, ((u16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->result.deviceInfo.standalonedevInfo.configMethods); CsrUint8Ser(ptr, len, (u8) primitive->result.deviceInfo.standalonedevInfo.p2PDeviceCap); - CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.standalonedevInfo.primDeviceType.deviceDetails, ((CsrUint16) (8))); + CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.standalonedevInfo.primDeviceType.deviceDetails, ((u16) (8))); CsrUint8Ser(ptr, len, (u8) primitive->result.deviceInfo.standalonedevInfo.secondaryDeviceTypeCount); { - CsrUint16 i4; + u16 i4; for (i4 = 0; i4 < primitive->result.deviceInfo.standalonedevInfo.secondaryDeviceTypeCount; i4++) { - CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.standalonedevInfo.secDeviceType[i4].deviceDetails, ((CsrUint16) (8))); + CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.standalonedevInfo.secDeviceType[i4].deviceDetails, ((u16) (8))); } } - CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.standalonedevInfo.deviceName, ((CsrUint16) (32))); + CsrMemCpySer(ptr, len, (const void *) primitive->result.deviceInfo.standalonedevInfo.deviceName, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->result.deviceInfo.standalonedevInfo.deviceNameLength); break; default: @@ -4679,25 +4679,25 @@ void* CsrWifiSmeScanResultIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrMemCpyDes(primitive->result.ssid.ssid, buffer, &offset, ((CsrUint16) (32))); + CsrMemCpyDes(primitive->result.ssid.ssid, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->result.ssid.length, buffer, &offset); - CsrMemCpyDes(primitive->result.bssid.a, buffer, &offset, ((CsrUint16) (6))); - CsrUint16Des((CsrUint16 *) &primitive->result.rssi, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->result.snr, buffer, &offset); + CsrMemCpyDes(primitive->result.bssid.a, buffer, &offset, ((u16) (6))); + CsrUint16Des((u16 *) &primitive->result.rssi, buffer, &offset); + CsrUint16Des((u16 *) &primitive->result.snr, buffer, &offset); CsrUint8Des((u8 *) &primitive->result.ifIndex, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->result.beaconPeriodTu, buffer, &offset); - CsrMemCpyDes(primitive->result.timeStamp.data, buffer, &offset, ((CsrUint16) (8))); - CsrMemCpyDes(primitive->result.localTime.data, buffer, &offset, ((CsrUint16) (8))); - CsrUint16Des((CsrUint16 *) &primitive->result.channelFrequency, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->result.capabilityInformation, buffer, &offset); + CsrUint16Des((u16 *) &primitive->result.beaconPeriodTu, buffer, &offset); + CsrMemCpyDes(primitive->result.timeStamp.data, buffer, &offset, ((u16) (8))); + CsrMemCpyDes(primitive->result.localTime.data, buffer, &offset, ((u16) (8))); + CsrUint16Des((u16 *) &primitive->result.channelFrequency, buffer, &offset); + CsrUint16Des((u16 *) &primitive->result.capabilityInformation, buffer, &offset); CsrUint8Des((u8 *) &primitive->result.channelNumber, buffer, &offset); CsrUint8Des((u8 *) &primitive->result.usability, buffer, &offset); CsrUint8Des((u8 *) &primitive->result.bssType, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->result.informationElementsLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->result.informationElementsLength, buffer, &offset); if (primitive->result.informationElementsLength) { primitive->result.informationElements = (u8 *)CsrPmemAlloc(primitive->result.informationElementsLength); - CsrMemCpyDes(primitive->result.informationElements, buffer, &offset, ((CsrUint16) (primitive->result.informationElementsLength))); + CsrMemCpyDes(primitive->result.informationElements, buffer, &offset, ((u16) (primitive->result.informationElementsLength))); } else { @@ -4711,7 +4711,7 @@ void* CsrWifiSmeScanResultIndDes(u8 *buffer, CsrSize length) break; case CSR_WIFI_SME_P2P_ROLE_GO: CsrUint8Des((u8 *) &primitive->result.deviceInfo.groupInfo.groupCapability, buffer, &offset); - CsrMemCpyDes(primitive->result.deviceInfo.groupInfo.p2pDeviceAddress.a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->result.deviceInfo.groupInfo.p2pDeviceAddress.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->result.deviceInfo.groupInfo.p2pClientInfoCount, buffer, &offset); primitive->result.deviceInfo.groupInfo.p2PClientInfo = NULL; if (primitive->result.deviceInfo.groupInfo.p2pClientInfoCount) @@ -4719,14 +4719,14 @@ void* CsrWifiSmeScanResultIndDes(u8 *buffer, CsrSize length) primitive->result.deviceInfo.groupInfo.p2PClientInfo = (CsrWifiSmeP2pClientInfoType *)CsrPmemAlloc(sizeof(CsrWifiSmeP2pClientInfoType) * primitive->result.deviceInfo.groupInfo.p2pClientInfoCount); } { - CsrUint16 i4; + u16 i4; for (i4 = 0; i4 < primitive->result.deviceInfo.groupInfo.p2pClientInfoCount; i4++) { - CsrMemCpyDes(primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].p2PClientInterfaceAddress.a, buffer, &offset, ((CsrUint16) (6))); - CsrMemCpyDes(primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceAddress.a, buffer, &offset, ((CsrUint16) (6))); - CsrUint16Des((CsrUint16 *) &primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.configMethods, buffer, &offset); + CsrMemCpyDes(primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].p2PClientInterfaceAddress.a, buffer, &offset, ((u16) (6))); + CsrMemCpyDes(primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceAddress.a, buffer, &offset, ((u16) (6))); + CsrUint16Des((u16 *) &primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.configMethods, buffer, &offset); CsrUint8Des((u8 *) &primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.p2PDeviceCap, buffer, &offset); - CsrMemCpyDes(primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.primDeviceType.deviceDetails, buffer, &offset, ((CsrUint16) (8))); + CsrMemCpyDes(primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.primDeviceType.deviceDetails, buffer, &offset, ((u16) (8))); CsrUint8Des((u8 *) &primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount, buffer, &offset); primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = NULL; if (primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount) @@ -4734,13 +4734,13 @@ void* CsrWifiSmeScanResultIndDes(u8 *buffer, CsrSize length) primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = (CsrWifiSmeWpsDeviceType *)CsrPmemAlloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount); } { - CsrUint16 i6; + u16 i6; for (i6 = 0; i6 < primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount; i6++) { - CsrMemCpyDes(primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType[i6].deviceDetails, buffer, &offset, ((CsrUint16) (8))); + CsrMemCpyDes(primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType[i6].deviceDetails, buffer, &offset, ((u16) (8))); } } - CsrMemCpyDes(primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceName, buffer, &offset, ((CsrUint16) (32))); + CsrMemCpyDes(primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceName, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceNameLength, buffer, &offset); } } @@ -4749,10 +4749,10 @@ void* CsrWifiSmeScanResultIndDes(u8 *buffer, CsrSize length) CsrUint8Des((u8 *) &primitive->result.deviceInfo.reservedNone.empty, buffer, &offset); break; case CSR_WIFI_SME_P2P_ROLE_STANDALONE: - CsrMemCpyDes(primitive->result.deviceInfo.standalonedevInfo.deviceAddress.a, buffer, &offset, ((CsrUint16) (6))); - CsrUint16Des((CsrUint16 *) &primitive->result.deviceInfo.standalonedevInfo.configMethods, buffer, &offset); + CsrMemCpyDes(primitive->result.deviceInfo.standalonedevInfo.deviceAddress.a, buffer, &offset, ((u16) (6))); + CsrUint16Des((u16 *) &primitive->result.deviceInfo.standalonedevInfo.configMethods, buffer, &offset); CsrUint8Des((u8 *) &primitive->result.deviceInfo.standalonedevInfo.p2PDeviceCap, buffer, &offset); - CsrMemCpyDes(primitive->result.deviceInfo.standalonedevInfo.primDeviceType.deviceDetails, buffer, &offset, ((CsrUint16) (8))); + CsrMemCpyDes(primitive->result.deviceInfo.standalonedevInfo.primDeviceType.deviceDetails, buffer, &offset, ((u16) (8))); CsrUint8Des((u8 *) &primitive->result.deviceInfo.standalonedevInfo.secondaryDeviceTypeCount, buffer, &offset); primitive->result.deviceInfo.standalonedevInfo.secDeviceType = NULL; if (primitive->result.deviceInfo.standalonedevInfo.secondaryDeviceTypeCount) @@ -4760,13 +4760,13 @@ void* CsrWifiSmeScanResultIndDes(u8 *buffer, CsrSize length) primitive->result.deviceInfo.standalonedevInfo.secDeviceType = (CsrWifiSmeWpsDeviceType *)CsrPmemAlloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->result.deviceInfo.standalonedevInfo.secondaryDeviceTypeCount); } { - CsrUint16 i4; + u16 i4; for (i4 = 0; i4 < primitive->result.deviceInfo.standalonedevInfo.secondaryDeviceTypeCount; i4++) { - CsrMemCpyDes(primitive->result.deviceInfo.standalonedevInfo.secDeviceType[i4].deviceDetails, buffer, &offset, ((CsrUint16) (8))); + CsrMemCpyDes(primitive->result.deviceInfo.standalonedevInfo.secDeviceType[i4].deviceDetails, buffer, &offset, ((u16) (8))); } } - CsrMemCpyDes(primitive->result.deviceInfo.standalonedevInfo.deviceName, buffer, &offset, ((CsrUint16) (32))); + CsrMemCpyDes(primitive->result.deviceInfo.standalonedevInfo.deviceName, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->result.deviceInfo.standalonedevInfo.deviceNameLength, buffer, &offset); break; default: @@ -4785,7 +4785,7 @@ void CsrWifiSmeScanResultIndSerFree(void *voidPrimitivePointer) { case CSR_WIFI_SME_P2P_ROLE_GO: { - CsrUint16 i4; + u16 i4; for (i4 = 0; i4 < primitive->result.deviceInfo.groupInfo.p2pClientInfoCount; i4++) { CsrPmemFree(primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType); @@ -4810,9 +4810,9 @@ CsrSize CsrWifiSmeScanResultsGetCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 153) */ bufferSize += 2; /* CsrResult primitive->status */ - bufferSize += 2; /* CsrUint16 primitive->scanResultsCount */ + bufferSize += 2; /* u16 primitive->scanResultsCount */ { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->scanResultsCount; i1++) { bufferSize += 32; /* u8 primitive->scanResults[i1].ssid.ssid[32] */ @@ -4821,15 +4821,15 @@ CsrSize CsrWifiSmeScanResultsGetCfmSizeof(void *msg) bufferSize += 2; /* CsrInt16 primitive->scanResults[i1].rssi */ bufferSize += 2; /* CsrInt16 primitive->scanResults[i1].snr */ bufferSize += 1; /* CsrWifiSmeRadioIF primitive->scanResults[i1].ifIndex */ - bufferSize += 2; /* CsrUint16 primitive->scanResults[i1].beaconPeriodTu */ + bufferSize += 2; /* u16 primitive->scanResults[i1].beaconPeriodTu */ bufferSize += 8; /* u8 primitive->scanResults[i1].timeStamp.data[8] */ bufferSize += 8; /* u8 primitive->scanResults[i1].localTime.data[8] */ - bufferSize += 2; /* CsrUint16 primitive->scanResults[i1].channelFrequency */ - bufferSize += 2; /* CsrUint16 primitive->scanResults[i1].capabilityInformation */ + bufferSize += 2; /* u16 primitive->scanResults[i1].channelFrequency */ + bufferSize += 2; /* u16 primitive->scanResults[i1].capabilityInformation */ bufferSize += 1; /* u8 primitive->scanResults[i1].channelNumber */ bufferSize += 1; /* CsrWifiSmeBasicUsability primitive->scanResults[i1].usability */ bufferSize += 1; /* CsrWifiSmeBssType primitive->scanResults[i1].bssType */ - bufferSize += 2; /* CsrUint16 primitive->scanResults[i1].informationElementsLength */ + bufferSize += 2; /* u16 primitive->scanResults[i1].informationElementsLength */ bufferSize += primitive->scanResults[i1].informationElementsLength; /* u8 primitive->scanResults[i1].informationElements */ bufferSize += 1; /* CsrWifiSmeP2pRole primitive->scanResults[i1].p2pDeviceRole */ switch (primitive->scanResults[i1].p2pDeviceRole) @@ -4842,7 +4842,7 @@ CsrSize CsrWifiSmeScanResultsGetCfmSizeof(void *msg) bufferSize += 6; /* u8 primitive->scanResults[i1].deviceInfo.groupInfo.p2pDeviceAddress.a[6] */ bufferSize += 1; /* u8 primitive->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount */ { - CsrUint16 i4; + u16 i4; for (i4 = 0; i4 < primitive->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount; i4++) { bufferSize += 6; /* u8 primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].p2PClientInterfaceAddress.a[6] */ @@ -4852,7 +4852,7 @@ CsrSize CsrWifiSmeScanResultsGetCfmSizeof(void *msg) bufferSize += 8; /* u8 primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.primDeviceType.deviceDetails[8] */ bufferSize += 1; /* u8 primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount */ { - CsrUint16 i6; + u16 i6; for (i6 = 0; i6 < primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount; i6++) { bufferSize += 8; /* u8 primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType[i6].deviceDetails[8] */ @@ -4873,7 +4873,7 @@ CsrSize CsrWifiSmeScanResultsGetCfmSizeof(void *msg) bufferSize += 8; /* u8 primitive->scanResults[i1].deviceInfo.standalonedevInfo.primDeviceType.deviceDetails[8] */ bufferSize += 1; /* u8 primitive->scanResults[i1].deviceInfo.standalonedevInfo.secondaryDeviceTypeCount */ { - CsrUint16 i4; + u16 i4; for (i4 = 0; i4 < primitive->scanResults[i1].deviceInfo.standalonedevInfo.secondaryDeviceTypeCount; i4++) { bufferSize += 8; /* u8 primitive->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType[i4].deviceDetails[8] */ @@ -4896,30 +4896,30 @@ u8* CsrWifiSmeScanResultsGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeScanResultsGetCfm *primitive = (CsrWifiSmeScanResultsGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanResultsCount); + CsrUint16Ser(ptr, len, (u16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->scanResultsCount); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->scanResultsCount; i1++) { - CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].ssid.ssid, ((CsrUint16) (32))); + CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].ssid.ssid, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->scanResults[i1].ssid.length); - CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].bssid.a, ((CsrUint16) (6))); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanResults[i1].rssi); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanResults[i1].snr); + CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].bssid.a, ((u16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->scanResults[i1].rssi); + CsrUint16Ser(ptr, len, (u16) primitive->scanResults[i1].snr); CsrUint8Ser(ptr, len, (u8) primitive->scanResults[i1].ifIndex); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanResults[i1].beaconPeriodTu); - CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].timeStamp.data, ((CsrUint16) (8))); - CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].localTime.data, ((CsrUint16) (8))); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanResults[i1].channelFrequency); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanResults[i1].capabilityInformation); + CsrUint16Ser(ptr, len, (u16) primitive->scanResults[i1].beaconPeriodTu); + CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].timeStamp.data, ((u16) (8))); + CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].localTime.data, ((u16) (8))); + CsrUint16Ser(ptr, len, (u16) primitive->scanResults[i1].channelFrequency); + CsrUint16Ser(ptr, len, (u16) primitive->scanResults[i1].capabilityInformation); CsrUint8Ser(ptr, len, (u8) primitive->scanResults[i1].channelNumber); CsrUint8Ser(ptr, len, (u8) primitive->scanResults[i1].usability); CsrUint8Ser(ptr, len, (u8) primitive->scanResults[i1].bssType); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanResults[i1].informationElementsLength); + CsrUint16Ser(ptr, len, (u16) primitive->scanResults[i1].informationElementsLength); if (primitive->scanResults[i1].informationElementsLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].informationElements, ((CsrUint16) (primitive->scanResults[i1].informationElementsLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].informationElements, ((u16) (primitive->scanResults[i1].informationElementsLength))); } CsrUint8Ser(ptr, len, (u8) primitive->scanResults[i1].p2pDeviceRole); switch (primitive->scanResults[i1].p2pDeviceRole) @@ -4929,26 +4929,26 @@ u8* CsrWifiSmeScanResultsGetCfmSer(u8 *ptr, CsrSize *len, void *msg) break; case CSR_WIFI_SME_P2P_ROLE_GO: CsrUint8Ser(ptr, len, (u8) primitive->scanResults[i1].deviceInfo.groupInfo.groupCapability); - CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.groupInfo.p2pDeviceAddress.a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.groupInfo.p2pDeviceAddress.a, ((u16) (6))); CsrUint8Ser(ptr, len, (u8) primitive->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount); { - CsrUint16 i4; + u16 i4; for (i4 = 0; i4 < primitive->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount; i4++) { - CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].p2PClientInterfaceAddress.a, ((CsrUint16) (6))); - CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceAddress.a, ((CsrUint16) (6))); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.configMethods); + CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].p2PClientInterfaceAddress.a, ((u16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceAddress.a, ((u16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.configMethods); CsrUint8Ser(ptr, len, (u8) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.p2PDeviceCap); - CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.primDeviceType.deviceDetails, ((CsrUint16) (8))); + CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.primDeviceType.deviceDetails, ((u16) (8))); CsrUint8Ser(ptr, len, (u8) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount); { - CsrUint16 i6; + u16 i6; for (i6 = 0; i6 < primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount; i6++) { - CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType[i6].deviceDetails, ((CsrUint16) (8))); + CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType[i6].deviceDetails, ((u16) (8))); } } - CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceName, ((CsrUint16) (32))); + CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceName, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceNameLength); } } @@ -4957,19 +4957,19 @@ u8* CsrWifiSmeScanResultsGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrUint8Ser(ptr, len, (u8) primitive->scanResults[i1].deviceInfo.reservedNone.empty); break; case CSR_WIFI_SME_P2P_ROLE_STANDALONE: - CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.standalonedevInfo.deviceAddress.a, ((CsrUint16) (6))); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->scanResults[i1].deviceInfo.standalonedevInfo.configMethods); + CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.standalonedevInfo.deviceAddress.a, ((u16) (6))); + CsrUint16Ser(ptr, len, (u16) primitive->scanResults[i1].deviceInfo.standalonedevInfo.configMethods); CsrUint8Ser(ptr, len, (u8) primitive->scanResults[i1].deviceInfo.standalonedevInfo.p2PDeviceCap); - CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.standalonedevInfo.primDeviceType.deviceDetails, ((CsrUint16) (8))); + CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.standalonedevInfo.primDeviceType.deviceDetails, ((u16) (8))); CsrUint8Ser(ptr, len, (u8) primitive->scanResults[i1].deviceInfo.standalonedevInfo.secondaryDeviceTypeCount); { - CsrUint16 i4; + u16 i4; for (i4 = 0; i4 < primitive->scanResults[i1].deviceInfo.standalonedevInfo.secondaryDeviceTypeCount; i4++) { - CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType[i4].deviceDetails, ((CsrUint16) (8))); + CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType[i4].deviceDetails, ((u16) (8))); } } - CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.standalonedevInfo.deviceName, ((CsrUint16) (32))); + CsrMemCpySer(ptr, len, (const void *) primitive->scanResults[i1].deviceInfo.standalonedevInfo.deviceName, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->scanResults[i1].deviceInfo.standalonedevInfo.deviceNameLength); break; default: @@ -4988,36 +4988,36 @@ void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanResultsCount, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanResultsCount, buffer, &offset); primitive->scanResults = NULL; if (primitive->scanResultsCount) { primitive->scanResults = (CsrWifiSmeScanResult *)CsrPmemAlloc(sizeof(CsrWifiSmeScanResult) * primitive->scanResultsCount); } { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->scanResultsCount; i1++) { - CsrMemCpyDes(primitive->scanResults[i1].ssid.ssid, buffer, &offset, ((CsrUint16) (32))); + CsrMemCpyDes(primitive->scanResults[i1].ssid.ssid, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->scanResults[i1].ssid.length, buffer, &offset); - CsrMemCpyDes(primitive->scanResults[i1].bssid.a, buffer, &offset, ((CsrUint16) (6))); - CsrUint16Des((CsrUint16 *) &primitive->scanResults[i1].rssi, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanResults[i1].snr, buffer, &offset); + CsrMemCpyDes(primitive->scanResults[i1].bssid.a, buffer, &offset, ((u16) (6))); + CsrUint16Des((u16 *) &primitive->scanResults[i1].rssi, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanResults[i1].snr, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanResults[i1].ifIndex, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanResults[i1].beaconPeriodTu, buffer, &offset); - CsrMemCpyDes(primitive->scanResults[i1].timeStamp.data, buffer, &offset, ((CsrUint16) (8))); - CsrMemCpyDes(primitive->scanResults[i1].localTime.data, buffer, &offset, ((CsrUint16) (8))); - CsrUint16Des((CsrUint16 *) &primitive->scanResults[i1].channelFrequency, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanResults[i1].capabilityInformation, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanResults[i1].beaconPeriodTu, buffer, &offset); + CsrMemCpyDes(primitive->scanResults[i1].timeStamp.data, buffer, &offset, ((u16) (8))); + CsrMemCpyDes(primitive->scanResults[i1].localTime.data, buffer, &offset, ((u16) (8))); + CsrUint16Des((u16 *) &primitive->scanResults[i1].channelFrequency, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanResults[i1].capabilityInformation, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanResults[i1].channelNumber, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanResults[i1].usability, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanResults[i1].bssType, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->scanResults[i1].informationElementsLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->scanResults[i1].informationElementsLength, buffer, &offset); if (primitive->scanResults[i1].informationElementsLength) { primitive->scanResults[i1].informationElements = (u8 *)CsrPmemAlloc(primitive->scanResults[i1].informationElementsLength); - CsrMemCpyDes(primitive->scanResults[i1].informationElements, buffer, &offset, ((CsrUint16) (primitive->scanResults[i1].informationElementsLength))); + CsrMemCpyDes(primitive->scanResults[i1].informationElements, buffer, &offset, ((u16) (primitive->scanResults[i1].informationElementsLength))); } else { @@ -5031,7 +5031,7 @@ void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, CsrSize length) break; case CSR_WIFI_SME_P2P_ROLE_GO: CsrUint8Des((u8 *) &primitive->scanResults[i1].deviceInfo.groupInfo.groupCapability, buffer, &offset); - CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.groupInfo.p2pDeviceAddress.a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.groupInfo.p2pDeviceAddress.a, buffer, &offset, ((u16) (6))); CsrUint8Des((u8 *) &primitive->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount, buffer, &offset); primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo = NULL; if (primitive->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount) @@ -5039,14 +5039,14 @@ void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, CsrSize length) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo = (CsrWifiSmeP2pClientInfoType *)CsrPmemAlloc(sizeof(CsrWifiSmeP2pClientInfoType) * primitive->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount); } { - CsrUint16 i4; + u16 i4; for (i4 = 0; i4 < primitive->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount; i4++) { - CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].p2PClientInterfaceAddress.a, buffer, &offset, ((CsrUint16) (6))); - CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceAddress.a, buffer, &offset, ((CsrUint16) (6))); - CsrUint16Des((CsrUint16 *) &primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.configMethods, buffer, &offset); + CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].p2PClientInterfaceAddress.a, buffer, &offset, ((u16) (6))); + CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceAddress.a, buffer, &offset, ((u16) (6))); + CsrUint16Des((u16 *) &primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.configMethods, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.p2PDeviceCap, buffer, &offset); - CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.primDeviceType.deviceDetails, buffer, &offset, ((CsrUint16) (8))); + CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.primDeviceType.deviceDetails, buffer, &offset, ((u16) (8))); CsrUint8Des((u8 *) &primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount, buffer, &offset); primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = NULL; if (primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount) @@ -5054,13 +5054,13 @@ void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, CsrSize length) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = (CsrWifiSmeWpsDeviceType *)CsrPmemAlloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount); } { - CsrUint16 i6; + u16 i6; for (i6 = 0; i6 < primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount; i6++) { - CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType[i6].deviceDetails, buffer, &offset, ((CsrUint16) (8))); + CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType[i6].deviceDetails, buffer, &offset, ((u16) (8))); } } - CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceName, buffer, &offset, ((CsrUint16) (32))); + CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceName, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.deviceNameLength, buffer, &offset); } } @@ -5069,10 +5069,10 @@ void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, CsrSize length) CsrUint8Des((u8 *) &primitive->scanResults[i1].deviceInfo.reservedNone.empty, buffer, &offset); break; case CSR_WIFI_SME_P2P_ROLE_STANDALONE: - CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.standalonedevInfo.deviceAddress.a, buffer, &offset, ((CsrUint16) (6))); - CsrUint16Des((CsrUint16 *) &primitive->scanResults[i1].deviceInfo.standalonedevInfo.configMethods, buffer, &offset); + CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.standalonedevInfo.deviceAddress.a, buffer, &offset, ((u16) (6))); + CsrUint16Des((u16 *) &primitive->scanResults[i1].deviceInfo.standalonedevInfo.configMethods, buffer, &offset); CsrUint8Des((u8 *) &primitive->scanResults[i1].deviceInfo.standalonedevInfo.p2PDeviceCap, buffer, &offset); - CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.standalonedevInfo.primDeviceType.deviceDetails, buffer, &offset, ((CsrUint16) (8))); + CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.standalonedevInfo.primDeviceType.deviceDetails, buffer, &offset, ((u16) (8))); CsrUint8Des((u8 *) &primitive->scanResults[i1].deviceInfo.standalonedevInfo.secondaryDeviceTypeCount, buffer, &offset); primitive->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType = NULL; if (primitive->scanResults[i1].deviceInfo.standalonedevInfo.secondaryDeviceTypeCount) @@ -5080,13 +5080,13 @@ void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, CsrSize length) primitive->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType = (CsrWifiSmeWpsDeviceType *)CsrPmemAlloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->scanResults[i1].deviceInfo.standalonedevInfo.secondaryDeviceTypeCount); } { - CsrUint16 i4; + u16 i4; for (i4 = 0; i4 < primitive->scanResults[i1].deviceInfo.standalonedevInfo.secondaryDeviceTypeCount; i4++) { - CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType[i4].deviceDetails, buffer, &offset, ((CsrUint16) (8))); + CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType[i4].deviceDetails, buffer, &offset, ((u16) (8))); } } - CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.standalonedevInfo.deviceName, buffer, &offset, ((CsrUint16) (32))); + CsrMemCpyDes(primitive->scanResults[i1].deviceInfo.standalonedevInfo.deviceName, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->scanResults[i1].deviceInfo.standalonedevInfo.deviceNameLength, buffer, &offset); break; default: @@ -5103,7 +5103,7 @@ void CsrWifiSmeScanResultsGetCfmSerFree(void *voidPrimitivePointer) { CsrWifiSmeScanResultsGetCfm *primitive = (CsrWifiSmeScanResultsGetCfm *) voidPrimitivePointer; { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < primitive->scanResultsCount; i1++) { CsrPmemFree(primitive->scanResults[i1].informationElements); @@ -5111,7 +5111,7 @@ void CsrWifiSmeScanResultsGetCfmSerFree(void *voidPrimitivePointer) { case CSR_WIFI_SME_P2P_ROLE_GO: { - CsrUint16 i4; + u16 i4; for (i4 = 0; i4 < primitive->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount; i4++) { CsrPmemFree(primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType); @@ -5137,7 +5137,7 @@ CsrSize CsrWifiSmeSmeStaConfigGetCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 1; /* u8 primitive->smeConfig.connectionQualityRssiChangeTrigger */ bufferSize += 1; /* u8 primitive->smeConfig.connectionQualitySnrChangeTrigger */ @@ -5154,8 +5154,8 @@ u8* CsrWifiSmeSmeStaConfigGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeSmeStaConfigGetCfm *primitive = (CsrWifiSmeSmeStaConfigGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint8Ser(ptr, len, (u8) primitive->smeConfig.connectionQualityRssiChangeTrigger); CsrUint8Ser(ptr, len, (u8) primitive->smeConfig.connectionQualitySnrChangeTrigger); CsrUint8Ser(ptr, len, (u8) primitive->smeConfig.wmmModeMask); @@ -5173,8 +5173,8 @@ void* CsrWifiSmeSmeStaConfigGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint8Des((u8 *) &primitive->smeConfig.connectionQualityRssiChangeTrigger, buffer, &offset); CsrUint8Des((u8 *) &primitive->smeConfig.connectionQualitySnrChangeTrigger, buffer, &offset); CsrUint8Des((u8 *) &primitive->smeConfig.wmmModeMask, buffer, &offset); @@ -5191,7 +5191,7 @@ CsrSize CsrWifiSmeSmeStaConfigSetCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 7) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ return bufferSize; } @@ -5202,8 +5202,8 @@ u8* CsrWifiSmeSmeStaConfigSetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeSmeStaConfigSetCfm *primitive = (CsrWifiSmeSmeStaConfigSetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -5215,8 +5215,8 @@ void* CsrWifiSmeSmeStaConfigSetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; } @@ -5229,7 +5229,7 @@ CsrSize CsrWifiSmeStationMacAddressGetCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 17) */ bufferSize += 2; /* CsrResult primitive->status */ { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < 2; i1++) { bufferSize += 6; /* u8 primitive->stationMacAddress[i1].a[6] */ @@ -5244,12 +5244,12 @@ u8* CsrWifiSmeStationMacAddressGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeStationMacAddressGetCfm *primitive = (CsrWifiSmeStationMacAddressGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->status); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < 2; i1++) { - CsrMemCpySer(ptr, len, (const void *) primitive->stationMacAddress[i1].a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->stationMacAddress[i1].a, ((u16) (6))); } } return(ptr); @@ -5263,12 +5263,12 @@ void* CsrWifiSmeStationMacAddressGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); { - CsrUint16 i1; + u16 i1; for (i1 = 0; i1 < 2; i1++) { - CsrMemCpyDes(primitive->stationMacAddress[i1].a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->stationMacAddress[i1].a, buffer, &offset, ((u16) (6))); } } @@ -5282,10 +5282,10 @@ CsrSize CsrWifiSmeTspecIndSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 4; /* CsrUint32 primitive->transactionId */ bufferSize += 1; /* CsrWifiSmeTspecResultCode primitive->tspecResultCode */ - bufferSize += 2; /* CsrUint16 primitive->tspecLength */ + bufferSize += 2; /* u16 primitive->tspecLength */ bufferSize += primitive->tspecLength; /* u8 primitive->tspec */ return bufferSize; } @@ -5296,13 +5296,13 @@ u8* CsrWifiSmeTspecIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeTspecInd *primitive = (CsrWifiSmeTspecInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint32Ser(ptr, len, (CsrUint32) primitive->transactionId); CsrUint8Ser(ptr, len, (u8) primitive->tspecResultCode); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->tspecLength); + CsrUint16Ser(ptr, len, (u16) primitive->tspecLength); if (primitive->tspecLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->tspec, ((CsrUint16) (primitive->tspecLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->tspec, ((u16) (primitive->tspecLength))); } return(ptr); } @@ -5315,14 +5315,14 @@ void* CsrWifiSmeTspecIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->transactionId, buffer, &offset); CsrUint8Des((u8 *) &primitive->tspecResultCode, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->tspecLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->tspecLength, buffer, &offset); if (primitive->tspecLength) { primitive->tspec = (u8 *)CsrPmemAlloc(primitive->tspecLength); - CsrMemCpyDes(primitive->tspec, buffer, &offset, ((CsrUint16) (primitive->tspecLength))); + CsrMemCpyDes(primitive->tspec, buffer, &offset, ((u16) (primitive->tspecLength))); } else { @@ -5347,11 +5347,11 @@ CsrSize CsrWifiSmeTspecCfmSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 15) */ - bufferSize += 2; /* CsrUint16 primitive->interfaceTag */ + bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 4; /* CsrUint32 primitive->transactionId */ bufferSize += 1; /* CsrWifiSmeTspecResultCode primitive->tspecResultCode */ - bufferSize += 2; /* CsrUint16 primitive->tspecLength */ + bufferSize += 2; /* u16 primitive->tspecLength */ bufferSize += primitive->tspecLength; /* u8 primitive->tspec */ return bufferSize; } @@ -5362,14 +5362,14 @@ u8* CsrWifiSmeTspecCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeTspecCfm *primitive = (CsrWifiSmeTspecCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->interfaceTag); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint32Ser(ptr, len, (CsrUint32) primitive->transactionId); CsrUint8Ser(ptr, len, (u8) primitive->tspecResultCode); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->tspecLength); + CsrUint16Ser(ptr, len, (u16) primitive->tspecLength); if (primitive->tspecLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->tspec, ((CsrUint16) (primitive->tspecLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->tspec, ((u16) (primitive->tspecLength))); } return(ptr); } @@ -5382,15 +5382,15 @@ void* CsrWifiSmeTspecCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->transactionId, buffer, &offset); CsrUint8Des((u8 *) &primitive->tspecResultCode, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->tspecLength, buffer, &offset); + CsrUint16Des((u16 *) &primitive->tspecLength, buffer, &offset); if (primitive->tspecLength) { primitive->tspec = (u8 *)CsrPmemAlloc(primitive->tspecLength); - CsrMemCpyDes(primitive->tspec, buffer, &offset, ((CsrUint16) (primitive->tspecLength))); + CsrMemCpyDes(primitive->tspec, buffer, &offset, ((u16) (primitive->tspecLength))); } else { @@ -5434,7 +5434,7 @@ u8* CsrWifiSmeVersionsGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeVersionsGetCfm *primitive = (CsrWifiSmeVersionsGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint32Ser(ptr, len, (CsrUint32) primitive->versions.chipId); CsrUint32Ser(ptr, len, (CsrUint32) primitive->versions.chipVersion); CsrUint32Ser(ptr, len, (CsrUint32) primitive->versions.firmwareBuild); @@ -5455,7 +5455,7 @@ void* CsrWifiSmeVersionsGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->versions.chipId, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->versions.chipVersion, buffer, &offset); CsrUint32Des((CsrUint32 *) &primitive->versions.firmwareBuild, buffer, &offset); @@ -5488,7 +5488,7 @@ CsrSize CsrWifiSmeCloakedSsidsGetCfmSizeof(void *msg) bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 1; /* u8 primitive->cloakedSsids.cloakedSsidsCount */ { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < primitive->cloakedSsids.cloakedSsidsCount; i2++) { bufferSize += 32; /* u8 primitive->cloakedSsids.cloakedSsids[i2].ssid[32] */ @@ -5504,13 +5504,13 @@ u8* CsrWifiSmeCloakedSsidsGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeCloakedSsidsGetCfm *primitive = (CsrWifiSmeCloakedSsidsGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint8Ser(ptr, len, (u8) primitive->cloakedSsids.cloakedSsidsCount); { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < primitive->cloakedSsids.cloakedSsidsCount; i2++) { - CsrMemCpySer(ptr, len, (const void *) primitive->cloakedSsids.cloakedSsids[i2].ssid, ((CsrUint16) (32))); + CsrMemCpySer(ptr, len, (const void *) primitive->cloakedSsids.cloakedSsids[i2].ssid, ((u16) (32))); CsrUint8Ser(ptr, len, (u8) primitive->cloakedSsids.cloakedSsids[i2].length); } } @@ -5525,7 +5525,7 @@ void* CsrWifiSmeCloakedSsidsGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint8Des((u8 *) &primitive->cloakedSsids.cloakedSsidsCount, buffer, &offset); primitive->cloakedSsids.cloakedSsids = NULL; if (primitive->cloakedSsids.cloakedSsidsCount) @@ -5533,10 +5533,10 @@ void* CsrWifiSmeCloakedSsidsGetCfmDes(u8 *buffer, CsrSize length) primitive->cloakedSsids.cloakedSsids = (CsrWifiSsid *)CsrPmemAlloc(sizeof(CsrWifiSsid) * primitive->cloakedSsids.cloakedSsidsCount); } { - CsrUint16 i2; + u16 i2; for (i2 = 0; i2 < primitive->cloakedSsids.cloakedSsidsCount; i2++) { - CsrMemCpyDes(primitive->cloakedSsids.cloakedSsids[i2].ssid, buffer, &offset, ((CsrUint16) (32))); + CsrMemCpyDes(primitive->cloakedSsids.cloakedSsids[i2].ssid, buffer, &offset, ((u16) (32))); CsrUint8Des((u8 *) &primitive->cloakedSsids.cloakedSsids[i2].length, buffer, &offset); } } @@ -5568,7 +5568,7 @@ u8* CsrWifiSmeWifiOnIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeWifiOnInd *primitive = (CsrWifiSmeWifiOnInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrMemCpySer(ptr, len, (const void *) primitive->address.a, ((CsrUint16) (6))); + CsrMemCpySer(ptr, len, (const void *) primitive->address.a, ((u16) (6))); return(ptr); } @@ -5580,7 +5580,7 @@ void* CsrWifiSmeWifiOnIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrMemCpyDes(primitive->address.a, buffer, &offset, ((CsrUint16) (6))); + CsrMemCpyDes(primitive->address.a, buffer, &offset, ((u16) (6))); return primitive; } @@ -5605,9 +5605,9 @@ u8* CsrWifiSmeSmeCommonConfigGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeSmeCommonConfigGetCfm *primitive = (CsrWifiSmeSmeCommonConfigGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint8Ser(ptr, len, (u8) primitive->deviceConfig.trustLevel); - CsrMemCpySer(ptr, len, (const void *) primitive->deviceConfig.countryCode, ((CsrUint16) (2))); + CsrMemCpySer(ptr, len, (const void *) primitive->deviceConfig.countryCode, ((u16) (2))); CsrUint8Ser(ptr, len, (u8) primitive->deviceConfig.firmwareDriverInterface); CsrUint8Ser(ptr, len, (u8) primitive->deviceConfig.enableStrictDraftN); return(ptr); @@ -5621,9 +5621,9 @@ void* CsrWifiSmeSmeCommonConfigGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint8Des((u8 *) &primitive->deviceConfig.trustLevel, buffer, &offset); - CsrMemCpyDes(primitive->deviceConfig.countryCode, buffer, &offset, ((CsrUint16) (2))); + CsrMemCpyDes(primitive->deviceConfig.countryCode, buffer, &offset, ((u16) (2))); CsrUint8Des((u8 *) &primitive->deviceConfig.firmwareDriverInterface, buffer, &offset); CsrUint8Des((u8 *) &primitive->deviceConfig.enableStrictDraftN, buffer, &offset); @@ -5637,7 +5637,7 @@ CsrSize CsrWifiSmeInterfaceCapabilityGetCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 9) */ bufferSize += 2; /* CsrResult primitive->status */ - bufferSize += 2; /* CsrUint16 primitive->numInterfaces */ + bufferSize += 2; /* u16 primitive->numInterfaces */ bufferSize += 2; /* u8 primitive->capBitmap[2] */ return bufferSize; } @@ -5648,9 +5648,9 @@ u8* CsrWifiSmeInterfaceCapabilityGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeInterfaceCapabilityGetCfm *primitive = (CsrWifiSmeInterfaceCapabilityGetCfm *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->status); - CsrUint16Ser(ptr, len, (CsrUint16) primitive->numInterfaces); - CsrMemCpySer(ptr, len, (const void *) primitive->capBitmap, ((CsrUint16) (2))); + CsrUint16Ser(ptr, len, (u16) primitive->status); + CsrUint16Ser(ptr, len, (u16) primitive->numInterfaces); + CsrMemCpySer(ptr, len, (const void *) primitive->capBitmap, ((u16) (2))); return(ptr); } @@ -5662,9 +5662,9 @@ void* CsrWifiSmeInterfaceCapabilityGetCfmDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->status, buffer, &offset); - CsrUint16Des((CsrUint16 *) &primitive->numInterfaces, buffer, &offset); - CsrMemCpyDes(primitive->capBitmap, buffer, &offset, ((CsrUint16) (2))); + CsrUint16Des((u16 *) &primitive->status, buffer, &offset); + CsrUint16Des((u16 *) &primitive->numInterfaces, buffer, &offset); + CsrMemCpyDes(primitive->capBitmap, buffer, &offset, ((u16) (2))); return primitive; } @@ -5774,7 +5774,7 @@ u8* CsrWifiSmeCoreDumpIndSer(u8 *ptr, CsrSize *len, void *msg) CsrUint32Ser(ptr, len, (CsrUint32) primitive->dataLength); if (primitive->dataLength) { - CsrMemCpySer(ptr, len, (const void *) primitive->data, ((CsrUint16) (primitive->dataLength))); + CsrMemCpySer(ptr, len, (const void *) primitive->data, ((u16) (primitive->dataLength))); } return(ptr); } @@ -5791,7 +5791,7 @@ void* CsrWifiSmeCoreDumpIndDes(u8 *buffer, CsrSize length) if (primitive->dataLength) { primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); - CsrMemCpyDes(primitive->data, buffer, &offset, ((CsrUint16) (primitive->dataLength))); + CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); } else { diff --git a/drivers/staging/csr/csr_wifi_vif_utils.h b/drivers/staging/csr/csr_wifi_vif_utils.h index ee8b438bbba..4eafbecf630 100644 --- a/drivers/staging/csr/csr_wifi_vif_utils.h +++ b/drivers/staging/csr/csr_wifi_vif_utils.h @@ -25,7 +25,7 @@ extern "C" { /* Common macros for NME and SME to be used temporarily until SoftMAC changes are made */ #define CSR_WIFI_NUM_INTERFACES (u8)0x1 -#define CSR_WIFI_INTERFACE_IN_USE (CsrUint16)0x0 +#define CSR_WIFI_INTERFACE_IN_USE (u16)0x0 /* This is used at places where interface Id isn't available*/ #define CSR_WIFI_INTERFACE_ZERO 0 @@ -37,14 +37,14 @@ extern "C" { /* Extract the Interface Id from the event */ #define CsrWifiVifUtilsGetVifTagFromEvent(msg) \ - ((CsrUint16) * ((CsrUint16 *) ((u8 *) (msg) + sizeof(CsrWifiFsmEvent)))) + ((u16) * ((u16 *) ((u8 *) (msg) + sizeof(CsrWifiFsmEvent)))) /* The HPI Vif combines the type and the interface id */ #define CsrWifiVifUtilsGetVifTagFromHipEvent(msg) \ ((msg)->virtualInterfaceIdentifier & 0x00FF) #define CsrWifiVifUtilsPackHipEventVif(type, interfaceId) \ - ((CsrUint16)((interfaceId) | ((type) << 8))) + ((u16)((interfaceId) | ((type) << 8))) /* TYPES DEFINITIONS ********************************************************/ @@ -60,7 +60,7 @@ extern "C" { * * @param[in] u8 : interface capability bitmap * @param[in] u8* : pointer to the array of current interface modes - * @param[in] CsrUint16 : interfaceTag + * @param[in] u16 : interfaceTag * @param[in] CsrWifiInterfaceMode : mode * * @return @@ -68,7 +68,7 @@ extern "C" { */ extern CsrBool CsrWifiVifUtilsCheckCompatibility(u8 interfaceCapability, u8 *currentInterfaceModes, - CsrUint16 interfaceTag, + u16 interfaceTag, CsrWifiInterfaceMode mode); /** @@ -77,12 +77,12 @@ extern CsrBool CsrWifiVifUtilsCheckCompatibility(u8 interfaceCapabil * NOTE: Only checks that the interface is supported, no checks are made to * determine whether a supported interface may be made active. * - * @param[in] CsrUint16 : interfaceTag + * @param[in] u16 : interfaceTag * * @return * CsrBool : returns true if the interface is supported, otherwise false. */ -extern CsrBool CsrWifiVifUtilsIsSupported(CsrUint16 interfaceTag); +extern CsrBool CsrWifiVifUtilsIsSupported(u16 interfaceTag); #ifdef CSR_LOG_ENABLE /** diff --git a/drivers/staging/csr/data_tx.c b/drivers/staging/csr/data_tx.c index c5858a58f3c..8ed7a7845cc 100644 --- a/drivers/staging/csr/data_tx.c +++ b/drivers/staging/csr/data_tx.c @@ -19,7 +19,7 @@ int uf_verify_m4(unifi_priv_t *priv, const unsigned char *packet, unsigned int length) { const unsigned char *p = packet; - CsrUint16 keyinfo; + u16 keyinfo; if (length < (4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1 + 8)) { diff --git a/drivers/staging/csr/drv.c b/drivers/staging/csr/drv.c index 4be6d9533cd..5ce33296fe4 100644 --- a/drivers/staging/csr/drv.c +++ b/drivers/staging/csr/drv.c @@ -1295,7 +1295,7 @@ unifi_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) case UNIFI_INIT_NETDEV: { /* get the proper interfaceTagId */ - CsrUint16 interfaceTag=0; + u16 interfaceTag=0; netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; dev = priv->netdev[interfaceTag]; @@ -1483,14 +1483,14 @@ unifi_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) break; } - pcli->snap_filter.protocols = CsrPmemAlloc(snap_filter.count * sizeof(CsrUint16)); + pcli->snap_filter.protocols = CsrPmemAlloc(snap_filter.count * sizeof(u16)); if (!pcli->snap_filter.protocols) { r = -ENOMEM; goto out; } if (copy_from_user((void*)pcli->snap_filter.protocols, (void*)snap_filter.protocols, - snap_filter.count * sizeof(CsrUint16))) + snap_filter.count * sizeof(u16))) { CsrPmemFree(pcli->snap_filter.protocols); r = -EFAULT; @@ -1805,16 +1805,16 @@ udi_log_event(ul_client_t *pcli, { int timestamp = jiffies_to_msecs(jiffies); unifi_debug_log_to_buf("T:"); - unifi_debug_log_to_buf("%04X%04X ", *(((CsrUint16*)×tamp) + 1), - *(CsrUint16*)×tamp); + unifi_debug_log_to_buf("%04X%04X ", *(((u16*)×tamp) + 1), + *(u16*)×tamp); } /* Add signal */ unifi_debug_log_to_buf("S%s:%04X R:%04X D:%04X ", dir ? "T" : "F", - *(CsrUint16*)signal, - *(CsrUint16*)(signal + 2), - *(CsrUint16*)(signal + 4)); + *(u16*)signal, + *(u16*)(signal + 2), + *(u16*)(signal + 4)); unifi_debug_hex_to_buf(signal + 6, signal_len - 6); /* Add bulk data (assume 1 bulk data per signal) */ diff --git a/drivers/staging/csr/io.c b/drivers/staging/csr/io.c index f489ade7f1b..d0895797f62 100644 --- a/drivers/staging/csr/io.c +++ b/drivers/staging/csr/io.c @@ -333,7 +333,7 @@ register_unifi_sdio(CsrSdioFunction *sdio_dev, int bus_id, struct device *dev) Unifi_netdev_instances[bus_id * CSR_WIFI_NUM_INTERFACES] = netdev_priv(priv->netdev[0]); /* Initialise the mini-coredump capture buffers */ - csrResult = unifi_coredump_init(priv->card, (CsrUint16)coredump_max); + csrResult = unifi_coredump_init(priv->card, (u16)coredump_max); if (csrResult != CSR_RESULT_SUCCESS) { unifi_error(priv, "Couldn't allocate mini-coredump buffers\n"); } diff --git a/drivers/staging/csr/netdev.c b/drivers/staging/csr/netdev.c index cef0ba367bd..947a6ec2d61 100644 --- a/drivers/staging/csr/netdev.c +++ b/drivers/staging/csr/netdev.c @@ -553,7 +553,7 @@ uf_alloc_netdevice(CsrSdioFunction *sdio_dev, int bus_id) * --------------------------------------------------------------------------- */ CsrBool -uf_alloc_netdevice_for_other_interfaces(unifi_priv_t *priv, CsrUint16 interfaceTag) +uf_alloc_netdevice_for_other_interfaces(unifi_priv_t *priv, u16 interfaceTag) { struct net_device *dev; netInterface_priv_t *interfacePriv; @@ -1080,7 +1080,7 @@ skb_add_llc_snap(struct net_device *dev, struct sk_buff *skb, int proto) #ifdef CSR_SUPPORT_SME static int _identify_sme_ma_pkt_ind(unifi_priv_t *priv, - const s8 *oui, CsrUint16 protocol, + const s8 *oui, u16 protocol, const CSR_SIGNAL *signal, bulk_data_param_t *bulkdata, const unsigned char *daddr, @@ -1322,7 +1322,7 @@ skb_80211_to_ether(unifi_priv_t *priv, struct sk_buff *skb, } /* skb_80211_to_ether() */ -static CsrWifiRouterCtrlPortAction verify_port(unifi_priv_t *priv, unsigned char *address, int queue, CsrUint16 interfaceTag) +static CsrWifiRouterCtrlPortAction verify_port(unifi_priv_t *priv, unsigned char *address, int queue, u16 interfaceTag) { #ifdef CSR_NATIVE_LINUX #ifdef CSR_SUPPORT_WEXT @@ -1368,12 +1368,12 @@ static CsrWifiRouterCtrlPortAction verify_port(unifi_priv_t *priv, unsigned char int prepare_and_add_macheader(unifi_priv_t *priv, struct sk_buff *skb, struct sk_buff *newSkb, CSR_PRIORITY priority, bulk_data_param_t *bulkdata, - CsrUint16 interfaceTag, + u16 interfaceTag, const u8 *daddr, const u8 *saddr, CsrBool protection) { - CsrUint16 fc = 0; + u16 fc = 0; u8 qc = 0; u8 macHeaderLengthInBytes = MAC_HEADER_SIZE, *bufPtr = NULL; bulk_data_param_t data_ptrs; @@ -1649,12 +1649,12 @@ static int send_ma_pkt_request(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr *ehdr, CSR_PRIORITY priority) { int r; - CsrUint16 i; + u16 i; CsrBool eapolStore = FALSE; struct sk_buff *newSkb = NULL; bulk_data_param_t bulkdata; const int proto = ntohs(ehdr->h_proto); - CsrUint16 interfaceTag; + u16 interfaceTag; CsrWifiMacAddress peerAddress; CSR_TRANSMISSION_CONTROL transmissionControl = CSR_NO_CONFIRM_REQUIRED; s8 protection; @@ -2150,7 +2150,7 @@ unifi_restart_xmit(void *ospriv, unifi_TrafficQueue queue) static void -indicate_rx_skb(unifi_priv_t *priv, CsrUint16 ifTag, u8* dst_a, u8* src_a, struct sk_buff *skb, CSR_SIGNAL *signal, +indicate_rx_skb(unifi_priv_t *priv, u16 ifTag, u8* dst_a, u8* src_a, struct sk_buff *skb, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) { int r, sr = 0; @@ -2250,7 +2250,7 @@ indicate_rx_skb(unifi_priv_t *priv, CsrUint16 ifTag, u8* dst_a, u8* src_a, struc void uf_process_rx_pending_queue(unifi_priv_t *priv, int queue, CsrWifiMacAddress source_address, - int indicate, CsrUint16 interfaceTag) + int indicate, u16 interfaceTag) { rx_buffered_packets_t *rx_q_item; struct list_head *rx_list; @@ -2325,7 +2325,7 @@ uf_process_rx_pending_queue(unifi_priv_t *priv, int queue, void uf_resume_data_plane(unifi_priv_t *priv, int queue, CsrWifiMacAddress peer_address, - CsrUint16 interfaceTag) + u16 interfaceTag) { #ifdef CSR_SUPPORT_WEXT netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; @@ -2363,7 +2363,7 @@ uf_resume_data_plane(unifi_priv_t *priv, int queue, } /* uf_resume_data_plane() */ -void uf_free_pending_rx_packets(unifi_priv_t *priv, int queue, CsrWifiMacAddress peer_address,CsrUint16 interfaceTag) +void uf_free_pending_rx_packets(unifi_priv_t *priv, int queue, CsrWifiMacAddress peer_address,u16 interfaceTag) { uf_process_rx_pending_queue(priv, queue, peer_address, 0,interfaceTag); @@ -2387,7 +2387,7 @@ void uf_free_pending_rx_packets(unifi_priv_t *priv, int queue, CsrWifiMacAddress static void unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) { - CsrUint16 interfaceTag; + u16 interfaceTag; bulk_data_desc_t *pData; const CSR_MA_PACKET_INDICATION *pkt_ind = &signal->u.MaPacketIndication; struct sk_buff *skb; @@ -2398,7 +2398,7 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) u8 da[ETH_ALEN], sa[ETH_ALEN]; u8 toDs, fromDs, frameType, macHeaderLengthInBytes = MAC_HEADER_SIZE; - CsrUint16 frameControl; + u16 frameControl; netInterface_priv_t *interfacePriv; struct ethhdr ehdr; @@ -2676,7 +2676,7 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) static void process_ma_packet_cfm(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) { - CsrUint16 interfaceTag; + u16 interfaceTag; const CSR_MA_PACKET_CONFIRM *pkt_cfm = &signal->u.MaPacketConfirm; netInterface_priv_t *interfacePriv; @@ -2732,11 +2732,11 @@ static void process_ma_packet_cfm(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d */ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) { - CsrUint16 interfaceTag; + u16 interfaceTag; bulk_data_desc_t *pData; CSR_MA_PACKET_INDICATION *pkt_ind = (CSR_MA_PACKET_INDICATION*)&signal->u.MaPacketIndication; struct sk_buff *skb; - CsrUint16 frameControl; + u16 frameControl; netInterface_priv_t *interfacePriv; u8 da[ETH_ALEN], sa[ETH_ALEN]; u8 *bssid = NULL, *ba_addr = NULL; @@ -2748,7 +2748,7 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d CsrBool powerSaveChanged = FALSE; u8 pmBit = 0; CsrWifiRouterCtrlStaInfo_t *srcStaInfo = NULL; - CsrUint16 qosControl; + u16 qosControl; #endif @@ -2820,7 +2820,7 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d frameType = ((frameControl & 0x000C) >> 2); unifi_trace(priv, UDBG3, "Rx Frame Type: %d sn: %d\n",frameType, - (le16_to_cpu(*((CsrUint16*)(bulkdata->d[0].os_data_ptr + IEEE802_11_SEQUENCE_CONTROL_OFFSET))) >> 4) & 0xfff); + (le16_to_cpu(*((u16*)(bulkdata->d[0].os_data_ptr + IEEE802_11_SEQUENCE_CONTROL_OFFSET))) >> 4) & 0xfff); if(frameType == IEEE802_11_FRAMETYPE_CONTROL){ #ifdef CSR_SUPPORT_SME unifi_trace(priv, UDBG6, "%s: Received Control Frame\n", __FUNCTION__); @@ -2929,7 +2929,7 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d frame_desc_struct frame_desc; frame_desc.bulkdata = *bulkdata; frame_desc.signal = *signal; - frame_desc.sn = (le16_to_cpu(*((CsrUint16*)(bulkdata->d[0].os_data_ptr + IEEE802_11_SEQUENCE_CONTROL_OFFSET))) >> 4) & 0xfff; + frame_desc.sn = (le16_to_cpu(*((u16*)(bulkdata->d[0].os_data_ptr + IEEE802_11_SEQUENCE_CONTROL_OFFSET))) >> 4) & 0xfff; frame_desc.active = TRUE; unifi_trace(priv, UDBG6, "%s: calling process_ba_frame (session=%d)\n", __FUNCTION__, ba_session_idx); process_ba_frame(priv, interfacePriv, ba_session, &frame_desc); @@ -3626,10 +3626,10 @@ static void bulk_data_param_t subframe_bulkdata; u8 *dot11_hdr_ptr = (u8*)bulkdata->d[0].os_data_ptr; CsrResult csrResult; - CsrUint16 frameControl; + u16 frameControl; u8 *qos_control_ptr; - frameControl = le16_to_cpu(*((CsrUint16*)dot11_hdr_ptr)); + frameControl = le16_to_cpu(*((u16*)dot11_hdr_ptr)); qos_control_ptr = dot11_hdr_ptr + (((frameControl & IEEE802_11_FC_TO_DS_MASK) && (frameControl & IEEE802_11_FC_FROM_DS_MASK))?30: 24); if(!(*qos_control_ptr & IEEE802_11_QC_A_MSDU_PRESENT)) { unifi_trace(priv, UDBG6, "%s: calling unifi_rx()", __FUNCTION__); @@ -3712,10 +3712,10 @@ static void add_frame_to_ba_complete(unifi_priv_t *priv, static void update_expected_sn(unifi_priv_t *priv, netInterface_priv_t *interfacePriv, ba_session_rx_struct *ba_session, - CsrUint16 sn) + u16 sn) { int i, j; - CsrUint16 gap; + u16 gap; gap = (sn - ba_session->expected_sn) & 0xFFF; unifi_trace(priv, UDBG6, "%s: proccess the frames up to new_expected_sn = %d gap = %d\n", __FUNCTION__, sn, gap); @@ -3754,7 +3754,7 @@ static void complete_ready_sequence(unifi_priv_t *priv, void scroll_ba_window(unifi_priv_t *priv, netInterface_priv_t *interfacePriv, ba_session_rx_struct *ba_session, - CsrUint16 sn) + u16 sn) { if(((sn - ba_session->expected_sn) & 0xFFF) <= 2048) { update_expected_sn(priv, interfacePriv, ba_session, sn); @@ -3766,10 +3766,10 @@ void scroll_ba_window(unifi_priv_t *priv, static int consume_frame_or_get_buffer_index(unifi_priv_t *priv, netInterface_priv_t *interfacePriv, ba_session_rx_struct *ba_session, - CsrUint16 sn, + u16 sn, frame_desc_struct *frame_desc) { int i; - CsrUint16 sn_temp; + u16 sn_temp; if(((sn - ba_session->expected_sn) & 0xFFF) <= 2048) { @@ -3781,7 +3781,7 @@ static int consume_frame_or_get_buffer_index(unifi_priv_t *priv, sn_temp = ba_session->expected_sn + ba_session->wind_size; unifi_trace(priv, UDBG6, "%s: new frame: sn=%d\n", __FUNCTION__, sn); if(!(((sn - sn_temp) & 0xFFF) > 2048)) { - CsrUint16 new_expected_sn; + u16 new_expected_sn; unifi_trace(priv, UDBG6, "%s: frame is out of window\n", __FUNCTION__); sn_temp = (sn - ba_session->wind_size) & 0xFFF; new_expected_sn = (sn_temp + 1) & 0xFFF; @@ -3822,7 +3822,7 @@ static void process_ba_frame(unifi_priv_t *priv, frame_desc_struct *frame_desc) { int i; - CsrUint16 sn = frame_desc->sn; + u16 sn = frame_desc->sn; if (ba_session->timeout) { mod_timer(&ba_session->timer, (jiffies + usecs_to_jiffies((ba_session->timeout) * 1024))); @@ -3868,7 +3868,7 @@ static void check_ba_frame_age_timeout( unifi_priv_t *priv, CsrTime now; CsrTime age; u8 i, j; - CsrUint16 sn_temp; + u16 sn_temp; /* gap is started at 1 because we have buffered frames and * hence a minimum gap of 1 exists @@ -3941,7 +3941,7 @@ static void check_ba_frame_age_timeout( unifi_priv_t *priv, static void process_ma_packet_error_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) { - CsrUint16 interfaceTag; + u16 interfaceTag; const CSR_MA_PACKET_ERROR_INDICATION *pkt_err_ind = &signal->u.MaPacketErrorIndication; netInterface_priv_t *interfacePriv; ba_session_rx_struct *ba_session; diff --git a/drivers/staging/csr/os.c b/drivers/staging/csr/os.c index f5a9352ce78..35dc9087d79 100644 --- a/drivers/staging/csr/os.c +++ b/drivers/staging/csr/os.c @@ -370,7 +370,7 @@ unifi_trace_nop(void* ospriv, int level, const char *fmt, ...) /* Memory dump with level filter controlled by unifi_debug */ void -unifi_dump(void *ospriv, int level, const char *msg, void *mem, CsrUint16 len) +unifi_dump(void *ospriv, int level, const char *msg, void *mem, u16 len) { unifi_priv_t *priv = (unifi_priv_t*) ospriv; @@ -400,7 +400,7 @@ unifi_dump(void *ospriv, int level, const char *msg, void *mem, CsrUint16 len) /* Memory dump that appears all the time, use sparingly */ void -dump(void *mem, CsrUint16 len) +dump(void *mem, u16 len) { int i, col = 0; unsigned char *pdata = (unsigned char *)mem; @@ -430,7 +430,7 @@ dump(void *mem, CsrUint16 len) void -dump16(void *mem, CsrUint16 len) +dump16(void *mem, u16 len) { int i, col=0; unsigned short *p = (unsigned short *)mem; @@ -457,7 +457,7 @@ dump16(void *mem, CsrUint16 len) #ifdef CSR_WIFI_HIP_DEBUG_OFFLINE void -dump_str(void *mem, CsrUint16 len) +dump_str(void *mem, u16 len) { int i, col = 0; unsigned char *pdata = (unsigned char *)mem; diff --git a/drivers/staging/csr/putest.c b/drivers/staging/csr/putest.c index 676c8f6bf6b..9c9dc60c900 100644 --- a/drivers/staging/csr/putest.c +++ b/drivers/staging/csr/putest.c @@ -545,7 +545,7 @@ free_fw: int unifi_putest_coredump_prepare(unifi_priv_t *priv, unsigned char *arg) { - CsrUint16 data_u16; + u16 data_u16; CsrInt32 i; CsrResult r; diff --git a/drivers/staging/csr/sdio_mmc.c b/drivers/staging/csr/sdio_mmc.c index f95a57f0072..8dc91bf920c 100644 --- a/drivers/staging/csr/sdio_mmc.c +++ b/drivers/staging/csr/sdio_mmc.c @@ -180,7 +180,7 @@ CsrSdioWrite8(CsrSdioFunction *function, CsrUint32 address, u8 data) } /* CsrSdioWrite8() */ CsrResult -CsrSdioRead16(CsrSdioFunction *function, CsrUint32 address, CsrUint16 *data) +CsrSdioRead16(CsrSdioFunction *function, CsrUint32 address, u16 *data) { struct sdio_func *func = (struct sdio_func *)function->priv; int err; @@ -207,7 +207,7 @@ CsrSdioRead16(CsrSdioFunction *function, CsrUint32 address, CsrUint16 *data) CsrResult -CsrSdioWrite16(CsrSdioFunction *function, CsrUint32 address, CsrUint16 data) +CsrSdioWrite16(CsrSdioFunction *function, CsrUint32 address, u16 data) { struct sdio_func *func = (struct sdio_func *)function->priv; int err; @@ -716,7 +716,7 @@ sdio_set_block_size_ignore_first_error(struct sdio_func *func, unsigned blksz) } CsrResult -CsrSdioBlockSizeSet(CsrSdioFunction *function, CsrUint16 blockSize) +CsrSdioBlockSizeSet(CsrSdioFunction *function, u16 blockSize) { struct sdio_func *func = (struct sdio_func *)function->priv; int r = 0; diff --git a/drivers/staging/csr/sdio_stubs.c b/drivers/staging/csr/sdio_stubs.c index bc6a3697c00..839fae01d96 100644 --- a/drivers/staging/csr/sdio_stubs.c +++ b/drivers/staging/csr/sdio_stubs.c @@ -38,7 +38,7 @@ CsrResult __attribute__((weak)) CsrSdioHardReset(CsrSdioFunction *function) } CsrResult __attribute__((weak)) CsrSdioBlockSizeSet(CsrSdioFunction *function, - CsrUint16 blockSize) + u16 blockSize) { return CSR_RESULT_SUCCESS; } diff --git a/drivers/staging/csr/sme_blocking.c b/drivers/staging/csr/sme_blocking.c index 8461baca2de..c95f1b30522 100644 --- a/drivers/staging/csr/sme_blocking.c +++ b/drivers/staging/csr/sme_blocking.c @@ -222,7 +222,7 @@ _sme_wait_for_reply(unifi_priv_t *priv, #ifdef CSR_SUPPORT_WEXT int sme_mgt_wifi_on(unifi_priv_t *priv) { - CsrUint16 numElements; + u16 numElements; CsrWifiSmeDataBlock* dataList; #ifdef CSR_SUPPORT_WEXT_AP int r; @@ -350,7 +350,7 @@ int sme_mgt_scan_full(unifi_priv_t *priv, is_active, CSR_WIFI_SME_BSS_TYPE_ANY_BSS, CSR_WIFI_SME_SCAN_TYPE_ALL, - (CsrUint16)num_channels, channel_list, + (u16)num_channels, channel_list, 0, NULL); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_LONG_TIMEOUT); @@ -372,7 +372,7 @@ int sme_mgt_scan_results_get_async(unifi_priv_t *priv, char *scan_results, long scan_results_len) { - CsrUint16 scan_result_list_count; + u16 scan_result_list_count; CsrWifiSmeScanResult *scan_result_list; CsrWifiSmeScanResult *scan_result; int r; @@ -1443,7 +1443,7 @@ int sme_sys_resume(unifi_priv_t *priv) } #ifdef CSR_SUPPORT_WEXT_AP -int sme_ap_stop(unifi_priv_t *priv,CsrUint16 interface_tag) +int sme_ap_stop(unifi_priv_t *priv,u16 interface_tag) { int r; @@ -1471,7 +1471,7 @@ int sme_ap_stop(unifi_priv_t *priv,CsrUint16 interface_tag) } -int sme_ap_start(unifi_priv_t *priv,CsrUint16 interface_tag, +int sme_ap_start(unifi_priv_t *priv,u16 interface_tag, CsrWifiSmeApConfig_t * ap_config) { int r; diff --git a/drivers/staging/csr/sme_native.c b/drivers/staging/csr/sme_native.c index 2091109f7c1..2e63db2bc94 100644 --- a/drivers/staging/csr/sme_native.c +++ b/drivers/staging/csr/sme_native.c @@ -249,7 +249,7 @@ sme_native_log_event(ul_client_t *pcli, if (r == 0) { signal_len = SigGetSize(&signal); } else { - CsrUint16 receiver_id = CSR_GET_UINT16_FROM_LITTLE_ENDIAN((sig_packed) + sizeof(CsrUint16)) & 0xFF00; + u16 receiver_id = CSR_GET_UINT16_FROM_LITTLE_ENDIAN((sig_packed) + sizeof(u16)) & 0xFF00; /* The control indications are 1 byte, pass them to client. */ if (sig_len == 1) { diff --git a/drivers/staging/csr/sme_sys.c b/drivers/staging/csr/sme_sys.c index e28e7c8ce0c..c3d9c6a98c2 100644 --- a/drivers/staging/csr/sme_sys.c +++ b/drivers/staging/csr/sme_sys.c @@ -64,7 +64,7 @@ void send_auto_ma_packet_confirm(unifi_priv_t *priv, CSR_SIGNAL unpacked_signal; u8 sigbuf[UNIFI_PACKED_SIGBUF_SIZE]; - CsrUint16 packed_siglen; + u16 packed_siglen; list_for_each_safe(listHead, placeHolder, buffered_frames_list) @@ -279,7 +279,7 @@ void CsrWifiRouterCtrlHipReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) void *dest; CsrResult csrResult; CSR_SIGNAL *signal; - CsrUint16 interfaceTag = 0; + u16 interfaceTag = 0; CSR_MA_PACKET_REQUEST *req; netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; @@ -301,7 +301,7 @@ void CsrWifiRouterCtrlHipReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) signal = (CSR_SIGNAL *)hipreq->mlmeCommand; unifi_trace(priv, UDBG4, "CsrWifiRouterCtrlHipReqHandler: 0x04%X ---->\n", - *((CsrUint16*)hipreq->mlmeCommand)); + *((u16*)hipreq->mlmeCommand)); /* Construct the signal. */ signal_ptr = (u8*)hipreq->mlmeCommand; @@ -348,7 +348,7 @@ void CsrWifiRouterCtrlHipReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) } unifi_trace(priv, UDBG3, "SME SEND: Signal 0x%.4X \n", - *((CsrUint16*)signal_ptr)); + *((u16*)signal_ptr)); if (signal->SignalPrimitiveHeader.SignalId == CSR_MA_PACKET_REQUEST_ID) { CSR_SIGNAL unpacked_signal; @@ -387,7 +387,7 @@ void CsrWifiRouterCtrlHipReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) if (r) { unifi_error(priv, "CsrWifiRouterCtrlHipReqHandler: Failed to send signal (0x%.4X - %u)\n", - *((CsrUint16*)signal_ptr), r); + *((u16*)signal_ptr), r); CsrWifiRouterCtrlWifiOffIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0,CSR_WIFI_SME_CONTROL_INDICATION_ERROR); } @@ -396,7 +396,7 @@ void CsrWifiRouterCtrlHipReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) #ifdef CSR_WIFI_SEND_GRATUITOUS_ARP static void -uf_send_gratuitous_arp(unifi_priv_t *priv, CsrUint16 interfaceTag) +uf_send_gratuitous_arp(unifi_priv_t *priv, u16 interfaceTag) { netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; CSR_PRIORITY priority; @@ -504,7 +504,7 @@ configure_data_port(unifi_priv_t *priv, CsrWifiRouterCtrlPortAction port_action, const CsrWifiMacAddress *macAddress, const int queue, - CsrUint16 interfaceTag) + u16 interfaceTag) { const u8 broadcast_mac_address[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; unifi_port_config_t *port; @@ -1354,7 +1354,7 @@ void CsrWifiRouterCtrlTrafficClassificationReqHandler(void* drvpriv, CsrWifiFsmE static int _sys_packet_req(unifi_priv_t *priv, const CSR_SIGNAL *signal, u8 subscriptionHandle, - CsrUint16 frameLength, u8 *frame, + u16 frameLength, u8 *frame, int proto) { int r; @@ -1364,7 +1364,7 @@ _sys_packet_req(unifi_priv_t *priv, const CSR_SIGNAL *signal, struct sk_buff *skb, *newSkb = NULL; CsrWifiMacAddress peerMacAddress; CsrResult csrResult; - CsrUint16 interfaceTag = req.VirtualInterfaceIdentifier & 0xff; + u16 interfaceTag = req.VirtualInterfaceIdentifier & 0xff; CsrBool eapolStore = FALSE; s8 protection = 0; netInterface_priv_t *interfacePriv; @@ -1498,12 +1498,12 @@ void CsrWifiRouterMaPacketReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) unifi_priv_t *priv = (unifi_priv_t*)drvpriv; CsrWifiRouterMaPacketReq* mareq = (CsrWifiRouterMaPacketReq*)msg; llc_snap_hdr_t *snap; - CsrUint16 snap_protocol; + u16 snap_protocol; CSR_SIGNAL signal; CSR_MA_PACKET_REQUEST *req = &signal.u.MaPacketRequest; CsrWifiRouterCtrlPortAction controlPortaction; u8 *daddr, *saddr; - CsrUint16 interfaceTag = mareq->interfaceTag & 0x00ff; + u16 interfaceTag = mareq->interfaceTag & 0x00ff; int queue; netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; @@ -1638,7 +1638,7 @@ void CsrWifiRouterCtrlM4TransmitReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) } /* reset the station records when the mode is set as CSR_WIFI_ROUTER_CTRL_MODE_NONE */ -static void CsrWifiRouterCtrlResetStationRecordList(unifi_priv_t *priv, CsrUint16 interfaceTag) +static void CsrWifiRouterCtrlResetStationRecordList(unifi_priv_t *priv, u16 interfaceTag) { u8 i,j; CsrWifiRouterCtrlStaInfo_t *staInfo=NULL; @@ -1723,7 +1723,7 @@ static void CsrWifiRouterCtrlResetStationRecordList(unifi_priv_t *priv, CsrUint1 } } -void CsrWifiRouterCtrlInterfaceReset(unifi_priv_t *priv, CsrUint16 interfaceTag) +void CsrWifiRouterCtrlInterfaceReset(unifi_priv_t *priv, u16 interfaceTag) { netInterface_priv_t *interfacePriv; @@ -2409,7 +2409,7 @@ void uf_send_disconnected_ind_wq(struct work_struct *work) CsrWifiRouterCtrlStaInfo_t *staInfo = container_of(work, CsrWifiRouterCtrlStaInfo_t, send_disconnected_ind_task); unifi_priv_t *priv; - CsrUint16 interfaceTag; + u16 interfaceTag; struct list_head send_cfm_list; u8 j; @@ -2611,9 +2611,9 @@ static void ba_session_terminate_timer_func(unsigned long data) CsrBool blockack_session_stop(unifi_priv_t *priv, - CsrUint16 interfaceTag, + u16 interfaceTag, CsrWifiRouterCtrlBlockAckRole role, - CsrUint16 tID, + u16 tID, CsrWifiMacAddress macAddress) { netInterface_priv_t *interfacePriv; @@ -2731,12 +2731,12 @@ void CsrWifiRouterCtrlBlockAckDisableReqHandler(void* drvpriv, CsrWifiFsmEvent* CsrBool blockack_session_start(unifi_priv_t *priv, - CsrUint16 interfaceTag, - CsrUint16 tID, - CsrUint16 timeout, + u16 interfaceTag, + u16 tID, + u16 timeout, CsrWifiRouterCtrlBlockAckRole role, - CsrUint16 wind_size, - CsrUint16 start_sn, + u16 wind_size, + u16 start_sn, CsrWifiMacAddress macAddress ) { diff --git a/drivers/staging/csr/sme_userspace.c b/drivers/staging/csr/sme_userspace.c index fc2506e4a95..b4a00096140 100644 --- a/drivers/staging/csr/sme_userspace.c +++ b/drivers/staging/csr/sme_userspace.c @@ -223,7 +223,7 @@ unifi_ta_indicate_protocol(void *ospriv, if (CSR_WIFI_ROUTER_CTRL_PROTOCOL_DIRECTION_RX == direction) { - CsrUint16 interfaceTag = 0; + u16 interfaceTag = 0; CsrWifiRouterCtrlTrafficProtocolIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0, interfaceTag, packet_type, diff --git a/drivers/staging/csr/sme_wext.c b/drivers/staging/csr/sme_wext.c index 64e2939efa0..51c19bb97b7 100644 --- a/drivers/staging/csr/sme_wext.c +++ b/drivers/staging/csr/sme_wext.c @@ -727,7 +727,7 @@ iwprivsapstop(struct net_device *dev, struct iw_request_info *info, netInterface_priv_t *interfacePriv = (netInterface_priv_t *)netdev_priv(dev); unifi_priv_t *priv = interfacePriv->privPtr; int r; - CsrUint16 interface_tag = interfacePriv->InterfaceTag; + u16 interface_tag = interfacePriv->InterfaceTag; unifi_trace(priv, UDBG1, "iwprivsapstop\n" ); r = sme_ap_stop(priv,interface_tag); @@ -766,7 +766,7 @@ iwprivsstackstop(struct net_device *dev, struct iw_request_info *info, netInterface_priv_t *interfacePriv = (netInterface_priv_t *)netdev_priv(dev); unifi_priv_t *priv = interfacePriv->privPtr; int r = 0; - CsrUint16 interface_tag = interfacePriv->InterfaceTag; + u16 interface_tag = interfacePriv->InterfaceTag; unifi_trace(priv, UDBG1, "iwprivsstackstop\n" ); diff --git a/drivers/staging/csr/ul_int.c b/drivers/staging/csr/ul_int.c index 3135468ef36..325218fc246 100644 --- a/drivers/staging/csr/ul_int.c +++ b/drivers/staging/csr/ul_int.c @@ -418,7 +418,7 @@ ul_send_signal_unpacked(unifi_priv_t *priv, CSR_SIGNAL *sigptr, bulk_data_param_t *bulkdata) { u8 sigbuf[UNIFI_PACKED_SIGBUF_SIZE]; - CsrUint16 packed_siglen; + u16 packed_siglen; CsrResult csrResult; unsigned long lock_flags; int r; diff --git a/drivers/staging/csr/unifi_clients.h b/drivers/staging/csr/unifi_clients.h index ca105e56571..418cb4d92fc 100644 --- a/drivers/staging/csr/unifi_clients.h +++ b/drivers/staging/csr/unifi_clients.h @@ -98,7 +98,7 @@ struct ul_client { CSR_SIGNAL* reply_signal; bulk_data_t* reply_bulkdata[UNIFI_MAX_DATA_REFERENCES]; - CsrUint16 signal_filter[SIG_FILTER_SIZE]; + u16 signal_filter[SIG_FILTER_SIZE]; /* ------------------------------------------------------------------- */ diff --git a/drivers/staging/csr/unifi_event.c b/drivers/staging/csr/unifi_event.c index bbc1564bd2f..c2ef2ee2107 100644 --- a/drivers/staging/csr/unifi_event.c +++ b/drivers/staging/csr/unifi_event.c @@ -97,7 +97,7 @@ static CsrBool check_routing_pkt_data_ind(unifi_priv_t *priv, CsrBool *freeBulkData, netInterface_priv_t *interfacePriv) { - CsrUint16 frmCtrl, receptionStatus, frmCtrlSubType; + u16 frmCtrl, receptionStatus, frmCtrlSubType; u8 *macHdrLocation; u8 interfaceTag; CsrBool isDataFrame; @@ -112,7 +112,7 @@ static CsrBool check_routing_pkt_data_ind(unifi_priv_t *priv, CsrBool isWapiUnicastPkt = FALSE; #ifdef CSR_WIFI_SECURITY_WAPI_QOSCTRL_MIC_WORKAROUND - CsrUint16 qosControl; + u16 qosControl; #endif u8 llcSnapHeaderOffset = 0; @@ -467,7 +467,7 @@ unifi_process_receive_event(void *ospriv, #define CSR_MA_PACKET_INDICATION_RECEPTION_STATUS_OFFSET sizeof(CSR_SIGNAL_PRIMITIVE_HEADER) + 22 netInterface_priv_t *interfacePriv; u8 interfaceTag; - CsrUint16 receptionStatus = CSR_RX_SUCCESS; + u16 receptionStatus = CSR_RX_SUCCESS; /* Pull out interface tag from virtual interface identifier */ interfaceTag = (CSR_GET_UINT16_FROM_LITTLE_ENDIAN(sigdata + CSR_MA_PACKET_INDICATION_INTERFACETAG_OFFSET)) & 0xff; @@ -489,7 +489,7 @@ unifi_process_receive_event(void *ospriv, CSR_SIGNAL signal; u8 *destAddr; CsrResult res; - CsrUint16 interfaceTag = 0; + u16 interfaceTag = 0; CsrBool isMcastPkt = TRUE; unifi_trace(priv, UDBG6, "Received a WAPI data packet when the Unicast/Multicast filter is set\n"); diff --git a/drivers/staging/csr/unifi_os.h b/drivers/staging/csr/unifi_os.h index 0a974945068..4e63a942f1a 100644 --- a/drivers/staging/csr/unifi_os.h +++ b/drivers/staging/csr/unifi_os.h @@ -90,11 +90,11 @@ extern int unifi_debug; } while (0) -void unifi_dump(void *ospriv, int lvl, const char *msg, void *mem, CsrUint16 len); -void dump(void *mem, CsrUint16 len); -void dump16(void *mem, CsrUint16 len); +void unifi_dump(void *ospriv, int lvl, const char *msg, void *mem, u16 len); +void dump(void *mem, u16 len); +void dump16(void *mem, u16 len); #ifdef CSR_WIFI_HIP_DEBUG_OFFLINE -void dump_str(void *mem, CsrUint16 len); +void dump_str(void *mem, u16 len); #endif /* CSR_WIFI_HIP_DEBUG_OFFLINE */ void unifi_error(void* ospriv, const char *fmt, ...); @@ -113,11 +113,11 @@ void unifi_trace(void* ospriv, int level, const char *fmt, ...); #define ASSERT(cond) -static inline void unifi_dump(void *ospriv, int lvl, const char *msg, void *mem, CsrUint16 len) {} -static inline void dump(void *mem, CsrUint16 len) {} -static inline void dump16(void *mem, CsrUint16 len) {} +static inline void unifi_dump(void *ospriv, int lvl, const char *msg, void *mem, u16 len) {} +static inline void dump(void *mem, u16 len) {} +static inline void dump16(void *mem, u16 len) {} #ifdef CSR_WIFI_HIP_DEBUG_OFFLINE -static inline void dump_str(void *mem, CsrUint16 len) {} +static inline void dump_str(void *mem, u16 len) {} #endif /* CSR_WIFI_HIP_DEBUG_OFFLINE */ void unifi_error_nop(void* ospriv, const char *fmt, ...); diff --git a/drivers/staging/csr/unifi_pdu_processing.c b/drivers/staging/csr/unifi_pdu_processing.c index a007a59aef9..51ce5e40b0a 100644 --- a/drivers/staging/csr/unifi_pdu_processing.c +++ b/drivers/staging/csr/unifi_pdu_processing.c @@ -55,7 +55,7 @@ static void _update_buffered_pkt_params_after_alignment(unifi_priv_t *priv, bulk void unifi_frame_ma_packet_req(unifi_priv_t *priv, CSR_PRIORITY priority, CSR_RATE TransmitRate, CSR_CLIENT_TAG hostTag, - CsrUint16 interfaceTag, CSR_TRANSMISSION_CONTROL transmissionControl, + u16 interfaceTag, CSR_TRANSMISSION_CONTROL transmissionControl, CSR_PROCESS_ID leSenderProcessId, u8 *peerMacAddress, CSR_SIGNAL *signal) { @@ -137,7 +137,7 @@ int frame_and_send_queued_pdu(unifi_priv_t* priv,tx_buffered_packets_t* buffered int result; u8 toDs, fromDs, macHeaderLengthInBytes = MAC_HEADER_SIZE; u8 *qc; - CsrUint16 *fc = (CsrUint16*)(buffered_pkt->bulkdata.os_data_ptr); + u16 *fc = (u16*)(buffered_pkt->bulkdata.os_data_ptr); unsigned long lock_flags; unifi_trace(priv, UDBG3, "frame_and_send_queued_pdu with moreData: %d , EOSP: %d\n",moreData,eosp); unifi_frame_ma_packet_req(priv, buffered_pkt->priority, buffered_pkt->rate, buffered_pkt->hostTag, @@ -449,7 +449,7 @@ CsrResult enque_tx_data_pdu(unifi_priv_t *priv, bulk_data_param_t *bulkdata, #ifdef CSR_WIFI_REQUEUE_PACKET_TO_HAL CsrResult unifi_reque_ma_packet_request (void *ospriv, CsrUint32 host_tag, - CsrUint16 txStatus, bulk_data_desc_t *bulkDataDesc) + u16 txStatus, bulk_data_desc_t *bulkDataDesc) { CsrResult status = CSR_RESULT_SUCCESS; unifi_priv_t *priv = (unifi_priv_t*)ospriv; @@ -459,9 +459,9 @@ CsrResult unifi_reque_ma_packet_request (void *ospriv, CsrUint32 host_tag, bulk_data_param_t bulkData; CSR_SIGNAL signal; CSR_PRIORITY priority = 0; - CsrUint16 interfaceTag = 0; + u16 interfaceTag = 0; unifi_TrafficQueue priority_q; - CsrUint16 frameControl = 0, frameType = 0; + u16 frameControl = 0, frameType = 0; unsigned long lock_flags; interfacePriv = priv->interfacePriv[interfaceTag]; @@ -531,7 +531,7 @@ CsrResult unifi_reque_ma_packet_request (void *ospriv, CsrUint32 host_tag, /* Extract the Packet priority */ if (TRUE == staRecord->wmmOrQosEnabled) { - CsrUint16 qosControl = 0; + u16 qosControl = 0; u8 dataFrameType = 0; dataFrameType =((frameControl & IEEE80211_FC_SUBTYPE_MASK) >> 4); @@ -635,15 +635,15 @@ static void is_all_ac_deliver_enabled_and_moredata(CsrWifiRouterCtrlStaInfo_t *s * * --------------------------------------------------------------------------- */ -void uf_handle_tim_cfm(unifi_priv_t *priv, CSR_MLME_SET_TIM_CONFIRM *cfm, CsrUint16 receiverProcessId) +void uf_handle_tim_cfm(unifi_priv_t *priv, CSR_MLME_SET_TIM_CONFIRM *cfm, u16 receiverProcessId) { u8 handle = CSR_WIFI_GET_STATION_HANDLE_FROM_RECEIVER_ID(receiverProcessId); u8 timSetStatus = CSR_WIFI_GET_TIMSET_STATE_FROM_RECEIVER_ID(receiverProcessId); - CsrUint16 interfaceTag = (cfm->VirtualInterfaceIdentifier & 0xff); + u16 interfaceTag = (cfm->VirtualInterfaceIdentifier & 0xff); netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; CsrWifiRouterCtrlStaInfo_t *staRecord = NULL; /* This variable holds what TIM value we wanted to set in firmware */ - CsrUint16 timSetValue = 0; + u16 timSetValue = 0; /* Irrespective of interface the count maintained */ static u8 retryCount = 0; unsigned long lock_flags; @@ -859,7 +859,7 @@ void uf_handle_tim_cfm(unifi_priv_t *priv, CSR_MLME_SET_TIM_CONFIRM *cfm, CsrUin * * --------------------------------------------------------------------------- */ -void update_tim(unifi_priv_t * priv, CsrUint16 aid, u8 setTim, CsrUint16 interfaceTag, CsrUint32 handle) +void update_tim(unifi_priv_t * priv, u16 aid, u8 setTim, u16 interfaceTag, CsrUint32 handle) { CSR_SIGNAL signal; CsrInt32 r; @@ -956,7 +956,7 @@ void update_tim(unifi_priv_t * priv, CsrUint16 aid, u8 setTim, CsrUint16 interfa static void process_peer_active_transition(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t *staRecord, - CsrUint16 interfaceTag) + u16 interfaceTag) { int r,i; CsrBool spaceAvail[4] = {TRUE,TRUE,TRUE,TRUE}; @@ -1072,7 +1072,7 @@ void process_peer_active_transition(unifi_priv_t * priv, -void uf_process_ma_pkt_cfm_for_ap(unifi_priv_t *priv,CsrUint16 interfaceTag, const CSR_MA_PACKET_CONFIRM *pkt_cfm) +void uf_process_ma_pkt_cfm_for_ap(unifi_priv_t *priv,u16 interfaceTag, const CSR_MA_PACKET_CONFIRM *pkt_cfm) { netInterface_priv_t *interfacePriv; u8 i; @@ -1201,7 +1201,7 @@ void uf_process_ma_pkt_cfm_for_ap(unifi_priv_t *priv,CsrUint16 interfaceTag, con } #endif -CsrUint16 uf_get_vif_identifier (CsrWifiRouterCtrlMode mode, CsrUint16 tag) +u16 uf_get_vif_identifier (CsrWifiRouterCtrlMode mode, u16 tag) { switch(mode) { @@ -1255,12 +1255,12 @@ CsrUint16 uf_get_vif_identifier (CsrWifiRouterCtrlMode mode, CsrUint16 tag) static int update_macheader(unifi_priv_t *priv, struct sk_buff *skb, struct sk_buff *newSkb, CSR_PRIORITY *priority, - bulk_data_param_t *bulkdata, CsrUint16 interfaceTag, + bulk_data_param_t *bulkdata, u16 interfaceTag, u8 macHeaderLengthInBytes, u8 qosDestination) { - CsrUint16 *fc = NULL; + u16 *fc = NULL; u8 direction = 0, toDs, fromDs; u8 *bufPtr = NULL; u8 sa[ETH_ALEN], da[ETH_ALEN]; @@ -1280,7 +1280,7 @@ static int update_macheader(unifi_priv_t *priv, struct sk_buff *skb, headroom = skb_headroom(skb); /* pointer to frame control field */ - fc = (CsrUint16*) macHeaderBuf; + fc = (u16*) macHeaderBuf; toDs = (*fc & cpu_to_le16(IEEE802_11_FC_TO_DS_MASK))?1 : 0; fromDs = (*fc & cpu_to_le16(IEEE802_11_FC_FROM_DS_MASK))? 1: 0; @@ -1510,7 +1510,7 @@ uf_ap_process_data_pdu(unifi_priv_t *priv, struct sk_buff *skb, u8 macHeaderLengthInBytes) { const CSR_MA_PACKET_INDICATION *ind = &(signal->u.MaPacketIndication); - CsrUint16 interfaceTag = (ind->VirtualInterfaceIdentifier & 0x00ff); + u16 interfaceTag = (ind->VirtualInterfaceIdentifier & 0x00ff); struct sk_buff *newSkb = NULL; /* pointer to skb or private skb created using skb_copy() */ struct sk_buff *skbPtr = skb; @@ -1645,7 +1645,7 @@ uf_ap_process_data_pdu(unifi_priv_t *priv, struct sk_buff *skb, CsrResult uf_process_ma_packet_req(unifi_priv_t *priv, u8 *peerMacAddress, CSR_CLIENT_TAG hostTag, - CsrUint16 interfaceTag, + u16 interfaceTag, CSR_TRANSMISSION_CONTROL transmissionControl, CSR_RATE TransmitRate, CSR_PRIORITY priority, @@ -1662,7 +1662,7 @@ CsrResult uf_process_ma_packet_req(unifi_priv_t *priv, int frameType = 0; CsrBool queuePacketDozing = FALSE; CsrUint32 priority_q; - CsrUint16 frmCtrl; + u16 frmCtrl; struct list_head * list = NULL; /* List to which buffered PDUs are to be enqueued*/ CsrBool setBcTim=FALSE; netInterface_priv_t *interfacePriv; @@ -1976,7 +1976,7 @@ CsrResult uf_process_ma_packet_req(unifi_priv_t *priv, } #ifdef CSR_SUPPORT_SME -s8 uf_get_protection_bit_from_interfacemode(unifi_priv_t *priv, CsrUint16 interfaceTag, const u8 *daddr) +s8 uf_get_protection_bit_from_interfacemode(unifi_priv_t *priv, u16 interfaceTag, const u8 *daddr) { s8 protection = 0; netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; @@ -2017,7 +2017,7 @@ s8 uf_get_protection_bit_from_interfacemode(unifi_priv_t *priv, CsrUint16 interf } #endif #ifdef CSR_SUPPORT_SME -u8 send_multicast_frames(unifi_priv_t *priv, CsrUint16 interfaceTag) +u8 send_multicast_frames(unifi_priv_t *priv, u16 interfaceTag) { int r; tx_buffered_packets_t * buffered_pkt = NULL; @@ -2122,7 +2122,7 @@ void uf_process_ma_vif_availibility_ind(unifi_priv_t *priv,u8 *sigdata, CSR_SIGNAL signal; CSR_MA_VIF_AVAILABILITY_INDICATION *ind; int r; - CsrUint16 interfaceTag; + u16 interfaceTag; u8 pduSent =0; CSR_RESULT_CODE resultCode = CSR_RC_SUCCESS; netInterface_priv_t *interfacePriv; @@ -2130,7 +2130,7 @@ void uf_process_ma_vif_availibility_ind(unifi_priv_t *priv,u8 *sigdata, func_enter(); unifi_trace(priv, UDBG3, "uf_process_ma_vif_availibility_ind: Process signal 0x%.4X\n", - *((CsrUint16*)sigdata)); + *((u16*)sigdata)); r = read_unpack_signal(sigdata, &signal); if (r) { @@ -2265,7 +2265,7 @@ void uf_send_buffered_data_from_delivery_ac(unifi_priv_t *priv, struct list_head *txList) { - CsrUint16 interfaceTag = GET_ACTIVE_INTERFACE_TAG(priv); + u16 interfaceTag = GET_ACTIVE_INTERFACE_TAG(priv); tx_buffered_packets_t * buffered_pkt = NULL; unsigned long lock_flags; CsrBool eosp=FALSE; @@ -2408,7 +2408,7 @@ void uf_send_buffered_data_from_ac(unifi_priv_t *priv, void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q) { - CsrUint16 interfaceTag = GET_ACTIVE_INTERFACE_TAG(priv); + u16 interfaceTag = GET_ACTIVE_INTERFACE_TAG(priv); CsrUint32 startIndex=0,endIndex=0; CsrWifiRouterCtrlStaInfo_t * staInfo = NULL; u8 queue; @@ -2576,7 +2576,7 @@ CsrBool uf_is_more_data_for_non_delivery_ac(CsrWifiRouterCtrlStaInfo_t *staRecor } -int uf_process_station_records_for_sending_data(unifi_priv_t *priv,CsrUint16 interfaceTag, +int uf_process_station_records_for_sending_data(unifi_priv_t *priv,u16 interfaceTag, CsrWifiRouterCtrlStaInfo_t *srcStaInfo, CsrWifiRouterCtrlStaInfo_t *dstStaInfo) { @@ -2636,7 +2636,7 @@ int uf_process_station_records_for_sending_data(unifi_priv_t *priv,CsrUint16 int * interfaceTag virtual interface tag * --------------------------------------------------------------------------- */ -static void uf_handle_uspframes_delivery(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t *staInfo, CsrUint16 interfaceTag) +static void uf_handle_uspframes_delivery(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t *staInfo, u16 interfaceTag) { s8 i; @@ -2733,8 +2733,8 @@ static void uf_handle_uspframes_delivery(unifi_priv_t * priv, CsrWifiRouterCtrlS void uf_process_wmm_deliver_ac_uapsd(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t * srcStaInfo, - CsrUint16 qosControl, - CsrUint16 interfaceTag) + u16 qosControl, + u16 interfaceTag) { CSR_PRIORITY priority; unifi_TrafficQueue priority_q; @@ -2759,7 +2759,7 @@ void uf_process_wmm_deliver_ac_uapsd(unifi_priv_t * priv, } -void uf_send_qos_null(unifi_priv_t * priv,CsrUint16 interfaceTag, const u8 *da,CSR_PRIORITY priority,CsrWifiRouterCtrlStaInfo_t * srcStaInfo) +void uf_send_qos_null(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRIORITY priority,CsrWifiRouterCtrlStaInfo_t * srcStaInfo) { bulk_data_param_t bulkdata; CsrResult csrResult; @@ -2830,7 +2830,7 @@ void uf_send_qos_null(unifi_priv_t * priv,CsrUint16 interfaceTag, const u8 *da,C return; } -void uf_send_nulldata(unifi_priv_t * priv,CsrUint16 interfaceTag, const u8 *da,CSR_PRIORITY priority,CsrWifiRouterCtrlStaInfo_t * srcStaInfo) +void uf_send_nulldata(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRIORITY priority,CsrWifiRouterCtrlStaInfo_t * srcStaInfo) { bulk_data_param_t bulkdata; CsrResult csrResult; @@ -2958,7 +2958,7 @@ CsrBool uf_check_broadcast_bssid(unifi_priv_t *priv, const bulk_data_param_t *bu CsrBool uf_process_pm_bit_for_peer(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t * srcStaInfo, - u8 pmBit,CsrUint16 interfaceTag) + u8 pmBit,u16 interfaceTag) { CsrBool moreData = FALSE; CsrBool powerSaveChanged = FALSE; @@ -3052,7 +3052,7 @@ CsrBool uf_process_pm_bit_for_peer(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo -void uf_process_ps_poll(unifi_priv_t *priv,u8* sa,u8* da,u8 pmBit,CsrUint16 interfaceTag) +void uf_process_ps_poll(unifi_priv_t *priv,u8* sa,u8* da,u8 pmBit,u16 interfaceTag) { CsrWifiRouterCtrlStaInfo_t *staRecord = CsrWifiRouterCtrlGetStationRecordFromPeerMacAddress(priv, sa, interfaceTag); @@ -3448,7 +3448,7 @@ tx_buffered_packets_t *dequeue_tx_data_pdu(unifi_priv_t *priv, struct list_head /* generic function to get the station record handler */ CsrWifiRouterCtrlStaInfo_t *CsrWifiRouterCtrlGetStationRecordFromPeerMacAddress(unifi_priv_t *priv, const u8 *peerMacAddress, - CsrUint16 interfaceTag) + u16 interfaceTag) { u8 i; netInterface_priv_t *interfacePriv; @@ -3482,7 +3482,7 @@ CsrWifiRouterCtrlStaInfo_t *CsrWifiRouterCtrlGetStationRecordFromPeerMacAddress( /* generic function to get the station record handler from the handle */ CsrWifiRouterCtrlStaInfo_t * CsrWifiRouterCtrlGetStationRecordFromHandle(unifi_priv_t *priv, CsrUint32 handle, - CsrUint16 interfaceTag) + u16 interfaceTag) { netInterface_priv_t *interfacePriv; @@ -3495,7 +3495,7 @@ CsrWifiRouterCtrlStaInfo_t * CsrWifiRouterCtrlGetStationRecordFromHandle(unifi_p } /* Function to do inactivity */ -void uf_check_inactivity(unifi_priv_t *priv, CsrUint16 interfaceTag, CsrTime currentTime) +void uf_check_inactivity(unifi_priv_t *priv, u16 interfaceTag, CsrTime currentTime) { CsrUint32 i; CsrWifiRouterCtrlStaInfo_t *staInfo; @@ -3544,7 +3544,7 @@ void uf_check_inactivity(unifi_priv_t *priv, CsrUint16 interfaceTag, CsrTime cur } /* Function to update activity of a station */ -void uf_update_sta_activity(unifi_priv_t *priv, CsrUint16 interfaceTag, const u8 *peerMacAddress) +void uf_update_sta_activity(unifi_priv_t *priv, u16 interfaceTag, const u8 *peerMacAddress) { CsrTime elapsedTime, currentTime; /* Time in microseconds */ CsrTime timeHi; /* Not used - Time in microseconds */ @@ -3587,7 +3587,7 @@ void uf_update_sta_activity(unifi_priv_t *priv, CsrUint16 interfaceTag, const u8 uf_check_inactivity(priv, interfaceTag, currentTime); } } -void resume_unicast_buffered_frames(unifi_priv_t *priv, CsrUint16 interfaceTag) +void resume_unicast_buffered_frames(unifi_priv_t *priv, u16 interfaceTag) { netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; @@ -3677,7 +3677,7 @@ void resume_unicast_buffered_frames(unifi_priv_t *priv, CsrUint16 interfaceTag) } func_exit(); } -void update_eosp_to_head_of_broadcast_list_head(unifi_priv_t *priv,CsrUint16 interfaceTag) +void update_eosp_to_head_of_broadcast_list_head(unifi_priv_t *priv,u16 interfaceTag) { netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; @@ -3718,7 +3718,7 @@ void update_eosp_to_head_of_broadcast_list_head(unifi_priv_t *priv,CsrUint16 int * interfaceTag For which resume should happen * --------------------------------------------------------------------------- */ -void resume_suspended_uapsd(unifi_priv_t* priv,CsrUint16 interfaceTag) +void resume_suspended_uapsd(unifi_priv_t* priv,u16 interfaceTag) { u8 startIndex; diff --git a/drivers/staging/csr/unifi_priv.h b/drivers/staging/csr/unifi_priv.h index f56c7025380..126e7c694da 100644 --- a/drivers/staging/csr/unifi_priv.h +++ b/drivers/staging/csr/unifi_priv.h @@ -305,7 +305,7 @@ typedef u8 CsrWifiAcPowersaveMode; typedef struct tx_buffered_packets { /* List link structure */ struct list_head q; - CsrUint16 interfaceTag; + u16 interfaceTag; CSR_CLIENT_TAG hostTag; CSR_PROCESS_ID leSenderProcessId; CSR_TRANSMISSION_CONTROL transmissionControl; @@ -325,9 +325,9 @@ typedef struct CsrWifiRouterCtrlStaInfo_t { CsrUint32 assignedHandle; CsrBool wmmOrQosEnabled; CsrWifiAcPowersaveMode powersaveMode[MAX_ACCESS_CATOGORY]; - CsrUint16 maxSpLength; + u16 maxSpLength; CsrBool uapsdActive; - CsrUint16 noOfSpFramesSent; + u16 noOfSpFramesSent; /* Router/Driver database */ #ifdef CSR_SUPPORT_SME @@ -338,7 +338,7 @@ typedef struct CsrWifiRouterCtrlStaInfo_t { struct netInterface_priv *interfacePriv; struct work_struct send_disconnected_ind_task; CsrBool activity_flag; - CsrUint16 listenIntervalInTus; + u16 listenIntervalInTus; CSR_CLIENT_TAG nullDataHostTag; /* Activity timestamps for the station */ @@ -355,7 +355,7 @@ typedef struct CsrWifiRouterCtrlStaInfo_t { u8 prevFrmType; u8 prevFrmAccessCatogory; CsrBool protection; - CsrUint16 aid; + u16 aid; CsrBool txSuspend; u8 timSet; /* Dont change the value of below macro for SET & RESET */ @@ -366,13 +366,13 @@ typedef struct CsrWifiRouterCtrlStaInfo_t { CsrBool timRequestPendingFlag; u8 updateTimReqQueued; - CsrUint16 noOfPktQueued; + u16 noOfPktQueued; }CsrWifiRouterCtrlStaInfo_t; #ifdef CSR_SUPPORT_WEXT_AP struct CsrWifiSmeApConfig { CsrWifiSsid ssid; - CsrUint16 channel; + u16 channel; CsrWifiNmeApCredentials credentials; u8 max_connections; u8 if_index; @@ -387,7 +387,7 @@ typedef struct { u8 *bufptr; /* Signal Primitive */ bulk_data_param_t data_ptrs; /* Bulk Data pointers */ - CsrUint16 sig_len; + u16 sig_len; }rx_buff_struct_t; typedef struct @@ -496,7 +496,7 @@ struct unifi_priv { u8 allPeerDozing; u8 pausedStaHandle[MAX_ACCESS_CATOGORY]; /* Max packet the driver can queue, irrespective of interface number */ - CsrUint16 noOfPktQueuedInDriver; + u16 noOfPktQueuedInDriver; #define CSR_WIFI_DRIVER_SUPPORT_FOR_MAX_PKT_QUEUEING 512 #define CSR_WIFI_DRIVER_MAX_PKT_QUEUING_THRESHOLD_PER_PEER 64 #define CSR_WIFI_DRIVER_MINIMUM_BROADCAST_PKT_THRESHOLD 3 @@ -674,7 +674,7 @@ struct unifi_priv { }; typedef struct { - CsrUint16 queue_length[4]; + u16 queue_length[4]; u8 os_queue_paused; } unifi_OsQosInfo; @@ -683,21 +683,21 @@ typedef struct { CsrBool active; bulk_data_param_t bulkdata; CSR_SIGNAL signal; - CsrUint16 sn; + u16 sn; CsrTime recv_time; } frame_desc_struct; typedef struct { frame_desc_struct *buffer; - CsrUint16 wind_size; - CsrUint16 occupied_slots; + u16 wind_size; + u16 occupied_slots; struct timer_list timer; - CsrUint16 timeout; - CsrUint16 expected_sn; - CsrUint16 start_sn; + u16 timeout; + u16 expected_sn; + u16 start_sn; CsrBool trigger_ba_after_ssn; struct netInterface_priv *interfacePriv; - CsrUint16 tID; + u16 tID; CsrWifiMacAddress macAddress; struct work_struct send_ba_err_task; } ba_session_rx_struct; @@ -705,13 +705,13 @@ typedef struct { typedef struct { struct netInterface_priv *interfacePriv; - CsrUint16 tID; + u16 tID; CsrWifiMacAddress macAddress; } ba_session_tx_struct; typedef struct netInterface_priv { - CsrUint16 InterfaceTag; + u16 InterfaceTag; struct unifi_priv *privPtr; ba_session_tx_struct *ba_session_tx[MAX_SUPPORTED_BA_SESSIONS_TX]; ba_session_rx_struct *ba_session_rx[MAX_SUPPORTED_BA_SESSIONS_RX]; @@ -770,7 +770,7 @@ typedef struct netInterface_priv CsrTime last_inactivity_check; /*number of multicast or borad cast packets queued*/ - CsrUint16 noOfbroadcastPktQueued; + u16 noOfbroadcastPktQueued; #endif /* A list to hold the buffered uncontrolled port packets */ struct list_head rx_uncontrolled_list; @@ -895,7 +895,7 @@ unifi_priv_t *uf_alloc_netdevice(CsrSdioFunction *sdio_dev, int bus_id); int uf_free_netdevice(unifi_priv_t *priv); /* Allocating function for other interfaces */ -CsrBool uf_alloc_netdevice_for_other_interfaces(unifi_priv_t *priv, CsrUint16 interfaceTag); +CsrBool uf_alloc_netdevice_for_other_interfaces(unifi_priv_t *priv, u16 interfaceTag); /* * Firmware download related functions. @@ -957,8 +957,8 @@ int uf_verify_m4(unifi_priv_t *priv, const unsigned char *packet, #ifdef CSR_SUPPORT_SME CsrBool uf_check_broadcast_bssid(unifi_priv_t *priv, const bulk_data_param_t *bulkdata); -CsrBool uf_process_pm_bit_for_peer(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t * srcStaInfo,u8 pmBit,CsrUint16 interfaceTag); -void uf_process_ps_poll(unifi_priv_t *priv,u8* sa,u8* da,u8 pmBit,CsrUint16 interfaceTag); +CsrBool uf_process_pm_bit_for_peer(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t * srcStaInfo,u8 pmBit,u16 interfaceTag); +void uf_process_ps_poll(unifi_priv_t *priv,u8* sa,u8* da,u8 pmBit,u16 interfaceTag); int uf_ap_process_data_pdu(unifi_priv_t *priv, struct sk_buff *skb, struct ethhdr *ehdr, CsrWifiRouterCtrlStaInfo_t * srcStaInfo, const CSR_SIGNAL *signal, @@ -967,24 +967,24 @@ int uf_ap_process_data_pdu(unifi_priv_t *priv, struct sk_buff *skb, CsrBool uf_is_more_data_for_non_delivery_ac(CsrWifiRouterCtrlStaInfo_t *staRecord); void uf_process_wmm_deliver_ac_uapsd ( unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t * srcStaInfo, - CsrUint16 qosControl, - CsrUint16 interfaceTag); + u16 qosControl, + u16 interfaceTag); void uf_send_buffered_data_from_ac(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t * staInfo, u8 queue, struct list_head *txList); void uf_send_buffered_data_from_delivery_ac(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t * staInfo, u8 queue, struct list_head *txList); void uf_continue_uapsd(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t * staInfo); -void uf_send_qos_null(unifi_priv_t * priv,CsrUint16 interfaceTag, const u8 *da,CSR_PRIORITY priority,CsrWifiRouterCtrlStaInfo_t * srcStaInfo); -void uf_send_nulldata(unifi_priv_t * priv,CsrUint16 interfaceTag, const u8 *da,CSR_PRIORITY priority,CsrWifiRouterCtrlStaInfo_t * srcStaInfo); +void uf_send_qos_null(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRIORITY priority,CsrWifiRouterCtrlStaInfo_t * srcStaInfo); +void uf_send_nulldata(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRIORITY priority,CsrWifiRouterCtrlStaInfo_t * srcStaInfo); #endif -CsrResult uf_process_ma_packet_req(unifi_priv_t *priv, u8 *peerMacAddress, CSR_CLIENT_TAG hostTag, CsrUint16 interfaceTag, CSR_TRANSMISSION_CONTROL transmissionControl, CSR_RATE TransmitRate, CSR_PRIORITY priority, CSR_PROCESS_ID senderId, bulk_data_param_t *bulkdata); +CsrResult uf_process_ma_packet_req(unifi_priv_t *priv, u8 *peerMacAddress, CSR_CLIENT_TAG hostTag, u16 interfaceTag, CSR_TRANSMISSION_CONTROL transmissionControl, CSR_RATE TransmitRate, CSR_PRIORITY priority, CSR_PROCESS_ID senderId, bulk_data_param_t *bulkdata); void uf_process_ma_vif_availibility_ind(unifi_priv_t *priv,u8 *sigdata, CsrUint32 siglen); #ifdef CSR_SUPPORT_SME void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue queue); -int uf_process_station_records_for_sending_data(unifi_priv_t *priv,CsrUint16 interfaceTag, +int uf_process_station_records_for_sending_data(unifi_priv_t *priv,u16 interfaceTag, CsrWifiRouterCtrlStaInfo_t *srcStaInfo, CsrWifiRouterCtrlStaInfo_t *dstStaInfo); void uf_prepare_send_cfm_list_for_queued_pkts(unifi_priv_t * priv, @@ -995,9 +995,9 @@ void send_auto_ma_packet_confirm(unifi_priv_t *priv, struct list_head *buffered_frames_list); void uf_flush_list(unifi_priv_t * priv, struct list_head * list); tx_buffered_packets_t *dequeue_tx_data_pdu(unifi_priv_t *priv, struct list_head *txList); -void resume_unicast_buffered_frames(unifi_priv_t *priv, CsrUint16 interfaceTag); -void update_eosp_to_head_of_broadcast_list_head(unifi_priv_t *priv,CsrUint16 interfaceTag); -void resume_suspended_uapsd(unifi_priv_t* priv,CsrUint16 interfaceTag); +void resume_unicast_buffered_frames(unifi_priv_t *priv, u16 interfaceTag); +void update_eosp_to_head_of_broadcast_list_head(unifi_priv_t *priv,u16 interfaceTag); +void resume_suspended_uapsd(unifi_priv_t* priv,u16 interfaceTag); #endif /* * netdev.c @@ -1028,7 +1028,7 @@ int prepare_and_add_macheader(unifi_priv_t *priv, struct sk_buff *newSkb, CSR_PRIORITY priority, bulk_data_param_t *bulkdata, - CsrUint16 interfaceTag, + u16 interfaceTag, const u8 *daddr, const u8 *saddr, CsrBool protection); @@ -1038,7 +1038,7 @@ get_packet_priority(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr void unifi_frame_ma_packet_req(unifi_priv_t *priv, CSR_PRIORITY priority, CSR_RATE TransmitRate, CSR_CLIENT_TAG hostTag, - CsrUint16 interfaceTag, CSR_TRANSMISSION_CONTROL transmissionControl, + u16 interfaceTag, CSR_TRANSMISSION_CONTROL transmissionControl, CSR_PROCESS_ID leSenderProcessId, u8 *peerMacAddress, CSR_SIGNAL *signal); @@ -1053,40 +1053,40 @@ unifi_frame_ma_packet_req(unifi_priv_t *priv, CSR_PRIORITY priority, /* handle is 6 bits to accomodate in senderId LSB (only 64 station can be associated) */ #define CSR_WIFI_BROADCAST_OR_MULTICAST_HANDLE 0x3F -void update_tim(unifi_priv_t * priv, CsrUint16 aid, u8 setTim, CsrUint16 interfaceTag, CsrUint32 handle); -void uf_handle_tim_cfm(unifi_priv_t *priv, CSR_MLME_SET_TIM_CONFIRM *cfm, CsrUint16 senderProcessId); +void update_tim(unifi_priv_t * priv, u16 aid, u8 setTim, u16 interfaceTag, CsrUint32 handle); +void uf_handle_tim_cfm(unifi_priv_t *priv, CSR_MLME_SET_TIM_CONFIRM *cfm, u16 senderProcessId); /* Clear the Peer station Record, in case of wifioff/unexpected card removal */ -void CsrWifiRouterCtrlInterfaceReset(unifi_priv_t *priv, CsrUint16 interfaceTag); +void CsrWifiRouterCtrlInterfaceReset(unifi_priv_t *priv, u16 interfaceTag); void scroll_ba_window(unifi_priv_t *priv, netInterface_priv_t *interfacePriv, ba_session_rx_struct *ba_session, - CsrUint16 sn); + u16 sn); CsrBool blockack_session_stop(unifi_priv_t *priv, - CsrUint16 interfaceTag, + u16 interfaceTag, CsrWifiRouterCtrlBlockAckRole role, - CsrUint16 tID, + u16 tID, CsrWifiMacAddress macAddress); #ifdef CSR_SUPPORT_SME /* Fetch the protection information from interface Mode */ -s8 uf_get_protection_bit_from_interfacemode(unifi_priv_t *priv, CsrUint16 interfaceTag, const u8 *daddr); +s8 uf_get_protection_bit_from_interfacemode(unifi_priv_t *priv, u16 interfaceTag, const u8 *daddr); #endif /* Fetch the station record handler from data base for matching Mac address */ #ifdef CSR_SUPPORT_SME CsrWifiRouterCtrlStaInfo_t *CsrWifiRouterCtrlGetStationRecordFromPeerMacAddress(unifi_priv_t *priv, const u8 *peerMacAddress, - CsrUint16 interfaceTag); + u16 interfaceTag); /* Fetch the station record handler from data base for matching handle */ CsrWifiRouterCtrlStaInfo_t * CsrWifiRouterCtrlGetStationRecordFromHandle(unifi_priv_t *priv, CsrUint32 handle, - CsrUint16 interfaceTag); + u16 interfaceTag); -void uf_update_sta_activity(unifi_priv_t *priv, CsrUint16 interfaceTag, const u8 *peerMacAddress); -void uf_process_ma_pkt_cfm_for_ap(unifi_priv_t *priv,CsrUint16 interfaceTag, const CSR_MA_PACKET_CONFIRM *pkt_cfm); +void uf_update_sta_activity(unifi_priv_t *priv, u16 interfaceTag, const u8 *peerMacAddress); +void uf_process_ma_pkt_cfm_for_ap(unifi_priv_t *priv,u16 interfaceTag, const CSR_MA_PACKET_CONFIRM *pkt_cfm); #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) int uf_install_qdisc(struct net_device *dev); @@ -1094,9 +1094,9 @@ int uf_install_qdisc(struct net_device *dev); void uf_resume_data_plane(unifi_priv_t *priv, int queue, CsrWifiMacAddress peer_address, - CsrUint16 interfaceTag); + u16 interfaceTag); void uf_free_pending_rx_packets(unifi_priv_t *priv, int queue, - CsrWifiMacAddress peer_address,CsrUint16 interfaceTag); + CsrWifiMacAddress peer_address,u16 interfaceTag); int uf_register_netdev(unifi_priv_t *priv, int numOfInterface); void uf_unregister_netdev(unifi_priv_t *priv); @@ -1104,11 +1104,11 @@ void uf_unregister_netdev(unifi_priv_t *priv); void uf_net_get_name(struct net_device *dev, char *name, int len); void uf_send_queue_info(unifi_priv_t *priv); -CsrUint16 uf_get_vif_identifier(CsrWifiRouterCtrlMode mode, CsrUint16 tag); +u16 uf_get_vif_identifier(CsrWifiRouterCtrlMode mode, u16 tag); void uf_process_rx_pending_queue(unifi_priv_t *priv, int queue, CsrWifiMacAddress source_address, - int indicate, CsrUint16 interfaceTag); + int indicate, u16 interfaceTag); #ifdef CSR_WIFI_HIP_DEBUG_OFFLINE int uf_register_hip_offline_debug(unifi_priv_t *priv); diff --git a/drivers/staging/csr/unifi_sme.c b/drivers/staging/csr/unifi_sme.c index 559213ba8bc..98c9c07dadb 100644 --- a/drivers/staging/csr/unifi_sme.c +++ b/drivers/staging/csr/unifi_sme.c @@ -114,7 +114,7 @@ sme_log_event(ul_client_t *pcli, } if (unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_MA_PACKET_INDICATION_ID) { - CsrUint16 frmCtrl; + u16 frmCtrl; CsrBool unicastPdu = TRUE; u8 *macHdrLocation; u8 *raddr = NULL, *taddr = NULL; @@ -147,7 +147,7 @@ sme_log_event(ul_client_t *pcli, if(ind->ReceptionStatus == CSR_RX_SUCCESS) { u8 pmBit = (frmCtrl & 0x1000)?0x01:0x00; - CsrUint16 interfaceTag = (ind->VirtualInterfaceIdentifier & 0xff); + u16 interfaceTag = (ind->VirtualInterfaceIdentifier & 0xff); CsrWifiRouterCtrlStaInfo_t *srcStaInfo = CsrWifiRouterCtrlGetStationRecordFromPeerMacAddress(priv,taddr,interfaceTag); if((srcStaInfo != NULL) && (uf_check_broadcast_bssid(priv, bulkdata)== FALSE)) { @@ -163,7 +163,7 @@ sme_log_event(ul_client_t *pcli, if (unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_MA_PACKET_CONFIRM_ID) { CSR_MA_PACKET_CONFIRM *cfm = &unpacked_signal.u.MaPacketConfirm; - CsrUint16 interfaceTag = (cfm->VirtualInterfaceIdentifier & 0xff); + u16 interfaceTag = (cfm->VirtualInterfaceIdentifier & 0xff); netInterface_priv_t *interfacePriv; CSR_MA_PACKET_REQUEST *req; CsrWifiMacAddress peerMacAddress; @@ -212,7 +212,7 @@ sme_log_event(ul_client_t *pcli, #endif /* If EAPOL was requested via router APIs then send cfm else ignore*/ if((cfm->HostTag & 0x80000000) != CSR_WIFI_EAPOL_M4_HOST_TAG) { - CsrWifiRouterMaPacketCfmSend((CsrUint16)signal[2], + CsrWifiRouterMaPacketCfmSend((u16)signal[2], cfm->VirtualInterfaceIdentifier, result, (cfm->HostTag & 0x3fffffff), cfm->Rate); @@ -268,7 +268,7 @@ sme_log_event(ul_client_t *pcli, * --------------------------------------------------------------------------- */ CsrWifiRouterCtrlPortAction -uf_sme_port_state(unifi_priv_t *priv, unsigned char *address, int queue, CsrUint16 interfaceTag) +uf_sme_port_state(unifi_priv_t *priv, unsigned char *address, int queue, u16 interfaceTag) { int i; unifi_port_config_t *port; @@ -332,7 +332,7 @@ uf_sme_port_state(unifi_priv_t *priv, unsigned char *address, int queue, CsrUint * --------------------------------------------------------------------------- */ unifi_port_cfg_t* -uf_sme_port_config_handle(unifi_priv_t *priv, unsigned char *address, int queue, CsrUint16 interfaceTag) +uf_sme_port_config_handle(unifi_priv_t *priv, unsigned char *address, int queue, u16 interfaceTag) { int i; unifi_port_config_t *port; @@ -387,7 +387,7 @@ uf_multicast_list_wq(struct work_struct *work) unifi_priv_t *priv = container_of(work, unifi_priv_t, multicast_list_task); int i; - CsrUint16 interfaceTag = 0; + u16 interfaceTag = 0; CsrWifiMacAddress* multicast_address_list = NULL; int mc_count; u8 *mc_list; @@ -867,7 +867,7 @@ int unifi_cfg_get_info(unifi_priv_t *priv, unsigned char *arg) break; case UNIFI_CFG_GET_INSTANCE: { - CsrUint16 InterfaceId=0; + u16 InterfaceId=0; uf_net_get_name(priv->netdev[InterfaceId], &inst_name[0], sizeof(inst_name)); /* Copy the info to the out buffer */ @@ -1054,7 +1054,7 @@ uf_ta_ind_wq(struct work_struct *work) { struct ta_ind *ind = container_of(work, struct ta_ind, task); unifi_priv_t *priv = container_of(ind, unifi_priv_t, ta_ind_work); - CsrUint16 interfaceTag = 0; + u16 interfaceTag = 0; CsrWifiRouterCtrlTrafficProtocolIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0, @@ -1091,7 +1091,7 @@ uf_ta_sample_ind_wq(struct work_struct *work) { struct ta_sample_ind *ind = container_of(work, struct ta_sample_ind, task); unifi_priv_t *priv = container_of(ind, unifi_priv_t, ta_sample_ind_work); - CsrUint16 interfaceTag = 0; + u16 interfaceTag = 0; unifi_trace(priv, UDBG5, "rxtcp %d txtcp %d rxudp %d txudp %d prio %d\n", priv->rxTcpThroughput, @@ -1152,7 +1152,7 @@ void uf_send_m4_ready_wq(struct work_struct *work) { netInterface_priv_t *InterfacePriv = container_of(work, netInterface_priv_t, send_m4_ready_task); - CsrUint16 iface = InterfacePriv->InterfaceTag; + u16 iface = InterfacePriv->InterfaceTag; unifi_priv_t *priv = InterfacePriv->privPtr; CSR_MA_PACKET_REQUEST *req = &InterfacePriv->m4_signal.u.MaPacketRequest; CsrWifiMacAddress peer; @@ -1195,7 +1195,7 @@ uf_send_m4_ready_wq(struct work_struct *work) void uf_send_pkt_to_encrypt(struct work_struct *work) { netInterface_priv_t *interfacePriv = container_of(work, netInterface_priv_t, send_pkt_to_encrypt); - CsrUint16 interfaceTag = interfacePriv->InterfaceTag; + u16 interfaceTag = interfacePriv->InterfaceTag; unifi_priv_t *priv = interfacePriv->privPtr; CsrUint32 pktBulkDataLength; diff --git a/drivers/staging/csr/unifi_sme.h b/drivers/staging/csr/unifi_sme.h index 05de4cde889..bfe20d3d87a 100644 --- a/drivers/staging/csr/unifi_sme.h +++ b/drivers/staging/csr/unifi_sme.h @@ -77,16 +77,16 @@ typedef struct { /* SME's reply to a scan request */ - CsrUint16 reply_scan_results_count; + u16 reply_scan_results_count; CsrWifiSmeScanResult* reply_scan_results; } sme_reply_t; typedef struct { - CsrUint16 appHandle; + u16 appHandle; CsrWifiRouterEncapsulation encapsulation; - CsrUint16 protocol; + u16 protocol; u8 oui[3]; u8 in_use; } sme_ma_unidata_ind_filter_t; @@ -95,11 +95,11 @@ typedef struct { CsrWifiRouterCtrlPortAction uf_sme_port_state(unifi_priv_t *priv, unsigned char *address, int queue, - CsrUint16 interfaceTag); + u16 interfaceTag); unifi_port_cfg_t *uf_sme_port_config_handle(unifi_priv_t *priv, unsigned char *address, int queue, - CsrUint16 interfaceTag); + u16 interfaceTag); @@ -210,8 +210,8 @@ int sme_mgt_mib_get(unifi_priv_t *priv, int sme_mgt_mib_set(unifi_priv_t *priv, unsigned char *varbind, int length); #ifdef CSR_SUPPORT_WEXT_AP -int sme_ap_start(unifi_priv_t *priv,CsrUint16 interface_tag,CsrWifiSmeApConfig_t *ap_config); -int sme_ap_stop(unifi_priv_t *priv,CsrUint16 interface_tag); +int sme_ap_start(unifi_priv_t *priv,u16 interface_tag,CsrWifiSmeApConfig_t *ap_config); +int sme_ap_stop(unifi_priv_t *priv,u16 interface_tag); int sme_ap_config(unifi_priv_t *priv,CsrWifiSmeApMacConfig *ap_mac_config, CsrWifiNmeApConfig *group_security_config); int uf_configure_supported_rates(u8 * supportedRates, u8 phySupportedBitmap); #endif diff --git a/drivers/staging/csr/unifi_wext.h b/drivers/staging/csr/unifi_wext.h index ac86df92d95..4ce0011d0ec 100644 --- a/drivers/staging/csr/unifi_wext.h +++ b/drivers/staging/csr/unifi_wext.h @@ -58,9 +58,9 @@ void wext_send_assoc_event(unifi_priv_t *priv, unsigned char *bssid, unsigned char *scan_ie, unsigned int scan_ie_len); void wext_send_disassoc_event(unifi_priv_t *priv); void wext_send_michaelmicfailure_event(unifi_priv_t *priv, - CsrUint16 count, CsrWifiMacAddress address, - CsrWifiSmeKeyType keyType, CsrUint16 interfaceTag); -void wext_send_pmkid_candidate_event(unifi_priv_t *priv, CsrWifiMacAddress bssid, CsrBool preauth_allowed, CsrUint16 interfaceTag); + u16 count, CsrWifiMacAddress address, + CsrWifiSmeKeyType keyType, u16 interfaceTag); +void wext_send_pmkid_candidate_event(unifi_priv_t *priv, CsrWifiMacAddress bssid, CsrBool preauth_allowed, u16 interfaceTag); void wext_send_started_event(unifi_priv_t *priv); diff --git a/drivers/staging/csr/unifiio.h b/drivers/staging/csr/unifiio.h index c1e3f533870..74720fc3a19 100644 --- a/drivers/staging/csr/unifiio.h +++ b/drivers/staging/csr/unifiio.h @@ -205,9 +205,9 @@ typedef struct { typedef struct { /* Number of 16-bit ints in the protocols array */ - CsrUint16 count; + u16 count; /* List of protocol ids to pass */ - CsrUint16 *protocols; + u16 *protocols; } unifiio_snap_filter_t; @@ -312,20 +312,20 @@ typedef struct uf_cfg_ap_config { u8 phySupportedBitmap; u8 channel; - CsrUint16 beaconInterval; + u16 beaconInterval; u8 dtimPeriod; CsrBool wmmEnabled; u8 shortSlotTimeEnabled; - CsrUint16 groupkeyTimeout; + u16 groupkeyTimeout; CsrBool strictGtkRekeyEnabled; - CsrUint16 gmkTimeout; - CsrUint16 responseTimeout; + u16 gmkTimeout; + u16 responseTimeout; u8 retransLimit; u8 rxStbc; CsrBool rifsModeAllowed; u8 dualCtsProtection; u8 ctsProtectionType; - CsrUint16 maxListenInterval; + u16 maxListenInterval; }uf_cfg_ap_config_t; typedef struct tcpic_clsfr diff --git a/drivers/staging/csr/wext_events.c b/drivers/staging/csr/wext_events.c index 5674782b19a..f250ea60da5 100644 --- a/drivers/staging/csr/wext_events.c +++ b/drivers/staging/csr/wext_events.c @@ -217,10 +217,10 @@ _send_michaelmicfailure_event(struct net_device *dev, void wext_send_michaelmicfailure_event(unifi_priv_t *priv, - CsrUint16 count, + u16 count, CsrWifiMacAddress address, CsrWifiSmeKeyType keyType, - CsrUint16 interfaceTag) + u16 interfaceTag) { unsigned char tsc[8] = {0}; @@ -238,7 +238,7 @@ wext_send_michaelmicfailure_event(unifi_priv_t *priv, } /* wext_send_michaelmicfailure_event() */ void -wext_send_pmkid_candidate_event(unifi_priv_t *priv, CsrWifiMacAddress bssid, CsrBool preauth_allowed, CsrUint16 interfaceTag) +wext_send_pmkid_candidate_event(unifi_priv_t *priv, CsrWifiMacAddress bssid, CsrBool preauth_allowed, u16 interfaceTag) { #if WIRELESS_EXT > 17 union iwreq_data wrqu; -- cgit v1.2.3-70-g09d2 From 26a6b2e1688bc154a16778851d710e90b62f715e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 20 Jul 2012 12:05:42 -0700 Subject: staging: csr: remove CsrUint32 typedef MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the in-kernel u32 type instead. Cc: Mikko Virkkilä Cc: Lauri Hintsala Cc: Riku Mettälä Cc: Veli-Pekka Peltola Signed-off-by: Greg Kroah-Hartman --- drivers/staging/csr/bh.c | 2 +- drivers/staging/csr/csr_framework_ext.h | 12 +- drivers/staging/csr/csr_framework_ext_types.h | 2 +- drivers/staging/csr/csr_lib.h | 16 +- drivers/staging/csr/csr_log.h | 32 +-- drivers/staging/csr/csr_log_configure.h | 4 +- drivers/staging/csr/csr_macro.h | 18 +- drivers/staging/csr/csr_msgconv.h | 10 +- drivers/staging/csr/csr_pmem.h | 10 +- drivers/staging/csr/csr_sched.h | 10 +- drivers/staging/csr/csr_sdio.h | 36 ++-- .../staging/csr/csr_serialize_primitive_types.c | 24 +-- drivers/staging/csr/csr_time.h | 4 +- drivers/staging/csr/csr_types.h | 5 +- drivers/staging/csr/csr_unicode.h | 12 +- drivers/staging/csr/csr_utf16.c | 76 +++---- drivers/staging/csr/csr_util.c | 30 +-- drivers/staging/csr/csr_util.h | 14 +- drivers/staging/csr/csr_wifi_fsm.h | 14 +- drivers/staging/csr/csr_wifi_fsm_types.h | 10 +- drivers/staging/csr/csr_wifi_hip_card.h | 6 +- drivers/staging/csr/csr_wifi_hip_card_sdio.c | 44 ++-- drivers/staging/csr/csr_wifi_hip_card_sdio.h | 112 +++++------ drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c | 12 +- drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c | 98 ++++----- drivers/staging/csr/csr_wifi_hip_chiphelper.c | 16 +- drivers/staging/csr/csr_wifi_hip_chiphelper.h | 24 +-- .../staging/csr/csr_wifi_hip_chiphelper_private.h | 28 +-- drivers/staging/csr/csr_wifi_hip_download.c | 32 +-- drivers/staging/csr/csr_wifi_hip_dump.c | 12 +- drivers/staging/csr/csr_wifi_hip_send.c | 14 +- drivers/staging/csr/csr_wifi_hip_signals.c | 2 +- drivers/staging/csr/csr_wifi_hip_sigs.h | 10 +- drivers/staging/csr/csr_wifi_hip_ta_sampling.c | 32 +-- drivers/staging/csr/csr_wifi_hip_ta_sampling.h | 14 +- drivers/staging/csr/csr_wifi_hip_unifi.h | 50 ++--- drivers/staging/csr/csr_wifi_hip_unifi_udi.h | 2 +- drivers/staging/csr/csr_wifi_hip_xbv.c | 166 +++++++-------- drivers/staging/csr/csr_wifi_hip_xbv.h | 34 ++-- drivers/staging/csr/csr_wifi_lib.h | 4 +- drivers/staging/csr/csr_wifi_msgconv.h | 12 +- drivers/staging/csr/csr_wifi_nme_prim.h | 18 +- drivers/staging/csr/csr_wifi_router_ctrl_prim.h | 46 ++--- .../staging/csr/csr_wifi_router_ctrl_serialize.c | 108 +++++----- drivers/staging/csr/csr_wifi_router_prim.h | 10 +- drivers/staging/csr/csr_wifi_router_serialize.c | 24 +-- drivers/staging/csr/csr_wifi_router_transport.c | 2 +- .../csr/csr_wifi_serialize_primitive_types.c | 18 +- drivers/staging/csr/csr_wifi_sme_prim.h | 78 ++++---- drivers/staging/csr/csr_wifi_sme_serialize.c | 222 ++++++++++----------- drivers/staging/csr/drv.c | 6 +- drivers/staging/csr/firmware.c | 4 +- drivers/staging/csr/netdev.c | 6 +- drivers/staging/csr/sdio_mmc.c | 20 +- drivers/staging/csr/sme_blocking.c | 2 +- drivers/staging/csr/sme_native.c | 8 +- drivers/staging/csr/sme_sys.c | 8 +- drivers/staging/csr/sme_userspace.c | 8 +- drivers/staging/csr/sme_wext.c | 4 +- drivers/staging/csr/ul_int.c | 4 +- drivers/staging/csr/unifi_clients.h | 2 +- drivers/staging/csr/unifi_event.c | 4 +- drivers/staging/csr/unifi_pdu_processing.c | 32 +-- drivers/staging/csr/unifi_priv.h | 20 +- drivers/staging/csr/unifi_sme.c | 12 +- drivers/staging/csr/unifi_sme.h | 2 +- 66 files changed, 865 insertions(+), 868 deletions(-) (limited to 'drivers/staging/csr/csr_wifi_fsm.h') diff --git a/drivers/staging/csr/bh.c b/drivers/staging/csr/bh.c index bfc2f9ef1b6..b089c28d561 100644 --- a/drivers/staging/csr/bh.c +++ b/drivers/staging/csr/bh.c @@ -227,7 +227,7 @@ bh_thread_function(void *arg) unifi_priv_t *priv = (unifi_priv_t*)arg; CsrResult csrResult; long ret; - CsrUint32 timeout, t; + u32 timeout, t; struct uf_thread *this_thread; unifi_trace(priv, UDBG2, "bh_thread_function starting\n"); diff --git a/drivers/staging/csr/csr_framework_ext.h b/drivers/staging/csr/csr_framework_ext.h index 942db87faa0..82da0a4db5e 100644 --- a/drivers/staging/csr/csr_framework_ext.h +++ b/drivers/staging/csr/csr_framework_ext.h @@ -66,7 +66,7 @@ CsrResult CsrEventCreate(CsrEventHandle *eventHandle); * CSR_FE_RESULT_INVALID_POINTER in case the eventBits pointer is invalid * *----------------------------------------------------------------------------*/ -CsrResult CsrEventWait(CsrEventHandle *eventHandle, u16 timeoutInMs, CsrUint32 *eventBits); +CsrResult CsrEventWait(CsrEventHandle *eventHandle, u16 timeoutInMs, u32 *eventBits); /*----------------------------------------------------------------------------* * NAME @@ -81,7 +81,7 @@ CsrResult CsrEventWait(CsrEventHandle *eventHandle, u16 timeoutInMs, CsrUint32 * * CSR_FE_RESULT_INVALID_HANDLE in case the eventHandle is invalid * *----------------------------------------------------------------------------*/ -CsrResult CsrEventSet(CsrEventHandle *eventHandle, CsrUint32 eventBits); +CsrResult CsrEventSet(CsrEventHandle *eventHandle, u32 eventBits); /*----------------------------------------------------------------------------* * NAME @@ -195,7 +195,7 @@ void CsrGlobalMutexUnlock(void); * *----------------------------------------------------------------------------*/ CsrResult CsrThreadCreate(void (*threadFunction)(void *pointer), void *pointer, - CsrUint32 stackSize, u16 priority, + u32 stackSize, u16 priority, const CsrCharString *threadName, CsrThreadHandle *threadHandle); /*----------------------------------------------------------------------------* @@ -257,7 +257,7 @@ void CsrThreadSleep(u16 sleepTimeInMs); *----------------------------------------------------------------------------*/ #ifdef CSR_MEM_DEBUG void *CsrMemAllocDebug(CsrSize size, - const CsrCharString *file, CsrUint32 line); + const CsrCharString *file, u32 line); #define CsrMemAlloc(sz) CsrMemAllocDebug((sz), __FILE__, __LINE__) #else void *CsrMemAlloc(CsrSize size); @@ -278,7 +278,7 @@ void *CsrMemAlloc(CsrSize size); *----------------------------------------------------------------------------*/ #ifdef CSR_MEM_DEBUG void *CsrMemCallocDebug(CsrSize numberOfElements, CsrSize elementSize, - const CsrCharString *file, CsrUint32 line); + const CsrCharString *file, u32 line); #define CsrMemCalloc(cnt, sz) CsrMemAllocDebug((cnt), (sz), __FILE__, __LINE__) #else void *CsrMemCalloc(CsrSize numberOfElements, CsrSize elementSize); @@ -311,7 +311,7 @@ void CsrMemFree(void *pointer); *----------------------------------------------------------------------------*/ #ifdef CSR_MEM_DEBUG void *CsrMemAllocDmaDebug(CsrSize size, - const CsrCharString *file, CsrUint32 line); + const CsrCharString *file, u32 line); #define CsrMemAllocDma(sz) CsrMemAllocDmaDebug((sz), __FILE__, __LINE__) #else void *CsrMemAllocDma(CsrSize size); diff --git a/drivers/staging/csr/csr_framework_ext_types.h b/drivers/staging/csr/csr_framework_ext_types.h index d155a2b8eee..b1ff72f2ccf 100644 --- a/drivers/staging/csr/csr_framework_ext_types.h +++ b/drivers/staging/csr/csr_framework_ext_types.h @@ -49,7 +49,7 @@ struct CsrEvent { pthread_cond_t event; pthread_mutex_t mutex; - CsrUint32 eventBits; + u32 eventBits; }; typedef struct CsrEvent CsrEventHandle; diff --git a/drivers/staging/csr/csr_lib.h b/drivers/staging/csr/csr_lib.h index 7259b63f17a..55768f857a2 100644 --- a/drivers/staging/csr/csr_lib.h +++ b/drivers/staging/csr/csr_lib.h @@ -102,7 +102,7 @@ typedef struct { CsrPrim type; u16 value1; - CsrUint32 value2; + u32 value2; } CsrEventCsrUint16CsrUint32; /*----------------------------------------------------------------------------* @@ -113,7 +113,7 @@ typedef struct * Allocates and fills in a message with the signature CsrEventCsrUint16 * *----------------------------------------------------------------------------*/ -CsrEventCsrUint16CsrUint32 *CsrEventCsrUint16CsrUint32_struct(u16 primtype, u16 msgtype, u16 value1, CsrUint32 value2); +CsrEventCsrUint16CsrUint32 *CsrEventCsrUint16CsrUint32_struct(u16 primtype, u16 msgtype, u16 value1, u32 value2); typedef struct { @@ -135,7 +135,7 @@ CsrEventCsrUint16CsrCharString *CsrEventCsrUint16CsrCharString_struct(u16 primty typedef struct { CsrPrim type; - CsrUint32 value; + u32 value; } CsrEventCsrUint32; /*----------------------------------------------------------------------------* @@ -146,12 +146,12 @@ typedef struct * Allocates and fills in a message with the signature CsrEventCsrUint32 * *----------------------------------------------------------------------------*/ -CsrEventCsrUint32 *CsrEventCsrUint32_struct(u16 primtype, u16 msgtype, CsrUint32 value); +CsrEventCsrUint32 *CsrEventCsrUint32_struct(u16 primtype, u16 msgtype, u32 value); typedef struct { CsrPrim type; - CsrUint32 value1; + u32 value1; u16 value2; } CsrEventCsrUint32CsrUint16; @@ -163,12 +163,12 @@ typedef struct * Allocates and fills in a message with the signature CsrEventCsrUint32CsrUint16 * *----------------------------------------------------------------------------*/ -CsrEventCsrUint32CsrUint16 *CsrEventCsrUint32CsrUint16_struct(u16 primtype, u16 msgtype, CsrUint32 value1, CsrUint32 value2); +CsrEventCsrUint32CsrUint16 *CsrEventCsrUint32CsrUint16_struct(u16 primtype, u16 msgtype, u32 value1, u32 value2); typedef struct { CsrPrim type; - CsrUint32 value1; + u32 value1; CsrCharString *value2; } CsrEventCsrUint32CsrCharString; @@ -180,7 +180,7 @@ typedef struct * Allocates and fills in a message with the signature CsrEventCsrUint32CsrCharString * *----------------------------------------------------------------------------*/ -CsrEventCsrUint32CsrCharString *CsrEventCsrUint32CsrCharString_struct(u16 primtype, u16 msgtype, CsrUint32 value1, CsrCharString *value2); +CsrEventCsrUint32CsrCharString *CsrEventCsrUint32CsrCharString_struct(u16 primtype, u16 msgtype, u32 value1, CsrCharString *value2); #ifdef __cplusplus } diff --git a/drivers/staging/csr/csr_log.h b/drivers/staging/csr/csr_log.h index f6aaac18f99..748657b6f80 100644 --- a/drivers/staging/csr/csr_log.h +++ b/drivers/staging/csr/csr_log.h @@ -27,7 +27,7 @@ extern "C" { /*----------------------------------------------------*/ /* Filtering on environment specific log levels */ /*----------------------------------------------------*/ -typedef CsrUint32 CsrLogLevelEnvironment; +typedef u32 CsrLogLevelEnvironment; #define CSR_LOG_LEVEL_ENVIRONMENT_OFF ((CsrLogLevelEnvironment) 0x00000000) /* No environment data/events are logged */ #define CSR_LOG_LEVEL_ENVIRONMENT_BCI_ACL ((CsrLogLevelEnvironment) 0x00000001) /* BlueCore Channel Interface HCI Acl data are logged */ #define CSR_LOG_LEVEL_ENVIRONMENT_BCI_HCI ((CsrLogLevelEnvironment) 0x00000002) /* BlueCore Channel Interface HCI Cmd/Evt data are logged */ @@ -47,7 +47,7 @@ typedef CsrUint32 CsrLogLevelEnvironment; /*----------------------------------------------------*/ /* Filtering on task specific log levels */ /*----------------------------------------------------*/ -typedef CsrUint32 CsrLogLevelTask; +typedef u32 CsrLogLevelTask; #define CSR_LOG_LEVEL_TASK_OFF ((CsrLogLevelTask) 0x00000000) /* No events are logged for this task */ #define CSR_LOG_LEVEL_TASK_TEXT ((CsrLogLevelTask) 0x00000001) /* Text strings printed by a task are logged NB: This bit does not affect the CSR_LOG_TEXT_LEVEL interface. This has to be configured separately */ #define CSR_LOG_LEVEL_TASK_TEXT_LOC ((CsrLogLevelTask) 0x00000002) /* The locaction where the text string call occured are logged. NB: This is a supplement to CSR_LOG_LEVEL_TASK_TEXT, it has no effect without it */ @@ -104,7 +104,7 @@ typedef struct typedef struct { const CsrCharString *techVer; - CsrUint32 primitiveInfoCount; + u32 primitiveInfoCount; CsrLogPrimitiveInformation *primitiveInfo; } CsrLogTechInformation; @@ -113,7 +113,7 @@ typedef struct /*---------------------------------*/ typedef u8 bitmask8_t; typedef u16 bitmask16_t; -typedef CsrUint32 bitmask32_t; +typedef u32 bitmask32_t; #ifdef CSR_LOG_ENABLE #ifdef CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER @@ -141,7 +141,7 @@ typedef CsrUint32 bitmask32_t; /* DEPRECATED - replaced by csr_log_text.h */ void CsrLogTaskText(const CsrCharString *text, - CsrUint32 line, + u32 line, const CsrCharString *file); #define CSR_LOG_STATE_TRANSITION_MASK_FSM_NAME (0x001) @@ -154,15 +154,15 @@ void CsrLogTaskText(const CsrCharString *text, /* DEPRECATED - replaced by csr_log_text.h */ void CsrLogStateTransition(bitmask16_t mask, - CsrUint32 identifier, + u32 identifier, const CsrCharString *fsm_name, - CsrUint32 prev_state, + u32 prev_state, const CsrCharString *prev_state_str, - CsrUint32 in_event, + u32 in_event, const CsrCharString *in_event_str, - CsrUint32 next_state, + u32 next_state, const CsrCharString *next_state_str, - CsrUint32 line, + u32 line, const CsrCharString *file); /*---------------------------------*/ @@ -183,7 +183,7 @@ void CsrLogDeactivate(CsrSchedQid tskid); #define SYNERGY_SERIALIZER_TYPE_DUMP (0x000) #define SYNERGY_SERIALIZER_TYPE_SER (0x001) -void CsrLogMessagePut(CsrUint32 line, +void CsrLogMessagePut(u32 line, const CsrCharString *file, CsrSchedQid src_task_id, CsrSchedQid dst_taskid, @@ -198,7 +198,7 @@ void CsrLogMessageGet(CsrSchedQid src_task_id, u16 prim_type, const void *msg); -void CsrLogTimedEventIn(CsrUint32 line, +void CsrLogTimedEventIn(u32 line, const CsrCharString *file, CsrSchedQid task_id, CsrSchedTid tid, @@ -212,7 +212,7 @@ void CsrLogTimedEventFire(CsrSchedQid task_id, void CsrLogTimedEventDone(CsrSchedQid task_id, CsrSchedTid tid); -void CsrLogTimedEventCancel(CsrUint32 line, +void CsrLogTimedEventCancel(u32 line, const CsrCharString *file, CsrSchedQid task_id, CsrSchedTid tid, @@ -230,17 +230,17 @@ void CsrLogBgintServiceDone(CsrSchedBgint irq); void CsrLogExceptionStateEvent(u16 prim_type, CsrPrim msg_type, u16 state, - CsrUint32 line, + u32 line, const CsrCharString *file); void CsrLogExceptionGeneral(u16 prim_type, u16 state, const CsrCharString *text, - CsrUint32 line, + u32 line, const CsrCharString *file); void CsrLogExceptionWarning(u16 prim_type, u16 state, const CsrCharString *text, - CsrUint32 line, + u32 line, const CsrCharString *file); #ifdef __cplusplus diff --git a/drivers/staging/csr/csr_log_configure.h b/drivers/staging/csr/csr_log_configure.h index c47016ba833..60e7be9ebde 100644 --- a/drivers/staging/csr/csr_log_configure.h +++ b/drivers/staging/csr/csr_log_configure.h @@ -45,7 +45,7 @@ void CsrLogLevelTaskSetSpecific(CsrSchedQid taskId, CsrLogLevelTask taskLogLevel /*--------------------------------------------*/ /* Filtering on log text warning levels */ /*--------------------------------------------*/ -typedef CsrUint32 CsrLogLevelText; +typedef u32 CsrLogLevelText; #define CSR_LOG_LEVEL_TEXT_OFF ((CsrLogLevelText) 0x0000) #define CSR_LOG_LEVEL_TEXT_CRITICAL ((CsrLogLevelText) 0x0001) @@ -64,7 +64,7 @@ typedef CsrUint32 CsrLogLevelText; * clashes the technologies are only allowed to assign values within the same restrictive range as allies to * primitive identifiers. eg. for the framework components outside the scheduler is only allowed to assign * taskId's in the range 0x0600xxxx to 0x06FFxxxx. And so on for other technologies. */ -typedef CsrUint32 CsrLogTextTaskId; +typedef u32 CsrLogTextTaskId; /* Set the text logging level for all Tasks */ /* This function call takes precedence over all previous calls to CsrLogLevelTextSetTask() and CsrLogLevelTextSetTaskSubOrigin() */ diff --git a/drivers/staging/csr/csr_macro.h b/drivers/staging/csr/csr_macro.h index 7656e2ac5d5..92cdb8d37f5 100644 --- a/drivers/staging/csr/csr_macro.h +++ b/drivers/staging/csr/csr_macro.h @@ -17,7 +17,7 @@ extern "C" { #endif /*------------------------------------------------------------------*/ -/* Bits - intended to operate on CsrUint32 values */ +/* Bits - intended to operate on u32 values */ /*------------------------------------------------------------------*/ #define CSR_MASK_IS_SET(val, mask) (((val) & (mask)) == (mask)) #define CSR_MASK_IS_UNSET(val, mask) ((((val) & (mask)) ^ mask) == (mask)) @@ -32,8 +32,8 @@ extern "C" { /* Endian conversion */ /*------------------------------------------------------------------*/ #define CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr) (((u16) ((u8 *) (ptr))[0]) | ((u16) ((u8 *) (ptr))[1]) << 8) -#define CSR_GET_UINT32_FROM_LITTLE_ENDIAN(ptr) (((CsrUint32) ((u8 *) (ptr))[0]) | ((CsrUint32) ((u8 *) (ptr))[1]) << 8 | \ - ((CsrUint32) ((u8 *) (ptr))[2]) << 16 | ((CsrUint32) ((u8 *) (ptr))[3]) << 24) +#define CSR_GET_UINT32_FROM_LITTLE_ENDIAN(ptr) (((u32) ((u8 *) (ptr))[0]) | ((u32) ((u8 *) (ptr))[1]) << 8 | \ + ((u32) ((u8 *) (ptr))[2]) << 16 | ((u32) ((u8 *) (ptr))[3]) << 24) #define CSR_COPY_UINT16_TO_LITTLE_ENDIAN(uint, ptr) ((u8 *) (ptr))[0] = ((u8) ((uint) & 0x00FF)); \ ((u8 *) (ptr))[1] = ((u8) ((uint) >> 8)) #define CSR_COPY_UINT32_TO_LITTLE_ENDIAN(uint, ptr) ((u8 *) (ptr))[0] = ((u8) ((uint) & 0x000000FF)); \ @@ -43,8 +43,8 @@ extern "C" { #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_UINT32_FROM_BIG_ENDIAN(ptr) (((CsrUint32) ((u8 *) (ptr))[3]) | ((CsrUint32) ((u8 *) (ptr))[2]) << 8 | \ - ((CsrUint32) ((u8 *) (ptr))[1]) << 16 | ((CsrUint32) ((u8 *) (ptr))[0]) << 24) +#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)); \ ((u8 *) (ptr))[0] = ((u8) ((uint) >> 8)) #define CSR_COPY_UINT24_TO_BIG_ENDIAN(uint, ptr) ((u8 *) (ptr))[2] = ((u8) ((uint) & 0x000000FF)); \ @@ -70,10 +70,10 @@ extern "C" { ((u16) (input)[0]));(input) += 2 #define CSR_CONVERT_32_FROM_XAP(output, input) \ - (output) = (((CsrUint32) (input)[1]) << 24) | \ - (((CsrUint32) (input)[0]) << 16) | \ - (((CsrUint32) (input)[3]) << 8) | \ - ((CsrUint32) (input)[2]);input += 4 + (output) = (((u32) (input)[1]) << 24) | \ + (((u32) (input)[0]) << 16) | \ + (((u32) (input)[3]) << 8) | \ + ((u32) (input)[2]);input += 4 #define CSR_ADD_UINT8_TO_XAP(output, input) \ (output)[0] = (input); \ diff --git a/drivers/staging/csr/csr_msgconv.h b/drivers/staging/csr/csr_msgconv.h index 7438f9578f0..0f614bc7db8 100644 --- a/drivers/staging/csr/csr_msgconv.h +++ b/drivers/staging/csr/csr_msgconv.h @@ -73,14 +73,14 @@ void CsrMsgConvDeinit(void); /* SHOULD BE INTERNAL TO FRAMEWORK AKA DEPRECATED */ -CsrUint32 CsrCharStringSerLen(const CsrCharString *str); -CsrUint32 CsrUtf8StringSerLen(const CsrUtf8String *str); -CsrUint32 CsrUtf16StringSerLen(const CsrUtf16String *str); +u32 CsrCharStringSerLen(const CsrCharString *str); +u32 CsrUtf8StringSerLen(const CsrUtf8String *str); +u32 CsrUtf16StringSerLen(const CsrUtf16String *str); /* Prototypes for primitive type serializers */ void CsrUint8Ser(u8 *buffer, CsrSize *offset, u8 value); void CsrUint16Ser(u8 *buffer, CsrSize *offset, u16 value); -void CsrUint32Ser(u8 *buffer, CsrSize *offset, CsrUint32 value); +void CsrUint32Ser(u8 *buffer, CsrSize *offset, u32 value); void CsrMemCpySer(u8 *buffer, CsrSize *offset, const void *value, CsrSize length); void CsrCharStringSer(u8 *buffer, CsrSize *offset, const CsrCharString *value); void CsrUtf8StringSer(u8 *buffer, CsrSize *offset, const CsrUtf8String *value); @@ -90,7 +90,7 @@ void CsrSizeSer(u8 *buffer, CsrSize *offset, CsrSize value); void CsrUint8Des(u8 *value, u8 *buffer, CsrSize *offset); void CsrUint16Des(u16 *value, u8 *buffer, CsrSize *offset); -void CsrUint32Des(CsrUint32 *value, u8 *buffer, CsrSize *offset); +void CsrUint32Des(u32 *value, u8 *buffer, CsrSize *offset); void CsrMemCpyDes(void *value, u8 *buffer, CsrSize *offset, CsrSize length); void CsrCharStringDes(CsrCharString **value, u8 *buffer, CsrSize *offset); void CsrUtf8StringDes(CsrUtf8String **value, u8 *buffer, CsrSize *offset); diff --git a/drivers/staging/csr/csr_pmem.h b/drivers/staging/csr/csr_pmem.h index 4007915cc4c..be21186dbc0 100644 --- a/drivers/staging/csr/csr_pmem.h +++ b/drivers/staging/csr/csr_pmem.h @@ -39,7 +39,7 @@ extern "C" { *****************************************************************************/ #ifdef CSR_PMEM_DEBUG void *CsrPmemAllocDebug(CsrSize size, - const CsrCharString *file, CsrUint32 line); + const CsrCharString *file, u32 line); #define CsrPmemAlloc(sz) CsrPmemAllocDebug((sz), __FILE__, __LINE__) #else void *CsrPmemAlloc(CsrSize size); @@ -108,8 +108,8 @@ typedef u8 CsrPmemDebugAllocType; #define CSR_PMEM_DEBUG_TYPE_MEM_CALLOC 3 #define CSR_PMEM_DEBUG_TYPE_MEM_ALLOC_DMA 4 -typedef void (CsrPmemDebugOnAlloc)(void *ptr, void *userptr, CsrSize size, CsrPmemDebugAllocType type, const CsrCharString* file, CsrUint32 line); -typedef void (CsrPmemDebugOnFree)(void *ptr, void *userptr, CsrPmemDebugAllocType type, const CsrCharString* file, CsrUint32 line); +typedef void (CsrPmemDebugOnAlloc)(void *ptr, void *userptr, CsrSize size, CsrPmemDebugAllocType type, const CsrCharString* file, u32 line); +typedef void (CsrPmemDebugOnFree)(void *ptr, void *userptr, CsrPmemDebugAllocType type, const CsrCharString* file, u32 line); /*----------------------------------------------------------------------------* * NAME @@ -127,10 +127,10 @@ typedef void (CsrPmemDebugOnFree)(void *ptr, void *userptr, CsrPmemDebugAllocTyp *----------------------------------------------------------------------------*/ void CsrPmemDebugInstallHooks(u8 headSize, u8 endSize, CsrPmemDebugOnAlloc *onAllocCallback, CsrPmemDebugOnFree *onFreeCallback); -void *CsrPmemDebugAlloc(CsrSize size, CsrPmemDebugAllocType type, const CsrCharString* file, CsrUint32 line); +void *CsrPmemDebugAlloc(CsrSize size, CsrPmemDebugAllocType type, const CsrCharString* file, u32 line); #define CsrPmemAlloc(size) CsrPmemDebugAlloc(size, CSR_PMEM_DEBUG_TYPE_PMEM_ALLOC, __FILE__, __LINE__) -void CsrPmemDebugFree(void *ptr, CsrPmemDebugAllocType type, const CsrCharString* file, CsrUint32 line); +void CsrPmemDebugFree(void *ptr, CsrPmemDebugAllocType type, const CsrCharString* file, u32 line); #define CsrPmemFree(ptr) CsrPmemDebugFree(ptr, CSR_PMEM_DEBUG_TYPE_PMEM_ALLOC, __FILE__, __LINE__) #endif diff --git a/drivers/staging/csr/csr_sched.h b/drivers/staging/csr/csr_sched.h index 944b7c13a05..530ee288de6 100644 --- a/drivers/staging/csr/csr_sched.h +++ b/drivers/staging/csr/csr_sched.h @@ -17,7 +17,7 @@ extern "C" { #endif /* An identifier issued by the scheduler. */ -typedef CsrUint32 CsrSchedIdentifier; +typedef u32 CsrSchedIdentifier; /* A task identifier */ typedef u16 CsrSchedTaskId; @@ -135,7 +135,7 @@ void CsrSchedBgintSet(CsrSchedBgint bgint); void CsrSchedMessagePutStringLog(CsrSchedQid q, u16 mi, void *mv, - CsrUint32 line, + u32 line, const CsrCharString *file); #define CsrSchedMessagePut(q, mi, mv) CsrSchedMessagePutStringLog((q), (mi), (mv), __LINE__, __FILE__) #else @@ -167,7 +167,7 @@ void CsrSchedMessagePut(CsrSchedQid q, void CsrSchedMessageBroadcastStringLog(u16 mi, void *(*msg_build_func)(void *), void *msg_build_ptr, - CsrUint32 line, + u32 line, const CsrCharString *file); #define CsrSchedMessageBroadcast(mi, fn, ptr) CsrSchedMessageBroadcastStringLog((mi), (fn), (ptr), __LINE__, __FILE__) #else @@ -222,7 +222,7 @@ CsrSchedTid CsrSchedTimerSetStringLog(CsrTime delay, void (*fn)(u16 mi, void *mv), u16 fniarg, void *fnvarg, - CsrUint32 line, + u32 line, const CsrCharString *file); #define CsrSchedTimerSet(d, fn, fni, fnv) CsrSchedTimerSetStringLog((d), (fn), (fni), (fnv), __LINE__, __FILE__) #else @@ -248,7 +248,7 @@ CsrSchedTid CsrSchedTimerSet(CsrTime delay, CsrBool CsrSchedTimerCancelStringLog(CsrSchedTid eventid, u16 *pmi, void **pmv, - CsrUint32 line, + u32 line, const CsrCharString *file); #define CsrSchedTimerCancel(e, pmi, pmv) CsrSchedTimerCancelStringLog((e), (pmi), (pmv), __LINE__, __FILE__) #else diff --git a/drivers/staging/csr/csr_sdio.h b/drivers/staging/csr/csr_sdio.h index 0b24f55aa0b..861604de633 100644 --- a/drivers/staging/csr/csr_sdio.h +++ b/drivers/staging/csr/csr_sdio.h @@ -85,7 +85,7 @@ typedef struct { CsrSdioFunctionId sdioId; u16 blockSize; /* Actual configured block size, or 0 if unconfigured */ - CsrUint32 features; /* Bit mask with any of CSR_SDIO_FEATURE_* set */ + u32 features; /* Bit mask with any of CSR_SDIO_FEATURE_* set */ void *device; /* Handle of device containing the function */ void *driverData; /* For use by the Function Driver */ void *priv; /* For use by the SDIO Driver */ @@ -479,7 +479,7 @@ CsrResult CsrSdioBlockSizeSet(CsrSdioFunction *function, u16 blockSize); * * *----------------------------------------------------------------------------*/ -CsrResult CsrSdioMaxBusClockFrequencySet(CsrSdioFunction *function, CsrUint32 maxFrequency); +CsrResult CsrSdioMaxBusClockFrequencySet(CsrSdioFunction *function, u32 maxFrequency); /*----------------------------------------------------------------------------* * NAME @@ -519,10 +519,10 @@ CsrResult CsrSdioMaxBusClockFrequencySet(CsrSdioFunction *function, CsrUint32 ma * the callback function. * *----------------------------------------------------------------------------*/ -CsrResult CsrSdioRead8(CsrSdioFunction *function, CsrUint32 address, u8 *data); -CsrResult CsrSdioWrite8(CsrSdioFunction *function, CsrUint32 address, u8 data); -void CsrSdioRead8Async(CsrSdioFunction *function, CsrUint32 address, u8 *data, CsrSdioAsyncCallback callback); -void CsrSdioWrite8Async(CsrSdioFunction *function, CsrUint32 address, u8 data, CsrSdioAsyncCallback callback); +CsrResult CsrSdioRead8(CsrSdioFunction *function, u32 address, u8 *data); +CsrResult CsrSdioWrite8(CsrSdioFunction *function, u32 address, u8 data); +void CsrSdioRead8Async(CsrSdioFunction *function, u32 address, u8 *data, CsrSdioAsyncCallback callback); +void CsrSdioWrite8Async(CsrSdioFunction *function, u32 address, u8 data, CsrSdioAsyncCallback callback); /*----------------------------------------------------------------------------* * NAME @@ -563,10 +563,10 @@ void CsrSdioWrite8Async(CsrSdioFunction *function, CsrUint32 address, u8 data, C * the callback function. * *----------------------------------------------------------------------------*/ -CsrResult CsrSdioRead16(CsrSdioFunction *function, CsrUint32 address, u16 *data); -CsrResult CsrSdioWrite16(CsrSdioFunction *function, CsrUint32 address, u16 data); -void CsrSdioRead16Async(CsrSdioFunction *function, CsrUint32 address, u16 *data, CsrSdioAsyncCallback callback); -void CsrSdioWrite16Async(CsrSdioFunction *function, CsrUint32 address, u16 data, CsrSdioAsyncCallback callback); +CsrResult CsrSdioRead16(CsrSdioFunction *function, u32 address, u16 *data); +CsrResult CsrSdioWrite16(CsrSdioFunction *function, u32 address, u16 data); +void CsrSdioRead16Async(CsrSdioFunction *function, u32 address, u16 *data, CsrSdioAsyncCallback callback); +void CsrSdioWrite16Async(CsrSdioFunction *function, u32 address, u16 data, CsrSdioAsyncCallback callback); /*----------------------------------------------------------------------------* * NAME @@ -608,10 +608,10 @@ void CsrSdioWrite16Async(CsrSdioFunction *function, CsrUint32 address, u16 data, * the callback function. * *----------------------------------------------------------------------------*/ -CsrResult CsrSdioF0Read8(CsrSdioFunction *function, CsrUint32 address, u8 *data); -CsrResult CsrSdioF0Write8(CsrSdioFunction *function, CsrUint32 address, u8 data); -void CsrSdioF0Read8Async(CsrSdioFunction *function, CsrUint32 address, u8 *data, CsrSdioAsyncCallback callback); -void CsrSdioF0Write8Async(CsrSdioFunction *function, CsrUint32 address, u8 data, CsrSdioAsyncCallback callback); +CsrResult CsrSdioF0Read8(CsrSdioFunction *function, u32 address, u8 *data); +CsrResult CsrSdioF0Write8(CsrSdioFunction *function, u32 address, u8 data); +void CsrSdioF0Read8Async(CsrSdioFunction *function, u32 address, u8 *data, CsrSdioAsyncCallback callback); +void CsrSdioF0Write8Async(CsrSdioFunction *function, u32 address, u8 data, CsrSdioAsyncCallback callback); /*----------------------------------------------------------------------------* * NAME @@ -654,10 +654,10 @@ void CsrSdioF0Write8Async(CsrSdioFunction *function, CsrUint32 address, u8 data, * the callback function. * *----------------------------------------------------------------------------*/ -CsrResult CsrSdioRead(CsrSdioFunction *function, CsrUint32 address, void *data, CsrUint32 length); -CsrResult CsrSdioWrite(CsrSdioFunction *function, CsrUint32 address, const void *data, CsrUint32 length); -void CsrSdioReadAsync(CsrSdioFunction *function, CsrUint32 address, void *data, CsrUint32 length, CsrSdioAsyncCallback callback); -void CsrSdioWriteAsync(CsrSdioFunction *function, CsrUint32 address, const void *data, CsrUint32 length, CsrSdioAsyncCallback callback); +CsrResult CsrSdioRead(CsrSdioFunction *function, u32 address, void *data, u32 length); +CsrResult CsrSdioWrite(CsrSdioFunction *function, u32 address, const void *data, u32 length); +void CsrSdioReadAsync(CsrSdioFunction *function, u32 address, void *data, u32 length, CsrSdioAsyncCallback callback); +void CsrSdioWriteAsync(CsrSdioFunction *function, u32 address, const void *data, u32 length, CsrSdioAsyncCallback callback); /*----------------------------------------------------------------------------* * NAME diff --git a/drivers/staging/csr/csr_serialize_primitive_types.c b/drivers/staging/csr/csr_serialize_primitive_types.c index 3b20b7d6304..a96dcb7343b 100644 --- a/drivers/staging/csr/csr_serialize_primitive_types.c +++ b/drivers/staging/csr/csr_serialize_primitive_types.c @@ -31,7 +31,7 @@ void CsrUint16Des(u16 *value, u8 *buffer, CsrSize *offset) } EXPORT_SYMBOL_GPL(CsrUint16Des); -void CsrUint32Des(CsrUint32 *value, u8 *buffer, CsrSize *offset) +void CsrUint32Des(u32 *value, u8 *buffer, CsrSize *offset) { *value = (buffer[*offset + 0] << 0) | (buffer[*offset + 1] << 8) | @@ -63,7 +63,7 @@ void CsrUtf8StringDes(CsrUtf8String **value, u8 *buffer, CsrSize *offset) void CsrUtf16StringDes(CsrUtf16String **value, u8 *buffer, CsrSize *offset) { - CsrUint32 length, i; + u32 length, i; CsrUint32Des(&length, buffer, offset); @@ -103,7 +103,7 @@ void CsrUint16Ser(u8 *buffer, CsrSize *offset, u16 value) } EXPORT_SYMBOL_GPL(CsrUint16Ser); -void CsrUint32Ser(u8 *buffer, CsrSize *offset, CsrUint32 value) +void CsrUint32Ser(u8 *buffer, CsrSize *offset, u32 value) { buffer[*offset + 0] = (u8) ((value >> 0) & 0xFF); buffer[*offset + 1] = (u8) ((value >> 8) & 0xFF); @@ -143,8 +143,8 @@ void CsrUtf16StringSer(u8 *buffer, CsrSize *offset, const CsrUtf16String *value) { if (value) { - CsrUint32 length = CsrUtf16StrLen(value) + 1; - CsrUint32 i; + u32 length = CsrUtf16StrLen(value) + 1; + u32 i; CsrUint32Ser(buffer, offset, length); @@ -173,11 +173,11 @@ void CsrVoidPtrSer(u8 *buffer, CsrSize *offset, void *ptr) CsrSizeSer(buffer, offset, (CsrSize) ptr); } -CsrUint32 CsrCharStringSerLen(const CsrCharString *str) +u32 CsrCharStringSerLen(const CsrCharString *str) { if (str) { - return (CsrUint32) (CsrStrLen(str) + sizeof(*str)); + return (u32) (CsrStrLen(str) + sizeof(*str)); } else { @@ -185,11 +185,11 @@ CsrUint32 CsrCharStringSerLen(const CsrCharString *str) } } -CsrUint32 CsrUtf8StringSerLen(const CsrUtf8String *str) +u32 CsrUtf8StringSerLen(const CsrUtf8String *str) { if (str) { - return (CsrUint32) (CsrStrLen((CsrCharString *) str) + sizeof(*str)); + return (u32) (CsrStrLen((CsrCharString *) str) + sizeof(*str)); } else { @@ -197,16 +197,16 @@ CsrUint32 CsrUtf8StringSerLen(const CsrUtf8String *str) } } -CsrUint32 CsrUtf16StringSerLen(const CsrUtf16String *str) +u32 CsrUtf16StringSerLen(const CsrUtf16String *str) { if (str) { /* We always write down the length of the string */ - return sizeof(CsrUint32) + (CsrUtf16StrLen(str) + 1) * sizeof(*str); + return sizeof(u32) + (CsrUtf16StrLen(str) + 1) * sizeof(*str); } else { - return sizeof(CsrUint32); + return sizeof(u32); } } diff --git a/drivers/staging/csr/csr_time.h b/drivers/staging/csr/csr_time.h index 032942712b6..9687b065b55 100644 --- a/drivers/staging/csr/csr_time.h +++ b/drivers/staging/csr/csr_time.h @@ -27,7 +27,7 @@ extern "C" { reference, usually associated with system startup. *******************************************************************************/ -typedef CsrUint32 CsrTime; +typedef u32 CsrTime; /******************************************************************************* @@ -42,7 +42,7 @@ typedef CsrUint32 CsrTime; *******************************************************************************/ typedef struct { - CsrUint32 sec; + u32 sec; u16 msec; } CsrTimeUtc; diff --git a/drivers/staging/csr/csr_types.h b/drivers/staging/csr/csr_types.h index 061fde835f5..144c980f4db 100644 --- a/drivers/staging/csr/csr_types.h +++ b/drivers/staging/csr/csr_types.h @@ -32,9 +32,6 @@ typedef ptrdiff_t CsrPtrdiff; /* Type of the result of subtracting two pointer typedef uintptr_t CsrUintptr; /* Unsigned integer large enough to hold any pointer (ISO/IEC 9899:1999 7.18.1.4) */ typedef ptrdiff_t CsrIntptr; /* intptr_t is not defined in kernel. Use the equivalent ptrdiff_t. */ -/* Unsigned fixed width types */ -typedef uint32_t CsrUint32; - /* Signed fixed width types */ typedef int32_t CsrInt32; @@ -45,7 +42,7 @@ typedef u8 CsrBool; typedef char CsrCharString; typedef u8 CsrUtf8String; typedef u16 CsrUtf16String; /* 16-bit UTF16 strings */ -typedef CsrUint32 CsrUint24; +typedef u32 CsrUint24; /* * 64-bit integers diff --git a/drivers/staging/csr/csr_unicode.h b/drivers/staging/csr/csr_unicode.h index 64519c0d311..4a97771280c 100644 --- a/drivers/staging/csr/csr_unicode.h +++ b/drivers/staging/csr/csr_unicode.h @@ -16,10 +16,10 @@ extern "C" { #endif -CsrUtf16String *CsrUint32ToUtf16String(CsrUint32 number); +CsrUtf16String *CsrUint32ToUtf16String(u32 number); -CsrUint32 CsrUtf16StringToUint32(const CsrUtf16String *unicodeString); -CsrUint32 CsrUtf16StrLen(const CsrUtf16String *unicodeString); +u32 CsrUtf16StringToUint32(const CsrUtf16String *unicodeString); +u32 CsrUtf16StrLen(const CsrUtf16String *unicodeString); CsrUtf8String *CsrUtf16String2Utf8(const CsrUtf16String *source); @@ -29,9 +29,9 @@ CsrUtf16String *CsrUtf16StrCpy(CsrUtf16String *target, const CsrUtf16String *sou CsrUtf16String *CsrUtf16StringDuplicate(const CsrUtf16String *source); u16 CsrUtf16StrICmp(const CsrUtf16String *string1, const CsrUtf16String *string2); -u16 CsrUtf16StrNICmp(const CsrUtf16String *string1, const CsrUtf16String *string2, CsrUint32 count); +u16 CsrUtf16StrNICmp(const CsrUtf16String *string1, const CsrUtf16String *string2, u32 count); -CsrUtf16String *CsrUtf16MemCpy(CsrUtf16String *dest, const CsrUtf16String *src, CsrUint32 count); +CsrUtf16String *CsrUtf16MemCpy(CsrUtf16String *dest, const CsrUtf16String *src, u32 count); CsrUtf16String *CsrUtf16ConcatenateTexts(const CsrUtf16String *inputText1, const CsrUtf16String *inputText2, const CsrUtf16String *inputText3, const CsrUtf16String *inputText4); @@ -40,7 +40,7 @@ CsrUtf16String *CsrXML2Utf16String(CsrUtf16String *str); CsrInt32 CsrUtf8StrCmp(const CsrUtf8String *string1, const CsrUtf8String *string2); CsrInt32 CsrUtf8StrNCmp(const CsrUtf8String *string1, const CsrUtf8String *string2, CsrSize count); -CsrUint32 CsrUtf8StringLengthInBytes(const CsrUtf8String *string); +u32 CsrUtf8StringLengthInBytes(const CsrUtf8String *string); /******************************************************************************* diff --git a/drivers/staging/csr/csr_utf16.c b/drivers/staging/csr/csr_utf16.c index 7e724da7808..b9a5c5f033d 100644 --- a/drivers/staging/csr/csr_utf16.c +++ b/drivers/staging/csr/csr_utf16.c @@ -13,15 +13,15 @@ #include "csr_unicode.h" #include "csr_util.h" -#define UNI_SUR_HIGH_START ((CsrUint32) 0xD800) -#define UNI_SUR_HIGH_END ((CsrUint32) 0xDBFF) -#define UNI_SUR_LOW_START ((CsrUint32) 0xDC00) -#define UNI_SUR_LOW_END ((CsrUint32) 0xDFFF) -#define UNI_REPLACEMENT_CHAR ((CsrUint32) 0xFFFD) +#define UNI_SUR_HIGH_START ((u32) 0xD800) +#define UNI_SUR_HIGH_END ((u32) 0xDBFF) +#define UNI_SUR_LOW_START ((u32) 0xDC00) +#define UNI_SUR_LOW_END ((u32) 0xDFFF) +#define UNI_REPLACEMENT_CHAR ((u32) 0xFFFD) #define UNI_HALF_SHIFT ((u8) 10) /* used for shifting by 10 bits */ -#define UNI_HALF_BASE ((CsrUint32) 0x00010000) -#define UNI_BYTEMASK ((CsrUint32) 0xBF) -#define UNI_BYTEMARK ((CsrUint32) 0x80) +#define UNI_HALF_BASE ((u32) 0x00010000) +#define UNI_BYTEMASK ((u32) 0xBF) +#define UNI_BYTEMARK ((u32) 0x80) #define CAPITAL(x) ((x >= 'a') && (x <= 'z') ? ((x) & 0x00DF) : (x)) @@ -55,8 +55,8 @@ static const s8 trailingBytesForUtf8[256] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xE0 - 0xFF */ }; -/* Values to be substracted from a CsrUint32 when converting from UTF8 to UTF16 */ -static const CsrUint32 offsetsFromUtf8[4] = +/* Values to be substracted from a u32 when converting from UTF8 to UTF16 */ +static const u32 offsetsFromUtf8[4] = { 0x00000000, 0x00003080, 0x000E2080, 0x03C82080 }; @@ -73,11 +73,11 @@ static const CsrUint32 offsetsFromUtf8[4] = * Output: A string of UTF-16 characters. * *********************************************************************************/ -CsrUtf16String *CsrUint32ToUtf16String(CsrUint32 number) +CsrUtf16String *CsrUint32ToUtf16String(u32 number) { u16 count, noOfDigits; CsrUtf16String *output; - CsrUint32 tempNumber; + u32 tempNumber; /* calculate the number of digits in the output */ tempNumber = number; @@ -113,10 +113,10 @@ CsrUtf16String *CsrUint32ToUtf16String(CsrUint32 number) * Output: 32 bit number. * *********************************************************************************/ -CsrUint32 CsrUtf16StringToUint32(const CsrUtf16String *unicodeString) +u32 CsrUtf16StringToUint32(const CsrUtf16String *unicodeString) { u16 numLen, count; - CsrUint32 newNumber = 0; + u32 newNumber = 0; numLen = (u16) CsrUtf16StrLen(unicodeString); @@ -150,7 +150,7 @@ CsrUint32 CsrUtf16StringToUint32(const CsrUtf16String *unicodeString) * Output: A pointer to an unicoded string. * *********************************************************************************/ -CsrUtf16String *CsrUtf16MemCpy(CsrUtf16String *dest, const CsrUtf16String *src, CsrUint32 count) +CsrUtf16String *CsrUtf16MemCpy(CsrUtf16String *dest, const CsrUtf16String *src, u32 count) { return CsrMemCpy((u8 *) dest, (u8 *) src, count * sizeof(CsrUtf16String)); } @@ -171,7 +171,7 @@ CsrUtf16String *CsrUtf16ConcatenateTexts(const CsrUtf16String *inputText1, const const CsrUtf16String *inputText3, const CsrUtf16String *inputText4) { CsrUtf16String *outputText; - CsrUint32 textLen, textLen1, textLen2, textLen3, textLen4; + u32 textLen, textLen1, textLen2, textLen3, textLen4; textLen1 = CsrUtf16StrLen(inputText1); textLen2 = CsrUtf16StrLen(inputText2); @@ -225,9 +225,9 @@ CsrUtf16String *CsrUtf16ConcatenateTexts(const CsrUtf16String *inputText1, const * Output: The number of 16 bit elements in the string. * *********************************************************************************/ -CsrUint32 CsrUtf16StrLen(const CsrUtf16String *unicodeString) +u32 CsrUtf16StrLen(const CsrUtf16String *unicodeString) { - CsrUint32 length; + u32 length; length = 0; if (unicodeString != NULL) @@ -256,10 +256,10 @@ CsrUint32 CsrUtf16StrLen(const CsrUtf16String *unicodeString) CsrUtf8String *CsrUtf16String2Utf8(const CsrUtf16String *source) { CsrUtf8String *dest, *destStart = NULL; - CsrUint32 i; - CsrUint32 ch; - CsrUint32 length; - CsrUint32 sourceLength; + u32 i; + u32 ch; + u32 length; + u32 sourceLength; u8 bytes; CsrBool appendNull = FALSE; @@ -280,7 +280,7 @@ CsrUtf8String *CsrUtf16String2Utf8(const CsrUtf16String *source) { if (i + 1 < sourceLength) /* The low surrogate is in the source */ { - CsrUint32 ch2 = source[++i]; + u32 ch2 = source[++i]; if ((ch2 >= UNI_SUR_LOW_START) && (ch2 <= UNI_SUR_LOW_END)) /* And it is a legal low surrogate */ { length += 4; @@ -330,7 +330,7 @@ CsrUtf8String *CsrUtf16String2Utf8(const CsrUtf16String *source) { if (i + 1 < sourceLength) /* The low surrogate is in the source */ { - CsrUint32 ch2 = source[++i]; + u32 ch2 = source[++i]; if ((ch2 >= UNI_SUR_LOW_START) && (ch2 <= UNI_SUR_LOW_END)) /* And it is a legal low surrogate, convert to UTF-32 */ { ch = ((ch - UNI_SUR_HIGH_START) << UNI_HALF_SHIFT) + (ch2 - UNI_SUR_LOW_START) + UNI_HALF_BASE; @@ -356,19 +356,19 @@ CsrUtf8String *CsrUtf16String2Utf8(const CsrUtf16String *source) } /* Figure out how many bytes that are required */ - if (ch < (CsrUint32) 0x80) + if (ch < (u32) 0x80) { bytes = 1; } - else if (ch < (CsrUint32) 0x800) + else if (ch < (u32) 0x800) { bytes = 2; } - else if (ch < (CsrUint32) 0x10000) + else if (ch < (u32) 0x10000) { bytes = 3; } - else if (ch < (CsrUint32) 0x110000) + else if (ch < (u32) 0x110000) { bytes = 4; } @@ -463,7 +463,7 @@ CsrUtf8String *CsrUtf16String2Utf8(const CsrUtf16String *source) TRUE if the given code unit is legal. *****************************************************************************/ -static CsrBool isLegalUtf8(const CsrUtf8String *codeUnit, CsrUint32 length) +static CsrBool isLegalUtf8(const CsrUtf8String *codeUnit, u32 length) { const CsrUtf8String *srcPtr = codeUnit + length; u8 byte; @@ -633,9 +633,9 @@ CsrUtf16String *CsrUtf82Utf16String(const CsrUtf8String *utf8String) { *dest++ = UNI_REPLACEMENT_CHAR; } - else /* It is legal, convert the character to an CsrUint32 */ + else /* It is legal, convert the character to an u32 */ { - CsrUint32 ch = 0; + u32 ch = 0; switch (extraBytes2Read) /* Everything falls through */ { @@ -731,7 +731,7 @@ CsrUtf16String *CsrUtf16StrCpy(CsrUtf16String *target, const CsrUtf16String *sou CsrUtf16String *CsrUtf16StringDuplicate(const CsrUtf16String *source) { CsrUtf16String *target = NULL; - CsrUint32 length; + u32 length; if (source) /* if source is not NULL*/ { @@ -781,7 +781,7 @@ u16 CsrUtf16StrICmp(const CsrUtf16String *string1, const CsrUtf16String *string2 * Output: 0: if the strings are identical. * *********************************************************************************/ -u16 CsrUtf16StrNICmp(const CsrUtf16String *string1, const CsrUtf16String *string2, CsrUint32 count) +u16 CsrUtf16StrNICmp(const CsrUtf16String *string1, const CsrUtf16String *string2, u32 count) { while ((*string1 || *string2) && count--) { @@ -814,7 +814,7 @@ CsrUtf16String *CsrUtf16String2XML(CsrUtf16String *str) CsrUtf16String *scanString; CsrUtf16String *outputString = NULL; CsrUtf16String *resultString = str; - CsrUint32 stringLength = 0; + u32 stringLength = 0; CsrBool encodeChars = FALSE; scanString = str; @@ -907,7 +907,7 @@ CsrUtf16String *CsrXML2Utf16String(CsrUtf16String *str) CsrUtf16String *scanString; CsrUtf16String *outputString = NULL; CsrUtf16String *resultString = str; - CsrUint32 stringLength = 0; + u32 stringLength = 0; CsrBool encodeChars = FALSE; scanString = str; @@ -1026,14 +1026,14 @@ CsrInt32 CsrUtf8StrNCmp(const CsrUtf8String *string1, const CsrUtf8String *strin return CsrStrNCmp((const CsrCharString *) string1, (const CsrCharString *) string2, count); } -CsrUint32 CsrUtf8StringLengthInBytes(const CsrUtf8String *string) +u32 CsrUtf8StringLengthInBytes(const CsrUtf8String *string) { CsrSize length = 0; if (string) { length = CsrStrLen((const CsrCharString *) string); } - return (CsrUint32) length; + return (u32) length; } CsrUtf8String *CsrUtf8StrCpy(CsrUtf8String *target, const CsrUtf8String *source) @@ -1093,7 +1093,7 @@ CsrUtf8String *CsrUtf8StrDup(const CsrUtf8String *source) CsrUtf8String *CsrUtf8StringConcatenateTexts(const CsrUtf8String *inputText1, const CsrUtf8String *inputText2, const CsrUtf8String *inputText3, const CsrUtf8String *inputText4) { CsrUtf8String *outputText; - CsrUint32 textLen, textLen1, textLen2, textLen3, textLen4; + u32 textLen, textLen1, textLen2, textLen3, textLen4; textLen1 = CsrUtf8StringLengthInBytes(inputText1); textLen2 = CsrUtf8StringLengthInBytes(inputText2); diff --git a/drivers/staging/csr/csr_util.c b/drivers/staging/csr/csr_util.c index aaadc6f7487..edee2e2e67a 100644 --- a/drivers/staging/csr/csr_util.c +++ b/drivers/staging/csr/csr_util.c @@ -21,7 +21,7 @@ /*------------------------------------------------------------------*/ /* Time proportional with the number of 1's */ -u8 CsrBitCountSparse(CsrUint32 n) +u8 CsrBitCountSparse(u32 n) { u8 count = 0; @@ -35,11 +35,11 @@ u8 CsrBitCountSparse(CsrUint32 n) } /* Time proportional with the number of 0's */ -u8 CsrBitCountDense(CsrUint32 n) +u8 CsrBitCountDense(u32 n) { - u8 count = 8 * sizeof(CsrUint32); + u8 count = 8 * sizeof(u32); - n ^= (CsrUint32) (-1); + n ^= (u32) (-1); while (n) { @@ -101,7 +101,7 @@ CsrBool CsrHexStrToUint16(const CsrCharString *string, u16 *returnValue) return FALSE; } -CsrBool CsrHexStrToUint32(const CsrCharString *string, CsrUint32 *returnValue) +CsrBool CsrHexStrToUint32(const CsrCharString *string, u32 *returnValue) { u16 currentIndex = 0; *returnValue = 0; @@ -125,7 +125,7 @@ CsrBool CsrHexStrToUint32(const CsrCharString *string, CsrUint32 *returnValue) return FALSE; } -CsrUint32 CsrPow(CsrUint32 base, CsrUint32 exponent) +u32 CsrPow(u32 base, u32 exponent) { if (exponent == 0) { @@ -133,7 +133,7 @@ CsrUint32 CsrPow(CsrUint32 base, CsrUint32 exponent) } else { - CsrUint32 i, t = base; + u32 i, t = base; for (i = 1; i < exponent; i++) { @@ -204,14 +204,14 @@ void CsrUInt16ToHex(u16 number, CsrCharString *str) str[4] = '\0'; } -void CsrUInt32ToHex(CsrUint32 number, CsrCharString *str) +void CsrUInt32ToHex(u32 number, CsrCharString *str) { u16 index; - CsrUint32 currentValue; + u32 currentValue; for (index = 0; index < 8; index++) { - currentValue = (CsrUint32) (number & 0x0000000F); + currentValue = (u32) (number & 0x0000000F); number >>= 4; str[7 - index] = (char) (currentValue > 9 ? currentValue + 55 : currentValue + '0'); } @@ -324,11 +324,11 @@ CsrCharString *CsrStrNCpyZero(CsrCharString *dest, } /* Convert string with base 10 to integer */ -CsrUint32 CsrStrToInt(const CsrCharString *str) +u32 CsrStrToInt(const CsrCharString *str) { s16 i; - CsrUint32 res; - CsrUint32 digit; + u32 res; + u32 digit; res = 0; digit = 1; @@ -350,7 +350,7 @@ CsrUint32 CsrStrToInt(const CsrCharString *str) CsrCharString *CsrStrDup(const CsrCharString *string) { CsrCharString *copy; - CsrUint32 len; + u32 len; copy = NULL; if (string != NULL) @@ -366,7 +366,7 @@ int CsrStrNICmp(const CsrCharString *string1, const CsrCharString *string2, CsrSize count) { - CsrUint32 index; + u32 index; int returnValue = 0; for (index = 0; index < count; index++) diff --git a/drivers/staging/csr/csr_util.h b/drivers/staging/csr/csr_util.h index 610d35e2ee5..f19f953b3fe 100644 --- a/drivers/staging/csr/csr_util.h +++ b/drivers/staging/csr/csr_util.h @@ -18,21 +18,21 @@ extern "C" { #include "csr_macro.h" /*------------------------------------------------------------------*/ -/* Bits - intended to operate on CsrUint32 values */ +/* Bits - intended to operate on u32 values */ /*------------------------------------------------------------------*/ -u8 CsrBitCountSparse(CsrUint32 n); -u8 CsrBitCountDense(CsrUint32 n); +u8 CsrBitCountSparse(u32 n); +u8 CsrBitCountDense(u32 n); /*------------------------------------------------------------------*/ /* Base conversion */ /*------------------------------------------------------------------*/ CsrBool CsrHexStrToUint8(const CsrCharString *string, u8 *returnValue); CsrBool CsrHexStrToUint16(const CsrCharString *string, u16 *returnValue); -CsrBool CsrHexStrToUint32(const CsrCharString *string, CsrUint32 *returnValue); -CsrUint32 CsrPow(CsrUint32 base, CsrUint32 exponent); +CsrBool CsrHexStrToUint32(const CsrCharString *string, u32 *returnValue); +u32 CsrPow(u32 base, u32 exponent); void CsrIntToBase10(CsrInt32 number, CsrCharString *str); void CsrUInt16ToHex(u16 number, CsrCharString *str); -void CsrUInt32ToHex(CsrUint32 number, CsrCharString *str); +void CsrUInt32ToHex(u32 number, CsrCharString *str); /*------------------------------------------------------------------*/ /* Standard C Library functions */ @@ -74,7 +74,7 @@ CsrInt32 CsrVsnprintf(CsrCharString *string, CsrSize count, const CsrCharString void *CsrMemDup(const void *buf1, CsrSize count); int CsrStrNICmp(const CsrCharString *string1, const CsrCharString *string2, CsrSize count); CsrCharString *CsrStrDup(const CsrCharString *string); -CsrUint32 CsrStrToInt(const CsrCharString *string); +u32 CsrStrToInt(const CsrCharString *string); CsrCharString *CsrStrNCpyZero(CsrCharString *dest, const CsrCharString *src, CsrSize count); /*------------------------------------------------------------------*/ diff --git a/drivers/staging/csr/csr_wifi_fsm.h b/drivers/staging/csr/csr_wifi_fsm.h index 2128034a256..0f9cd8f3cf6 100644 --- a/drivers/staging/csr/csr_wifi_fsm.h +++ b/drivers/staging/csr/csr_wifi_fsm.h @@ -122,9 +122,9 @@ extern void CsrWifiFsmShutdown(CsrWifiFsmContext *context); * @param[in] context : FSM context * * @return - * CsrUint32 Time in ms until next timeout or 0xFFFFFFFF for no timer set + * u32 Time in ms until next timeout or 0xFFFFFFFF for no timer set */ -extern CsrUint32 CsrWifiFsmExecute(CsrWifiFsmContext *context); +extern u32 CsrWifiFsmExecute(CsrWifiFsmContext *context); /** * @brief @@ -174,9 +174,9 @@ extern void CsrWifiFsmSendEventExternal(CsrWifiFsmContext *context, CsrWifiFsmEv * @param[in] context : FSM context * * @return - * CsrUint32 32 bit ms tick + * u32 32 bit ms tick */ -extern CsrUint32 CsrWifiFsmGetTimeOfDayMs(CsrWifiFsmContext *context); +extern u32 CsrWifiFsmGetTimeOfDayMs(CsrWifiFsmContext *context); /** * @brief @@ -188,9 +188,9 @@ extern CsrUint32 CsrWifiFsmGetTimeOfDayMs(CsrWifiFsmContext *context); * @param[in] context : FSM context * * @return - * CsrUint32 Time in ms until next timeout or 0xFFFFFFFF for no timer set + * u32 Time in ms until next timeout or 0xFFFFFFFF for no timer set */ -extern CsrUint32 CsrWifiFsmGetNextTimeout(CsrWifiFsmContext *context); +extern u32 CsrWifiFsmGetNextTimeout(CsrWifiFsmContext *context); /** * @brief @@ -217,7 +217,7 @@ extern void CsrWifiFsmFastForward(CsrWifiFsmContext *context, u16 ms); * @return * void */ -extern void CsrWifiFsmTestAdvanceTime(CsrWifiFsmContext *context, CsrUint32 ms); +extern void CsrWifiFsmTestAdvanceTime(CsrWifiFsmContext *context, u32 ms); /** * @brief diff --git a/drivers/staging/csr/csr_wifi_fsm_types.h b/drivers/staging/csr/csr_wifi_fsm_types.h index 5bc69874bc7..63b69fe5436 100644 --- a/drivers/staging/csr/csr_wifi_fsm_types.h +++ b/drivers/staging/csr/csr_wifi_fsm_types.h @@ -79,7 +79,7 @@ typedef struct CsrWifiFsmTimer struct CsrWifiFsmTimer *next; CsrWifiFsmTimerId timerid; - CsrUint32 timeoutTimeMs; + u32 timeoutTimeMs; } CsrWifiFsmTimer; @@ -202,7 +202,7 @@ typedef void (*CsrWifiFsmDumpFnPtr)(CsrWifiFsmContext *context, void *fsmData); */ typedef struct { - CsrUint32 eventid; + u32 eventid; CsrWifiFsmTransitionFnPtr transition; #ifdef CSR_LOG_ENABLE const CsrCharString *transitionName; @@ -253,7 +253,7 @@ typedef struct typedef struct { const CsrCharString *processName; - const CsrUint32 processId; + const u32 processId; const CsrWifiFsmTransitionFunctionTable transitionTable; const CsrWifiFsmTableEntry unhandledTransitions; const CsrWifiFsmTableEntry ignoreFunctions; @@ -389,7 +389,7 @@ struct CsrWifiFsmContext #ifdef CSR_WIFI_FSM_MUTEX_ENABLE CsrMutexHandle externalEventQueueLock; /* The external event queue mutex */ #endif - CsrUint32 timeOffset; /* Amount to adjust the TimeOfDayMs by */ + u32 timeOffset; /* Amount to adjust the TimeOfDayMs by */ CsrWifiFsmTimerList timerQueue; /* The internal timer queue */ CsrBool useTempSaveList; /* Should the temp save list be used */ CsrWifiFsmEventList tempSaveList; /* The temp save event queue */ @@ -409,7 +409,7 @@ struct CsrWifiFsmContext #ifndef CSR_WIFI_FSM_SCHEDULER_DISABLED CsrSchedTid schedTimerId; /* Scheduler TimerId for use in Scheduler Tasks */ - CsrUint32 schedTimerNexttimeoutMs; /* Next timeout time for the current timer */ + u32 schedTimerNexttimeoutMs; /* Next timeout time for the current timer */ #endif #ifdef CSR_WIFI_FSM_MUTEX_ENABLE diff --git a/drivers/staging/csr/csr_wifi_hip_card.h b/drivers/staging/csr/csr_wifi_hip_card.h index 6a0d60b42e9..481ba68ccd0 100644 --- a/drivers/staging/csr/csr_wifi_hip_card.h +++ b/drivers/staging/csr/csr_wifi_hip_card.h @@ -99,11 +99,11 @@ u16 CardAreAllFromHostDataSlotsEmpty(card_t *card); CsrResult card_start_processor(card_t *card, enum unifi_dbg_processors_select which); -CsrResult card_wait_for_firmware_to_start(card_t *card, CsrUint32 *paddr); +CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr); CsrResult unifi_dl_firmware(card_t *card, void *arg); -CsrResult unifi_dl_patch(card_t *card, void *arg, CsrUint32 boot_ctrl); -CsrResult unifi_do_loader_op(card_t *card, CsrUint32 op_addr, u8 opcode); +CsrResult unifi_dl_patch(card_t *card, void *arg, u32 boot_ctrl); +CsrResult unifi_do_loader_op(card_t *card, u32 op_addr, u8 opcode); void* unifi_dl_fw_read_start(card_t *card, s8 is_fw); CsrResult unifi_coredump_handle_request(card_t *card); diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio.c b/drivers/staging/csr/csr_wifi_hip_card_sdio.c index 1c88f1cbba8..0678344cd4e 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio.c +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio.c @@ -67,7 +67,7 @@ static CsrResult unifi_read_chip_version(card_t *card); card_t* unifi_alloc_card(CsrSdioFunction *sdio, void *ospriv) { card_t *card; - CsrUint32 i; + u32 i; func_enter(); @@ -86,9 +86,9 @@ card_t* unifi_alloc_card(CsrSdioFunction *sdio, void *ospriv) card->unifi_interrupt_seq = 1; /* Make these invalid. */ - card->proc_select = (CsrUint32)(-1); - card->dmem_page = (CsrUint32)(-1); - card->pmem_page = (CsrUint32)(-1); + card->proc_select = (u32)(-1); + card->dmem_page = (u32)(-1); + card->pmem_page = (u32)(-1); card->bh_reason_host = 0; card->bh_reason_unifi = 0; @@ -137,7 +137,7 @@ card_t* unifi_alloc_card(CsrSdioFunction *sdio, void *ospriv) * warnings when casting pointer types, e.g. on 64-bit systems. */ { - CsrUint32 val = 0x01234567; + u32 val = 0x01234567; if (*((u8 *)&val) == 0x01) { @@ -288,9 +288,9 @@ CsrResult unifi_init(card_t *card) * The page registers will be maintained by unifi_read...() and * unifi_write...(). */ - card->proc_select = (CsrUint32)(-1); - card->dmem_page = (CsrUint32)(-1); - card->pmem_page = (CsrUint32)(-1); + card->proc_select = (u32)(-1); + card->dmem_page = (u32)(-1); + card->pmem_page = (u32)(-1); r = unifi_write_direct16(card, ChipHelper_HOST_WINDOW3_PAGE(card->helper) * 2, 0); if (r == CSR_WIFI_HIP_RESULT_NO_DEVICE) { @@ -598,7 +598,7 @@ static void _build_sdio_config_data(sdio_config_data_t *cfg_data, */ static CsrResult card_hw_init(card_t *card) { - CsrUint32 slut_address; + u32 slut_address; u16 initialised; u16 finger_print; symbol_t slut; @@ -692,7 +692,7 @@ static CsrResult card_hw_init(card_t *card) while (!search_4slut_again) { u16 s; - CsrUint32 l; + u32 l; r = unifi_card_read16(card, slut_address, &s); if (r != CSR_RESULT_SUCCESS) @@ -810,7 +810,7 @@ static CsrResult card_hw_init(card_t *card) case CSR_SLT_BUILD_ID_NUMBER: { - CsrUint32 n; + u32 n; r = unifi_read32(card, slut.obj, &n); if (r == CSR_WIFI_HIP_RESULT_NO_DEVICE) { @@ -1233,7 +1233,7 @@ static CsrResult card_wait_for_unifi_to_disable(card_t *card) * CSR_RESULT_SUCCESS on success, CSR error code on failure. * --------------------------------------------------------------------------- */ -CsrResult card_wait_for_firmware_to_start(card_t *card, CsrUint32 *paddr) +CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr) { CsrInt32 i; u16 mbox0, mbox1; @@ -1335,7 +1335,7 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, CsrUint32 *paddr) return r; } - *paddr = (((CsrUint32)mbox1 << 16) | mbox0); + *paddr = (((u32)mbox1 << 16) | mbox0); func_exit(); return CSR_RESULT_SUCCESS; @@ -1681,7 +1681,7 @@ static CsrResult card_allocate_memory_resources(card_t *card) /* Allocate memory for the array used for slot host tag mapping */ card->fh_slot_host_tag_record = - (CsrUint32 *)CsrMemAlloc(n * sizeof(CsrUint32)); + (u32 *)CsrMemAlloc(n * sizeof(u32)); if (card->fh_slot_host_tag_record == NULL) { @@ -2640,7 +2640,7 @@ static CsrResult unifi_prepare_hw(card_t *card) static CsrResult unifi_read_chip_version(card_t *card) { - CsrUint32 gbl_chip_version; + u32 gbl_chip_version; CsrResult r; u16 ver; @@ -3025,14 +3025,14 @@ CsrResult unifi_card_hard_reset(card_t *card) { CsrResult r; const struct chip_helper_reset_values *init_data; - CsrUint32 chunks; + u32 chunks; func_enter(); /* Clear cache of page registers */ - card->proc_select = (CsrUint32)(-1); - card->dmem_page = (CsrUint32)(-1); - card->pmem_page = (CsrUint32)(-1); + card->proc_select = (u32)(-1); + card->dmem_page = (u32)(-1); + card->pmem_page = (u32)(-1); /* * We need to have a valid card->helper before we use software hard reset. @@ -3665,7 +3665,7 @@ static CsrResult firmware_present_in_flash(card_t *card) static void bootstrap_chip_hw(card_t *card) { const struct chip_helper_init_values *vals; - CsrUint32 i, len; + u32 i, len; void *sdio = card->sdio_if; CsrResult csrResult; @@ -3816,7 +3816,7 @@ CsrResult card_start_processor(card_t *card, enum unifi_dbg_processors_select wh * None * --------------------------------------------------------------------------- */ -void unifi_set_interrupt_mode(card_t *card, CsrUint32 mode) +void unifi_set_interrupt_mode(card_t *card, u32 mode) { if (mode == CSR_WIFI_INTMODE_RUN_BH_ONCE) { @@ -4104,7 +4104,7 @@ void unifi_get_hip_qos_info(card_t *card, unifi_HipQosInfo *hipqosinfo) { CsrInt32 count_fhr; s16 t; - CsrUint32 occupied_fh; + u32 occupied_fh; q_t *sigq; u16 nslots, i; diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio.h b/drivers/staging/csr/csr_wifi_hip_card_sdio.h index 6463e246dba..42fce7b3ae4 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio.h +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio.h @@ -173,7 +173,7 @@ typedef struct u16 initialised; /* Added by protocol version 0x0001 */ - CsrUint32 overlay_size; + u32 overlay_size; /* Added by protocol version 0x0300 */ u16 data_slot_round; @@ -407,11 +407,11 @@ struct card * array is indexed by slot numbers and each index stores * information of the last host tag it was used for */ - CsrUint32 *fh_slot_host_tag_record; + u32 *fh_slot_host_tag_record; /* Info read from Symbol Table during probe */ - CsrUint32 build_id; + u32 build_id; CsrCharString build_id_string[128]; /* Retrieve from SDIO driver. */ @@ -455,7 +455,7 @@ struct card u8 request_max_clock; /* Last SDIO clock frequency set */ - CsrUint32 sdio_clock_speed; + u32 sdio_clock_speed; /* * Current host state (copy of value in IOABORT register and @@ -518,7 +518,7 @@ struct card * SHARED_IO_INTERRUPT register. * Flag to say we need to generate an interrupt at end of processing. */ - CsrUint32 unifi_interrupt_seq; + u32 unifi_interrupt_seq; u8 generate_interrupt; @@ -548,17 +548,17 @@ struct card sdio_config_data_t config_data; /* SDIO address of the Initialised flag and Control Data struct */ - CsrUint32 init_flag_addr; - CsrUint32 sdio_ctrl_addr; + u32 init_flag_addr; + u32 sdio_ctrl_addr; /* The last value written to the Shared Data Memory Page register */ - CsrUint32 proc_select; - CsrUint32 dmem_page; - CsrUint32 pmem_page; + u32 proc_select; + u32 dmem_page; + u32 pmem_page; /* SDIO traffic counters limited to 32 bits for Synergy compatibility */ - CsrUint32 sdio_bytes_read; - CsrUint32 sdio_bytes_written; + u32 sdio_bytes_read; + u32 sdio_bytes_written; u8 memory_resources_allocated; @@ -585,42 +585,42 @@ struct card #ifdef CSR_WIFI_HIP_DATA_PLANE_PROFILE struct cmd_profile { - CsrUint32 cmd52_count; - CsrUint32 cmd53_count; - CsrUint32 tx_count; - CsrUint32 tx_cfm_count; - CsrUint32 rx_count; - CsrUint32 bh_count; - CsrUint32 process_count; - CsrUint32 protocol_count; - - CsrUint32 cmd52_f0_r_count; - CsrUint32 cmd52_f0_w_count; - CsrUint32 cmd52_r8or16_count; - CsrUint32 cmd52_w8or16_count; - CsrUint32 cmd52_r16_count; - CsrUint32 cmd52_w16_count; - CsrUint32 cmd52_r32_count; - - CsrUint32 sdio_cmd_signal; - CsrUint32 sdio_cmd_clear_slot; - CsrUint32 sdio_cmd_to_host; - CsrUint32 sdio_cmd_from_host; - CsrUint32 sdio_cmd_from_host_and_clear; + u32 cmd52_count; + u32 cmd53_count; + u32 tx_count; + u32 tx_cfm_count; + u32 rx_count; + u32 bh_count; + u32 process_count; + u32 protocol_count; + + u32 cmd52_f0_r_count; + u32 cmd52_f0_w_count; + u32 cmd52_r8or16_count; + u32 cmd52_w8or16_count; + u32 cmd52_r16_count; + u32 cmd52_w16_count; + u32 cmd52_r32_count; + + u32 sdio_cmd_signal; + u32 sdio_cmd_clear_slot; + u32 sdio_cmd_to_host; + u32 sdio_cmd_from_host; + u32 sdio_cmd_from_host_and_clear; } hip_prof; struct cmd_profile cmd_prof; #endif /* Interrupt processing mode flags */ - CsrUint32 intmode; + u32 intmode; #ifdef UNIFI_DEBUG u8 lsb; #endif /* Historic firmware panic codes */ - CsrUint32 panic_data_phy_addr; - CsrUint32 panic_data_mac_addr; + u32 panic_data_phy_addr; + u32 panic_data_mac_addr; u16 last_phy_panic_code; u16 last_phy_panic_arg; u16 last_mac_panic_code; @@ -657,34 +657,34 @@ CsrInt32 card_read_signal_counts(card_t *card); bulk_data_desc_t* card_find_data_slot(card_t *card, s16 slot); -CsrResult unifi_read32(card_t *card, CsrUint32 unifi_addr, CsrUint32 *pdata); -CsrResult unifi_readnz(card_t *card, CsrUint32 unifi_addr, +CsrResult unifi_read32(card_t *card, u32 unifi_addr, u32 *pdata); +CsrResult unifi_readnz(card_t *card, u32 unifi_addr, void *pdata, u16 len); -CsrInt32 unifi_read_shared_count(card_t *card, CsrUint32 addr); +CsrInt32 unifi_read_shared_count(card_t *card, u32 addr); -CsrResult unifi_writen(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len); +CsrResult unifi_writen(card_t *card, u32 unifi_addr, void *pdata, u16 len); -CsrResult unifi_bulk_rw(card_t *card, CsrUint32 handle, - void *pdata, CsrUint32 len, s16 direction); -CsrResult unifi_bulk_rw_noretry(card_t *card, CsrUint32 handle, - void *pdata, CsrUint32 len, s16 direction); +CsrResult unifi_bulk_rw(card_t *card, u32 handle, + void *pdata, u32 len, s16 direction); +CsrResult unifi_bulk_rw_noretry(card_t *card, u32 handle, + void *pdata, u32 len, s16 direction); #define UNIFI_SDIO_READ 0 #define UNIFI_SDIO_WRITE 1 -CsrResult unifi_read_8_or_16(card_t *card, CsrUint32 unifi_addr, u8 *pdata); -CsrResult unifi_write_8_or_16(card_t *card, CsrUint32 unifi_addr, u8 data); -CsrResult unifi_read_direct_8_or_16(card_t *card, CsrUint32 addr, u8 *pdata); -CsrResult unifi_write_direct_8_or_16(card_t *card, CsrUint32 addr, u8 data); +CsrResult unifi_read_8_or_16(card_t *card, u32 unifi_addr, u8 *pdata); +CsrResult unifi_write_8_or_16(card_t *card, u32 unifi_addr, u8 data); +CsrResult unifi_read_direct_8_or_16(card_t *card, u32 addr, u8 *pdata); +CsrResult unifi_write_direct_8_or_16(card_t *card, u32 addr, u8 data); -CsrResult unifi_read_direct16(card_t *card, CsrUint32 addr, u16 *pdata); -CsrResult unifi_read_direct32(card_t *card, CsrUint32 addr, CsrUint32 *pdata); -CsrResult unifi_read_directn(card_t *card, CsrUint32 addr, void *pdata, u16 len); +CsrResult unifi_read_direct16(card_t *card, u32 addr, u16 *pdata); +CsrResult unifi_read_direct32(card_t *card, u32 addr, u32 *pdata); +CsrResult unifi_read_directn(card_t *card, u32 addr, void *pdata, u16 len); -CsrResult unifi_write_direct16(card_t *card, CsrUint32 addr, u16 data); -CsrResult unifi_write_directn(card_t *card, CsrUint32 addr, void *pdata, u16 len); +CsrResult unifi_write_direct16(card_t *card, u32 addr, u16 data); +CsrResult unifi_write_directn(card_t *card, u32 addr, void *pdata, u16 len); -CsrResult sdio_read_f0(card_t *card, CsrUint32 addr, u8 *pdata); -CsrResult sdio_write_f0(card_t *card, CsrUint32 addr, u8 data); +CsrResult sdio_read_f0(card_t *card, u32 addr, u8 *pdata); +CsrResult sdio_write_f0(card_t *card, u32 addr, u8 data); void unifi_read_panic(card_t *card); #ifdef CSR_PRE_ALLOC_NET_DATA diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c b/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c index 1d09b974851..9c9e9070f6b 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c @@ -212,7 +212,7 @@ CsrResult prealloc_netdata_alloc(card_t *card) } -static CsrResult prealloc_netdata_get(card_t *card, bulk_data_desc_t *bulk_data_slot, CsrUint32 size) +static CsrResult prealloc_netdata_get(card_t *card, bulk_data_desc_t *bulk_data_slot, u32 size) { CsrResult r; @@ -354,7 +354,7 @@ CsrResult unifi_force_low_power_mode(card_t *card) * CSR_RESULT_SUCCESS on success or a CSR error code. * --------------------------------------------------------------------------- */ -CsrResult unifi_bh(card_t *card, CsrUint32 *remaining) +CsrResult unifi_bh(card_t *card, u32 *remaining) { CsrResult r; CsrResult csrResult; @@ -1315,7 +1315,7 @@ static CsrResult process_to_host_signals(card_t *card, CsrInt32 *processed) if (GET_SIGNAL_ID(bufptr + 2) == CSR_MA_PACKET_CONFIRM_ID) { /* Get host tag and transmission status */ - CsrUint32 host_tag = GET_PACKED_MA_PACKET_CONFIRM_HOST_TAG(bufptr + 2); + u32 host_tag = GET_PACKED_MA_PACKET_CONFIRM_HOST_TAG(bufptr + 2); u16 status = GET_PACKED_MA_PACKET_CONFIRM_TRANSMISSION_STATUS(bufptr + 2); unifi_trace(card->ospriv, UDBG4, "process_to_host_signals signal ID=%x host Tag=%x status=%x\n", @@ -1841,8 +1841,8 @@ static CsrResult process_bulk_data_command(card_t *card, const u8 *cmdptr, */ static CsrResult check_fh_sig_slots(card_t *card, u16 needed, CsrInt32 *space_fh) { - CsrUint32 count_fhw; - CsrUint32 occupied_fh, slots_fh; + u32 count_fhw; + u32 occupied_fh, slots_fh; CsrInt32 count_fhr; count_fhw = card->from_host_signals_w; @@ -2180,7 +2180,7 @@ static CsrResult process_fh_traffic_queue(card_t *card, CsrInt32 *processed) u16 needed_chunks; CsrInt32 space_chunks; u16 q_index; - CsrUint32 host_tag = 0; + u32 host_tag = 0; u16 slot_num = 0; *processed = 0; diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c b/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c index 15a040350cb..0454f435a68 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c @@ -53,7 +53,7 @@ * CSR_RESULT_FAILURE an SDIO error occurred * --------------------------------------------------------------------------- */ -static CsrResult retrying_read8(card_t *card, s16 funcnum, CsrUint32 addr, u8 *pdata) +static CsrResult retrying_read8(card_t *card, s16 funcnum, u32 addr, u8 *pdata) { CsrSdioFunction *sdio = card->sdio_if; CsrResult r = CSR_RESULT_SUCCESS; @@ -128,7 +128,7 @@ static CsrResult retrying_read8(card_t *card, s16 funcnum, CsrUint32 addr, u8 *p } /* retrying_read8() */ -static CsrResult retrying_write8(card_t *card, s16 funcnum, CsrUint32 addr, u8 data) +static CsrResult retrying_write8(card_t *card, s16 funcnum, u32 addr, u8 data) { CsrSdioFunction *sdio = card->sdio_if; CsrResult r = CSR_RESULT_SUCCESS; @@ -202,7 +202,7 @@ static CsrResult retrying_write8(card_t *card, s16 funcnum, CsrUint32 addr, u8 d static CsrResult retrying_read16(card_t *card, s16 funcnum, - CsrUint32 addr, u16 *pdata) + u32 addr, u16 *pdata) { CsrSdioFunction *sdio = card->sdio_if; CsrResult r = CSR_RESULT_SUCCESS; @@ -263,7 +263,7 @@ static CsrResult retrying_read16(card_t *card, s16 funcnum, static CsrResult retrying_write16(card_t *card, s16 funcnum, - CsrUint32 addr, u16 data) + u32 addr, u16 data) { CsrSdioFunction *sdio = card->sdio_if; CsrResult r = CSR_RESULT_SUCCESS; @@ -338,7 +338,7 @@ static CsrResult retrying_write16(card_t *card, s16 funcnum, * CSR_RESULT_FAILURE an SDIO error occurred * --------------------------------------------------------------------------- */ -CsrResult sdio_read_f0(card_t *card, CsrUint32 addr, u8 *pdata) +CsrResult sdio_read_f0(card_t *card, u32 addr, u8 *pdata) { #if defined (CSR_WIFI_HIP_DEBUG_OFFLINE) && defined (CSR_WIFI_HIP_DATA_PLANE_PROFILE) card->cmd_prof.cmd52_f0_r_count++; @@ -364,7 +364,7 @@ CsrResult sdio_read_f0(card_t *card, CsrUint32 addr, u8 *pdata) * CSR_RESULT_FAILURE an SDIO error occurred * --------------------------------------------------------------------------- */ -CsrResult sdio_write_f0(card_t *card, CsrUint32 addr, u8 data) +CsrResult sdio_write_f0(card_t *card, u32 addr, u8 data) { #if defined (CSR_WIFI_HIP_DEBUG_OFFLINE) && defined (CSR_WIFI_HIP_DATA_PLANE_PROFILE) card->cmd_prof.cmd52_f0_w_count++; @@ -388,7 +388,7 @@ CsrResult sdio_write_f0(card_t *card, CsrUint32 addr, u8 data) * CSR_RESULT_SUCCESS on success, non-zero error code on error: * --------------------------------------------------------------------------- */ -CsrResult unifi_read_direct_8_or_16(card_t *card, CsrUint32 addr, u8 *pdata) +CsrResult unifi_read_direct_8_or_16(card_t *card, u32 addr, u8 *pdata) { #ifdef CSR_WIFI_TRANSPORT_CSPI u16 w; @@ -423,7 +423,7 @@ CsrResult unifi_read_direct_8_or_16(card_t *card, CsrUint32 addr, u8 *pdata) * to memory until the preceding even address is written. * --------------------------------------------------------------------------- */ -CsrResult unifi_write_direct_8_or_16(card_t *card, CsrUint32 addr, u8 data) +CsrResult unifi_write_direct_8_or_16(card_t *card, u32 addr, u8 data) { if (addr & 1) { @@ -462,7 +462,7 @@ CsrResult unifi_write_direct_8_or_16(card_t *card, CsrUint32 addr, u8 data) * even address is read. * --------------------------------------------------------------------------- */ -CsrResult unifi_read_direct16(card_t *card, CsrUint32 addr, u16 *pdata) +CsrResult unifi_read_direct16(card_t *card, u32 addr, u16 *pdata) { return retrying_read16(card, card->function, addr, pdata); } /* unifi_read_direct16() */ @@ -490,7 +490,7 @@ CsrResult unifi_read_direct16(card_t *card, CsrUint32 addr, u16 *pdata) * even address is written. * --------------------------------------------------------------------------- */ -CsrResult unifi_write_direct16(card_t *card, CsrUint32 addr, u16 data) +CsrResult unifi_write_direct16(card_t *card, u32 addr, u16 data) { return retrying_write16(card, card->function, addr, data); } /* unifi_write_direct16() */ @@ -513,7 +513,7 @@ CsrResult unifi_write_direct16(card_t *card, CsrUint32 addr, u16 data) * CSR_RESULT_FAILURE an SDIO error occurred * --------------------------------------------------------------------------- */ -CsrResult unifi_read_direct32(card_t *card, CsrUint32 addr, CsrUint32 *pdata) +CsrResult unifi_read_direct32(card_t *card, u32 addr, u32 *pdata) { CsrResult r; u16 w0, w1; @@ -530,7 +530,7 @@ CsrResult unifi_read_direct32(card_t *card, CsrUint32 addr, CsrUint32 *pdata) return r; } - *pdata = ((CsrUint32)w1 << 16) | (CsrUint32)w0; + *pdata = ((u32)w1 << 16) | (u32)w0; return CSR_RESULT_SUCCESS; } /* unifi_read_direct32() */ @@ -564,10 +564,10 @@ CsrResult unifi_read_direct32(card_t *card, CsrUint32 addr, CsrUint32 *pdata) * even address is read. * --------------------------------------------------------------------------- */ -static CsrResult unifi_read_directn_match(card_t *card, CsrUint32 addr, void *pdata, u16 len, s8 m, CsrUint32 *num) +static CsrResult unifi_read_directn_match(card_t *card, u32 addr, void *pdata, u16 len, s8 m, u32 *num) { CsrResult r; - CsrUint32 i; + u32 i; u8 *cptr; u16 w; @@ -631,9 +631,9 @@ static CsrResult unifi_read_directn_match(card_t *card, CsrUint32 addr, void *pd * even address is read. * --------------------------------------------------------------------------- */ -CsrResult unifi_read_directn(card_t *card, CsrUint32 addr, void *pdata, u16 len) +CsrResult unifi_read_directn(card_t *card, u32 addr, void *pdata, u16 len) { - CsrUint32 num; + u32 num; return unifi_read_directn_match(card, addr, pdata, len, -1, &num); } /* unifi_read_directn() */ @@ -664,7 +664,7 @@ CsrResult unifi_read_directn(card_t *card, CsrUint32 addr, void *pdata, u16 len) * This means we must write data as pairs of bytes in reverse order. * --------------------------------------------------------------------------- */ -CsrResult unifi_write_directn(card_t *card, CsrUint32 addr, void *pdata, u16 len) +CsrResult unifi_write_directn(card_t *card, u32 addr, void *pdata, u16 len) { CsrResult r; u8 *cptr; @@ -714,10 +714,10 @@ CsrResult unifi_write_directn(card_t *card, CsrUint32 addr, void *pdata, u16 len * CSR_RESULT_FAILURE an SDIO error occurred * --------------------------------------------------------------------------- */ -static CsrResult set_dmem_page(card_t *card, CsrUint32 dmem_addr, CsrUint32 *paddr) +static CsrResult set_dmem_page(card_t *card, u32 dmem_addr, u32 *paddr) { u16 page, addr; - CsrUint32 len; + u32 len; CsrResult r; *paddr = 0; @@ -753,11 +753,11 @@ static CsrResult set_dmem_page(card_t *card, CsrUint32 dmem_addr, CsrUint32 *pad } /* set_dmem_page() */ -static CsrResult set_pmem_page(card_t *card, CsrUint32 pmem_addr, - enum chip_helper_window_type mem_type, CsrUint32 *paddr) +static CsrResult set_pmem_page(card_t *card, u32 pmem_addr, + enum chip_helper_window_type mem_type, u32 *paddr) { u16 page, addr; - CsrUint32 len; + u32 len; CsrResult r; *paddr = 0; @@ -814,10 +814,10 @@ static CsrResult set_pmem_page(card_t *card, CsrUint32 pmem_addr, * CSR_WIFI_HIP_RESULT_INVALID_VALUE the address is invalid * --------------------------------------------------------------------------- */ -static CsrResult set_page(card_t *card, CsrUint32 generic_addr, CsrUint32 *paddr) +static CsrResult set_page(card_t *card, u32 generic_addr, u32 *paddr) { CsrInt32 space; - CsrUint32 addr; + u32 addr; CsrResult r = CSR_RESULT_SUCCESS; if (!paddr) @@ -1018,7 +1018,7 @@ CsrResult unifi_set_proc_select(card_t *card, enum unifi_dbg_processors_select s return CSR_WIFI_HIP_RESULT_INVALID_VALUE; } - if (card->proc_select != (CsrUint32)select) + if (card->proc_select != (u32)select) { r = unifi_write_direct16(card, ChipHelper_DBG_HOST_PROC_SELECT(card->helper) * 2, @@ -1033,7 +1033,7 @@ CsrResult unifi_set_proc_select(card_t *card, enum unifi_dbg_processors_select s return r; } - card->proc_select = (CsrUint32)select; + card->proc_select = (u32)select; } return CSR_RESULT_SUCCESS; @@ -1059,9 +1059,9 @@ CsrResult unifi_set_proc_select(card_t *card, enum unifi_dbg_processors_select s * CSR_WIFI_HIP_RESULT_INVALID_VALUE a bad generic pointer was specified * --------------------------------------------------------------------------- */ -CsrResult unifi_read_8_or_16(card_t *card, CsrUint32 unifi_addr, u8 *pdata) +CsrResult unifi_read_8_or_16(card_t *card, u32 unifi_addr, u8 *pdata) { - CsrUint32 sdio_addr; + u32 sdio_addr; CsrResult r; #ifdef CSR_WIFI_TRANSPORT_CSPI u16 w; @@ -1110,9 +1110,9 @@ CsrResult unifi_read_8_or_16(card_t *card, CsrUint32 unifi_addr, u8 *pdata) * write with the previously cached odd byte. * --------------------------------------------------------------------------- */ -CsrResult unifi_write_8_or_16(card_t *card, CsrUint32 unifi_addr, u8 data) +CsrResult unifi_write_8_or_16(card_t *card, u32 unifi_addr, u8 data) { - CsrUint32 sdio_addr; + u32 sdio_addr; CsrResult r; #ifdef CSR_WIFI_TRANSPORT_CSPI u16 w; @@ -1162,9 +1162,9 @@ CsrResult unifi_write_8_or_16(card_t *card, CsrUint32 unifi_addr, u8 data) * CSR_WIFI_HIP_RESULT_INVALID_VALUE a bad generic pointer was specified * --------------------------------------------------------------------------- */ -CsrResult unifi_card_read16(card_t *card, CsrUint32 unifi_addr, u16 *pdata) +CsrResult unifi_card_read16(card_t *card, u32 unifi_addr, u16 *pdata) { - CsrUint32 sdio_addr; + u32 sdio_addr; CsrResult r; r = set_page(card, unifi_addr, &sdio_addr); @@ -1199,9 +1199,9 @@ CsrResult unifi_card_read16(card_t *card, CsrUint32 unifi_addr, u16 *pdata) * CSR_WIFI_HIP_RESULT_INVALID_VALUE a bad generic pointer was specified * --------------------------------------------------------------------------- */ -CsrResult unifi_card_write16(card_t *card, CsrUint32 unifi_addr, u16 data) +CsrResult unifi_card_write16(card_t *card, u32 unifi_addr, u16 data) { - CsrUint32 sdio_addr; + u32 sdio_addr; CsrResult r; r = set_page(card, unifi_addr, &sdio_addr); @@ -1236,9 +1236,9 @@ CsrResult unifi_card_write16(card_t *card, CsrUint32 unifi_addr, u16 data) * CSR_WIFI_HIP_RESULT_INVALID_VALUE a bad generic pointer was specified * --------------------------------------------------------------------------- */ -CsrResult unifi_read32(card_t *card, CsrUint32 unifi_addr, CsrUint32 *pdata) +CsrResult unifi_read32(card_t *card, u32 unifi_addr, u32 *pdata) { - CsrUint32 sdio_addr; + u32 sdio_addr; CsrResult r; r = set_page(card, unifi_addr, &sdio_addr); @@ -1278,11 +1278,11 @@ CsrResult unifi_read32(card_t *card, CsrUint32 unifi_addr, CsrUint32 *pdata) * CSR_WIFI_HIP_RESULT_INVALID_VALUE a bad generic pointer was specified * --------------------------------------------------------------------------- */ -CsrResult unifi_readn_match(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len, s8 match) +CsrResult unifi_readn_match(card_t *card, u32 unifi_addr, void *pdata, u16 len, s8 match) { - CsrUint32 sdio_addr; + u32 sdio_addr; CsrResult r; - CsrUint32 num; + u32 num; r = set_page(card, unifi_addr, &sdio_addr); if (r != CSR_RESULT_SUCCESS) @@ -1295,13 +1295,13 @@ CsrResult unifi_readn_match(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 } /* unifi_readn_match() */ -CsrResult unifi_card_readn(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len) +CsrResult unifi_card_readn(card_t *card, u32 unifi_addr, void *pdata, u16 len) { return unifi_readn_match(card, unifi_addr, pdata, len, -1); } /* unifi_card_readn() */ -CsrResult unifi_readnz(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len) +CsrResult unifi_readnz(card_t *card, u32 unifi_addr, void *pdata, u16 len) { return unifi_readn_match(card, unifi_addr, pdata, len, 0); } /* unifi_readnz() */ @@ -1323,7 +1323,7 @@ CsrResult unifi_readnz(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len) * Value read from memory (0-127) or -1 on error * --------------------------------------------------------------------------- */ -CsrInt32 unifi_read_shared_count(card_t *card, CsrUint32 addr) +CsrInt32 unifi_read_shared_count(card_t *card, u32 addr) { u8 b; /* I've increased this count, because I have seen cases where @@ -1384,9 +1384,9 @@ CsrInt32 unifi_read_shared_count(card_t *card, CsrUint32 addr) * CSR_WIFI_HIP_RESULT_INVALID_VALUE an odd length or length too big. * --------------------------------------------------------------------------- */ -CsrResult unifi_writen(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len) +CsrResult unifi_writen(card_t *card, u32 unifi_addr, void *pdata, u16 len) { - CsrUint32 sdio_addr; + u32 sdio_addr; CsrResult r; r = set_page(card, unifi_addr, &sdio_addr); @@ -1400,7 +1400,7 @@ CsrResult unifi_writen(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len) static CsrResult csr_sdio_block_rw(card_t *card, s16 funcnum, - CsrUint32 addr, u8 *pdata, + u32 addr, u8 *pdata, u16 count, s16 dir_is_write) { CsrResult csrResult; @@ -1472,8 +1472,8 @@ static CsrResult csr_sdio_block_rw(card_t *card, s16 funcnum, * This function uses SDIO CMD53, which is the block transfer mode. * --------------------------------------------------------------------------- */ -CsrResult unifi_bulk_rw(card_t *card, CsrUint32 handle, void *pdata, - CsrUint32 len, s16 direction) +CsrResult unifi_bulk_rw(card_t *card, u32 handle, void *pdata, + u32 len, s16 direction) { #define CMD53_RETRIES 3 /* @@ -1693,8 +1693,8 @@ CsrResult unifi_bulk_rw(card_t *card, CsrUint32 handle, void *pdata, * This function uses SDIO CMD53, which is the block transfer mode. * --------------------------------------------------------------------------- */ -CsrResult unifi_bulk_rw_noretry(card_t *card, CsrUint32 handle, void *pdata, - CsrUint32 len, s16 direction) +CsrResult unifi_bulk_rw_noretry(card_t *card, u32 handle, void *pdata, + u32 len, s16 direction) { CsrResult csrResult; diff --git a/drivers/staging/csr/csr_wifi_hip_chiphelper.c b/drivers/staging/csr/csr_wifi_hip_chiphelper.c index efdbab010b6..4e8cc3fa655 100644 --- a/drivers/staging/csr/csr_wifi_hip_chiphelper.c +++ b/drivers/staging/csr/csr_wifi_hip_chiphelper.c @@ -577,7 +577,7 @@ static const struct chip_device_desc_t *chip_ver_to_desc[] = ChipDescript* ChipHelper_GetVersionSdio(u8 sdio_ver) { - CsrUint32 i; + u32 i; for (i = 0; i < nelem(chip_ver_to_desc); i++) { @@ -593,7 +593,7 @@ ChipDescript* ChipHelper_GetVersionSdio(u8 sdio_ver) ChipDescript* ChipHelper_GetVersionAny(u16 from_FF9A, u16 from_FE81) { - CsrUint32 i; + u32 i; if ((from_FF9A & 0xFF00) != 0) { @@ -666,7 +666,7 @@ CHIP_HELPER_LIST(C_DEF) */ u16 ChipHelper_MapAddress_SPI2HOST(ChipDescript *chip_help, u16 addr) { - CsrUint32 i; + u32 i; for (i = 0; i < chip_help->map.len; i++) { if (chip_help->map.vals[i].spi == addr) @@ -680,7 +680,7 @@ u16 ChipHelper_MapAddress_SPI2HOST(ChipDescript *chip_help, u16 addr) u16 ChipHelper_MapAddress_HOST2SPI(ChipDescript *chip_help, u16 addr) { - CsrUint32 i; + u32 i; for (i = 0; i < chip_help->map.len; i++) { if (chip_help->map.vals[i].host == addr) @@ -725,7 +725,7 @@ u16 ChipHelper_WINDOW_SIZE(ChipDescript *chip_help, /* Get the register writes we should do to make sure that the chip is running with most clocks on. */ -CsrUint32 ChipHelper_ClockStartupSequence(ChipDescript *chip_help, +u32 ChipHelper_ClockStartupSequence(ChipDescript *chip_help, const struct chip_helper_init_values **val) { *val = chip_help->init.vals; @@ -734,7 +734,7 @@ CsrUint32 ChipHelper_ClockStartupSequence(ChipDescript /* Get the set of values tat we should write to the chip to perform a reset. */ -CsrUint32 ChipHelper_HostResetSequence(ChipDescript *chip_help, +u32 ChipHelper_HostResetSequence(ChipDescript *chip_help, const struct chip_helper_reset_values **val) { *val = chip_help->reset_prog.vals; @@ -746,8 +746,8 @@ CsrUint32 ChipHelper_HostResetSequence(ChipDescript *c CsrInt32 ChipHelper_DecodeWindow(ChipDescript *chip_help, enum chip_helper_window_index window, enum chip_helper_window_type type, - CsrUint32 offset, - u16 *page, u16 *addr, CsrUint32 *len) + u32 offset, + u16 *page, u16 *addr, u32 *len) { const struct window_info_t *win; const struct window_shift_info_t *mode; diff --git a/drivers/staging/csr/csr_wifi_hip_chiphelper.h b/drivers/staging/csr/csr_wifi_hip_chiphelper.h index a539c0485d7..11cff4e0b49 100644 --- a/drivers/staging/csr/csr_wifi_hip_chiphelper.h +++ b/drivers/staging/csr/csr_wifi_hip_chiphelper.h @@ -140,8 +140,8 @@ struct chip_helper_init_values /* A block of data that should be written to the device */ struct chip_helper_reset_values { - CsrUint32 gp_address; - CsrUint32 len; + u32 gp_address; + u32 len; const u16 *data; }; @@ -230,10 +230,10 @@ ChipDescript* ChipHelper_GetVersionBlueCore(enum chip_helper_bluecore_age age, CHIP_HELPER_DEF0(m, (u16, SDIO_HOST_INT, regs->sdio_host_int)) \ CHIP_HELPER_DEF0(m, (u16, COEX_STATUS, regs->coex_status)) \ CHIP_HELPER_DEF0(m, (u16, SHARED_IO_INTERRUPT, regs->shared_io_interrupt)) \ - CHIP_HELPER_DEF0(m, (CsrUint32, PROGRAM_MEMORY_RAM_OFFSET, prog_offset.ram)) \ - CHIP_HELPER_DEF0(m, (CsrUint32, PROGRAM_MEMORY_ROM_OFFSET, prog_offset.rom)) \ - CHIP_HELPER_DEF0(m, (CsrUint32, PROGRAM_MEMORY_FLASH_OFFSET, prog_offset.flash)) \ - CHIP_HELPER_DEF0(m, (CsrUint32, PROGRAM_MEMORY_EXT_SRAM_OFFSET, prog_offset.ext_sram)) \ + CHIP_HELPER_DEF0(m, (u32, PROGRAM_MEMORY_RAM_OFFSET, prog_offset.ram)) \ + CHIP_HELPER_DEF0(m, (u32, PROGRAM_MEMORY_ROM_OFFSET, prog_offset.rom)) \ + CHIP_HELPER_DEF0(m, (u32, PROGRAM_MEMORY_FLASH_OFFSET, prog_offset.flash)) \ + CHIP_HELPER_DEF0(m, (u32, PROGRAM_MEMORY_EXT_SRAM_OFFSET, prog_offset.ext_sram)) \ CHIP_HELPER_DEF0(m, (u16, DATA_MEMORY_RAM_OFFSET, data_offset.ram)) \ CHIP_HELPER_DEF0(m, (CsrInt32, HasFlash, bools.has_flash)) \ CHIP_HELPER_DEF0(m, (CsrInt32, HasExtSram, bools.has_ext_sram)) \ @@ -244,8 +244,8 @@ ChipDescript* ChipHelper_GetVersionBlueCore(enum chip_helper_bluecore_age age, CHIP_HELPER_DEF1(m, (u16, WINDOW_SIZE, enum chip_helper_window_index, window)) \ CHIP_HELPER_DEF1(m, (u16, MapAddress_SPI2HOST, u16, addr)) \ CHIP_HELPER_DEF1(m, (u16, MapAddress_HOST2SPI, u16, addr)) \ - CHIP_HELPER_DEF1(m, (CsrUint32, ClockStartupSequence, const struct chip_helper_init_values **, val)) \ - CHIP_HELPER_DEF1(m, (CsrUint32, HostResetSequence, const struct chip_helper_reset_values **, val)) + CHIP_HELPER_DEF1(m, (u32, ClockStartupSequence, const struct chip_helper_init_values **, val)) \ + CHIP_HELPER_DEF1(m, (u32, HostResetSequence, const struct chip_helper_reset_values **, val)) /* Some magic to help the expansion */ #define CHIP_HELPER_DEF0(a, b) \ @@ -405,8 +405,8 @@ CHIP_HELPER_LIST(C_DEC) CsrInt32 ChipHelper_DecodeWindow(ChipDescript *chip_help, enum chip_helper_window_index window, enum chip_helper_window_type type, - CsrUint32 offset, - u16 *page, u16 *addr, CsrUint32 *len); + u32 offset, + u16 *page, u16 *addr, u32 *len); #ifdef __cplusplus /* Close the extern "C" */ @@ -459,8 +459,8 @@ public: /* The DecodeWindow function, see the description of the C version. */ CsrInt32 DecodeWindow(chip_helper_window_index window, chip_helper_window_type type, - CsrUint32 offset, - u16 &page, u16 &addr, CsrUint32 &len) const; + u32 offset, + u16 &page, u16 &addr, u32 &len) const; private: ChipDescript *m_desc; diff --git a/drivers/staging/csr/csr_wifi_hip_chiphelper_private.h b/drivers/staging/csr/csr_wifi_hip_chiphelper_private.h index aacafe1a118..de6e063f466 100644 --- a/drivers/staging/csr/csr_wifi_hip_chiphelper_private.h +++ b/drivers/staging/csr/csr_wifi_hip_chiphelper_private.h @@ -43,20 +43,20 @@ extern "C" { /* Address value pairs */ struct val_array_t { - CsrUint32 len; + u32 len; const struct chip_helper_init_values *vals; }; /* Just a (counted) u16 array */ struct data_array_t { - CsrUint32 len; + u32 len; const u16 *vals; }; struct reset_prog_t { - CsrUint32 len; + u32 len; const struct chip_helper_reset_values *vals; }; @@ -69,7 +69,7 @@ struct chip_map_address_t struct map_array_t { - CsrUint32 len; + u32 len; const struct chip_map_address_t *vals; }; @@ -118,7 +118,7 @@ struct chip_device_regs_t struct window_shift_info_t { CsrInt32 allowed; - CsrUint32 page_shift; + u32 page_shift; u16 page_offset; }; @@ -167,11 +167,11 @@ struct chip_device_desc_t /* Some misc. info on the chip */ struct { - CsrUint32 has_flash : 1; - CsrUint32 has_ext_sram : 1; - CsrUint32 has_rom : 1; - CsrUint32 has_bt : 1; - CsrUint32 has_wlan : 1; + u32 has_flash : 1; + u32 has_ext_sram : 1; + u32 has_rom : 1; + u32 has_bt : 1; + u32 has_wlan : 1; } bools; /* This table is used to remap register addresses depending on what @@ -184,10 +184,10 @@ struct chip_device_desc_t The RAM offset is probably the most useful. */ struct { - CsrUint32 ram; - CsrUint32 rom; - CsrUint32 flash; - CsrUint32 ext_sram; + u32 ram; + u32 rom; + u32 flash; + u32 ext_sram; } prog_offset; /* The offsets into the data address space of interesting things. */ diff --git a/drivers/staging/csr/csr_wifi_hip_download.c b/drivers/staging/csr/csr_wifi_hip_download.c index 808fae6a2d9..e90faf3864c 100644 --- a/drivers/staging/csr/csr_wifi_hip_download.c +++ b/drivers/staging/csr/csr_wifi_hip_download.c @@ -25,7 +25,7 @@ #undef CSR_WIFI_IGNORE_PATCH_VERSION_MISMATCH static CsrResult do_patch_download(card_t *card, void *dlpriv, - xbv1_t *pfwinfo, CsrUint32 boot_ctrl_addr); + xbv1_t *pfwinfo, u32 boot_ctrl_addr); static CsrResult do_patch_convert_download(card_t *card, void *dlpriv, xbv1_t *pfwinfo); @@ -49,9 +49,9 @@ static CsrResult do_patch_convert_download(card_t *card, * CSR_WIFI_HIP_RESULT_NOT_FOUND if not found * --------------------------------------------------------------------------- */ -static CsrResult _find_in_slut(card_t *card, symbol_t *psym, CsrUint32 *pslut) +static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut) { - CsrUint32 slut_address; + u32 slut_address; u16 finger_print; CsrResult r; CsrResult csrResult; @@ -122,7 +122,7 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, CsrUint32 *pslut) while (1) { u16 id; - CsrUint32 obj; + u32 obj; r = unifi_card_read16(card, slut_address, &id); if (r != CSR_RESULT_SUCCESS) @@ -186,9 +186,9 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, CsrUint32 *pslut) static CsrResult do_patch_convert_download(card_t *card, void *dlpriv, xbv1_t *pfwinfo) { CsrResult r; - CsrUint32 slut_base = 0xffffffff; + u32 slut_base = 0xffffffff; void *pfw; - CsrUint32 psize; + u32 psize; symbol_t sym; /* Reset the chip to guarantee that the ROM loader is running */ @@ -203,7 +203,7 @@ static CsrResult do_patch_convert_download(card_t *card, void *dlpriv, xbv1_t *p /* If no unifi_helper is running, the firmware version must be read */ if (card->build_id == 0) { - CsrUint32 ver = 0; + u32 ver = 0; sym.id = CSR_SLT_BUILD_ID_NUMBER; sym.obj = 0; /* To be updated by _find_in_slut() */ @@ -399,7 +399,7 @@ CsrResult unifi_dl_firmware(card_t *card, void *dlpriv) * This ends up telling UniFi to restart. * --------------------------------------------------------------------------- */ -CsrResult unifi_dl_patch(card_t *card, void *dlpriv, CsrUint32 boot_ctrl) +CsrResult unifi_dl_patch(card_t *card, void *dlpriv, u32 boot_ctrl) { xbv1_t *fwinfo; CsrResult r; @@ -497,7 +497,7 @@ void* unifi_dl_fw_read_start(card_t *card, s8 is_fw) * CSR_RESULT_SUCCESS on success, CSR error code on failure * --------------------------------------------------------------------------- */ -static CsrResult safe_read_shared_location(card_t *card, CsrUint32 address, u8 *pdata) +static CsrResult safe_read_shared_location(card_t *card, u32 address, u8 *pdata) { CsrResult r; u16 limit = 1000; @@ -559,7 +559,7 @@ static CsrResult safe_read_shared_location(card_t *card, CsrUint32 address, u8 * #define OPERATION_TIMEOUT_LOOPS (100) /* when OPERATION_TIMEOUT_DELAY==1, (500) otherwise */ #define OPERATION_TIMEOUT_DELAY 1 /* msec, or 200usecs */ -CsrResult unifi_do_loader_op(card_t *card, CsrUint32 op_addr, u8 opcode) +CsrResult unifi_do_loader_op(card_t *card, u32 op_addr, u8 opcode) { CsrResult r; s16 op_retries; @@ -654,13 +654,13 @@ CsrResult unifi_do_loader_op(card_t *card, CsrUint32 op_addr, u8 opcode) * --------------------------------------------------------------------------- */ static CsrResult send_ptdl_to_unifi(card_t *card, void *dlpriv, - const struct PTDL *ptdl, CsrUint32 handle, - CsrUint32 op_addr) + const struct PTDL *ptdl, u32 handle, + u32 op_addr) { - CsrUint32 offset; + u32 offset; u8 *buf; CsrInt32 data_len; - CsrUint32 write_len; + u32 write_len; CsrResult r; const u16 buf_size = 2 * 1024; @@ -753,13 +753,13 @@ static CsrResult send_ptdl_to_unifi(card_t *card, void *dlpriv, * CSR_WIFI_HIP_RESULT_INVALID_VALUE for a bad laoader version number * --------------------------------------------------------------------------- */ -static CsrResult do_patch_download(card_t *card, void *dlpriv, xbv1_t *pfwinfo, CsrUint32 boot_ctrl_addr) +static CsrResult do_patch_download(card_t *card, void *dlpriv, xbv1_t *pfwinfo, u32 boot_ctrl_addr) { CsrResult r; CsrInt32 i; u16 loader_version; u16 handle; - CsrUint32 total_bytes; + u32 total_bytes; /* * Read info from the SDIO Loader Control Data Structure diff --git a/drivers/staging/csr/csr_wifi_hip_dump.c b/drivers/staging/csr/csr_wifi_hip_dump.c index da1a7ac5409..2f70a6cd80d 100644 --- a/drivers/staging/csr/csr_wifi_hip_dump.c +++ b/drivers/staging/csr/csr_wifi_hip_dump.c @@ -42,7 +42,7 @@ typedef struct coredump_buf CsrTime timestamp; /* host's system time at capture */ s16 requestor; /* request: 0=auto dump, 1=manual */ u16 chip_ver; - CsrUint32 fw_ver; + u32 fw_ver; u16 *zone[HIP_CDUMP_NUM_ZONES]; struct coredump_buf *next; /* circular list */ @@ -54,7 +54,7 @@ struct coredump_zone { unifi_coredump_space_t space; /* XAP memory space this zone covers */ enum unifi_dbg_processors_select cpu; /* XAP CPU core selector */ - CsrUint32 gp; /* Generic Pointer to memory zone on XAP */ + u32 gp; /* Generic Pointer to memory zone on XAP */ u16 offset; /* 16-bit XAP word offset of zone in memory space */ u16 length; /* Length of zone in XAP words */ }; @@ -299,7 +299,7 @@ static CsrInt32 get_value_from_coredump(const coredump_buffer *coreDump, { CsrInt32 r = -1; u16 offset_in_zone; - CsrUint32 zone_end_offset; + u32 zone_end_offset; CsrInt32 i; const struct coredump_zone *def = &zonedef_table[0]; @@ -587,7 +587,7 @@ static CsrResult unifi_coredump_from_sdio(card_t *card, coredump_buffer *dump_bu { u16 val; CsrResult r; - CsrUint32 sdio_addr; + u32 sdio_addr; func_enter(); @@ -663,7 +663,7 @@ coredump_buffer* new_coredump_node(void *ospriv, coredump_buffer *prevnode) coredump_buffer *newnode = NULL; u16 *newzone = NULL; CsrInt32 i; - CsrUint32 zone_size; + u32 zone_size; /* Allocate node header */ newnode = (coredump_buffer *)CsrMemAlloc(sizeof(coredump_buffer)); @@ -744,7 +744,7 @@ CsrResult unifi_coredump_init(card_t *card, u16 num_dump_buffers) void *ospriv = card->ospriv; coredump_buffer *prev = NULL; coredump_buffer *newnode = NULL; - CsrUint32 i = 0; + u32 i = 0; #endif func_enter(); diff --git a/drivers/staging/csr/csr_wifi_hip_send.c b/drivers/staging/csr/csr_wifi_hip_send.c index 3e0e72eae8e..88b5e341d76 100644 --- a/drivers/staging/csr/csr_wifi_hip_send.c +++ b/drivers/staging/csr/csr_wifi_hip_send.c @@ -100,9 +100,9 @@ CSR_PRIORITY unifi_get_default_downgrade_priority(unifi_TrafficQueue queue) * Calls unifi_pause_xmit() when the last slots are used. * --------------------------------------------------------------------------- */ -static CsrResult send_signal(card_t *card, const u8 *sigptr, CsrUint32 siglen, +static CsrResult send_signal(card_t *card, const u8 *sigptr, u32 siglen, const bulk_data_param_t *bulkdata, - q_t *sigq, CsrUint32 priority_q, CsrUint32 run_bh) + q_t *sigq, u32 priority_q, u32 run_bh) { u16 i, data_slot_size; card_signal_t *csptr; @@ -135,7 +135,7 @@ static CsrResult send_signal(card_t *card, const u8 *sigptr, CsrUint32 siglen, { if ((bulkdata != NULL) && (bulkdata->d[i].data_length != 0)) { - CsrUint32 datalen = bulkdata->d[i].data_length; + u32 datalen = bulkdata->d[i].data_length; /* Make sure data will fit in a bulk data slot */ if (bulkdata->d[i].os_data_ptr == NULL) @@ -303,14 +303,14 @@ static CsrResult send_signal(card_t *card, const u8 *sigptr, CsrUint32 siglen, * to the device. Signals are constructed using the UniFi packed structures. * --------------------------------------------------------------------------- */ -CsrResult unifi_send_signal(card_t *card, const u8 *sigptr, CsrUint32 siglen, +CsrResult unifi_send_signal(card_t *card, const u8 *sigptr, u32 siglen, const bulk_data_param_t *bulkdata) { q_t *sig_soft_q; u16 signal_id; CsrResult r; - CsrUint32 run_bh; - CsrUint32 priority_q; + u32 run_bh; + u32 priority_q; /* A NULL signal pointer is a request to check if UniFi is responsive */ if (sigptr == NULL) @@ -395,7 +395,7 @@ CsrResult unifi_send_resources_available(card_t *card, const u8 *sigptr) if (signal_id == CSR_MA_PACKET_REQUEST_ID) { u16 frame_priority; - CsrUint32 priority_q; + u32 priority_q; /* Map the frame priority to a traffic queue index. */ frame_priority = GET_PACKED_MA_PACKET_REQUEST_FRAME_PRIORITY(sigptr); diff --git a/drivers/staging/csr/csr_wifi_hip_signals.c b/drivers/staging/csr/csr_wifi_hip_signals.c index a1b16faafbb..43d9b8e5ede 100644 --- a/drivers/staging/csr/csr_wifi_hip_signals.c +++ b/drivers/staging/csr/csr_wifi_hip_signals.c @@ -944,7 +944,7 @@ CsrInt32 SigGetDataRefs(CSR_SIGNAL *aSignal, CSR_DATAREF **aDataRef) } -CsrUint32 SigGetFilterPos(u16 aSigID) +u32 SigGetFilterPos(u16 aSigID) { switch (aSigID) { diff --git a/drivers/staging/csr/csr_wifi_hip_sigs.h b/drivers/staging/csr/csr_wifi_hip_sigs.h index d9c9d1ed45c..a483179b65a 100644 --- a/drivers/staging/csr/csr_wifi_hip_sigs.h +++ b/drivers/staging/csr/csr_wifi_hip_sigs.h @@ -61,9 +61,9 @@ typedef u16 CSR_CAPABILITY_INFORMATION; typedef u16 CSR_CHANNEL_STARTING_FACTOR; -typedef CsrUint32 CSR_CIPHER_SUITE_SELECTOR; +typedef u32 CSR_CIPHER_SUITE_SELECTOR; -typedef CsrUint32 CSR_CLIENT_TAG; +typedef u32 CSR_CLIENT_TAG; typedef enum CSR_CONNECTION_STATUS { @@ -89,7 +89,7 @@ typedef enum CSR_FRAME_TYPE CSR_PROBE_REQUEST = 0x0004 } CSR_FRAME_TYPE; -typedef CsrUint32 CSR_IPV4_ADDRESS; +typedef u32 CSR_IPV4_ADDRESS; typedef enum CSR_IFINTERFACE { @@ -144,7 +144,7 @@ typedef enum CSR_MEMORY_SPACE typedef u16 CSR_MICROSECONDS16; -typedef CsrUint32 CSR_MICROSECONDS32; +typedef u32 CSR_MICROSECONDS32; typedef u16 CSR_NATURAL16; @@ -1416,7 +1416,7 @@ typedef struct CSR_SIGNAL_PRIMITIVE #define SIG_FILTER_SIZE 6 -CsrUint32 SigGetFilterPos(u16 aSigID); +u32 SigGetFilterPos(u16 aSigID); #ifdef __cplusplus } diff --git a/drivers/staging/csr/csr_wifi_hip_ta_sampling.c b/drivers/staging/csr/csr_wifi_hip_ta_sampling.c index b53abbfe906..33fc3154736 100644 --- a/drivers/staging/csr/csr_wifi_hip_ta_sampling.c +++ b/drivers/staging/csr/csr_wifi_hip_ta_sampling.c @@ -100,16 +100,16 @@ static enum ta_frame_identity ta_detect_protocol(card_t *card, CsrWifiRouterCtrl u16 proto; u16 source_port, dest_port; CsrWifiMacAddress srcAddress; - CsrUint32 snap_hdr, oui_hdr; + u32 snap_hdr, oui_hdr; if (data->data_length < TA_LLC_HEADER_SIZE) { return TA_FRAME_UNKNOWN; } - snap_hdr = (((CsrUint32)data->os_data_ptr[0]) << 24) | - (((CsrUint32)data->os_data_ptr[1]) << 16) | - (((CsrUint32)data->os_data_ptr[2]) << 8); + snap_hdr = (((u32)data->os_data_ptr[0]) << 24) | + (((u32)data->os_data_ptr[1]) << 16) | + (((u32)data->os_data_ptr[2]) << 8); if (snap_hdr != snap_802_2) { return TA_FRAME_UNKNOWN; @@ -122,9 +122,9 @@ static enum ta_frame_identity ta_detect_protocol(card_t *card, CsrWifiRouterCtrl */ } - oui_hdr = (((CsrUint32)data->os_data_ptr[3]) << 24) | - (((CsrUint32)data->os_data_ptr[4]) << 16) | - (((CsrUint32)data->os_data_ptr[5]) << 8); + oui_hdr = (((u32)data->os_data_ptr[3]) << 24) | + (((u32)data->os_data_ptr[4]) << 16) | + (((u32)data->os_data_ptr[5]) << 8); if ((oui_hdr == oui_rfc1042) || (oui_hdr == oui_8021h)) { proto = (data->os_data_ptr[TA_ETHERNET_TYPE_OFFSET] * 256) + @@ -346,12 +346,12 @@ void unifi_ta_sample(card_t *card, const bulk_data_desc_t *data, const u8 *saddr, const u8 *sta_macaddr, - CsrUint32 timestamp, + u32 timestamp, u16 rate) { ta_data_t *tad = &card->ta_sampling; enum ta_frame_identity identity; - CsrUint32 time_delta; + u32 time_delta; @@ -387,8 +387,8 @@ void unifi_ta_sample(card_t *card, */ if (tad->stats.txFramesNum < TA_MAX_INTERVALS_IN_C1) { - CsrUint32 interval; - CsrUint32 index_in_intervals; + u32 interval; + u32 index_in_intervals; interval = timestamp - tad->tx_last_ts; tad->tx_last_ts = timestamp; @@ -423,7 +423,7 @@ void unifi_ta_sample(card_t *card, * rxFramesNum can be flashed in tas_reset_data() by another thread. * Use a temp to avoid division by zero. */ - CsrUint32 temp_rxFramesNum; + u32 temp_rxFramesNum; temp_rxFramesNum = tad->stats.rxFramesNum; /* Calculate this interval's mean frame Rx rate from the sum */ @@ -442,10 +442,10 @@ void unifi_ta_sample(card_t *card, */ if (tad->packet_filter & CSR_WIFI_ROUTER_CTRL_TRAFFIC_PACKET_TYPE_CUSTOM) { - CsrUint32 rxTcpThroughput = tad->ta_l4stats.rxTcpBytesCount / time_delta; - CsrUint32 txTcpThroughput = tad->ta_l4stats.txTcpBytesCount / time_delta; - CsrUint32 rxUdpThroughput = tad->ta_l4stats.rxUdpBytesCount / time_delta; - CsrUint32 txUdpThroughput = tad->ta_l4stats.txUdpBytesCount / time_delta; + u32 rxTcpThroughput = tad->ta_l4stats.rxTcpBytesCount / time_delta; + u32 txTcpThroughput = tad->ta_l4stats.txTcpBytesCount / time_delta; + u32 rxUdpThroughput = tad->ta_l4stats.rxUdpBytesCount / time_delta; + u32 txUdpThroughput = tad->ta_l4stats.txUdpBytesCount / time_delta; unifi_ta_indicate_l4stats(card->ospriv, rxTcpThroughput, diff --git a/drivers/staging/csr/csr_wifi_hip_ta_sampling.h b/drivers/staging/csr/csr_wifi_hip_ta_sampling.h index 7183e25e9df..46c630b4bee 100644 --- a/drivers/staging/csr/csr_wifi_hip_ta_sampling.h +++ b/drivers/staging/csr/csr_wifi_hip_ta_sampling.h @@ -29,10 +29,10 @@ extern "C" { typedef struct ta_l4stats { - CsrUint32 rxTcpBytesCount; - CsrUint32 txTcpBytesCount; - CsrUint32 rxUdpBytesCount; - CsrUint32 txUdpBytesCount; + u32 rxTcpBytesCount; + u32 txTcpBytesCount; + u32 rxUdpBytesCount; + u32 txUdpBytesCount; } ta_l4stats_t; /* @@ -48,10 +48,10 @@ typedef struct ta_data CsrWifiRouterCtrlTrafficFilter custom_filter; /* The timestamp of the last tx packet processed. */ - CsrUint32 tx_last_ts; + u32 tx_last_ts; /* The timestamp of the last packet processed. */ - CsrUint32 last_indication_time; + u32 last_indication_time; /* Statistics */ CsrWifiRouterCtrlTrafficStats stats; @@ -60,7 +60,7 @@ typedef struct ta_data CsrWifiRouterCtrlTrafficType traffic_type; /* Sum of packet rx rates for this interval used to calculate mean */ - CsrUint32 rx_sum_rate; + u32 rx_sum_rate; ta_l4stats_t ta_l4stats; } ta_data_t; diff --git a/drivers/staging/csr/csr_wifi_hip_unifi.h b/drivers/staging/csr/csr_wifi_hip_unifi.h index cbe600d1b7b..6f2090e374e 100644 --- a/drivers/staging/csr/csr_wifi_hip_unifi.h +++ b/drivers/staging/csr/csr_wifi_hip_unifi.h @@ -140,16 +140,16 @@ typedef enum typedef struct _bulk_data_desc { const u8 *os_data_ptr; - CsrUint32 data_length; + u32 data_length; const void *os_net_buf_ptr; - CsrUint32 net_buf_length; + u32 net_buf_length; } bulk_data_desc_t; /* Structure of an entry in the Symbol Look Up Table (SLUT). */ typedef struct _symbol { u16 id; - CsrUint32 obj; + u32 obj; } symbol_t; /* @@ -196,9 +196,9 @@ typedef struct _card_info { u16 chip_id; u16 chip_version; - CsrUint32 fw_build; + u32 fw_build; u16 fw_hip_version; - CsrUint32 sdio_block_size; + u32 sdio_block_size; } card_info_t; @@ -225,14 +225,14 @@ typedef struct unifi_coredump_req /* From user */ CsrInt32 index; /* 0=newest, -1=oldest */ unifi_coredump_space_t space; /* memory space */ - CsrUint32 offset; /* register offset in space */ + u32 offset; /* register offset in space */ /* From driver */ - CsrUint32 drv_build; /* Driver build id */ - CsrUint32 chip_ver; /* Chip version */ - CsrUint32 fw_ver; /* Firmware version */ + u32 drv_build; /* Driver build id */ + u32 chip_ver; /* Chip version */ + u32 fw_ver; /* Firmware version */ CsrInt32 requestor; /* Requestor: 0=auto dump, 1=manual */ CsrTime timestamp; /* time of capture by driver */ - CsrUint32 serial; /* capture serial number */ + u32 serial; /* capture serial number */ CsrInt32 value; /* register value */ } unifi_coredump_req_t; /* mini-coredumped reg value request */ @@ -325,7 +325,7 @@ void unifi_cancel_pending_signals(card_t *card); * @ingroup upperedge */ CsrResult unifi_send_signal(card_t *card, const u8 *sigptr, - CsrUint32 siglen, + u32 siglen, const bulk_data_param_t *bulkdata); /** @@ -398,7 +398,7 @@ CsrResult unifi_check_io_status(card_t *card, CsrInt32 *status); * * @ingroup upperedge */ -CsrResult unifi_bh(card_t *card, CsrUint32 *remaining); +CsrResult unifi_bh(card_t *card, u32 *remaining); /** @@ -513,7 +513,7 @@ void unifi_ta_sample(card_t *card, const bulk_data_desc_t *data, const u8 *saddr, const u8 *sta_macaddr, - CsrUint32 timestamp, + u32 timestamp, u16 rate); /** @@ -545,9 +545,9 @@ void unifi_ta_classification(card_t *card, CsrResult unifi_card_hard_reset(card_t *card); -CsrResult unifi_card_readn(card_t *card, CsrUint32 unifi_addr, void *pdata, u16 len); -CsrResult unifi_card_read16(card_t *card, CsrUint32 unifi_addr, u16 *pdata); -CsrResult unifi_card_write16(card_t *card, CsrUint32 unifi_addr, u16 data); +CsrResult unifi_card_readn(card_t *card, u32 unifi_addr, void *pdata, u16 len); +CsrResult unifi_card_read16(card_t *card, u32 unifi_addr, u16 *pdata); +CsrResult unifi_card_write16(card_t *card, u32 unifi_addr, u16 data); enum unifi_dbg_processors_select @@ -643,7 +643,7 @@ CsrResult unifi_run_bh(void *ospriv); * @ingroup upperedge */ void unifi_receive_event(void *ospriv, - u8 *sigdata, CsrUint32 siglen, + u8 *sigdata, u32 siglen, const bulk_data_param_t *bulkdata); #ifdef CSR_WIFI_REQUEUE_PACKET_TO_HAL @@ -659,7 +659,7 @@ void unifi_receive_event(void *ospriv, * * @ingroup upperedge */ -CsrResult unifi_reque_ma_packet_request(void *ospriv, CsrUint32 host_tag, +CsrResult unifi_reque_ma_packet_request(void *ospriv, u32 host_tag, u16 status, bulk_data_desc_t *bulkDataDesc); @@ -719,7 +719,7 @@ void* unifi_fw_read_start(void *ospriv, s8 is_fw, const card_info_t *info); * * @ingroup upperedge */ -CsrInt32 unifi_fw_read(void *ospriv, void *arg, CsrUint32 offset, void *buf, CsrUint32 len); +CsrInt32 unifi_fw_read(void *ospriv, void *arg, u32 offset, void *buf, u32 len); /** * @@ -746,7 +746,7 @@ void unifi_fw_read_stop(void *ospriv, void *dlpriv); * * @ingroup upperedge */ -void* unifi_fw_open_buffer(void *ospriv, void *fwbuf, CsrUint32 len); +void* unifi_fw_open_buffer(void *ospriv, void *fwbuf, u32 len); /** * @@ -806,10 +806,10 @@ void unifi_ta_indicate_protocol(void *ospriv, */ void unifi_ta_indicate_sampling(void *ospriv, CsrWifiRouterCtrlTrafficStats *stats); void unifi_ta_indicate_l4stats(void *ospriv, - CsrUint32 rxTcpThroughput, - CsrUint32 txTcpThroughput, - CsrUint32 rxUdpThroughput, - CsrUint32 txUdpThroughput); + u32 rxTcpThroughput, + u32 txTcpThroughput, + u32 rxUdpThroughput, + u32 txUdpThroughput); #endif void unifi_rx_queue_flush(void *ospriv); @@ -849,7 +849,7 @@ CsrResult unifi_capture_panic(card_t *card); #define CSR_WIFI_INTMODE_DEFAULT 0 #define CSR_WIFI_INTMODE_RUN_BH_ONCE 1 /* Run BH once per interrupt */ -void unifi_set_interrupt_mode(card_t *card, CsrUint32 mode); +void unifi_set_interrupt_mode(card_t *card, u32 mode); /* * unifi_request_max_clock() requests that max SDIO clock speed is set at the diff --git a/drivers/staging/csr/csr_wifi_hip_unifi_udi.h b/drivers/staging/csr/csr_wifi_hip_unifi_udi.h index e69f5c75d22..774bdc95826 100644 --- a/drivers/staging/csr/csr_wifi_hip_unifi_udi.h +++ b/drivers/staging/csr/csr_wifi_hip_unifi_udi.h @@ -38,7 +38,7 @@ enum udi_log_direction }; typedef void (*udi_func_t)(void *ospriv, u8 *sigdata, - CsrUint32 signal_len, + u32 signal_len, const bulk_data_param_t *bulkdata, enum udi_log_direction dir); diff --git a/drivers/staging/csr/csr_wifi_hip_xbv.c b/drivers/staging/csr/csr_wifi_hip_xbv.c index 3236b2be629..3d559af2852 100644 --- a/drivers/staging/csr/csr_wifi_hip_xbv.c +++ b/drivers/staging/csr/csr_wifi_hip_xbv.c @@ -53,7 +53,7 @@ typedef struct typedef struct { CsrCharString t_name[4]; - CsrUint32 t_len; + u32 t_len; } tag_t; @@ -86,44 +86,44 @@ typedef struct xbv_container container; CsrInt32 ioffset_end; } s[XBV_STACK_SIZE]; - CsrUint32 ptr; + u32 ptr; } xbv_stack_t; static CsrInt32 read_tag(card_t *card, ct_t *ct, tag_t *tag); -static CsrInt32 read_bytes(card_t *card, ct_t *ct, void *buf, CsrUint32 len); -static CsrInt32 read_uint(card_t *card, ct_t *ct, CsrUint32 *u, CsrUint32 len); +static CsrInt32 read_bytes(card_t *card, ct_t *ct, void *buf, u32 len); +static CsrInt32 read_uint(card_t *card, ct_t *ct, u32 *u, u32 len); static CsrInt32 xbv_check(xbv1_t *fwinfo, const xbv_stack_t *stack, xbv_mode new_mode, xbv_container old_cont); static CsrInt32 xbv_push(xbv1_t *fwinfo, xbv_stack_t *stack, xbv_mode new_mode, xbv_container old_cont, - xbv_container new_cont, CsrUint32 ioff); + xbv_container new_cont, u32 ioff); -static CsrUint32 write_uint16(void *buf, const CsrUint32 offset, +static u32 write_uint16(void *buf, const u32 offset, const u16 val); -static CsrUint32 write_uint32(void *buf, const CsrUint32 offset, - const CsrUint32 val); -static CsrUint32 write_bytes(void *buf, const CsrUint32 offset, - const u8 *data, const CsrUint32 len); -static CsrUint32 write_tag(void *buf, const CsrUint32 offset, +static u32 write_uint32(void *buf, const u32 offset, + const u32 val); +static u32 write_bytes(void *buf, const u32 offset, + const u8 *data, const u32 len); +static u32 write_tag(void *buf, const u32 offset, const CsrCharString *tag_str); -static CsrUint32 write_chunk(void *buf, const CsrUint32 offset, +static u32 write_chunk(void *buf, const u32 offset, const CsrCharString *tag_str, - const CsrUint32 payload_len); -static u16 calc_checksum(void *buf, const CsrUint32 offset, - const CsrUint32 bytes_len); -static CsrUint32 calc_patch_size(const xbv1_t *fwinfo); - -static CsrUint32 write_xbv_header(void *buf, const CsrUint32 offset, - const CsrUint32 file_payload_length); -static CsrUint32 write_ptch_header(void *buf, const CsrUint32 offset, - const CsrUint32 fw_id); -static CsrUint32 write_patchcmd(void *buf, const CsrUint32 offset, - const CsrUint32 dst_genaddr, const u16 len); -static CsrUint32 write_reset_ptdl(void *buf, const CsrUint32 offset, - const xbv1_t *fwinfo, CsrUint32 fw_id); -static CsrUint32 write_fwdl_to_ptdl(void *buf, const CsrUint32 offset, + const u32 payload_len); +static u16 calc_checksum(void *buf, const u32 offset, + const u32 bytes_len); +static u32 calc_patch_size(const xbv1_t *fwinfo); + +static u32 write_xbv_header(void *buf, const u32 offset, + const u32 file_payload_length); +static u32 write_ptch_header(void *buf, const u32 offset, + const u32 fw_id); +static u32 write_patchcmd(void *buf, const u32 offset, + const u32 dst_genaddr, const u16 len); +static u32 write_reset_ptdl(void *buf, const u32 offset, + const xbv1_t *fwinfo, u32 fw_id); +static u32 write_fwdl_to_ptdl(void *buf, const u32 offset, fwreadfn_t readfn, const struct FWDL *fwdl, - const void *fw_buf, const CsrUint32 fw_id, + const void *fw_buf, const u32 fw_id, void *rdbuf); /* @@ -210,7 +210,7 @@ CsrResult xbv1_parse(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwin /* File format version */ if (TAG_EQ(tag.t_name, "VERF")) { - CsrUint32 version; + u32 version; if (xbv_check(fwinfo, &stack, xbv_unknown, xbv_xbv1) || (tag.t_len != 2) || @@ -228,7 +228,7 @@ CsrResult xbv1_parse(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwin else if (TAG_EQ(tag.t_name, "LIST")) { CsrCharString name[4]; - CsrUint32 list_end; + u32 list_end; list_end = ct.ioffset + tag.t_len; @@ -287,7 +287,7 @@ CsrResult xbv1_parse(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwin } else if (TAG_EQ(tag.t_name, "SLTP")) { - CsrUint32 addr; + u32 addr; if (xbv_check(fwinfo, &stack, xbv_firmware, xbv_fw) || (tag.t_len != 4) || @@ -301,7 +301,7 @@ CsrResult xbv1_parse(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwin } else if (TAG_EQ(tag.t_name, "FWDL")) { - CsrUint32 addr; + u32 addr; struct FWDL *fwdl; if (xbv_check(fwinfo, &stack, xbv_firmware, xbv_fw) || @@ -335,7 +335,7 @@ CsrResult xbv1_parse(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwin } else if (TAG_EQ(tag.t_name, "VMEQ")) { - CsrUint32 temp[3]; + u32 temp[3]; struct VAND *vand; struct VMEQ *vmeq; @@ -366,7 +366,7 @@ CsrResult xbv1_parse(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwin } else if (TAG_EQ(tag.t_name, "FWID")) { - CsrUint32 build_id; + u32 build_id; if (xbv_check(fwinfo, &stack, xbv_patch, xbv_ptch) || (tag.t_len != 4) || @@ -467,7 +467,7 @@ static CsrInt32 xbv_check(xbv1_t *fwinfo, const xbv_stack_t *stack, /* Make checks as above and then enter a new list */ static CsrInt32 xbv_push(xbv1_t *fwinfo, xbv_stack_t *stack, xbv_mode new_mode, xbv_container old_cont, - xbv_container new_cont, CsrUint32 new_ioff) + xbv_container new_cont, u32 new_ioff) { if (xbv_check(fwinfo, stack, new_mode, old_cont)) { @@ -489,14 +489,14 @@ static CsrInt32 xbv_push(xbv1_t *fwinfo, xbv_stack_t *stack, } -static CsrUint32 xbv2uint(u8 *ptr, CsrInt32 len) +static u32 xbv2uint(u8 *ptr, CsrInt32 len) { - CsrUint32 u = 0; + u32 u = 0; s16 i; for (i = 0; i < len; i++) { - CsrUint32 b; + u32 b; b = ptr[i]; u += b << (i * 8); } @@ -533,7 +533,7 @@ static CsrInt32 read_tag(card_t *card, ct_t *ct, tag_t *tag) } /* read_tag() */ -static CsrInt32 read_bytes(card_t *card, ct_t *ct, void *buf, CsrUint32 len) +static CsrInt32 read_bytes(card_t *card, ct_t *ct, void *buf, u32 len) { /* read the tag value */ if ((*ct->iread)(card->ospriv, ct->dlpriv, ct->ioffset, buf, len) != (CsrInt32)len) @@ -547,7 +547,7 @@ static CsrInt32 read_bytes(card_t *card, ct_t *ct, void *buf, CsrUint32 len) } /* read_bytes() */ -static CsrInt32 read_uint(card_t *card, ct_t *ct, CsrUint32 *u, CsrUint32 len) +static CsrInt32 read_uint(card_t *card, ct_t *ct, u32 *u, u32 len) { u8 buf[4]; @@ -568,7 +568,7 @@ static CsrInt32 read_uint(card_t *card, ct_t *ct, CsrUint32 *u, CsrUint32 len) } /* read_uint() */ -static CsrUint32 write_uint16(void *buf, const CsrUint32 offset, const u16 val) +static u32 write_uint16(void *buf, const u32 offset, const u16 val) { u8 *dst = (u8 *)buf + offset; *dst++ = (u8)(val & 0xff); /* LSB first */ @@ -577,17 +577,17 @@ static CsrUint32 write_uint16(void *buf, const CsrUint32 offset, const u16 val) } -static CsrUint32 write_uint32(void *buf, const CsrUint32 offset, const CsrUint32 val) +static u32 write_uint32(void *buf, const u32 offset, const u32 val) { (void)write_uint16(buf, offset + 0, (u16)(val & 0xffff)); (void)write_uint16(buf, offset + 2, (u16)(val >> 16)); - return sizeof(CsrUint32); + return sizeof(u32); } -static CsrUint32 write_bytes(void *buf, const CsrUint32 offset, const u8 *data, const CsrUint32 len) +static u32 write_bytes(void *buf, const u32 offset, const u8 *data, const u32 len) { - CsrUint32 i; + u32 i; u8 *dst = (u8 *)buf + offset; for (i = 0; i < len; i++) @@ -598,7 +598,7 @@ static CsrUint32 write_bytes(void *buf, const CsrUint32 offset, const u8 *data, } -static CsrUint32 write_tag(void *buf, const CsrUint32 offset, const CsrCharString *tag_str) +static u32 write_tag(void *buf, const u32 offset, const CsrCharString *tag_str) { u8 *dst = (u8 *)buf + offset; CsrMemCpy(dst, tag_str, 4); @@ -606,19 +606,19 @@ static CsrUint32 write_tag(void *buf, const CsrUint32 offset, const CsrCharStrin } -static CsrUint32 write_chunk(void *buf, const CsrUint32 offset, const CsrCharString *tag_str, const CsrUint32 payload_len) +static u32 write_chunk(void *buf, const u32 offset, const CsrCharString *tag_str, const u32 payload_len) { - CsrUint32 written = 0; + u32 written = 0; written += write_tag(buf, offset, tag_str); - written += write_uint32(buf, written + offset, (CsrUint32)payload_len); + written += write_uint32(buf, written + offset, (u32)payload_len); return written; } -static u16 calc_checksum(void *buf, const CsrUint32 offset, const CsrUint32 bytes_len) +static u16 calc_checksum(void *buf, const u32 offset, const u32 bytes_len) { - CsrUint32 i; + u32 i; u8 *src = (u8 *)buf + offset; u16 sum = 0; u16 val; @@ -640,10 +640,10 @@ static u16 calc_checksum(void *buf, const CsrUint32 offset, const CsrUint32 byte #define PTDL_RESET_DATA_SIZE 20 /* Size of reset vectors PTDL */ -static CsrUint32 calc_patch_size(const xbv1_t *fwinfo) +static u32 calc_patch_size(const xbv1_t *fwinfo) { s16 i; - CsrUint32 size = 0; + u32 size = 0; /* * Work out how big an equivalent patch format file must be for this image. @@ -673,9 +673,9 @@ static CsrUint32 calc_patch_size(const xbv1_t *fwinfo) } -static CsrUint32 write_xbv_header(void *buf, const CsrUint32 offset, const CsrUint32 file_payload_length) +static u32 write_xbv_header(void *buf, const u32 offset, const u32 file_payload_length) { - CsrUint32 written = 0; + u32 written = 0; /* The length value given to the XBV chunk is the length of all subsequent * contents of the file, excluding the 8 byte size of the XBV1 header itself @@ -690,9 +690,9 @@ static CsrUint32 write_xbv_header(void *buf, const CsrUint32 offset, const CsrUi } -static CsrUint32 write_ptch_header(void *buf, const CsrUint32 offset, const CsrUint32 fw_id) +static u32 write_ptch_header(void *buf, const u32 offset, const u32 fw_id) { - CsrUint32 written = 0; + u32 written = 0; /* LIST is written with a zero length, to be updated later */ written += write_chunk(buf, offset + written, (CsrCharString *)"LIST", 0); @@ -711,10 +711,10 @@ static CsrUint32 write_ptch_header(void *buf, const CsrUint32 offset, const CsrU #define UF_MEMPUT_MAC 0x0000 #define UF_MEMPUT_PHY 0x1000 -static CsrUint32 write_patchcmd(void *buf, const CsrUint32 offset, const CsrUint32 dst_genaddr, const u16 len) +static u32 write_patchcmd(void *buf, const u32 offset, const u32 dst_genaddr, const u16 len) { - CsrUint32 written = 0; - CsrUint32 region = (dst_genaddr >> 28); + u32 written = 0; + u32 region = (dst_genaddr >> 28); u16 cmd_and_len = UF_MEMPUT_MAC; if (region == UF_REGION_PHY) @@ -739,19 +739,19 @@ static CsrUint32 write_patchcmd(void *buf, const CsrUint32 offset, const CsrUint } -static CsrUint32 write_fwdl_to_ptdl(void *buf, const CsrUint32 offset, fwreadfn_t readfn, +static u32 write_fwdl_to_ptdl(void *buf, const u32 offset, fwreadfn_t readfn, const struct FWDL *fwdl, const void *dlpriv, - const CsrUint32 fw_id, void *fw_buf) + const u32 fw_id, void *fw_buf) { - CsrUint32 written = 0; + u32 written = 0; s16 chunks = 0; - CsrUint32 left = fwdl->dl_size; /* Bytes left in this fwdl */ - CsrUint32 dl_addr = fwdl->dl_addr; /* Target address of fwdl image on XAP */ - CsrUint32 dl_offs = fwdl->dl_offset; /* Offset of fwdl image data in source */ + u32 left = fwdl->dl_size; /* Bytes left in this fwdl */ + u32 dl_addr = fwdl->dl_addr; /* Target address of fwdl image on XAP */ + u32 dl_offs = fwdl->dl_offset; /* Offset of fwdl image data in source */ u16 csum; - CsrUint32 csum_start_offs; /* first offset to include in checksum */ - CsrUint32 sec_data_len; /* section data byte count */ - CsrUint32 sec_len; /* section data + header byte count */ + u32 csum_start_offs; /* first offset to include in checksum */ + u32 sec_data_len; /* section data byte count */ + u32 sec_len; /* section data + header byte count */ /* FWDL maps to one or more PTDLs, as max size for a PTDL is 1K words */ while (left) @@ -810,12 +810,12 @@ static CsrUint32 write_fwdl_to_ptdl(void *buf, const CsrUint32 offset, fwreadfn_ #define UF_MAC_START_CMD 0x6000 /* MAC "Set start address" command */ #define UF_PHY_START_CMD 0x7000 /* PHY "Set start address" command */ -static CsrUint32 write_reset_ptdl(void *buf, const CsrUint32 offset, const xbv1_t *fwinfo, CsrUint32 fw_id) +static u32 write_reset_ptdl(void *buf, const u32 offset, const xbv1_t *fwinfo, u32 fw_id) { - CsrUint32 written = 0; + u32 written = 0; u16 csum; - CsrUint32 csum_start_offs; /* first offset to include in checksum */ - CsrUint32 sec_len; /* section data + header byte count */ + u32 csum_start_offs; /* first offset to include in checksum */ + u32 sec_len; /* section data + header byte count */ sec_len = SEC_CMD_LEN + PTDL_VEC_HDR_SIZE; /* Total section byte length */ @@ -871,12 +871,12 @@ static CsrUint32 write_reset_ptdl(void *buf, const CsrUint32 offset, const xbv1_ * --------------------------------------------------------------------------- */ CsrInt32 xbv1_read_slut(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwinfo, - symbol_t *slut, CsrUint32 slut_len) + symbol_t *slut, u32 slut_len) { s16 i; CsrInt32 offset; - CsrUint32 magic; - CsrUint32 count = 0; + u32 magic; + u32 count = 0; ct_t ct; if (fwinfo->mode != xbv_firmware) @@ -916,7 +916,7 @@ CsrInt32 xbv1_read_slut(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *f while (count < slut_len) { - CsrUint32 id, obj; + u32 id, obj; /* Read Symbol Id */ if (read_uint(card, &ct, &id, 2)) @@ -969,16 +969,16 @@ CsrInt32 xbv1_read_slut(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *f #define PTCH_LIST_SIZE 16 /* sizeof PTCH+FWID chunk in LIST header */ void* xbv_to_patch(card_t *card, fwreadfn_t readfn, - const void *fw_buf, const xbv1_t *fwinfo, CsrUint32 *size) + const void *fw_buf, const xbv1_t *fwinfo, u32 *size) { void *patch_buf = NULL; - CsrUint32 patch_buf_size; - CsrUint32 payload_offs = 0; /* Start of XBV payload */ + u32 patch_buf_size; + u32 payload_offs = 0; /* Start of XBV payload */ s16 i; - CsrUint32 patch_offs = 0; - CsrUint32 list_len_offs = 0; /* Offset of PTDL LIST length parameter */ - CsrUint32 ptdl_start_offs = 0; /* Offset of first PTDL chunk */ - CsrUint32 fw_id; + u32 patch_offs = 0; + u32 list_len_offs = 0; /* Offset of PTDL LIST length parameter */ + u32 ptdl_start_offs = 0; /* Offset of first PTDL chunk */ + u32 fw_id; void *rdbuf; if (!fw_buf || !fwinfo || !card) diff --git a/drivers/staging/csr/csr_wifi_hip_xbv.h b/drivers/staging/csr/csr_wifi_hip_xbv.h index abf6e4b83a7..3e3771e15d9 100644 --- a/drivers/staging/csr/csr_wifi_hip_xbv.h +++ b/drivers/staging/csr/csr_wifi_hip_xbv.h @@ -33,39 +33,39 @@ extern "C" { struct VMEQ { - CsrUint32 addr; + u32 addr; u16 mask; u16 value; }; struct VAND { - CsrUint32 first; - CsrUint32 count; + u32 first; + u32 count; }; struct VERS { - CsrUint32 num_vand; + u32 num_vand; }; struct FWDL { - CsrUint32 dl_addr; - CsrUint32 dl_size; - CsrUint32 dl_offset; + u32 dl_addr; + u32 dl_size; + u32 dl_offset; }; struct FWOV { - CsrUint32 dl_size; - CsrUint32 dl_offset; + u32 dl_size; + u32 dl_offset; }; struct PTDL { - CsrUint32 dl_size; - CsrUint32 dl_offset; + u32 dl_size; + u32 dl_offset; }; #define MAX_VMEQ 64 @@ -90,11 +90,11 @@ typedef struct /* Parts of a Firmware XBV1 */ struct VMEQ vmeq[MAX_VMEQ]; - CsrUint32 num_vmeq; + u32 num_vmeq; struct VAND vand[MAX_VAND]; struct VERS vers; - CsrUint32 slut_addr; + u32 slut_addr; /* F/W download image, possibly more than one part */ struct FWDL fwdl[MAX_FWDL]; @@ -105,20 +105,20 @@ typedef struct /* Parts of a Patch XBV1 */ - CsrUint32 build_id; + u32 build_id; struct PTDL ptdl[MAX_PTDL]; s16 num_ptdl; } xbv1_t; -typedef CsrInt32 (*fwreadfn_t)(void *ospriv, void *dlpriv, CsrUint32 offset, void *buf, CsrUint32 len); +typedef CsrInt32 (*fwreadfn_t)(void *ospriv, void *dlpriv, u32 offset, void *buf, u32 len); CsrResult xbv1_parse(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwinfo); CsrInt32 xbv1_read_slut(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwinfo, - symbol_t *slut, CsrUint32 slut_len); + symbol_t *slut, u32 slut_len); void* xbv_to_patch(card_t *card, fwreadfn_t readfn, const void *fw_buf, const xbv1_t *fwinfo, - CsrUint32 *size); + u32 *size); #ifdef __cplusplus } diff --git a/drivers/staging/csr/csr_wifi_lib.h b/drivers/staging/csr/csr_wifi_lib.h index 540d93cc5cc..861e4a42ac9 100644 --- a/drivers/staging/csr/csr_wifi_lib.h +++ b/drivers/staging/csr/csr_wifi_lib.h @@ -76,7 +76,7 @@ CsrWifiEventCsrUint16* CsrWifiEventCsrUint16_struct(u16 primtype, u16 msgtype, C typedef struct { CsrWifiFsmEvent common; - CsrUint32 value; + u32 value; } CsrWifiEventCsrUint32; /*----------------------------------------------------------------------------* @@ -87,7 +87,7 @@ typedef struct * Allocates and fills in a message with the signature CsrWifiEventCsrUint32 * *----------------------------------------------------------------------------*/ -CsrWifiEventCsrUint32* CsrWifiEventCsrUint32_struct(u16 primtype, u16 msgtype, CsrSchedQid dst, CsrSchedQid src, CsrUint32 value); +CsrWifiEventCsrUint32* CsrWifiEventCsrUint32_struct(u16 primtype, u16 msgtype, CsrSchedQid dst, CsrSchedQid src, u32 value); typedef struct { diff --git a/drivers/staging/csr/csr_wifi_msgconv.h b/drivers/staging/csr/csr_wifi_msgconv.h index 72da857742a..e97aaee55ff 100644 --- a/drivers/staging/csr/csr_wifi_msgconv.h +++ b/drivers/staging/csr/csr_wifi_msgconv.h @@ -22,15 +22,15 @@ extern "C" { void CsrUint16SerBigEndian(u8 *ptr, CsrSize *len, u16 v); -void CsrUint24SerBigEndian(u8 *ptr, CsrSize *len, CsrUint32 v); -void CsrUint32SerBigEndian(u8 *ptr, CsrSize *len, CsrUint32 v); +void CsrUint24SerBigEndian(u8 *ptr, CsrSize *len, u32 v); +void CsrUint32SerBigEndian(u8 *ptr, CsrSize *len, u32 v); void CsrUint16DesBigEndian(u16 *v, u8 *buffer, CsrSize *offset); -void CsrUint24DesBigEndian(CsrUint32 *v, u8 *buffer, CsrSize *offset); -void CsrUint32DesBigEndian(CsrUint32 *v, u8 *buffer, CsrSize *offset); +void CsrUint24DesBigEndian(u32 *v, u8 *buffer, CsrSize *offset); +void CsrUint32DesBigEndian(u32 *v, u8 *buffer, CsrSize *offset); -void CsrUint24Ser(u8 *ptr, CsrSize *len, CsrUint32 v); -void CsrUint24Des(CsrUint32 *v, u8 *buffer, CsrSize *offset); +void CsrUint24Ser(u8 *ptr, CsrSize *len, u32 v); +void CsrUint24Des(u32 *v, u8 *buffer, CsrSize *offset); CsrSize CsrWifiEventSizeof(void *msg); diff --git a/drivers/staging/csr/csr_wifi_nme_prim.h b/drivers/staging/csr/csr_wifi_nme_prim.h index 4aff2916995..2c7394372e1 100644 --- a/drivers/staging/csr/csr_wifi_nme_prim.h +++ b/drivers/staging/csr/csr_wifi_nme_prim.h @@ -336,7 +336,7 @@ typedef u16 CsrWifiNmeEncryption; - Used to register for all available indications *******************************************************************************/ -typedef CsrUint32 CsrWifiNmeIndications; +typedef u32 CsrWifiNmeIndications; #define CSR_WIFI_NME_INDICATIONS_IND_AP_STATION ((CsrWifiNmeIndications) 0x00100000) #define CSR_WIFI_NME_INDICATIONS_IND_AP_STOP ((CsrWifiNmeIndications) 0x00200000) #define CSR_WIFI_NME_INDICATIONS_IND_SIM_UMTS_AUTH ((CsrWifiNmeIndications) 0x01000000) @@ -489,7 +489,7 @@ typedef u16 CsrWifiNmeEncryptionMask; Mask type for use with the values defined by CsrWifiNmeIndications *******************************************************************************/ -typedef CsrUint32 CsrWifiNmeIndicationsMask; +typedef u32 CsrWifiNmeIndicationsMask; /******************************************************************************* NAME @@ -501,7 +501,7 @@ typedef CsrUint32 CsrWifiNmeIndicationsMask; specific indications *******************************************************************************/ -typedef CsrUint32 CsrWifiNmeNmeIndicationsMask; +typedef u32 CsrWifiNmeNmeIndicationsMask; /******************************************************************************* NAME @@ -594,11 +594,11 @@ typedef struct *******************************************************************************/ typedef struct { - CsrUint32 certificateLength; + u32 certificateLength; u8 *certificate; u16 privateKeyLength; u8 *privateKey; - CsrUint32 caCertificateLength; + u32 caCertificateLength; u8 *caCertificate; } CsrWifiNmeWapiCredentials; @@ -711,17 +711,17 @@ typedef struct CsrCharString *userName; CsrCharString *userPassword; CsrCharString *authServerUserIdentity; - CsrUint32 clientCertificateLength; + u32 clientCertificateLength; u8 *clientCertificate; - CsrUint32 certificateAuthorityCertificateLength; + u32 certificateAuthorityCertificateLength; u8 *certificateAuthorityCertificate; u16 privateKeyLength; u8 *privateKey; CsrCharString *privateKeyPassword; - CsrUint32 sessionLength; + u32 sessionLength; u8 *session; CsrBool allowPacProvisioning; - CsrUint32 pacLength; + u32 pacLength; u8 *pac; CsrCharString *pacPassword; } CsrWifiNmeEapCredentials; diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_prim.h b/drivers/staging/csr/csr_wifi_router_ctrl_prim.h index 37ba5ea258e..83b9c411f5c 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_prim.h +++ b/drivers/staging/csr/csr_wifi_router_ctrl_prim.h @@ -28,14 +28,14 @@ extern "C" { typedef CsrPrim CsrWifiRouterCtrlPrim; -typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteWrite)(u8 func, CsrUint32 address, u8 data); -typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteRead)(u8 func, CsrUint32 address, u8 *pdata); -typedef CsrResult (*CsrWifiRouterCtrlRawSdioFirmwareDownload)(CsrUint32 length, const u8 *pdata); +typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteWrite)(u8 func, u32 address, u8 data); +typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteRead)(u8 func, u32 address, u8 *pdata); +typedef CsrResult (*CsrWifiRouterCtrlRawSdioFirmwareDownload)(u32 length, const u8 *pdata); typedef CsrResult (*CsrWifiRouterCtrlRawSdioReset)(void); typedef CsrResult (*CsrWifiRouterCtrlRawSdioCoreDumpPrepare)(CsrBool suspendSme); -typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteBlockRead)(u8 func, CsrUint32 address, u8 *pdata, CsrUint32 length); -typedef CsrResult (*CsrWifiRouterCtrlRawSdioGpRead16)(u8 func, CsrUint32 address, u16 *pdata); -typedef CsrResult (*CsrWifiRouterCtrlRawSdioGpWrite16)(u8 func, CsrUint32 address, u16 data); +typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteBlockRead)(u8 func, u32 address, u8 *pdata, u32 length); +typedef CsrResult (*CsrWifiRouterCtrlRawSdioGpRead16)(u8 func, u32 address, u16 *pdata); +typedef CsrResult (*CsrWifiRouterCtrlRawSdioGpWrite16)(u8 func, u32 address, u16 data); /******************************************************************************* @@ -410,7 +410,7 @@ typedef u8 CsrWifiRouterCtrlTrafficType; DESCRIPTION *******************************************************************************/ -typedef CsrUint32 CsrWifiRouterCtrlPeerRecordHandle; +typedef u32 CsrWifiRouterCtrlPeerRecordHandle; /******************************************************************************* NAME @@ -467,9 +467,9 @@ typedef u8 CsrWifiRouterCtrlTrafficStreamId; *******************************************************************************/ typedef struct { - CsrUint32 firmwarePatch; + u32 firmwarePatch; CsrCharString *smeBuild; - CsrUint32 smeHip; + u32 smeHip; } CsrWifiRouterCtrlSmeVersions; /******************************************************************************* @@ -510,10 +510,10 @@ typedef struct *******************************************************************************/ typedef struct { - CsrUint32 etherType; + u32 etherType; u8 ipType; - CsrUint32 udpSourcePort; - CsrUint32 udpDestPort; + u32 udpSourcePort; + u32 udpDestPort; } CsrWifiRouterCtrlTrafficFilter; /******************************************************************************* @@ -534,11 +534,11 @@ typedef struct *******************************************************************************/ typedef struct { - CsrUint32 rxMeanRate; - CsrUint32 rxFramesNum; - CsrUint32 txFramesNum; - CsrUint32 rxBytesCount; - CsrUint32 txBytesCount; + u32 rxMeanRate; + u32 rxFramesNum; + u32 txFramesNum; + u32 rxBytesCount; + u32 txBytesCount; u8 intervals[11]; } CsrWifiRouterCtrlTrafficStats; @@ -560,12 +560,12 @@ typedef struct *******************************************************************************/ typedef struct { - CsrUint32 chipId; - CsrUint32 chipVersion; - CsrUint32 firmwareBuild; - CsrUint32 firmwareHip; + u32 chipId; + u32 chipVersion; + u32 firmwareBuild; + u32 firmwareHip; CsrCharString *routerBuild; - CsrUint32 routerHip; + u32 routerHip; } CsrWifiRouterCtrlVersions; /******************************************************************************* @@ -1044,7 +1044,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrUint32 dataLength; + u32 dataLength; u8 *data; } CsrWifiRouterCtrlWifiOnReq; diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c index f46a5362462..6befbd8b0c6 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c +++ b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c @@ -611,10 +611,10 @@ CsrSize CsrWifiRouterCtrlTrafficConfigReqSizeof(void *msg) bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 2; /* CsrWifiRouterCtrlTrafficConfigType primitive->trafficConfigType */ bufferSize += 2; /* u16 primitive->config.packetFilter */ - bufferSize += 4; /* CsrUint32 primitive->config.customFilter.etherType */ + bufferSize += 4; /* u32 primitive->config.customFilter.etherType */ bufferSize += 1; /* u8 primitive->config.customFilter.ipType */ - bufferSize += 4; /* CsrUint32 primitive->config.customFilter.udpSourcePort */ - bufferSize += 4; /* CsrUint32 primitive->config.customFilter.udpDestPort */ + bufferSize += 4; /* u32 primitive->config.customFilter.udpSourcePort */ + bufferSize += 4; /* u32 primitive->config.customFilter.udpDestPort */ return bufferSize; } @@ -628,10 +628,10 @@ u8* CsrWifiRouterCtrlTrafficConfigReqSer(u8 *ptr, CsrSize *len, void *msg) CsrUint16Ser(ptr, len, (u16) primitive->clientData); CsrUint16Ser(ptr, len, (u16) primitive->trafficConfigType); CsrUint16Ser(ptr, len, (u16) primitive->config.packetFilter); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->config.customFilter.etherType); + CsrUint32Ser(ptr, len, (u32) primitive->config.customFilter.etherType); CsrUint8Ser(ptr, len, (u8) primitive->config.customFilter.ipType); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->config.customFilter.udpSourcePort); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->config.customFilter.udpDestPort); + CsrUint32Ser(ptr, len, (u32) primitive->config.customFilter.udpSourcePort); + CsrUint32Ser(ptr, len, (u32) primitive->config.customFilter.udpDestPort); return(ptr); } @@ -647,10 +647,10 @@ void* CsrWifiRouterCtrlTrafficConfigReqDes(u8 *buffer, CsrSize length) CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); CsrUint16Des((u16 *) &primitive->trafficConfigType, buffer, &offset); CsrUint16Des((u16 *) &primitive->config.packetFilter, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->config.customFilter.etherType, buffer, &offset); + CsrUint32Des((u32 *) &primitive->config.customFilter.etherType, buffer, &offset); CsrUint8Des((u8 *) &primitive->config.customFilter.ipType, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->config.customFilter.udpSourcePort, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->config.customFilter.udpDestPort, buffer, &offset); + CsrUint32Des((u32 *) &primitive->config.customFilter.udpSourcePort, buffer, &offset); + CsrUint32Des((u32 *) &primitive->config.customFilter.udpDestPort, buffer, &offset); return primitive; } @@ -663,7 +663,7 @@ CsrSize CsrWifiRouterCtrlWifiOnReqSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 10) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 4; /* CsrUint32 primitive->dataLength */ + bufferSize += 4; /* u32 primitive->dataLength */ bufferSize += primitive->dataLength; /* u8 primitive->data */ return bufferSize; } @@ -675,7 +675,7 @@ u8* CsrWifiRouterCtrlWifiOnReqSer(u8 *ptr, CsrSize *len, void *msg) *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); CsrUint16Ser(ptr, len, (u16) primitive->clientData); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->dataLength); + CsrUint32Ser(ptr, len, (u32) primitive->dataLength); if (primitive->dataLength) { CsrMemCpySer(ptr, len, (const void *) primitive->data, ((u16) (primitive->dataLength))); @@ -692,7 +692,7 @@ void* CsrWifiRouterCtrlWifiOnReqDes(u8 *buffer, CsrSize length) CsrUint16Des(&primitive->common.type, buffer, &offset); CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->dataLength, buffer, &offset); + CsrUint32Des((u32 *) &primitive->dataLength, buffer, &offset); if (primitive->dataLength) { primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); @@ -731,9 +731,9 @@ CsrSize CsrWifiRouterCtrlWifiOnResSizeof(void *msg) bufferSize += 6; /* u8 primitive->stationMacAddress[i1].a[6] */ } } - bufferSize += 4; /* CsrUint32 primitive->smeVersions.firmwarePatch */ + bufferSize += 4; /* u32 primitive->smeVersions.firmwarePatch */ bufferSize += (primitive->smeVersions.smeBuild?CsrStrLen(primitive->smeVersions.smeBuild) : 0) + 1; /* CsrCharString* primitive->smeVersions.smeBuild (0 byte len + 1 for NULL Term) */ - bufferSize += 4; /* CsrUint32 primitive->smeVersions.smeHip */ + bufferSize += 4; /* u32 primitive->smeVersions.smeHip */ bufferSize += 1; /* CsrBool primitive->scheduledInterrupt */ return bufferSize; } @@ -754,9 +754,9 @@ u8* CsrWifiRouterCtrlWifiOnResSer(u8 *ptr, CsrSize *len, void *msg) CsrMemCpySer(ptr, len, (const void *) primitive->stationMacAddress[i1].a, ((u16) (6))); } } - CsrUint32Ser(ptr, len, (CsrUint32) primitive->smeVersions.firmwarePatch); + CsrUint32Ser(ptr, len, (u32) primitive->smeVersions.firmwarePatch); CsrCharStringSer(ptr, len, primitive->smeVersions.smeBuild); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->smeVersions.smeHip); + CsrUint32Ser(ptr, len, (u32) primitive->smeVersions.smeHip); CsrUint8Ser(ptr, len, (u8) primitive->scheduledInterrupt); return(ptr); } @@ -779,9 +779,9 @@ void* CsrWifiRouterCtrlWifiOnResDes(u8 *buffer, CsrSize length) CsrMemCpyDes(primitive->stationMacAddress[i1].a, buffer, &offset, ((u16) (6))); } } - CsrUint32Des((CsrUint32 *) &primitive->smeVersions.firmwarePatch, buffer, &offset); + CsrUint32Des((u32 *) &primitive->smeVersions.firmwarePatch, buffer, &offset); CsrCharStringDes(&primitive->smeVersions.smeBuild, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->smeVersions.smeHip, buffer, &offset); + CsrUint32Des((u32 *) &primitive->smeVersions.smeHip, buffer, &offset); CsrUint8Des((u8 *) &primitive->scheduledInterrupt, buffer, &offset); return primitive; @@ -953,7 +953,7 @@ u8* CsrWifiRouterCtrlPeerDelReqSer(u8 *ptr, CsrSize *len, void *msg) CsrUint16Ser(ptr, len, primitive->common.type); CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint16Ser(ptr, len, (u16) primitive->clientData); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->peerRecordHandle); + CsrUint32Ser(ptr, len, (u32) primitive->peerRecordHandle); return(ptr); } @@ -967,7 +967,7 @@ void* CsrWifiRouterCtrlPeerDelReqDes(u8 *buffer, CsrSize length) CsrUint16Des(&primitive->common.type, buffer, &offset); CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->peerRecordHandle, buffer, &offset); + CsrUint32Des((u32 *) &primitive->peerRecordHandle, buffer, &offset); return primitive; } @@ -993,7 +993,7 @@ u8* CsrWifiRouterCtrlPeerUpdateReqSer(u8 *ptr, CsrSize *len, void *msg) CsrUint16Ser(ptr, len, primitive->common.type); CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint16Ser(ptr, len, (u16) primitive->clientData); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->peerRecordHandle); + CsrUint32Ser(ptr, len, (u32) primitive->peerRecordHandle); CsrUint16Ser(ptr, len, (u16) primitive->powersaveMode); return(ptr); } @@ -1008,7 +1008,7 @@ void* CsrWifiRouterCtrlPeerUpdateReqDes(u8 *buffer, CsrSize length) CsrUint16Des(&primitive->common.type, buffer, &offset); CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->peerRecordHandle, buffer, &offset); + CsrUint32Des((u32 *) &primitive->peerRecordHandle, buffer, &offset); CsrUint16Des((u16 *) &primitive->powersaveMode, buffer, &offset); return primitive; @@ -1734,11 +1734,11 @@ CsrSize CsrWifiRouterCtrlTrafficSampleIndSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 38) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 2; /* u16 primitive->interfaceTag */ - bufferSize += 4; /* CsrUint32 primitive->stats.rxMeanRate */ - bufferSize += 4; /* CsrUint32 primitive->stats.rxFramesNum */ - bufferSize += 4; /* CsrUint32 primitive->stats.txFramesNum */ - bufferSize += 4; /* CsrUint32 primitive->stats.rxBytesCount */ - bufferSize += 4; /* CsrUint32 primitive->stats.txBytesCount */ + bufferSize += 4; /* u32 primitive->stats.rxMeanRate */ + bufferSize += 4; /* u32 primitive->stats.rxFramesNum */ + bufferSize += 4; /* u32 primitive->stats.txFramesNum */ + bufferSize += 4; /* u32 primitive->stats.rxBytesCount */ + bufferSize += 4; /* u32 primitive->stats.txBytesCount */ bufferSize += 11; /* u8 primitive->stats.intervals[11] */ return bufferSize; } @@ -1751,11 +1751,11 @@ u8* CsrWifiRouterCtrlTrafficSampleIndSer(u8 *ptr, CsrSize *len, void *msg) CsrUint16Ser(ptr, len, primitive->common.type); CsrUint16Ser(ptr, len, (u16) primitive->clientData); CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->stats.rxMeanRate); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->stats.rxFramesNum); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->stats.txFramesNum); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->stats.rxBytesCount); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->stats.txBytesCount); + CsrUint32Ser(ptr, len, (u32) primitive->stats.rxMeanRate); + CsrUint32Ser(ptr, len, (u32) primitive->stats.rxFramesNum); + CsrUint32Ser(ptr, len, (u32) primitive->stats.txFramesNum); + CsrUint32Ser(ptr, len, (u32) primitive->stats.rxBytesCount); + CsrUint32Ser(ptr, len, (u32) primitive->stats.txBytesCount); CsrMemCpySer(ptr, len, (const void *) primitive->stats.intervals, ((u16) (11))); return(ptr); } @@ -1770,11 +1770,11 @@ void* CsrWifiRouterCtrlTrafficSampleIndDes(u8 *buffer, CsrSize length) CsrUint16Des(&primitive->common.type, buffer, &offset); CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->stats.rxMeanRate, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->stats.rxFramesNum, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->stats.txFramesNum, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->stats.rxBytesCount, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->stats.txBytesCount, buffer, &offset); + CsrUint32Des((u32 *) &primitive->stats.rxMeanRate, buffer, &offset); + CsrUint32Des((u32 *) &primitive->stats.rxFramesNum, buffer, &offset); + CsrUint32Des((u32 *) &primitive->stats.txFramesNum, buffer, &offset); + CsrUint32Des((u32 *) &primitive->stats.rxBytesCount, buffer, &offset); + CsrUint32Des((u32 *) &primitive->stats.txBytesCount, buffer, &offset); CsrMemCpyDes(primitive->stats.intervals, buffer, &offset, ((u16) (11))); return primitive; @@ -1789,12 +1789,12 @@ CsrSize CsrWifiRouterCtrlWifiOnIndSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 27) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 2; /* CsrResult primitive->status */ - bufferSize += 4; /* CsrUint32 primitive->versions.chipId */ - bufferSize += 4; /* CsrUint32 primitive->versions.chipVersion */ - bufferSize += 4; /* CsrUint32 primitive->versions.firmwareBuild */ - bufferSize += 4; /* CsrUint32 primitive->versions.firmwareHip */ + bufferSize += 4; /* u32 primitive->versions.chipId */ + bufferSize += 4; /* u32 primitive->versions.chipVersion */ + bufferSize += 4; /* u32 primitive->versions.firmwareBuild */ + bufferSize += 4; /* u32 primitive->versions.firmwareHip */ bufferSize += (primitive->versions.routerBuild?CsrStrLen(primitive->versions.routerBuild) : 0) + 1; /* CsrCharString* primitive->versions.routerBuild (0 byte len + 1 for NULL Term) */ - bufferSize += 4; /* CsrUint32 primitive->versions.routerHip */ + bufferSize += 4; /* u32 primitive->versions.routerHip */ return bufferSize; } @@ -1806,12 +1806,12 @@ u8* CsrWifiRouterCtrlWifiOnIndSer(u8 *ptr, CsrSize *len, void *msg) CsrUint16Ser(ptr, len, primitive->common.type); CsrUint16Ser(ptr, len, (u16) primitive->clientData); CsrUint16Ser(ptr, len, (u16) primitive->status); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->versions.chipId); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->versions.chipVersion); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->versions.firmwareBuild); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->versions.firmwareHip); + CsrUint32Ser(ptr, len, (u32) primitive->versions.chipId); + CsrUint32Ser(ptr, len, (u32) primitive->versions.chipVersion); + CsrUint32Ser(ptr, len, (u32) primitive->versions.firmwareBuild); + CsrUint32Ser(ptr, len, (u32) primitive->versions.firmwareHip); CsrCharStringSer(ptr, len, primitive->versions.routerBuild); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->versions.routerHip); + CsrUint32Ser(ptr, len, (u32) primitive->versions.routerHip); return(ptr); } @@ -1825,12 +1825,12 @@ void* CsrWifiRouterCtrlWifiOnIndDes(u8 *buffer, CsrSize length) CsrUint16Des(&primitive->common.type, buffer, &offset); CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); CsrUint16Des((u16 *) &primitive->status, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->versions.chipId, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->versions.chipVersion, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->versions.firmwareBuild, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->versions.firmwareHip, buffer, &offset); + CsrUint32Des((u32 *) &primitive->versions.chipId, buffer, &offset); + CsrUint32Des((u32 *) &primitive->versions.chipVersion, buffer, &offset); + CsrUint32Des((u32 *) &primitive->versions.firmwareBuild, buffer, &offset); + CsrUint32Des((u32 *) &primitive->versions.firmwareHip, buffer, &offset); CsrCharStringDes(&primitive->versions.routerBuild, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->versions.routerHip, buffer, &offset); + CsrUint32Des((u32 *) &primitive->versions.routerHip, buffer, &offset); return primitive; } @@ -2067,7 +2067,7 @@ u8* CsrWifiRouterCtrlPeerAddCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrUint16Ser(ptr, len, (u16) primitive->clientData); CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((u16) (6))); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->peerRecordHandle); + CsrUint32Ser(ptr, len, (u32) primitive->peerRecordHandle); CsrUint16Ser(ptr, len, (u16) primitive->status); return(ptr); } @@ -2083,7 +2083,7 @@ void* CsrWifiRouterCtrlPeerAddCfmDes(u8 *buffer, CsrSize length) CsrUint16Des((u16 *) &primitive->clientData, buffer, &offset); CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((u16) (6))); - CsrUint32Des((CsrUint32 *) &primitive->peerRecordHandle, buffer, &offset); + CsrUint32Des((u32 *) &primitive->peerRecordHandle, buffer, &offset); CsrUint16Des((u16 *) &primitive->status, buffer, &offset); return primitive; diff --git a/drivers/staging/csr/csr_wifi_router_prim.h b/drivers/staging/csr/csr_wifi_router_prim.h index c281f0264af..3b9ce1a39fa 100644 --- a/drivers/staging/csr/csr_wifi_router_prim.h +++ b/drivers/staging/csr/csr_wifi_router_prim.h @@ -81,7 +81,7 @@ typedef u8 CsrWifiRouterEncapsulation; CSR_WIFI_ROUTER_OUI_BT - *******************************************************************************/ -typedef CsrUint32 CsrWifiRouterOui; +typedef u32 CsrWifiRouterOui; #define CSR_WIFI_ROUTER_OUI_RFC_1042 ((CsrWifiRouterOui) 0x000000) #define CSR_WIFI_ROUTER_OUI_BT ((CsrWifiRouterOui) 0x001958) @@ -183,7 +183,7 @@ typedef struct u16 interfaceTag; CsrWifiRouterEncapsulation encapsulation; u16 protocol; - CsrUint32 oui; + u32 oui; } CsrWifiRouterMaPacketSubscribeReq; /******************************************************************************* @@ -248,7 +248,7 @@ typedef struct u8 *frame; CsrWifiRouterFrameFreeFunction freeFunction; CsrWifiRouterPriority priority; - CsrUint32 hostTag; + u32 hostTag; CsrBool cfmRequested; } CsrWifiRouterMaPacketReq; @@ -305,7 +305,7 @@ typedef struct { CsrWifiFsmEvent common; u16 interfaceTag; - CsrUint32 hostTag; + u32 hostTag; CsrWifiRouterPriority priority; CsrWifiMacAddress peerMacAddress; } CsrWifiRouterMaPacketCancelReq; @@ -381,7 +381,7 @@ typedef struct CsrWifiFsmEvent common; u16 interfaceTag; CsrResult result; - CsrUint32 hostTag; + u32 hostTag; u16 rate; } CsrWifiRouterMaPacketCfm; diff --git a/drivers/staging/csr/csr_wifi_router_serialize.c b/drivers/staging/csr/csr_wifi_router_serialize.c index 7711fa55fa9..c90bf7db1a7 100644 --- a/drivers/staging/csr/csr_wifi_router_serialize.c +++ b/drivers/staging/csr/csr_wifi_router_serialize.c @@ -32,7 +32,7 @@ CsrSize CsrWifiRouterMaPacketSubscribeReqSizeof(void *msg) bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiRouterEncapsulation primitive->encapsulation */ bufferSize += 2; /* u16 primitive->protocol */ - bufferSize += 4; /* CsrUint32 primitive->oui */ + bufferSize += 4; /* u32 primitive->oui */ return bufferSize; } @@ -45,7 +45,7 @@ u8* CsrWifiRouterMaPacketSubscribeReqSer(u8 *ptr, CsrSize *len, void *msg) CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->encapsulation); CsrUint16Ser(ptr, len, (u16) primitive->protocol); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->oui); + CsrUint32Ser(ptr, len, (u32) primitive->oui); return(ptr); } @@ -60,7 +60,7 @@ void* CsrWifiRouterMaPacketSubscribeReqDes(u8 *buffer, CsrSize length) CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->encapsulation, buffer, &offset); CsrUint16Des((u16 *) &primitive->protocol, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->oui, buffer, &offset); + CsrUint32Des((u32 *) &primitive->oui, buffer, &offset); return primitive; } @@ -78,7 +78,7 @@ CsrSize CsrWifiRouterMaPacketReqSizeof(void *msg) bufferSize += primitive->frameLength; /* u8 primitive->frame */ bufferSize += 4; /* CsrWifiRouterFrameFreeFunction primitive->freeFunction */ bufferSize += 2; /* CsrWifiRouterPriority primitive->priority */ - bufferSize += 4; /* CsrUint32 primitive->hostTag */ + bufferSize += 4; /* u32 primitive->hostTag */ bufferSize += 1; /* CsrBool primitive->cfmRequested */ return bufferSize; } @@ -98,7 +98,7 @@ u8* CsrWifiRouterMaPacketReqSer(u8 *ptr, CsrSize *len, void *msg) } CsrUint32Ser(ptr, len, 0); /* Special for Function Pointers... primitive->freeFunction */ CsrUint16Ser(ptr, len, (u16) primitive->priority); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->hostTag); + CsrUint32Ser(ptr, len, (u32) primitive->hostTag); CsrUint8Ser(ptr, len, (u8) primitive->cfmRequested); return(ptr); } @@ -126,7 +126,7 @@ void* CsrWifiRouterMaPacketReqDes(u8 *buffer, CsrSize length) primitive->freeFunction = NULL; /* Special for Function Pointers... */ offset += 4; CsrUint16Des((u16 *) &primitive->priority, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->hostTag, buffer, &offset); + CsrUint32Des((u32 *) &primitive->hostTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->cfmRequested, buffer, &offset); return primitive; @@ -186,7 +186,7 @@ CsrSize CsrWifiRouterMaPacketCancelReqSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 17) */ bufferSize += 2; /* u16 primitive->interfaceTag */ - bufferSize += 4; /* CsrUint32 primitive->hostTag */ + bufferSize += 4; /* u32 primitive->hostTag */ bufferSize += 2; /* CsrWifiRouterPriority primitive->priority */ bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */ return bufferSize; @@ -199,7 +199,7 @@ u8* CsrWifiRouterMaPacketCancelReqSer(u8 *ptr, CsrSize *len, void *msg) *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->hostTag); + CsrUint32Ser(ptr, len, (u32) primitive->hostTag); CsrUint16Ser(ptr, len, (u16) primitive->priority); CsrMemCpySer(ptr, len, (const void *) primitive->peerMacAddress.a, ((u16) (6))); return(ptr); @@ -214,7 +214,7 @@ void* CsrWifiRouterMaPacketCancelReqDes(u8 *buffer, CsrSize length) CsrUint16Des(&primitive->common.type, buffer, &offset); CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->hostTag, buffer, &offset); + CsrUint32Des((u32 *) &primitive->hostTag, buffer, &offset); CsrUint16Des((u16 *) &primitive->priority, buffer, &offset); CsrMemCpyDes(primitive->peerMacAddress.a, buffer, &offset, ((u16) (6))); @@ -307,7 +307,7 @@ CsrSize CsrWifiRouterMaPacketCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */ bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->result */ - bufferSize += 4; /* CsrUint32 primitive->hostTag */ + bufferSize += 4; /* u32 primitive->hostTag */ bufferSize += 2; /* u16 primitive->rate */ return bufferSize; } @@ -320,7 +320,7 @@ u8* CsrWifiRouterMaPacketCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrUint16Ser(ptr, len, primitive->common.type); CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint16Ser(ptr, len, (u16) primitive->result); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->hostTag); + CsrUint32Ser(ptr, len, (u32) primitive->hostTag); CsrUint16Ser(ptr, len, (u16) primitive->rate); return(ptr); } @@ -335,7 +335,7 @@ void* CsrWifiRouterMaPacketCfmDes(u8 *buffer, CsrSize length) CsrUint16Des(&primitive->common.type, buffer, &offset); CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint16Des((u16 *) &primitive->result, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->hostTag, buffer, &offset); + CsrUint32Des((u32 *) &primitive->hostTag, buffer, &offset); CsrUint16Des((u16 *) &primitive->rate, buffer, &offset); return primitive; diff --git a/drivers/staging/csr/csr_wifi_router_transport.c b/drivers/staging/csr/csr_wifi_router_transport.c index 3247b5890f6..6842ac3d1f6 100644 --- a/drivers/staging/csr/csr_wifi_router_transport.c +++ b/drivers/staging/csr/csr_wifi_router_transport.c @@ -198,7 +198,7 @@ static void CsrWifiRouterTransportSerialiseAndSend(u16 primType, void* msg) } #if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER) -void CsrSchedMessagePutStringLog(CsrSchedQid q, u16 mi, void *mv, CsrUint32 line, CsrCharString *file) +void CsrSchedMessagePutStringLog(CsrSchedQid q, u16 mi, void *mv, u32 line, CsrCharString *file) #else void CsrSchedMessagePut(CsrSchedQid q, u16 mi, void *mv) #endif diff --git a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c index b81e51a8c4f..5b5444a2e12 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); diff --git a/drivers/staging/csr/csr_wifi_sme_prim.h b/drivers/staging/csr/csr_wifi_sme_prim.h index 1732506e560..79bc2b23229 100644 --- a/drivers/staging/csr/csr_wifi_sme_prim.h +++ b/drivers/staging/csr/csr_wifi_sme_prim.h @@ -829,7 +829,7 @@ typedef u16 CsrWifiSmeIEEE80211Result; - Used to register for all available indications *******************************************************************************/ -typedef CsrUint32 CsrWifiSmeIndications; +typedef u32 CsrWifiSmeIndications; #define CSR_WIFI_SME_INDICATIONS_NONE ((CsrWifiSmeIndications) 0x00000000) #define CSR_WIFI_SME_INDICATIONS_WIFIOFF ((CsrWifiSmeIndications) 0x00000001) #define CSR_WIFI_SME_INDICATIONS_SCANRESULT ((CsrWifiSmeIndications) 0x00000002) @@ -1862,7 +1862,7 @@ typedef u16 CsrWifiSmeEncryptionMask; Mask type for use with the values defined by CsrWifiSmeIndications *******************************************************************************/ -typedef CsrUint32 CsrWifiSmeIndicationsMask; +typedef u32 CsrWifiSmeIndicationsMask; /******************************************************************************* NAME @@ -2127,29 +2127,29 @@ typedef struct { u8 unifiTxDataRate; u8 unifiRxDataRate; - CsrUint32 dot11RetryCount; - CsrUint32 dot11MultipleRetryCount; - CsrUint32 dot11AckFailureCount; - CsrUint32 dot11FrameDuplicateCount; - CsrUint32 dot11FcsErrorCount; - CsrUint32 dot11RtsSuccessCount; - CsrUint32 dot11RtsFailureCount; - CsrUint32 dot11FailedCount; - CsrUint32 dot11TransmittedFragmentCount; - CsrUint32 dot11TransmittedFrameCount; - CsrUint32 dot11WepExcludedCount; - CsrUint32 dot11WepIcvErrorCount; - CsrUint32 dot11WepUndecryptableCount; - CsrUint32 dot11MulticastReceivedFrameCount; - CsrUint32 dot11MulticastTransmittedFrameCount; - CsrUint32 dot11ReceivedFragmentCount; - CsrUint32 dot11Rsna4WayHandshakeFailures; - CsrUint32 dot11RsnaTkipCounterMeasuresInvoked; - CsrUint32 dot11RsnaStatsTkipLocalMicFailures; - CsrUint32 dot11RsnaStatsTkipReplays; - CsrUint32 dot11RsnaStatsTkipIcvErrors; - CsrUint32 dot11RsnaStatsCcmpReplays; - CsrUint32 dot11RsnaStatsCcmpDecryptErrors; + u32 dot11RetryCount; + u32 dot11MultipleRetryCount; + u32 dot11AckFailureCount; + u32 dot11FrameDuplicateCount; + u32 dot11FcsErrorCount; + u32 dot11RtsSuccessCount; + u32 dot11RtsFailureCount; + u32 dot11FailedCount; + u32 dot11TransmittedFragmentCount; + u32 dot11TransmittedFrameCount; + u32 dot11WepExcludedCount; + u32 dot11WepIcvErrorCount; + u32 dot11WepUndecryptableCount; + u32 dot11MulticastReceivedFrameCount; + u32 dot11MulticastTransmittedFrameCount; + u32 dot11ReceivedFragmentCount; + u32 dot11Rsna4WayHandshakeFailures; + u32 dot11RsnaTkipCounterMeasuresInvoked; + u32 dot11RsnaStatsTkipLocalMicFailures; + u32 dot11RsnaStatsTkipReplays; + u32 dot11RsnaStatsTkipIcvErrors; + u32 dot11RsnaStatsCcmpReplays; + u32 dot11RsnaStatsCcmpDecryptErrors; } CsrWifiSmeConnectionStats; /******************************************************************************* @@ -2450,15 +2450,15 @@ typedef struct *******************************************************************************/ typedef struct { - CsrUint32 chipId; - CsrUint32 chipVersion; - CsrUint32 firmwareBuild; - CsrUint32 firmwarePatch; - CsrUint32 firmwareHip; + u32 chipId; + u32 chipVersion; + u32 firmwareBuild; + u32 firmwarePatch; + u32 firmwareHip; CsrCharString *routerBuild; - CsrUint32 routerHip; + u32 routerHip; CsrCharString *smeBuild; - CsrUint32 smeHip; + u32 smeHip; } CsrWifiSmeVersions; /******************************************************************************* @@ -2603,8 +2603,8 @@ typedef struct u16 currentCoexPeriodMs; u16 currentCoexLatencyMs; CsrBool hasBtDevice; - CsrUint32 currentBlackoutDurationUs; - CsrUint32 currentBlackoutPeriodUs; + u32 currentBlackoutDurationUs; + u32 currentBlackoutPeriodUs; CsrWifiSmeCoexScheme currentCoexScheme; } CsrWifiSmeCoexInfo; @@ -4560,7 +4560,7 @@ typedef struct CsrWifiFsmEvent common; u16 interfaceTag; CsrWifiSmeListAction action; - CsrUint32 transactionId; + u32 transactionId; CsrBool strict; CsrWifiSmeTspecCtrlMask ctrlMask; u16 tspecLength; @@ -4830,7 +4830,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint32 dataLength; + u32 dataLength; u8 *data; } CsrWifiSmeSetReq; @@ -6129,7 +6129,7 @@ typedef struct { CsrWifiFsmEvent common; u16 interfaceTag; - CsrUint32 transactionId; + u32 transactionId; CsrWifiSmeTspecResultCode tspecResultCode; u16 tspecLength; u8 *tspec; @@ -6160,7 +6160,7 @@ typedef struct CsrWifiFsmEvent common; u16 interfaceTag; CsrResult status; - CsrUint32 transactionId; + u32 transactionId; CsrWifiSmeTspecResultCode tspecResultCode; u16 tspecLength; u8 *tspec; @@ -6465,7 +6465,7 @@ typedef struct typedef struct { CsrWifiFsmEvent common; - CsrUint32 dataLength; + u32 dataLength; u8 *data; } CsrWifiSmeCoreDumpInd; diff --git a/drivers/staging/csr/csr_wifi_sme_serialize.c b/drivers/staging/csr/csr_wifi_sme_serialize.c index b5ffdce5333..53d9fa273ed 100644 --- a/drivers/staging/csr/csr_wifi_sme_serialize.c +++ b/drivers/staging/csr/csr_wifi_sme_serialize.c @@ -1407,7 +1407,7 @@ CsrSize CsrWifiSmeTspecReqSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 18) */ bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiSmeListAction primitive->action */ - bufferSize += 4; /* CsrUint32 primitive->transactionId */ + bufferSize += 4; /* u32 primitive->transactionId */ bufferSize += 1; /* CsrBool primitive->strict */ bufferSize += 1; /* CsrWifiSmeTspecCtrlMask primitive->ctrlMask */ bufferSize += 2; /* u16 primitive->tspecLength */ @@ -1425,7 +1425,7 @@ u8* CsrWifiSmeTspecReqSer(u8 *ptr, CsrSize *len, void *msg) CsrUint16Ser(ptr, len, primitive->common.type); CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint8Ser(ptr, len, (u8) primitive->action); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->transactionId); + CsrUint32Ser(ptr, len, (u32) primitive->transactionId); CsrUint8Ser(ptr, len, (u8) primitive->strict); CsrUint8Ser(ptr, len, (u8) primitive->ctrlMask); CsrUint16Ser(ptr, len, (u16) primitive->tspecLength); @@ -1451,7 +1451,7 @@ void* CsrWifiSmeTspecReqDes(u8 *buffer, CsrSize length) CsrUint16Des(&primitive->common.type, buffer, &offset); CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint8Des((u8 *) &primitive->action, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->transactionId, buffer, &offset); + CsrUint32Des((u32 *) &primitive->transactionId, buffer, &offset); CsrUint8Des((u8 *) &primitive->strict, buffer, &offset); CsrUint8Des((u8 *) &primitive->ctrlMask, buffer, &offset); CsrUint16Des((u16 *) &primitive->tspecLength, buffer, &offset); @@ -1904,7 +1904,7 @@ CsrSize CsrWifiSmeSetReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 8) */ - bufferSize += 4; /* CsrUint32 primitive->dataLength */ + bufferSize += 4; /* u32 primitive->dataLength */ bufferSize += primitive->dataLength; /* u8 primitive->data */ return bufferSize; } @@ -1915,7 +1915,7 @@ u8* CsrWifiSmeSetReqSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeSetReq *primitive = (CsrWifiSmeSetReq *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->dataLength); + CsrUint32Ser(ptr, len, (u32) primitive->dataLength); if (primitive->dataLength) { CsrMemCpySer(ptr, len, (const void *) primitive->data, ((u16) (primitive->dataLength))); @@ -1931,7 +1931,7 @@ void* CsrWifiSmeSetReqDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->dataLength, buffer, &offset); + CsrUint32Des((u32 *) &primitive->dataLength, buffer, &offset); if (primitive->dataLength) { primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); @@ -2561,8 +2561,8 @@ CsrSize CsrWifiSmeCoexInfoGetCfmSizeof(void *msg) bufferSize += 2; /* u16 primitive->coexInfo.currentCoexPeriodMs */ bufferSize += 2; /* u16 primitive->coexInfo.currentCoexLatencyMs */ bufferSize += 1; /* CsrBool primitive->coexInfo.hasBtDevice */ - bufferSize += 4; /* CsrUint32 primitive->coexInfo.currentBlackoutDurationUs */ - bufferSize += 4; /* CsrUint32 primitive->coexInfo.currentBlackoutPeriodUs */ + bufferSize += 4; /* u32 primitive->coexInfo.currentBlackoutDurationUs */ + bufferSize += 4; /* u32 primitive->coexInfo.currentBlackoutPeriodUs */ bufferSize += 1; /* CsrWifiSmeCoexScheme primitive->coexInfo.currentCoexScheme */ return bufferSize; } @@ -2581,8 +2581,8 @@ u8* CsrWifiSmeCoexInfoGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrUint16Ser(ptr, len, (u16) primitive->coexInfo.currentCoexPeriodMs); CsrUint16Ser(ptr, len, (u16) primitive->coexInfo.currentCoexLatencyMs); CsrUint8Ser(ptr, len, (u8) primitive->coexInfo.hasBtDevice); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->coexInfo.currentBlackoutDurationUs); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->coexInfo.currentBlackoutPeriodUs); + CsrUint32Ser(ptr, len, (u32) primitive->coexInfo.currentBlackoutDurationUs); + CsrUint32Ser(ptr, len, (u32) primitive->coexInfo.currentBlackoutPeriodUs); CsrUint8Ser(ptr, len, (u8) primitive->coexInfo.currentCoexScheme); return(ptr); } @@ -2603,8 +2603,8 @@ void* CsrWifiSmeCoexInfoGetCfmDes(u8 *buffer, CsrSize length) CsrUint16Des((u16 *) &primitive->coexInfo.currentCoexPeriodMs, buffer, &offset); CsrUint16Des((u16 *) &primitive->coexInfo.currentCoexLatencyMs, buffer, &offset); CsrUint8Des((u8 *) &primitive->coexInfo.hasBtDevice, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->coexInfo.currentBlackoutDurationUs, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->coexInfo.currentBlackoutPeriodUs, buffer, &offset); + CsrUint32Des((u32 *) &primitive->coexInfo.currentBlackoutDurationUs, buffer, &offset); + CsrUint32Des((u32 *) &primitive->coexInfo.currentBlackoutPeriodUs, buffer, &offset); CsrUint8Des((u8 *) &primitive->coexInfo.currentCoexScheme, buffer, &offset); return primitive; @@ -2999,29 +2999,29 @@ CsrSize CsrWifiSmeConnectionStatsGetCfmSizeof(void *msg) bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 1; /* u8 primitive->connectionStats.unifiTxDataRate */ bufferSize += 1; /* u8 primitive->connectionStats.unifiRxDataRate */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11RetryCount */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11MultipleRetryCount */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11AckFailureCount */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11FrameDuplicateCount */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11FcsErrorCount */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11RtsSuccessCount */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11RtsFailureCount */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11FailedCount */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11TransmittedFragmentCount */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11TransmittedFrameCount */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11WepExcludedCount */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11WepIcvErrorCount */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11WepUndecryptableCount */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11MulticastReceivedFrameCount */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11MulticastTransmittedFrameCount */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11ReceivedFragmentCount */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11Rsna4WayHandshakeFailures */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11RsnaTkipCounterMeasuresInvoked */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11RsnaStatsTkipLocalMicFailures */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11RsnaStatsTkipReplays */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11RsnaStatsTkipIcvErrors */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11RsnaStatsCcmpReplays */ - bufferSize += 4; /* CsrUint32 primitive->connectionStats.dot11RsnaStatsCcmpDecryptErrors */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11RetryCount */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11MultipleRetryCount */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11AckFailureCount */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11FrameDuplicateCount */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11FcsErrorCount */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11RtsSuccessCount */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11RtsFailureCount */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11FailedCount */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11TransmittedFragmentCount */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11TransmittedFrameCount */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11WepExcludedCount */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11WepIcvErrorCount */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11WepUndecryptableCount */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11MulticastReceivedFrameCount */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11MulticastTransmittedFrameCount */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11ReceivedFragmentCount */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11Rsna4WayHandshakeFailures */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11RsnaTkipCounterMeasuresInvoked */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11RsnaStatsTkipLocalMicFailures */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11RsnaStatsTkipReplays */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11RsnaStatsTkipIcvErrors */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11RsnaStatsCcmpReplays */ + bufferSize += 4; /* u32 primitive->connectionStats.dot11RsnaStatsCcmpDecryptErrors */ return bufferSize; } @@ -3035,29 +3035,29 @@ u8* CsrWifiSmeConnectionStatsGetCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrUint16Ser(ptr, len, (u16) primitive->status); CsrUint8Ser(ptr, len, (u8) primitive->connectionStats.unifiTxDataRate); CsrUint8Ser(ptr, len, (u8) primitive->connectionStats.unifiRxDataRate); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11RetryCount); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11MultipleRetryCount); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11AckFailureCount); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11FrameDuplicateCount); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11FcsErrorCount); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11RtsSuccessCount); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11RtsFailureCount); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11FailedCount); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11TransmittedFragmentCount); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11TransmittedFrameCount); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11WepExcludedCount); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11WepIcvErrorCount); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11WepUndecryptableCount); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11MulticastReceivedFrameCount); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11MulticastTransmittedFrameCount); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11ReceivedFragmentCount); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11Rsna4WayHandshakeFailures); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11RsnaTkipCounterMeasuresInvoked); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11RsnaStatsTkipLocalMicFailures); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11RsnaStatsTkipReplays); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11RsnaStatsTkipIcvErrors); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11RsnaStatsCcmpReplays); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->connectionStats.dot11RsnaStatsCcmpDecryptErrors); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11RetryCount); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11MultipleRetryCount); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11AckFailureCount); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11FrameDuplicateCount); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11FcsErrorCount); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11RtsSuccessCount); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11RtsFailureCount); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11FailedCount); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11TransmittedFragmentCount); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11TransmittedFrameCount); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11WepExcludedCount); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11WepIcvErrorCount); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11WepUndecryptableCount); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11MulticastReceivedFrameCount); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11MulticastTransmittedFrameCount); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11ReceivedFragmentCount); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11Rsna4WayHandshakeFailures); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11RsnaTkipCounterMeasuresInvoked); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11RsnaStatsTkipLocalMicFailures); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11RsnaStatsTkipReplays); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11RsnaStatsTkipIcvErrors); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11RsnaStatsCcmpReplays); + CsrUint32Ser(ptr, len, (u32) primitive->connectionStats.dot11RsnaStatsCcmpDecryptErrors); return(ptr); } @@ -3073,29 +3073,29 @@ void* CsrWifiSmeConnectionStatsGetCfmDes(u8 *buffer, CsrSize length) CsrUint16Des((u16 *) &primitive->status, buffer, &offset); CsrUint8Des((u8 *) &primitive->connectionStats.unifiTxDataRate, buffer, &offset); CsrUint8Des((u8 *) &primitive->connectionStats.unifiRxDataRate, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11RetryCount, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11MultipleRetryCount, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11AckFailureCount, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11FrameDuplicateCount, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11FcsErrorCount, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11RtsSuccessCount, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11RtsFailureCount, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11FailedCount, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11TransmittedFragmentCount, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11TransmittedFrameCount, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11WepExcludedCount, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11WepIcvErrorCount, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11WepUndecryptableCount, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11MulticastReceivedFrameCount, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11MulticastTransmittedFrameCount, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11ReceivedFragmentCount, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11Rsna4WayHandshakeFailures, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11RsnaTkipCounterMeasuresInvoked, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11RsnaStatsTkipLocalMicFailures, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11RsnaStatsTkipReplays, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11RsnaStatsTkipIcvErrors, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11RsnaStatsCcmpReplays, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->connectionStats.dot11RsnaStatsCcmpDecryptErrors, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11RetryCount, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11MultipleRetryCount, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11AckFailureCount, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11FrameDuplicateCount, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11FcsErrorCount, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11RtsSuccessCount, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11RtsFailureCount, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11FailedCount, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11TransmittedFragmentCount, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11TransmittedFrameCount, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11WepExcludedCount, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11WepIcvErrorCount, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11WepUndecryptableCount, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11MulticastReceivedFrameCount, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11MulticastTransmittedFrameCount, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11ReceivedFragmentCount, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11Rsna4WayHandshakeFailures, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11RsnaTkipCounterMeasuresInvoked, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11RsnaStatsTkipLocalMicFailures, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11RsnaStatsTkipReplays, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11RsnaStatsTkipIcvErrors, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11RsnaStatsCcmpReplays, buffer, &offset); + CsrUint32Des((u32 *) &primitive->connectionStats.dot11RsnaStatsCcmpDecryptErrors, buffer, &offset); return primitive; } @@ -5283,7 +5283,7 @@ CsrSize CsrWifiSmeTspecIndSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */ bufferSize += 2; /* u16 primitive->interfaceTag */ - bufferSize += 4; /* CsrUint32 primitive->transactionId */ + bufferSize += 4; /* u32 primitive->transactionId */ bufferSize += 1; /* CsrWifiSmeTspecResultCode primitive->tspecResultCode */ bufferSize += 2; /* u16 primitive->tspecLength */ bufferSize += primitive->tspecLength; /* u8 primitive->tspec */ @@ -5297,7 +5297,7 @@ u8* CsrWifiSmeTspecIndSer(u8 *ptr, CsrSize *len, void *msg) *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->transactionId); + CsrUint32Ser(ptr, len, (u32) primitive->transactionId); CsrUint8Ser(ptr, len, (u8) primitive->tspecResultCode); CsrUint16Ser(ptr, len, (u16) primitive->tspecLength); if (primitive->tspecLength) @@ -5316,7 +5316,7 @@ void* CsrWifiSmeTspecIndDes(u8 *buffer, CsrSize length) CsrUint16Des(&primitive->common.type, buffer, &offset); CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->transactionId, buffer, &offset); + CsrUint32Des((u32 *) &primitive->transactionId, buffer, &offset); CsrUint8Des((u8 *) &primitive->tspecResultCode, buffer, &offset); CsrUint16Des((u16 *) &primitive->tspecLength, buffer, &offset); if (primitive->tspecLength) @@ -5349,7 +5349,7 @@ CsrSize CsrWifiSmeTspecCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 15) */ bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ - bufferSize += 4; /* CsrUint32 primitive->transactionId */ + bufferSize += 4; /* u32 primitive->transactionId */ bufferSize += 1; /* CsrWifiSmeTspecResultCode primitive->tspecResultCode */ bufferSize += 2; /* u16 primitive->tspecLength */ bufferSize += primitive->tspecLength; /* u8 primitive->tspec */ @@ -5364,7 +5364,7 @@ u8* CsrWifiSmeTspecCfmSer(u8 *ptr, CsrSize *len, void *msg) CsrUint16Ser(ptr, len, primitive->common.type); CsrUint16Ser(ptr, len, (u16) primitive->interfaceTag); CsrUint16Ser(ptr, len, (u16) primitive->status); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->transactionId); + CsrUint32Ser(ptr, len, (u32) primitive->transactionId); CsrUint8Ser(ptr, len, (u8) primitive->tspecResultCode); CsrUint16Ser(ptr, len, (u16) primitive->tspecLength); if (primitive->tspecLength) @@ -5384,7 +5384,7 @@ void* CsrWifiSmeTspecCfmDes(u8 *buffer, CsrSize length) CsrUint16Des(&primitive->common.type, buffer, &offset); CsrUint16Des((u16 *) &primitive->interfaceTag, buffer, &offset); CsrUint16Des((u16 *) &primitive->status, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->transactionId, buffer, &offset); + CsrUint32Des((u32 *) &primitive->transactionId, buffer, &offset); CsrUint8Des((u8 *) &primitive->tspecResultCode, buffer, &offset); CsrUint16Des((u16 *) &primitive->tspecLength, buffer, &offset); if (primitive->tspecLength) @@ -5416,15 +5416,15 @@ CsrSize CsrWifiSmeVersionsGetCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 33) */ bufferSize += 2; /* CsrResult primitive->status */ - bufferSize += 4; /* CsrUint32 primitive->versions.chipId */ - bufferSize += 4; /* CsrUint32 primitive->versions.chipVersion */ - bufferSize += 4; /* CsrUint32 primitive->versions.firmwareBuild */ - bufferSize += 4; /* CsrUint32 primitive->versions.firmwarePatch */ - bufferSize += 4; /* CsrUint32 primitive->versions.firmwareHip */ + bufferSize += 4; /* u32 primitive->versions.chipId */ + bufferSize += 4; /* u32 primitive->versions.chipVersion */ + bufferSize += 4; /* u32 primitive->versions.firmwareBuild */ + bufferSize += 4; /* u32 primitive->versions.firmwarePatch */ + bufferSize += 4; /* u32 primitive->versions.firmwareHip */ bufferSize += (primitive->versions.routerBuild?CsrStrLen(primitive->versions.routerBuild) : 0) + 1; /* CsrCharString* primitive->versions.routerBuild (0 byte len + 1 for NULL Term) */ - bufferSize += 4; /* CsrUint32 primitive->versions.routerHip */ + bufferSize += 4; /* u32 primitive->versions.routerHip */ bufferSize += (primitive->versions.smeBuild?CsrStrLen(primitive->versions.smeBuild) : 0) + 1; /* CsrCharString* primitive->versions.smeBuild (0 byte len + 1 for NULL Term) */ - bufferSize += 4; /* CsrUint32 primitive->versions.smeHip */ + bufferSize += 4; /* u32 primitive->versions.smeHip */ return bufferSize; } @@ -5435,15 +5435,15 @@ u8* CsrWifiSmeVersionsGetCfmSer(u8 *ptr, CsrSize *len, void *msg) *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); CsrUint16Ser(ptr, len, (u16) primitive->status); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->versions.chipId); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->versions.chipVersion); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->versions.firmwareBuild); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->versions.firmwarePatch); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->versions.firmwareHip); + CsrUint32Ser(ptr, len, (u32) primitive->versions.chipId); + CsrUint32Ser(ptr, len, (u32) primitive->versions.chipVersion); + CsrUint32Ser(ptr, len, (u32) primitive->versions.firmwareBuild); + CsrUint32Ser(ptr, len, (u32) primitive->versions.firmwarePatch); + CsrUint32Ser(ptr, len, (u32) primitive->versions.firmwareHip); CsrCharStringSer(ptr, len, primitive->versions.routerBuild); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->versions.routerHip); + CsrUint32Ser(ptr, len, (u32) primitive->versions.routerHip); CsrCharStringSer(ptr, len, primitive->versions.smeBuild); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->versions.smeHip); + CsrUint32Ser(ptr, len, (u32) primitive->versions.smeHip); return(ptr); } @@ -5456,15 +5456,15 @@ void* CsrWifiSmeVersionsGetCfmDes(u8 *buffer, CsrSize length) CsrUint16Des(&primitive->common.type, buffer, &offset); CsrUint16Des((u16 *) &primitive->status, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->versions.chipId, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->versions.chipVersion, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->versions.firmwareBuild, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->versions.firmwarePatch, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->versions.firmwareHip, buffer, &offset); + CsrUint32Des((u32 *) &primitive->versions.chipId, buffer, &offset); + CsrUint32Des((u32 *) &primitive->versions.chipVersion, buffer, &offset); + CsrUint32Des((u32 *) &primitive->versions.firmwareBuild, buffer, &offset); + CsrUint32Des((u32 *) &primitive->versions.firmwarePatch, buffer, &offset); + CsrUint32Des((u32 *) &primitive->versions.firmwareHip, buffer, &offset); CsrCharStringDes(&primitive->versions.routerBuild, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->versions.routerHip, buffer, &offset); + CsrUint32Des((u32 *) &primitive->versions.routerHip, buffer, &offset); CsrCharStringDes(&primitive->versions.smeBuild, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->versions.smeHip, buffer, &offset); + CsrUint32Des((u32 *) &primitive->versions.smeHip, buffer, &offset); return primitive; } @@ -5760,7 +5760,7 @@ CsrSize CsrWifiSmeCoreDumpIndSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 8) */ - bufferSize += 4; /* CsrUint32 primitive->dataLength */ + bufferSize += 4; /* u32 primitive->dataLength */ bufferSize += primitive->dataLength; /* u8 primitive->data */ return bufferSize; } @@ -5771,7 +5771,7 @@ u8* CsrWifiSmeCoreDumpIndSer(u8 *ptr, CsrSize *len, void *msg) CsrWifiSmeCoreDumpInd *primitive = (CsrWifiSmeCoreDumpInd *)msg; *len = 0; CsrUint16Ser(ptr, len, primitive->common.type); - CsrUint32Ser(ptr, len, (CsrUint32) primitive->dataLength); + CsrUint32Ser(ptr, len, (u32) primitive->dataLength); if (primitive->dataLength) { CsrMemCpySer(ptr, len, (const void *) primitive->data, ((u16) (primitive->dataLength))); @@ -5787,7 +5787,7 @@ void* CsrWifiSmeCoreDumpIndDes(u8 *buffer, CsrSize length) offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); - CsrUint32Des((CsrUint32 *) &primitive->dataLength, buffer, &offset); + CsrUint32Des((u32 *) &primitive->dataLength, buffer, &offset); if (primitive->dataLength) { primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); diff --git a/drivers/staging/csr/drv.c b/drivers/staging/csr/drv.c index 5ce33296fe4..c5beb220c21 100644 --- a/drivers/staging/csr/drv.c +++ b/drivers/staging/csr/drv.c @@ -1318,7 +1318,7 @@ unifi_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) /* Apply scheduled interrupt mode, if requested by module param */ if (run_bh_once != -1) { - unifi_set_interrupt_mode(priv->card, (CsrUint32)run_bh_once); + unifi_set_interrupt_mode(priv->card, (u32)run_bh_once); } priv->init_progress = UNIFI_INIT_COMPLETED; @@ -1703,7 +1703,7 @@ unifi_poll(struct file *filp, poll_table *wait) static void udi_set_log_filter(ul_client_t *pcli, unifiio_filter_t *udi_filter) { - CsrUint32 filter_pos; + u32 filter_pos; int i; if (udi_filter->action == UfSigFil_AllOn) @@ -1781,7 +1781,7 @@ udi_log_event(ul_client_t *pcli, int i; int total_len; udi_msg_t *msgptr; - CsrUint32 filter_pos; + u32 filter_pos; #ifdef OMNICLI_LINUX_EXTRA_LOG static volatile unsigned int printk_cpu = UINT_MAX; unsigned long long t; diff --git a/drivers/staging/csr/firmware.c b/drivers/staging/csr/firmware.c index 8199ff98bbd..b8716541c6e 100644 --- a/drivers/staging/csr/firmware.c +++ b/drivers/staging/csr/firmware.c @@ -140,7 +140,7 @@ unifi_fw_read_stop(void *ospriv, void *dlpriv) * --------------------------------------------------------------------------- */ void * -unifi_fw_open_buffer(void *ospriv, void *fwbuf, CsrUint32 len) +unifi_fw_open_buffer(void *ospriv, void *fwbuf, u32 len) { unifi_priv_t *priv = (unifi_priv_t*)ospriv; func_enter(); @@ -197,7 +197,7 @@ void unifi_fw_close_buffer(void *ospriv, void *fwbuf) * --------------------------------------------------------------------------- */ CsrInt32 -unifi_fw_read(void *ospriv, void *arg, CsrUint32 offset, void *buf, CsrUint32 len) +unifi_fw_read(void *ospriv, void *arg, u32 offset, void *buf, u32 len) { const struct dlpriv *dlpriv = arg; diff --git a/drivers/staging/csr/netdev.c b/drivers/staging/csr/netdev.c index 947a6ec2d61..529bd9d0d47 100644 --- a/drivers/staging/csr/netdev.c +++ b/drivers/staging/csr/netdev.c @@ -3619,9 +3619,9 @@ static struct notifier_block uf_netdev_notifier = { static void process_amsdu(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) { - CsrUint32 offset; - CsrUint32 length = bulkdata->d[0].data_length; - CsrUint32 subframe_length, subframe_body_length, dot11_hdr_size; + u32 offset; + u32 length = bulkdata->d[0].data_length; + u32 subframe_length, subframe_body_length, dot11_hdr_size; u8 *ptr; bulk_data_param_t subframe_bulkdata; u8 *dot11_hdr_ptr = (u8*)bulkdata->d[0].os_data_ptr; diff --git a/drivers/staging/csr/sdio_mmc.c b/drivers/staging/csr/sdio_mmc.c index 8dc91bf920c..d3fd57cdde0 100644 --- a/drivers/staging/csr/sdio_mmc.c +++ b/drivers/staging/csr/sdio_mmc.c @@ -144,7 +144,7 @@ csr_io_rw_direct(struct mmc_card *card, int write, uint8_t fn, CsrResult -CsrSdioRead8(CsrSdioFunction *function, CsrUint32 address, u8 *data) +CsrSdioRead8(CsrSdioFunction *function, u32 address, u8 *data) { struct sdio_func *func = (struct sdio_func *)function->priv; int err = 0; @@ -162,7 +162,7 @@ CsrSdioRead8(CsrSdioFunction *function, CsrUint32 address, u8 *data) } /* CsrSdioRead8() */ CsrResult -CsrSdioWrite8(CsrSdioFunction *function, CsrUint32 address, u8 data) +CsrSdioWrite8(CsrSdioFunction *function, u32 address, u8 data) { struct sdio_func *func = (struct sdio_func *)function->priv; int err = 0; @@ -180,7 +180,7 @@ CsrSdioWrite8(CsrSdioFunction *function, CsrUint32 address, u8 data) } /* CsrSdioWrite8() */ CsrResult -CsrSdioRead16(CsrSdioFunction *function, CsrUint32 address, u16 *data) +CsrSdioRead16(CsrSdioFunction *function, u32 address, u16 *data) { struct sdio_func *func = (struct sdio_func *)function->priv; int err; @@ -207,7 +207,7 @@ CsrSdioRead16(CsrSdioFunction *function, CsrUint32 address, u16 *data) CsrResult -CsrSdioWrite16(CsrSdioFunction *function, CsrUint32 address, u16 data) +CsrSdioWrite16(CsrSdioFunction *function, u32 address, u16 data) { struct sdio_func *func = (struct sdio_func *)function->priv; int err; @@ -234,7 +234,7 @@ CsrSdioWrite16(CsrSdioFunction *function, CsrUint32 address, u16 data) CsrResult -CsrSdioF0Read8(CsrSdioFunction *function, CsrUint32 address, u8 *data) +CsrSdioF0Read8(CsrSdioFunction *function, u32 address, u8 *data) { struct sdio_func *func = (struct sdio_func *)function->priv; int err = 0; @@ -256,7 +256,7 @@ CsrSdioF0Read8(CsrSdioFunction *function, CsrUint32 address, u8 *data) } /* CsrSdioF0Read8() */ CsrResult -CsrSdioF0Write8(CsrSdioFunction *function, CsrUint32 address, u8 data) +CsrSdioF0Write8(CsrSdioFunction *function, u32 address, u8 data) { struct sdio_func *func = (struct sdio_func *)function->priv; int err = 0; @@ -279,7 +279,7 @@ CsrSdioF0Write8(CsrSdioFunction *function, CsrUint32 address, u8 data) CsrResult -CsrSdioRead(CsrSdioFunction *function, CsrUint32 address, void *data, CsrUint32 length) +CsrSdioRead(CsrSdioFunction *function, u32 address, void *data, u32 length) { struct sdio_func *func = (struct sdio_func *)function->priv; int err; @@ -297,7 +297,7 @@ CsrSdioRead(CsrSdioFunction *function, CsrUint32 address, void *data, CsrUint32 } /* CsrSdioRead() */ CsrResult -CsrSdioWrite(CsrSdioFunction *function, CsrUint32 address, const void *data, CsrUint32 length) +CsrSdioWrite(CsrSdioFunction *function, u32 address, const void *data, u32 length) { struct sdio_func *func = (struct sdio_func *)function->priv; int err; @@ -404,14 +404,14 @@ csr_sdio_disable_hs(struct mmc_card *card) * --------------------------------------------------------------------------- */ CsrResult -CsrSdioMaxBusClockFrequencySet(CsrSdioFunction *function, CsrUint32 maxFrequency) +CsrSdioMaxBusClockFrequencySet(CsrSdioFunction *function, u32 maxFrequency) { struct sdio_func *func = (struct sdio_func *)function->priv; struct mmc_host *host = func->card->host; struct mmc_ios *ios = &host->ios; unsigned int max_hz; int err; - CsrUint32 max_khz = maxFrequency/1000; + u32 max_khz = maxFrequency/1000; if (!max_khz || max_khz > sdio_clock) { max_khz = sdio_clock; diff --git a/drivers/staging/csr/sme_blocking.c b/drivers/staging/csr/sme_blocking.c index c95f1b30522..921396712a5 100644 --- a/drivers/staging/csr/sme_blocking.c +++ b/drivers/staging/csr/sme_blocking.c @@ -1299,7 +1299,7 @@ int sme_mgt_packet_filter_set(unifi_priv_t *priv) } int sme_mgt_tspec(unifi_priv_t *priv, CsrWifiSmeListAction action, - CsrUint32 tid, CsrWifiSmeDataBlock *tspec, CsrWifiSmeDataBlock *tclas) + u32 tid, CsrWifiSmeDataBlock *tspec, CsrWifiSmeDataBlock *tclas) { int r; diff --git a/drivers/staging/csr/sme_native.c b/drivers/staging/csr/sme_native.c index 2e63db2bc94..f22b804e729 100644 --- a/drivers/staging/csr/sme_native.c +++ b/drivers/staging/csr/sme_native.c @@ -395,10 +395,10 @@ unifi_ta_indicate_sampling(void *ospriv, CsrWifiRouterCtrlTrafficStats *stats) void unifi_ta_indicate_l4stats(void *ospriv, - CsrUint32 rxTcpThroughput, - CsrUint32 txTcpThroughput, - CsrUint32 rxUdpThroughput, - CsrUint32 txUdpThroughput) + u32 rxTcpThroughput, + u32 txTcpThroughput, + u32 rxUdpThroughput, + u32 txUdpThroughput) { } /* unifi_ta_indicate_l4stats() */ diff --git a/drivers/staging/csr/sme_sys.c b/drivers/staging/csr/sme_sys.c index 59909a4ecfa..add577186dc 100644 --- a/drivers/staging/csr/sme_sys.c +++ b/drivers/staging/csr/sme_sys.c @@ -1093,7 +1093,7 @@ void CsrWifiRouterCtrlWifiOnResHandler(void* drvpriv, CsrWifiFsmEvent* msg) if (res->status == CSR_RESULT_SUCCESS) { int i; /* used as a loop counter */ - CsrUint32 intmode = CSR_WIFI_INTMODE_DEFAULT; + u32 intmode = CSR_WIFI_INTMODE_DEFAULT; #ifdef CSR_WIFI_SPLIT_PATCH CsrBool switching_ap_fw = FALSE; #endif @@ -1147,7 +1147,7 @@ void CsrWifiRouterCtrlWifiOnResHandler(void* drvpriv, CsrWifiFsmEvent* msg) * but let module param override. */ if (run_bh_once != -1) { - intmode = (CsrUint32)run_bh_once; + intmode = (u32)run_bh_once; } else if (res->scheduledInterrupt) { intmode = CSR_WIFI_INTMODE_RUN_BH_ONCE; } @@ -2098,7 +2098,7 @@ void CsrWifiRouterCtrlPeerDelReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) } /* Add the new station to the station record data base */ -static int peer_add_new_record(unifi_priv_t *priv,CsrWifiRouterCtrlPeerAddReq *req,CsrUint32 *handle) +static int peer_add_new_record(unifi_priv_t *priv,CsrWifiRouterCtrlPeerAddReq *req,u32 *handle) { u8 i, powerModeTemp = 0; CsrBool freeSlotFound = FALSE; @@ -2479,7 +2479,7 @@ void CsrWifiRouterCtrlPeerAddReqHandler(void* drvpriv,CsrWifiFsmEvent* msg) CsrWifiRouterCtrlPeerAddReq* req = (CsrWifiRouterCtrlPeerAddReq*)msg; CsrResult status = CSR_RESULT_SUCCESS; unifi_priv_t *priv = (unifi_priv_t*)drvpriv; - CsrUint32 handle = 0; + u32 handle = 0; netInterface_priv_t *interfacePriv = priv->interfacePriv[req->interfaceTag]; unifi_trace(priv, UDBG2, "entering CsrWifiRouterCtrlPeerAddReqHandler \n"); diff --git a/drivers/staging/csr/sme_userspace.c b/drivers/staging/csr/sme_userspace.c index b4a00096140..5dc7a2e376e 100644 --- a/drivers/staging/csr/sme_userspace.c +++ b/drivers/staging/csr/sme_userspace.c @@ -297,10 +297,10 @@ unifi_ta_indicate_sampling(void *ospriv, CsrWifiRouterCtrlTrafficStats *stats) */ void unifi_ta_indicate_l4stats(void *ospriv, - CsrUint32 rxTcpThroughput, - CsrUint32 txTcpThroughput, - CsrUint32 rxUdpThroughput, - CsrUint32 txUdpThroughput) + u32 rxTcpThroughput, + u32 txTcpThroughput, + u32 rxUdpThroughput, + u32 txUdpThroughput) { unifi_priv_t *priv = (unifi_priv_t*)ospriv; diff --git a/drivers/staging/csr/sme_wext.c b/drivers/staging/csr/sme_wext.c index 51c19bb97b7..7e85907e29a 100644 --- a/drivers/staging/csr/sme_wext.c +++ b/drivers/staging/csr/sme_wext.c @@ -458,7 +458,7 @@ static int decode_parameter_from_string(unifi_priv_t* priv, char **str_ptr, void *dst, int param_max_len) { u8 int_str[7] = "0"; - CsrUint32 param_str_len; + u32 param_str_len; u8 *param_str_begin,*param_str_end; u8 *orig_str = *str_ptr; @@ -480,7 +480,7 @@ static int decode_parameter_from_string(unifi_priv_t* priv, char **str_ptr, switch (param_type) { case PARAM_TYPE_INT: { - CsrUint32 *pdst_int = dst,num =0; + u32 *pdst_int = dst,num =0; int i,j=0; if (param_str_len > sizeof(int_str)) { param_str_len = sizeof(int_str); diff --git a/drivers/staging/csr/ul_int.c b/drivers/staging/csr/ul_int.c index 325218fc246..d71bb05239e 100644 --- a/drivers/staging/csr/ul_int.c +++ b/drivers/staging/csr/ul_int.c @@ -213,7 +213,7 @@ ul_deregister_client(ul_client_t *ul_client) */ void logging_handler(void *ospriv, - u8 *sigdata, CsrUint32 signal_len, + u8 *sigdata, u32 signal_len, const bulk_data_param_t *bulkdata, enum udi_log_direction direction) { @@ -340,7 +340,7 @@ _align_bulk_data_buffers(unifi_priv_t *priv, u8 *signal, * The following complex casting is in place in order to eliminate 64-bit compilation warning * "cast to/from pointer from/to integer of different size" */ - CsrUint32 align_offset = (CsrUint32)(long)(bulkdata->d[i].os_data_ptr) & (CSR_WIFI_ALIGN_BYTES-1); + u32 align_offset = (u32)(long)(bulkdata->d[i].os_data_ptr) & (CSR_WIFI_ALIGN_BYTES-1); if (align_offset) { skb = (struct sk_buff*)bulkdata->d[i].os_net_buf_ptr; diff --git a/drivers/staging/csr/unifi_clients.h b/drivers/staging/csr/unifi_clients.h index 418cb4d92fc..df853e160ea 100644 --- a/drivers/staging/csr/unifi_clients.h +++ b/drivers/staging/csr/unifi_clients.h @@ -49,7 +49,7 @@ typedef void (*udi_event_t)(ul_client_t *client, int dir); void logging_handler(void *ospriv, - u8 *sigdata, CsrUint32 signal_len, + u8 *sigdata, u32 signal_len, const bulk_data_param_t *bulkdata, enum udi_log_direction direction); diff --git a/drivers/staging/csr/unifi_event.c b/drivers/staging/csr/unifi_event.c index f1b8cc5bcf4..f5c2e77ba29 100644 --- a/drivers/staging/csr/unifi_event.c +++ b/drivers/staging/csr/unifi_event.c @@ -367,7 +367,7 @@ static CsrBool check_routing_pkt_data_ind(unifi_priv_t *priv, */ static void unifi_process_receive_event(void *ospriv, - u8 *sigdata, CsrUint32 siglen, + u8 *sigdata, u32 siglen, const bulk_data_param_t *bulkdata) { unifi_priv_t *priv = (unifi_priv_t*)ospriv; @@ -647,7 +647,7 @@ void rx_wq_handler(struct work_struct *work) */ void unifi_receive_event(void *ospriv, - u8 *sigdata, CsrUint32 siglen, + u8 *sigdata, u32 siglen, const bulk_data_param_t *bulkdata) { #ifdef CSR_WIFI_RX_PATH_SPLIT diff --git a/drivers/staging/csr/unifi_pdu_processing.c b/drivers/staging/csr/unifi_pdu_processing.c index 51ce5e40b0a..7c5fb4592e9 100644 --- a/drivers/staging/csr/unifi_pdu_processing.c +++ b/drivers/staging/csr/unifi_pdu_processing.c @@ -33,14 +33,14 @@ static void _update_buffered_pkt_params_after_alignment(unifi_priv_t *priv, bulk tx_buffered_packets_t* buffered_pkt) { struct sk_buff *skb ; - CsrUint32 align_offset; + u32 align_offset; if (priv == NULL || bulkdata == NULL || buffered_pkt == NULL){ return; } skb = (struct sk_buff*)bulkdata->d[0].os_net_buf_ptr; - align_offset = (CsrUint32)(long)(bulkdata->d[0].os_data_ptr) & (CSR_WIFI_ALIGN_BYTES-1); + align_offset = (u32)(long)(bulkdata->d[0].os_data_ptr) & (CSR_WIFI_ALIGN_BYTES-1); if(align_offset){ skb_pull(skb,align_offset); } @@ -448,7 +448,7 @@ CsrResult enque_tx_data_pdu(unifi_priv_t *priv, bulk_data_param_t *bulkdata, } #ifdef CSR_WIFI_REQUEUE_PACKET_TO_HAL -CsrResult unifi_reque_ma_packet_request (void *ospriv, CsrUint32 host_tag, +CsrResult unifi_reque_ma_packet_request (void *ospriv, u32 host_tag, u16 txStatus, bulk_data_desc_t *bulkDataDesc) { CsrResult status = CSR_RESULT_SUCCESS; @@ -859,7 +859,7 @@ void uf_handle_tim_cfm(unifi_priv_t *priv, CSR_MLME_SET_TIM_CONFIRM *cfm, u16 re * * --------------------------------------------------------------------------- */ -void update_tim(unifi_priv_t * priv, u16 aid, u8 setTim, u16 interfaceTag, CsrUint32 handle) +void update_tim(unifi_priv_t * priv, u16 aid, u8 setTim, u16 interfaceTag, u32 handle) { CSR_SIGNAL signal; CsrInt32 r; @@ -868,7 +868,7 @@ void update_tim(unifi_priv_t * priv, u16 aid, u8 setTim, u16 interfaceTag, CsrUi netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; u8 senderIdLsb = 0; CsrWifiRouterCtrlStaInfo_t *staRecord = NULL; - CsrUint32 oldTimSetStatus = 0, timSetStatus = 0; + u32 oldTimSetStatus = 0, timSetStatus = 0; unifi_trace(priv, UDBG5, "entering the update_tim routine\n"); @@ -1661,13 +1661,13 @@ CsrResult uf_process_ma_packet_req(unifi_priv_t *priv, CsrWifiPacketType pktType; int frameType = 0; CsrBool queuePacketDozing = FALSE; - CsrUint32 priority_q; + u32 priority_q; u16 frmCtrl; struct list_head * list = NULL; /* List to which buffered PDUs are to be enqueued*/ CsrBool setBcTim=FALSE; netInterface_priv_t *interfacePriv; CsrBool requeueOnSamePos = FALSE; - CsrUint32 handle = 0xFFFFFFFF; + u32 handle = 0xFFFFFFFF; unsigned long lock_flags; unifi_trace(priv, UDBG5, @@ -2025,7 +2025,7 @@ u8 send_multicast_frames(unifi_priv_t *priv, u16 interfaceTag) u8 pduSent =0; unsigned long lock_flags; netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; - CsrUint32 hostTag = 0xffffffff; + u32 hostTag = 0xffffffff; func_enter(); if(!isRouterBufferEnabled(priv,UNIFI_TRAFFIC_Q_VO)) { @@ -2116,7 +2116,7 @@ u8 send_multicast_frames(unifi_priv_t *priv, u16 interfaceTag) } #endif void uf_process_ma_vif_availibility_ind(unifi_priv_t *priv,u8 *sigdata, - CsrUint32 siglen) + u32 siglen) { #ifdef CSR_SUPPORT_SME CSR_SIGNAL signal; @@ -2409,7 +2409,7 @@ void uf_send_buffered_data_from_ac(unifi_priv_t *priv, void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q) { u16 interfaceTag = GET_ACTIVE_INTERFACE_TAG(priv); - CsrUint32 startIndex=0,endIndex=0; + u32 startIndex=0,endIndex=0; CsrWifiRouterCtrlStaInfo_t * staInfo = NULL; u8 queue; CsrBool moreData = FALSE; @@ -2769,7 +2769,7 @@ void uf_send_qos_null(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI CSR_TRANSMISSION_CONTROL transmissionControl = (TRANSMISSION_CONTROL_EOSP_MASK | TRANSMISSION_CONTROL_TRIGGER_MASK); int r; CSR_SIGNAL signal; - CsrUint32 priority_q; + u32 priority_q; CSR_RATE transmitRate = 0; @@ -2840,7 +2840,7 @@ void uf_send_nulldata(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI CSR_TRANSMISSION_CONTROL transmissionControl = 0; int r; CSR_SIGNAL signal; - CsrUint32 priority_q; + u32 priority_q; CSR_RATE transmitRate = 0; CSR_MA_PACKET_REQUEST *req = &signal.u.MaPacketRequest; unsigned long lock_flags; @@ -3481,7 +3481,7 @@ CsrWifiRouterCtrlStaInfo_t *CsrWifiRouterCtrlGetStationRecordFromPeerMacAddress( } /* generic function to get the station record handler from the handle */ CsrWifiRouterCtrlStaInfo_t * CsrWifiRouterCtrlGetStationRecordFromHandle(unifi_priv_t *priv, - CsrUint32 handle, + u32 handle, u16 interfaceTag) { netInterface_priv_t *interfacePriv; @@ -3497,7 +3497,7 @@ CsrWifiRouterCtrlStaInfo_t * CsrWifiRouterCtrlGetStationRecordFromHandle(unifi_p /* Function to do inactivity */ void uf_check_inactivity(unifi_priv_t *priv, u16 interfaceTag, CsrTime currentTime) { - CsrUint32 i; + u32 i; CsrWifiRouterCtrlStaInfo_t *staInfo; CsrTime elapsedTime; /* Time in microseconds */ netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; @@ -3523,7 +3523,7 @@ void uf_check_inactivity(unifi_priv_t *priv, u16 interfaceTag, CsrTime currentTi elapsedTime = (currentTime >= staInfo->lastActivity)? (currentTime - staInfo->lastActivity): - (~((CsrUint32)0) - staInfo->lastActivity + currentTime); + (~((u32)0) - staInfo->lastActivity + currentTime); spin_unlock_irqrestore(&priv->staRecord_lock,lock_flags); if (elapsedTime > MAX_INACTIVITY_INTERVAL) { @@ -3578,7 +3578,7 @@ void uf_update_sta_activity(unifi_priv_t *priv, u16 interfaceTag, const u8 *peer * 64 bit handling */ elapsedTime = (currentTime >= interfacePriv->last_inactivity_check)? (currentTime - interfacePriv->last_inactivity_check): - (~((CsrUint32)0) - interfacePriv->last_inactivity_check + currentTime); + (~((u32)0) - interfacePriv->last_inactivity_check + currentTime); spin_unlock_irqrestore(&priv->staRecord_lock,lock_flags); diff --git a/drivers/staging/csr/unifi_priv.h b/drivers/staging/csr/unifi_priv.h index 126e7c694da..2e05015e92f 100644 --- a/drivers/staging/csr/unifi_priv.h +++ b/drivers/staging/csr/unifi_priv.h @@ -322,7 +322,7 @@ typedef struct CsrWifiRouterCtrlStaInfo_t { /* Sme sends these parameters */ CsrWifiMacAddress peerMacAddress; - CsrUint32 assignedHandle; + u32 assignedHandle; CsrBool wmmOrQosEnabled; CsrWifiAcPowersaveMode powersaveMode[MAX_ACCESS_CATOGORY]; u16 maxSpLength; @@ -648,10 +648,10 @@ struct unifi_priv { #endif - CsrUint32 rxTcpThroughput; - CsrUint32 txTcpThroughput; - CsrUint32 rxUdpThroughput; - CsrUint32 txUdpThroughput; + u32 rxTcpThroughput; + u32 txTcpThroughput; + u32 rxUdpThroughput; + u32 txUdpThroughput; #ifdef CSR_WIFI_SECURITY_WAPI_ENABLE /*Set if multicast KeyID = 1*/ @@ -749,7 +749,7 @@ typedef struct netInterface_priv u8 mc_list[UNIFI_MAX_MULTICAST_ADDRESSES*ETH_ALEN]; /* The multicast addresses count that the thread needs to set. */ int mc_list_count; - CsrUint32 tag; + u32 tag; #ifdef CSR_SUPPORT_SME /* (un)controlled port configuration */ unifi_port_config_t controlled_data_port; @@ -791,7 +791,7 @@ typedef struct netInterface_priv CSR_CLIENT_TAG m4_hostTag; CsrBool dtimActive; CsrBool intraBssEnabled; - CsrUint32 multicastPduHostTag; /* Used to set the tim after getting + u32 multicastPduHostTag; /* Used to set the tim after getting a confirm for it */ CsrBool bcTimSet; CsrBool bcTimSetReqPendingFlag; @@ -981,7 +981,7 @@ void uf_send_nulldata(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI #endif CsrResult uf_process_ma_packet_req(unifi_priv_t *priv, u8 *peerMacAddress, CSR_CLIENT_TAG hostTag, u16 interfaceTag, CSR_TRANSMISSION_CONTROL transmissionControl, CSR_RATE TransmitRate, CSR_PRIORITY priority, CSR_PROCESS_ID senderId, bulk_data_param_t *bulkdata); -void uf_process_ma_vif_availibility_ind(unifi_priv_t *priv,u8 *sigdata, CsrUint32 siglen); +void uf_process_ma_vif_availibility_ind(unifi_priv_t *priv,u8 *sigdata, u32 siglen); #ifdef CSR_SUPPORT_SME void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue queue); int uf_process_station_records_for_sending_data(unifi_priv_t *priv,u16 interfaceTag, @@ -1053,7 +1053,7 @@ unifi_frame_ma_packet_req(unifi_priv_t *priv, CSR_PRIORITY priority, /* handle is 6 bits to accomodate in senderId LSB (only 64 station can be associated) */ #define CSR_WIFI_BROADCAST_OR_MULTICAST_HANDLE 0x3F -void update_tim(unifi_priv_t * priv, u16 aid, u8 setTim, u16 interfaceTag, CsrUint32 handle); +void update_tim(unifi_priv_t * priv, u16 aid, u8 setTim, u16 interfaceTag, u32 handle); void uf_handle_tim_cfm(unifi_priv_t *priv, CSR_MLME_SET_TIM_CONFIRM *cfm, u16 senderProcessId); /* Clear the Peer station Record, in case of wifioff/unexpected card removal */ @@ -1082,7 +1082,7 @@ CsrWifiRouterCtrlStaInfo_t *CsrWifiRouterCtrlGetStationRecordFromPeerMacAddress( /* Fetch the station record handler from data base for matching handle */ CsrWifiRouterCtrlStaInfo_t * CsrWifiRouterCtrlGetStationRecordFromHandle(unifi_priv_t *priv, - CsrUint32 handle, + u32 handle, u16 interfaceTag); void uf_update_sta_activity(unifi_priv_t *priv, u16 interfaceTag, const u8 *peerMacAddress); diff --git a/drivers/staging/csr/unifi_sme.c b/drivers/staging/csr/unifi_sme.c index 98c9c07dadb..85ea812ef9b 100644 --- a/drivers/staging/csr/unifi_sme.c +++ b/drivers/staging/csr/unifi_sme.c @@ -648,7 +648,7 @@ int unifi_cfg_wmm_qos_info(unifi_priv_t *priv, unsigned char *arg) int unifi_cfg_wmm_addts(unifi_priv_t *priv, unsigned char *arg) { - CsrUint32 addts_tid; + u32 addts_tid; u8 addts_ie_length; u8 *addts_ie; u8 *addts_params; @@ -657,12 +657,12 @@ int unifi_cfg_wmm_addts(unifi_priv_t *priv, unsigned char *arg) int rc; addts_params = (u8*)(((unifi_cfg_command_t*)arg) + 1); - if (get_user(addts_tid, (CsrUint32*)addts_params)) { + if (get_user(addts_tid, (u32*)addts_params)) { unifi_error(priv, "unifi_cfg_wmm_addts: Failed to get the argument\n"); return -EFAULT; } - addts_params += sizeof(CsrUint32); + addts_params += sizeof(u32); if (get_user(addts_ie_length, (u8*)addts_params)) { unifi_error(priv, "unifi_cfg_wmm_addts: Failed to get the argument\n"); return -EFAULT; @@ -702,14 +702,14 @@ int unifi_cfg_wmm_addts(unifi_priv_t *priv, unsigned char *arg) int unifi_cfg_wmm_delts(unifi_priv_t *priv, unsigned char *arg) { - CsrUint32 delts_tid; + u32 delts_tid; u8 *delts_params; CsrWifiSmeDataBlock tspec; CsrWifiSmeDataBlock tclas; int rc; delts_params = (u8*)(((unifi_cfg_command_t*)arg) + 1); - if (get_user(delts_tid, (CsrUint32*)delts_params)) { + if (get_user(delts_tid, (u32*)delts_params)) { unifi_error(priv, "unifi_cfg_wmm_delts: Failed to get the argument\n"); return -EFAULT; } @@ -1198,7 +1198,7 @@ void uf_send_pkt_to_encrypt(struct work_struct *work) u16 interfaceTag = interfacePriv->InterfaceTag; unifi_priv_t *priv = interfacePriv->privPtr; - CsrUint32 pktBulkDataLength; + u32 pktBulkDataLength; u8 *pktBulkData; unsigned long flags; diff --git a/drivers/staging/csr/unifi_sme.h b/drivers/staging/csr/unifi_sme.h index bfe20d3d87a..bdff0f3e915 100644 --- a/drivers/staging/csr/unifi_sme.h +++ b/drivers/staging/csr/unifi_sme.h @@ -166,7 +166,7 @@ int sme_mgt_sme_config_get(unifi_priv_t *priv, CsrWifiSmeStaConfig *staConfig, C int sme_mgt_coex_info_get(unifi_priv_t *priv, CsrWifiSmeCoexInfo *coexInfo); int sme_mgt_packet_filter_set(unifi_priv_t *priv); int sme_mgt_tspec(unifi_priv_t *priv, CsrWifiSmeListAction action, - CsrUint32 tid, CsrWifiSmeDataBlock *tspec, CsrWifiSmeDataBlock *tclas); + u32 tid, CsrWifiSmeDataBlock *tspec, CsrWifiSmeDataBlock *tclas); #ifdef CSR_SUPPORT_WEXT /* -- cgit v1.2.3-70-g09d2 From 5379b13d9e063e9bb2078a1c642f8df8c914e022 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 20 Jul 2012 12:25:15 -0700 Subject: staging: csr: remove CsrBool typedef MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use u8 instead. Cc: Mikko Virkkilä Cc: Lauri Hintsala Cc: Riku Mettälä Cc: Veli-Pekka Peltola Signed-off-by: Greg Kroah-Hartman --- drivers/staging/csr/csr_log.h | 8 +- drivers/staging/csr/csr_macro.h | 2 +- drivers/staging/csr/csr_msgconv.c | 4 +- drivers/staging/csr/csr_msgconv.h | 2 +- drivers/staging/csr/csr_sched.h | 10 +-- drivers/staging/csr/csr_types.h | 3 - drivers/staging/csr/csr_utf16.c | 8 +- drivers/staging/csr/csr_util.c | 10 +-- drivers/staging/csr/csr_util.h | 8 +- drivers/staging/csr/csr_wifi_fsm.h | 4 +- drivers/staging/csr/csr_wifi_fsm_types.h | 4 +- drivers/staging/csr/csr_wifi_hip_card.h | 4 +- drivers/staging/csr/csr_wifi_hip_card_sdio.c | 8 +- drivers/staging/csr/csr_wifi_hip_card_sdio.h | 4 +- drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c | 8 +- drivers/staging/csr/csr_wifi_nme_ap_prim.h | 8 +- drivers/staging/csr/csr_wifi_nme_ap_serialize.c | 32 ++++---- drivers/staging/csr/csr_wifi_nme_prim.h | 4 +- drivers/staging/csr/csr_wifi_router_ctrl_prim.h | 24 +++--- .../staging/csr/csr_wifi_router_ctrl_serialize.c | 18 ++--- drivers/staging/csr/csr_wifi_router_prim.h | 2 +- drivers/staging/csr/csr_wifi_router_serialize.c | 2 +- drivers/staging/csr/csr_wifi_sme_ap_prim.h | 22 +++--- drivers/staging/csr/csr_wifi_sme_prim.h | 58 +++++++------- drivers/staging/csr/csr_wifi_sme_serialize.c | 88 +++++++++++----------- drivers/staging/csr/csr_wifi_vif_utils.h | 8 +- drivers/staging/csr/firmware.c | 2 +- drivers/staging/csr/netdev.c | 10 +-- drivers/staging/csr/sme_blocking.c | 2 +- drivers/staging/csr/sme_sys.c | 14 ++-- drivers/staging/csr/unifi_event.c | 18 ++--- drivers/staging/csr/unifi_pdu_processing.c | 50 ++++++------ drivers/staging/csr/unifi_priv.h | 58 +++++++------- drivers/staging/csr/unifi_sme.c | 12 +-- drivers/staging/csr/unifi_sme.h | 2 +- drivers/staging/csr/unifi_wext.h | 2 +- drivers/staging/csr/unifiio.h | 6 +- drivers/staging/csr/wext_events.c | 2 +- 38 files changed, 264 insertions(+), 267 deletions(-) (limited to 'drivers/staging/csr/csr_wifi_fsm.h') diff --git a/drivers/staging/csr/csr_log.h b/drivers/staging/csr/csr_log.h index 6f8429d6440..2619d2229ec 100644 --- a/drivers/staging/csr/csr_log.h +++ b/drivers/staging/csr/csr_log.h @@ -71,9 +71,9 @@ typedef u32 CsrLogLevelTask; /* The bit masks between here are reserved for future usage */ #define CSR_LOG_LEVEL_TASK_ALL ((CsrLogLevelTask) 0xFFFFFFFF & ~(CSR_LOG_LEVEL_TASK_PRIM_ONLY_TYPE | CSR_LOG_LEVEL_TASK_PRIM_APPLY_LIMIT)) /* All info possible to log for a task are logged. WARNING: By using this define the application also accepts future possible task data/events in the logs */ -CsrBool CsrLogEnvironmentIsFiltered(CsrLogLevelEnvironment level); +u8 CsrLogEnvironmentIsFiltered(CsrLogLevelEnvironment level); CsrLogLevelTask CsrLogTaskFilterGet(CsrSchedQid taskId); -CsrBool CsrLogTaskIsFiltered(CsrSchedQid taskId, CsrLogLevelTask level); +u8 CsrLogTaskIsFiltered(CsrSchedQid taskId, CsrLogLevelTask level); /* * Logging stuff @@ -193,7 +193,7 @@ void CsrLogMessagePut(u32 line, void CsrLogMessageGet(CsrSchedQid src_task_id, CsrSchedQid dst_taskid, - CsrBool get_res, + u8 get_res, CsrSchedMsgId msg_id, u16 prim_type, const void *msg); @@ -216,7 +216,7 @@ void CsrLogTimedEventCancel(u32 line, const char *file, CsrSchedQid task_id, CsrSchedTid tid, - CsrBool cancel_res); + u8 cancel_res); void CsrLogBgintRegister(u8 thread_id, CsrSchedBgint irq, diff --git a/drivers/staging/csr/csr_macro.h b/drivers/staging/csr/csr_macro.h index 214d6a3075e..22405cfcf14 100644 --- a/drivers/staging/csr/csr_macro.h +++ b/drivers/staging/csr/csr_macro.h @@ -23,7 +23,7 @@ extern "C" { #define CSR_MASK_IS_UNSET(val, mask) ((((val) & (mask)) ^ mask) == (mask)) #define CSR_MASK_SET(val, mask) ((val) |= (mask)) #define CSR_MASK_UNSET(val, mask) ((val) = ((val) ^ (mask)) & (val)) /* Unsets the bits in val that are set in mask */ -#define CSR_BIT_IS_SET(val, bit) ((CsrBool) ((((val) & (1UL << (bit))) != 0))) +#define CSR_BIT_IS_SET(val, bit) ((u8) ((((val) & (1UL << (bit))) != 0))) #define CSR_BIT_SET(val, bit) ((val) |= (1UL << (bit))) #define CSR_BIT_UNSET(val, bit) ((val) &= ~(1UL << (bit))) #define CSR_BIT_TOGGLE(val, bit) ((val) ^= (1UL << (bit))) diff --git a/drivers/staging/csr/csr_msgconv.c b/drivers/staging/csr/csr_msgconv.c index b2aeb7a184c..0d61caf4f78 100644 --- a/drivers/staging/csr/csr_msgconv.c +++ b/drivers/staging/csr/csr_msgconv.c @@ -133,10 +133,10 @@ static CsrSize sizeof_message(u16 primType, void *msg) return ret; } -static CsrBool free_message(u16 primType, u8 *data) +static u8 free_message(u16 primType, u8 *data) { CsrMsgConvPrimEntry *ptr; - CsrBool ret; + u8 ret; ptr = CsrMsgConvFind(primType); diff --git a/drivers/staging/csr/csr_msgconv.h b/drivers/staging/csr/csr_msgconv.h index b195b795005..8df292d0491 100644 --- a/drivers/staging/csr/csr_msgconv.h +++ b/drivers/staging/csr/csr_msgconv.h @@ -51,7 +51,7 @@ typedef struct { CsrMsgConvPrimEntry *profile_converters; void *(*deserialize_data)(u16 primType, CsrSize length, u8 * data); - CsrBool (*free_message)(u16 primType, u8 *data); + u8 (*free_message)(u16 primType, u8 *data); CsrSize (*sizeof_message)(u16 primType, void *msg); u8 *(*serialize_message)(u16 primType, void *msg, CsrSize * length, diff --git a/drivers/staging/csr/csr_sched.h b/drivers/staging/csr/csr_sched.h index 2413463b818..663fe5926e7 100644 --- a/drivers/staging/csr/csr_sched.h +++ b/drivers/staging/csr/csr_sched.h @@ -185,7 +185,7 @@ void CsrSchedMessageBroadcast(u16 mi, * The message consists of one or both of a u16 and a void *. * * RETURNS - * CsrBool - TRUE if a message has been obtained from the queue, else FALSE. + * u8 - TRUE if a message has been obtained from the queue, else FALSE. * If a message is taken from the queue, then "*pmi" and "*pmv" are set to * the "mi" and "mv" passed to CsrSchedMessagePut() respectively. * @@ -193,7 +193,7 @@ void CsrSchedMessageBroadcast(u16 mi, * them message is discarded. * *----------------------------------------------------------------------------*/ -CsrBool CsrSchedMessageGet(u16 *pmi, void **pmv); +u8 CsrSchedMessageGet(u16 *pmi, void **pmv); /*----------------------------------------------------------------------------* * NAME @@ -241,18 +241,18 @@ CsrSchedTid CsrSchedTimerSet(CsrTime delay, * occurring. * * RETURNS - * CsrBool - TRUE if cancelled, FALSE if the event has already occurred. + * u8 - TRUE if cancelled, FALSE if the event has already occurred. * *----------------------------------------------------------------------------*/ #if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER) -CsrBool CsrSchedTimerCancelStringLog(CsrSchedTid eventid, +u8 CsrSchedTimerCancelStringLog(CsrSchedTid eventid, u16 *pmi, void **pmv, u32 line, const char *file); #define CsrSchedTimerCancel(e, pmi, pmv) CsrSchedTimerCancelStringLog((e), (pmi), (pmv), __LINE__, __FILE__) #else -CsrBool CsrSchedTimerCancel(CsrSchedTid eventid, +u8 CsrSchedTimerCancel(CsrSchedTid eventid, u16 *pmi, void **pmv); #endif diff --git a/drivers/staging/csr/csr_types.h b/drivers/staging/csr/csr_types.h index 0b5a23104fd..40bc644b55a 100644 --- a/drivers/staging/csr/csr_types.h +++ b/drivers/staging/csr/csr_types.h @@ -32,9 +32,6 @@ typedef ptrdiff_t CsrPtrdiff; /* Type of the result of subtracting two pointer typedef uintptr_t CsrUintptr; /* Unsigned integer large enough to hold any pointer (ISO/IEC 9899:1999 7.18.1.4) */ typedef ptrdiff_t CsrIntptr; /* intptr_t is not defined in kernel. Use the equivalent ptrdiff_t. */ -/* Boolean */ -typedef u8 CsrBool; - /* * 64-bit integers * diff --git a/drivers/staging/csr/csr_utf16.c b/drivers/staging/csr/csr_utf16.c index 3064536b58d..579cd4b07ba 100644 --- a/drivers/staging/csr/csr_utf16.c +++ b/drivers/staging/csr/csr_utf16.c @@ -261,7 +261,7 @@ u8 *CsrUtf16String2Utf8(const u16 *source) u32 length; u32 sourceLength; u8 bytes; - CsrBool appendNull = FALSE; + u8 appendNull = FALSE; u8 firstByteMark[5] = {0x00, 0x00, 0xC0, 0xE0, 0xF0}; @@ -463,7 +463,7 @@ u8 *CsrUtf16String2Utf8(const u16 *source) TRUE if the given code unit is legal. *****************************************************************************/ -static CsrBool isLegalUtf8(const u8 *codeUnit, u32 length) +static u8 isLegalUtf8(const u8 *codeUnit, u32 length) { const u8 *srcPtr = codeUnit + length; u8 byte; @@ -815,7 +815,7 @@ u16 *CsrUtf16String2XML(u16 *str) u16 *outputString = NULL; u16 *resultString = str; u32 stringLength = 0; - CsrBool encodeChars = FALSE; + u8 encodeChars = FALSE; scanString = str; if (scanString) @@ -908,7 +908,7 @@ u16 *CsrXML2Utf16String(u16 *str) u16 *outputString = NULL; u16 *resultString = str; u32 stringLength = 0; - CsrBool encodeChars = FALSE; + u8 encodeChars = FALSE; scanString = str; if (scanString) diff --git a/drivers/staging/csr/csr_util.c b/drivers/staging/csr/csr_util.c index e381f258523..afb57835f84 100644 --- a/drivers/staging/csr/csr_util.c +++ b/drivers/staging/csr/csr_util.c @@ -53,7 +53,7 @@ u8 CsrBitCountDense(u32 n) /*------------------------------------------------------------------*/ /* Base conversion */ /*------------------------------------------------------------------*/ -CsrBool CsrHexStrToUint8(const char *string, u8 *returnValue) +u8 CsrHexStrToUint8(const char *string, u8 *returnValue) { u16 currentIndex = 0; *returnValue = 0; @@ -77,7 +77,7 @@ CsrBool CsrHexStrToUint8(const char *string, u8 *returnValue) return FALSE; } -CsrBool CsrHexStrToUint16(const char *string, u16 *returnValue) +u8 CsrHexStrToUint16(const char *string, u16 *returnValue) { u16 currentIndex = 0; *returnValue = 0; @@ -101,7 +101,7 @@ CsrBool CsrHexStrToUint16(const char *string, u16 *returnValue) return FALSE; } -CsrBool CsrHexStrToUint32(const char *string, u32 *returnValue) +u8 CsrHexStrToUint32(const char *string, u32 *returnValue) { u16 currentIndex = 0; *returnValue = 0; @@ -150,7 +150,7 @@ void CsrIntToBase10(s32 number, char *str) s32 digit; u8 index; char res[I2B10_MAX]; - CsrBool foundDigit = FALSE; + u8 foundDigit = FALSE; for (digit = 0; digit < I2B10_MAX; digit++) { @@ -423,7 +423,7 @@ const char *CsrGetBaseName(const char *file) /*------------------------------------------------------------------*/ /* Misc */ /*------------------------------------------------------------------*/ -CsrBool CsrIsSpace(u8 c) +u8 CsrIsSpace(u8 c) { switch (c) { diff --git a/drivers/staging/csr/csr_util.h b/drivers/staging/csr/csr_util.h index e0bcca2584d..0324fb44754 100644 --- a/drivers/staging/csr/csr_util.h +++ b/drivers/staging/csr/csr_util.h @@ -26,9 +26,9 @@ u8 CsrBitCountDense(u32 n); /*------------------------------------------------------------------*/ /* Base conversion */ /*------------------------------------------------------------------*/ -CsrBool CsrHexStrToUint8(const char *string, u8 *returnValue); -CsrBool CsrHexStrToUint16(const char *string, u16 *returnValue); -CsrBool CsrHexStrToUint32(const char *string, u32 *returnValue); +u8 CsrHexStrToUint8(const char *string, u8 *returnValue); +u8 CsrHexStrToUint16(const char *string, u16 *returnValue); +u8 CsrHexStrToUint32(const char *string, u32 *returnValue); u32 CsrPow(u32 base, u32 exponent); void CsrIntToBase10(s32 number, char *str); void CsrUInt16ToHex(u16 number, char *str); @@ -85,7 +85,7 @@ const char *CsrGetBaseName(const char *file); /*------------------------------------------------------------------*/ /* Misc */ /*------------------------------------------------------------------*/ -CsrBool CsrIsSpace(u8 c); +u8 CsrIsSpace(u8 c); #define CsrOffsetOf(st, m) ((CsrSize) & ((st *) 0)->m) #ifdef __cplusplus diff --git a/drivers/staging/csr/csr_wifi_fsm.h b/drivers/staging/csr/csr_wifi_fsm.h index 0f9cd8f3cf6..d078deefe44 100644 --- a/drivers/staging/csr/csr_wifi_fsm.h +++ b/drivers/staging/csr/csr_wifi_fsm.h @@ -226,9 +226,9 @@ extern void CsrWifiFsmTestAdvanceTime(CsrWifiFsmContext *context, u32 ms); * @param[in] context : FSM context * * @return - * CsrBool returns TRUE if there are events for the FSM to process + * u8 returns TRUE if there are events for the FSM to process */ -extern CsrBool CsrWifiFsmHasEvents(CsrWifiFsmContext *context); +extern u8 CsrWifiFsmHasEvents(CsrWifiFsmContext *context); /** * @brief diff --git a/drivers/staging/csr/csr_wifi_fsm_types.h b/drivers/staging/csr/csr_wifi_fsm_types.h index 558fd2db03d..f3837c6794d 100644 --- a/drivers/staging/csr/csr_wifi_fsm_types.h +++ b/drivers/staging/csr/csr_wifi_fsm_types.h @@ -220,7 +220,7 @@ typedef struct typedef struct { const u8 numEntries; - const CsrBool saveAll; + const u8 saveAll; const CsrWifiFsmEventEntry *eventEntryArray; /* array of transition function pointers for state */ #ifdef CSR_LOG_ENABLE u16 stateNumber; @@ -391,7 +391,7 @@ struct CsrWifiFsmContext #endif u32 timeOffset; /* Amount to adjust the TimeOfDayMs by */ CsrWifiFsmTimerList timerQueue; /* The internal timer queue */ - CsrBool useTempSaveList; /* Should the temp save list be used */ + u8 useTempSaveList; /* Should the temp save list be used */ CsrWifiFsmEventList tempSaveList; /* The temp save event queue */ CsrWifiFsmEvent *eventForwardedOrSaved; /* The event that was forwarded or Saved */ u16 maxProcesses; /* Size of instanceArray */ diff --git a/drivers/staging/csr/csr_wifi_hip_card.h b/drivers/staging/csr/csr_wifi_hip_card.h index 348572f1996..9caf88c7887 100644 --- a/drivers/staging/csr/csr_wifi_hip_card.h +++ b/drivers/staging/csr/csr_wifi_hip_card.h @@ -43,7 +43,7 @@ CsrResult CardGenInt(card_t *card); /***************************************************************************** * CardPendingInt - */ -CsrResult CardPendingInt(card_t *card, CsrBool *pintr); +CsrResult CardPendingInt(card_t *card, u8 *pintr); /***************************************************************************** * CardDisableInt - @@ -63,7 +63,7 @@ void CardDisable(card_t *card); /***************************************************************************** * CardIntEnabled - */ -CsrResult CardIntEnabled(card_t *card, CsrBool *enabled); +CsrResult CardIntEnabled(card_t *card, u8 *enabled); /***************************************************************************** * CardGetDataSlotSize diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio.c b/drivers/staging/csr/csr_wifi_hip_card_sdio.c index 07b3ac8e052..22778de081d 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio.c +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio.c @@ -3261,7 +3261,7 @@ CsrResult CardDisableInt(card_t *card) * CSR_RESULT_FAILURE if an SDIO error occurred, * --------------------------------------------------------------------------- */ -CsrResult CardPendingInt(card_t *card, CsrBool *pintr) +CsrResult CardPendingInt(card_t *card, u8 *pintr) { CsrResult r; u8 pending; @@ -3303,7 +3303,7 @@ CsrResult CardPendingInt(card_t *card, CsrBool *pintr) CsrResult CardClearInt(card_t *card) { CsrResult r; - CsrBool intr; + u8 intr; if (card->chip_id > SDIO_CARD_ID_UNIFI_2) { @@ -3361,7 +3361,7 @@ CsrResult CardClearInt(card_t *card) * CSR_RESULT_FAILURE if an SDIO error occurred, * --------------------------------------------------------------------------- */ -CsrResult CardIntEnabled(card_t *card, CsrBool *enabled) +CsrResult CardIntEnabled(card_t *card, u8 *enabled) { CsrResult r; u8 int_enable; @@ -4036,7 +4036,7 @@ CsrResult unifi_check_io_status(card_t *card, s32 *status) { u8 io_en; CsrResult r; - CsrBool pending; + u8 pending; *status = 0; diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio.h b/drivers/staging/csr/csr_wifi_hip_card_sdio.h index ad5f1310610..dc2ed70f7ed 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio.h +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio.h @@ -300,7 +300,7 @@ typedef struct u16 packets_interval; /* Once a queue reaches a stable state, avoid processing */ - CsrBool queue_stable[UNIFI_NO_OF_TX_QS]; + u8 queue_stable[UNIFI_NO_OF_TX_QS]; } card_dynamic_slot_t; @@ -566,7 +566,7 @@ struct card u16 sdio_io_block_size; /* Pad transfer sizes to SDIO block boundaries */ - CsrBool sdio_io_block_pad; + u8 sdio_io_block_pad; /* Read from the XBV */ struct FWOV fwov; diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c b/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c index 1bc97acfdeb..8aba8281886 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c @@ -43,7 +43,7 @@ static CsrResult process_bh(card_t *card); -static CsrResult handle_host_protocol(card_t *card, CsrBool *processed_something); +static CsrResult handle_host_protocol(card_t *card, u8 *processed_something); static CsrResult flush_fh_buffer(card_t *card); @@ -358,7 +358,7 @@ CsrResult unifi_bh(card_t *card, u32 *remaining) { CsrResult r; CsrResult csrResult; - CsrBool pending; + u8 pending; s32 iostate, j; const enum unifi_low_power_mode low_power_mode = card->low_power_mode; u16 data_slots_used = 0; @@ -700,7 +700,7 @@ static CsrResult process_clock_request(card_t *card) static CsrResult process_bh(card_t *card) { CsrResult r; - CsrBool more; + u8 more; more = FALSE; /* Process the reasons (interrupt, signals) */ @@ -842,7 +842,7 @@ static CsrResult process_bh(card_t *card) * CSR_RESULT_SUCCESS on success or CSR error code. * --------------------------------------------------------------------------- */ -static CsrResult handle_host_protocol(card_t *card, CsrBool *processed_something) +static CsrResult handle_host_protocol(card_t *card, u8 *processed_something) { CsrResult r; s32 done; diff --git a/drivers/staging/csr/csr_wifi_nme_ap_prim.h b/drivers/staging/csr/csr_wifi_nme_ap_prim.h index 616a899b8eb..1ca0ec95917 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_prim.h +++ b/drivers/staging/csr/csr_wifi_nme_ap_prim.h @@ -78,7 +78,7 @@ typedef u8 CsrWifiNmeApPersCredentialType; typedef struct { u16 apGroupkeyTimeout; - CsrBool apStrictGtkRekey; + u8 apStrictGtkRekey; u16 apGmkTimeout; u16 apResponseTimeout; u8 apRetransLimit; @@ -256,14 +256,14 @@ typedef struct CsrWifiFsmEvent common; u16 interfaceTag; CsrWifiSmeApType apType; - CsrBool cloakSsid; + u8 cloakSsid; CsrWifiSsid ssid; CsrWifiSmeRadioIF ifIndex; u8 channel; CsrWifiNmeApCredentials apCredentials; u8 maxConnections; CsrWifiSmeApP2pGoConfig p2pGoParam; - CsrBool wpsEnabled; + u8 wpsEnabled; } CsrWifiNmeApStartReq; /******************************************************************************* @@ -334,7 +334,7 @@ typedef struct CsrWifiFsmEvent common; u16 interfaceTag; CsrWifiMacAddress staMacAddress; - CsrBool keepBlocking; + u8 keepBlocking; } CsrWifiNmeApStaRemoveReq; /******************************************************************************* diff --git a/drivers/staging/csr/csr_wifi_nme_ap_serialize.c b/drivers/staging/csr/csr_wifi_nme_ap_serialize.c index 3fecb6f135b..c9a36e92934 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_serialize.c +++ b/drivers/staging/csr/csr_wifi_nme_ap_serialize.c @@ -33,7 +33,7 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 104) */ bufferSize += 2; /* u16 primitive->apConfig.apGroupkeyTimeout */ - bufferSize += 1; /* CsrBool primitive->apConfig.apStrictGtkRekey */ + bufferSize += 1; /* u8 primitive->apConfig.apStrictGtkRekey */ bufferSize += 2; /* u16 primitive->apConfig.apGmkTimeout */ bufferSize += 2; /* u16 primitive->apConfig.apResponseTimeout */ bufferSize += 1; /* u8 primitive->apConfig.apRetransLimit */ @@ -44,9 +44,9 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg) bufferSize += 1; /* u8 primitive->apMacConfig.supportedRatesCount */ bufferSize += 20; /* u8 primitive->apMacConfig.supportedRates[20] */ bufferSize += 1; /* CsrWifiSmePreambleType primitive->apMacConfig.preamble */ - bufferSize += 1; /* CsrBool primitive->apMacConfig.shortSlotTimeEnabled */ + bufferSize += 1; /* u8 primitive->apMacConfig.shortSlotTimeEnabled */ bufferSize += 1; /* CsrWifiSmeCtsProtectionType primitive->apMacConfig.ctsProtectionType */ - bufferSize += 1; /* CsrBool primitive->apMacConfig.wmmEnabled */ + bufferSize += 1; /* u8 primitive->apMacConfig.wmmEnabled */ { u16 i2; for (i2 = 0; i2 < 4; i2++) @@ -55,7 +55,7 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg) bufferSize += 1; /* u8 primitive->apMacConfig.wmmApParams[i2].cwMax */ bufferSize += 1; /* u8 primitive->apMacConfig.wmmApParams[i2].aifs */ bufferSize += 2; /* u16 primitive->apMacConfig.wmmApParams[i2].txopLimit */ - bufferSize += 1; /* CsrBool primitive->apMacConfig.wmmApParams[i2].admissionControlMandatory */ + bufferSize += 1; /* u8 primitive->apMacConfig.wmmApParams[i2].admissionControlMandatory */ } } { @@ -66,7 +66,7 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg) bufferSize += 1; /* u8 primitive->apMacConfig.wmmApBcParams[i2].cwMax */ bufferSize += 1; /* u8 primitive->apMacConfig.wmmApBcParams[i2].aifs */ bufferSize += 2; /* u16 primitive->apMacConfig.wmmApBcParams[i2].txopLimit */ - bufferSize += 1; /* CsrBool primitive->apMacConfig.wmmApBcParams[i2].admissionControlMandatory */ + bufferSize += 1; /* u8 primitive->apMacConfig.wmmApBcParams[i2].admissionControlMandatory */ } } bufferSize += 1; /* CsrWifiSmeApAccessType primitive->apMacConfig.accessType */ @@ -78,12 +78,12 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg) bufferSize += 6; /* u8 primitive->apMacConfig.macAddressList[i2].a[6] */ } } - bufferSize += 1; /* CsrBool primitive->apMacConfig.apHtParams.greenfieldSupported */ - bufferSize += 1; /* CsrBool primitive->apMacConfig.apHtParams.shortGi20MHz */ + bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.greenfieldSupported */ + bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.shortGi20MHz */ bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.rxStbc */ - bufferSize += 1; /* CsrBool primitive->apMacConfig.apHtParams.rifsModeAllowed */ + bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.rifsModeAllowed */ bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.htProtection */ - bufferSize += 1; /* CsrBool primitive->apMacConfig.apHtParams.dualCtsProtection */ + bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.dualCtsProtection */ return bufferSize; } @@ -276,7 +276,7 @@ CsrSize CsrWifiNmeApStartReqSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 112) */ bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiSmeApType primitive->apType */ - bufferSize += 1; /* CsrBool primitive->cloakSsid */ + bufferSize += 1; /* u8 primitive->cloakSsid */ bufferSize += 32; /* u8 primitive->ssid.ssid[32] */ bufferSize += 1; /* u8 primitive->ssid.length */ bufferSize += 1; /* CsrWifiSmeRadioIF primitive->ifIndex */ @@ -346,11 +346,11 @@ CsrSize CsrWifiNmeApStartReqSizeof(void *msg) bufferSize += primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount; /* u8 primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel */ } } - bufferSize += 1; /* CsrBool primitive->p2pGoParam.opPsEnabled */ + bufferSize += 1; /* u8 primitive->p2pGoParam.opPsEnabled */ bufferSize += 1; /* u8 primitive->p2pGoParam.ctWindow */ bufferSize += 1; /* CsrWifiSmeP2pNoaConfigMethod primitive->p2pGoParam.noaConfigMethod */ - bufferSize += 1; /* CsrBool primitive->p2pGoParam.allowNoaWithNonP2pDevices */ - bufferSize += 1; /* CsrBool primitive->wpsEnabled */ + bufferSize += 1; /* u8 primitive->p2pGoParam.allowNoaWithNonP2pDevices */ + bufferSize += 1; /* u8 primitive->wpsEnabled */ return bufferSize; } @@ -589,7 +589,7 @@ CsrSize CsrWifiNmeApWmmParamUpdateReqSizeof(void *msg) bufferSize += 1; /* u8 primitive->wmmApParams[i1].cwMax */ bufferSize += 1; /* u8 primitive->wmmApParams[i1].aifs */ bufferSize += 2; /* u16 primitive->wmmApParams[i1].txopLimit */ - bufferSize += 1; /* CsrBool primitive->wmmApParams[i1].admissionControlMandatory */ + bufferSize += 1; /* u8 primitive->wmmApParams[i1].admissionControlMandatory */ } } { @@ -600,7 +600,7 @@ CsrSize CsrWifiNmeApWmmParamUpdateReqSizeof(void *msg) bufferSize += 1; /* u8 primitive->wmmApBcParams[i1].cwMax */ bufferSize += 1; /* u8 primitive->wmmApBcParams[i1].aifs */ bufferSize += 2; /* u16 primitive->wmmApBcParams[i1].txopLimit */ - bufferSize += 1; /* CsrBool primitive->wmmApBcParams[i1].admissionControlMandatory */ + bufferSize += 1; /* u8 primitive->wmmApBcParams[i1].admissionControlMandatory */ } } return bufferSize; @@ -679,7 +679,7 @@ CsrSize CsrWifiNmeApStaRemoveReqSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 12) */ bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 6; /* u8 primitive->staMacAddress.a[6] */ - bufferSize += 1; /* CsrBool primitive->keepBlocking */ + bufferSize += 1; /* u8 primitive->keepBlocking */ return bufferSize; } diff --git a/drivers/staging/csr/csr_wifi_nme_prim.h b/drivers/staging/csr/csr_wifi_nme_prim.h index 07ed8842b41..4676b42771a 100644 --- a/drivers/staging/csr/csr_wifi_nme_prim.h +++ b/drivers/staging/csr/csr_wifi_nme_prim.h @@ -720,7 +720,7 @@ typedef struct char *privateKeyPassword; u32 sessionLength; u8 *session; - CsrBool allowPacProvisioning; + u8 allowPacProvisioning; u32 pacLength; u8 *pac; char *pacPassword; @@ -896,7 +896,7 @@ typedef struct CsrWifiNmeBssType bssType; u8 channelNo; u8 ccxOptionsMask; - CsrBool cloakedSsid; + u8 cloakedSsid; CsrWifiNmeCredentials credentials; } CsrWifiNmeProfile; diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_prim.h b/drivers/staging/csr/csr_wifi_router_ctrl_prim.h index 076ef5317d0..f5ad3b312b3 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_prim.h +++ b/drivers/staging/csr/csr_wifi_router_ctrl_prim.h @@ -32,7 +32,7 @@ typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteWrite)(u8 func, u32 address, u8 typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteRead)(u8 func, u32 address, u8 *pdata); typedef CsrResult (*CsrWifiRouterCtrlRawSdioFirmwareDownload)(u32 length, const u8 *pdata); typedef CsrResult (*CsrWifiRouterCtrlRawSdioReset)(void); -typedef CsrResult (*CsrWifiRouterCtrlRawSdioCoreDumpPrepare)(CsrBool suspendSme); +typedef CsrResult (*CsrWifiRouterCtrlRawSdioCoreDumpPrepare)(u8 suspendSme); typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteBlockRead)(u8 func, u32 address, u8 *pdata, u32 length); typedef CsrResult (*CsrWifiRouterCtrlRawSdioGpRead16)(u8 func, u32 address, u16 *pdata); typedef CsrResult (*CsrWifiRouterCtrlRawSdioGpWrite16)(u8 func, u32 address, u16 data); @@ -488,7 +488,7 @@ typedef struct *******************************************************************************/ typedef struct { - CsrBool wmmOrQosEnabled; + u8 wmmOrQosEnabled; CsrWifiRouterCtrlPowersaveTypeMask powersaveMode; u8 maxSpLength; u16 listenIntervalInTus; @@ -684,7 +684,7 @@ typedef struct CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; CsrWifiRouterCtrlLowPowerMode mode; - CsrBool wakeHost; + u8 wakeHost; } CsrWifiRouterCtrlConfigurePowerModeReq; /******************************************************************************* @@ -791,7 +791,7 @@ typedef struct CsrWifiRouterCtrlPortAction uncontrolledPortAction; CsrWifiRouterCtrlPortAction controlledPortAction; CsrWifiMacAddress macAddress; - CsrBool setProtection; + u8 setProtection; } CsrWifiRouterCtrlPortConfigureReq; /******************************************************************************* @@ -1073,7 +1073,7 @@ typedef struct u16 numInterfaceAddress; CsrWifiMacAddress stationMacAddress[2]; CsrWifiRouterCtrlSmeVersions smeVersions; - CsrBool scheduledInterrupt; + u8 scheduledInterrupt; } CsrWifiRouterCtrlWifiOnRes; /******************************************************************************* @@ -1126,8 +1126,8 @@ typedef struct CsrWifiRouterCtrlRequestorInfo clientData; CsrWifiRouterCtrlMode mode; CsrWifiMacAddress bssid; - CsrBool protection; - CsrBool intraBssDistEnabled; + u8 protection; + u8 intraBssDistEnabled; } CsrWifiRouterCtrlModeSetReq; /******************************************************************************* @@ -1383,7 +1383,7 @@ typedef struct { CsrWifiFsmEvent common; u16 interfaceTag; - CsrBool isWapiConnected; + u8 isWapiConnected; } CsrWifiRouterCtrlWapiFilterReq; /******************************************************************************* @@ -1482,7 +1482,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrBool powerMaintained; + u8 powerMaintained; } CsrWifiRouterCtrlResumeInd; /******************************************************************************* @@ -1503,8 +1503,8 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiRouterCtrlRequestorInfo clientData; - CsrBool hardSuspend; - CsrBool d3Suspend; + u8 hardSuspend; + u8 d3Suspend; } CsrWifiRouterCtrlSuspendInd; /******************************************************************************* @@ -1802,7 +1802,7 @@ typedef struct CsrWifiRouterCtrlRequestorInfo clientData; u16 interfaceTag; CsrWifiMacAddress peerMacAddress; - CsrBool unicastPdu; + u8 unicastPdu; } CsrWifiRouterCtrlMicFailureInd; /******************************************************************************* diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c index 2dca1ea9ebc..8cad0a4f875 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c +++ b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c @@ -31,7 +31,7 @@ CsrSize CsrWifiRouterCtrlConfigurePowerModeReqSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 8) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 2; /* CsrWifiRouterCtrlLowPowerMode primitive->mode */ - bufferSize += 1; /* CsrBool primitive->wakeHost */ + bufferSize += 1; /* u8 primitive->wakeHost */ return bufferSize; } @@ -284,7 +284,7 @@ CsrSize CsrWifiRouterCtrlPortConfigureReqSizeof(void *msg) bufferSize += 2; /* CsrWifiRouterCtrlPortAction primitive->uncontrolledPortAction */ bufferSize += 2; /* CsrWifiRouterCtrlPortAction primitive->controlledPortAction */ bufferSize += 6; /* u8 primitive->macAddress.a[6] */ - bufferSize += 1; /* CsrBool primitive->setProtection */ + bufferSize += 1; /* u8 primitive->setProtection */ return bufferSize; } @@ -734,7 +734,7 @@ CsrSize CsrWifiRouterCtrlWifiOnResSizeof(void *msg) bufferSize += 4; /* u32 primitive->smeVersions.firmwarePatch */ bufferSize += (primitive->smeVersions.smeBuild?CsrStrLen(primitive->smeVersions.smeBuild) : 0) + 1; /* char* primitive->smeVersions.smeBuild (0 byte len + 1 for NULL Term) */ bufferSize += 4; /* u32 primitive->smeVersions.smeHip */ - bufferSize += 1; /* CsrBool primitive->scheduledInterrupt */ + bufferSize += 1; /* u8 primitive->scheduledInterrupt */ return bufferSize; } @@ -841,8 +841,8 @@ CsrSize CsrWifiRouterCtrlModeSetReqSizeof(void *msg) bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 1; /* CsrWifiRouterCtrlMode primitive->mode */ bufferSize += 6; /* u8 primitive->bssid.a[6] */ - bufferSize += 1; /* CsrBool primitive->protection */ - bufferSize += 1; /* CsrBool primitive->intraBssDistEnabled */ + bufferSize += 1; /* u8 primitive->protection */ + bufferSize += 1; /* u8 primitive->intraBssDistEnabled */ return bufferSize; } @@ -889,7 +889,7 @@ CsrSize CsrWifiRouterCtrlPeerAddReqSizeof(void *msg) bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */ bufferSize += 2; /* u16 primitive->associationId */ - bufferSize += 1; /* CsrBool primitive->staInfo.wmmOrQosEnabled */ + bufferSize += 1; /* u8 primitive->staInfo.wmmOrQosEnabled */ bufferSize += 2; /* CsrWifiRouterCtrlPowersaveTypeMask primitive->staInfo.powersaveMode */ bufferSize += 1; /* u8 primitive->staInfo.maxSpLength */ bufferSize += 2; /* u16 primitive->staInfo.listenIntervalInTus */ @@ -1467,8 +1467,8 @@ CsrSize CsrWifiRouterCtrlSuspendIndSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 7) */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ - bufferSize += 1; /* CsrBool primitive->hardSuspend */ - bufferSize += 1; /* CsrBool primitive->d3Suspend */ + bufferSize += 1; /* u8 primitive->hardSuspend */ + bufferSize += 1; /* u8 primitive->d3Suspend */ return bufferSize; } @@ -1969,7 +1969,7 @@ CsrSize CsrWifiRouterCtrlMicFailureIndSizeof(void *msg) bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */ - bufferSize += 1; /* CsrBool primitive->unicastPdu */ + bufferSize += 1; /* u8 primitive->unicastPdu */ return bufferSize; } diff --git a/drivers/staging/csr/csr_wifi_router_prim.h b/drivers/staging/csr/csr_wifi_router_prim.h index 3b9ce1a39fa..64b1f4fd7cd 100644 --- a/drivers/staging/csr/csr_wifi_router_prim.h +++ b/drivers/staging/csr/csr_wifi_router_prim.h @@ -249,7 +249,7 @@ typedef struct CsrWifiRouterFrameFreeFunction freeFunction; CsrWifiRouterPriority priority; u32 hostTag; - CsrBool cfmRequested; + u8 cfmRequested; } CsrWifiRouterMaPacketReq; /******************************************************************************* diff --git a/drivers/staging/csr/csr_wifi_router_serialize.c b/drivers/staging/csr/csr_wifi_router_serialize.c index c90bf7db1a7..913c291326a 100644 --- a/drivers/staging/csr/csr_wifi_router_serialize.c +++ b/drivers/staging/csr/csr_wifi_router_serialize.c @@ -79,7 +79,7 @@ CsrSize CsrWifiRouterMaPacketReqSizeof(void *msg) bufferSize += 4; /* CsrWifiRouterFrameFreeFunction primitive->freeFunction */ bufferSize += 2; /* CsrWifiRouterPriority primitive->priority */ bufferSize += 4; /* u32 primitive->hostTag */ - bufferSize += 1; /* CsrBool primitive->cfmRequested */ + bufferSize += 1; /* u8 primitive->cfmRequested */ return bufferSize; } diff --git a/drivers/staging/csr/csr_wifi_sme_ap_prim.h b/drivers/staging/csr/csr_wifi_sme_ap_prim.h index 363c10bdaf6..01df2a54966 100644 --- a/drivers/staging/csr/csr_wifi_sme_ap_prim.h +++ b/drivers/staging/csr/csr_wifi_sme_ap_prim.h @@ -248,12 +248,12 @@ typedef u16 CsrWifiSmeApWapiCapabilitiesMask; *******************************************************************************/ typedef struct { - CsrBool greenfieldSupported; - CsrBool shortGi20MHz; + u8 greenfieldSupported; + u8 shortGi20MHz; u8 rxStbc; - CsrBool rifsModeAllowed; + u8 rifsModeAllowed; u8 htProtection; - CsrBool dualCtsProtection; + u8 dualCtsProtection; } CsrWifiSmeApHtParams; /******************************************************************************* @@ -389,9 +389,9 @@ typedef struct u8 supportedRatesCount; u8 supportedRates[20]; CsrWifiSmePreambleType preamble; - CsrBool shortSlotTimeEnabled; + u8 shortSlotTimeEnabled; CsrWifiSmeCtsProtectionType ctsProtectionType; - CsrBool wmmEnabled; + u8 wmmEnabled; CsrWifiSmeWmmAcParams wmmApParams[4]; CsrWifiSmeWmmAcParams wmmApBcParams[4]; CsrWifiSmeApAccessType accessType; @@ -435,10 +435,10 @@ typedef struct { CsrWifiSmeP2pGroupCapabilityMask groupCapability; CsrWifiSmeApP2pOperatingChanList operatingChanList; - CsrBool opPsEnabled; + u8 opPsEnabled; u8 ctWindow; CsrWifiSmeP2pNoaConfigMethod noaConfigMethod; - CsrBool allowNoaWithNonP2pDevices; + u8 allowNoaWithNonP2pDevices; } CsrWifiSmeApP2pGoConfig; /******************************************************************************* @@ -481,7 +481,7 @@ typedef struct typedef struct { CsrWifiSmeApCredentials apCredentials; - CsrBool wpsEnabled; + u8 wpsEnabled; } CsrWifiSmeApSecConfig; @@ -553,7 +553,7 @@ typedef struct u16 interfaceTag; u8 initialPresence; CsrWifiSmeApType apType; - CsrBool cloakSsid; + u8 cloakSsid; CsrWifiSsid ssid; CsrWifiSmeRadioIF ifIndex; u8 channel; @@ -675,7 +675,7 @@ typedef struct CsrWifiSmeIEEE80211Reason deauthReason; CsrWifiSmeIEEE80211Reason disassocReason; CsrWifiMacAddress peerMacaddress; - CsrBool keepBlocking; + u8 keepBlocking; } CsrWifiSmeApStaDisconnectReq; /******************************************************************************* diff --git a/drivers/staging/csr/csr_wifi_sme_prim.h b/drivers/staging/csr/csr_wifi_sme_prim.h index 3131dd71297..84eb6e9f0c2 100644 --- a/drivers/staging/csr/csr_wifi_sme_prim.h +++ b/drivers/staging/csr/csr_wifi_sme_prim.h @@ -1988,9 +1988,9 @@ typedef struct typedef struct { u8 keepAliveTimeMs; - CsrBool apRoamingEnabled; + u8 apRoamingEnabled; u8 measurementsMask; - CsrBool ccxRadioMgtEnabled; + u8 ccxRadioMgtEnabled; } CsrWifiSmeCcxConfig; /******************************************************************************* @@ -2037,8 +2037,8 @@ typedef struct *******************************************************************************/ typedef struct { - CsrBool coexEnableSchemeManagement; - CsrBool coexPeriodicWakeHost; + u8 coexEnableSchemeManagement; + u8 coexPeriodicWakeHost; u16 coexTrafficBurstyLatencyMs; u16 coexTrafficContinuousLatencyMs; u16 coexObexBlackoutDurationMs; @@ -2231,7 +2231,7 @@ typedef struct *******************************************************************************/ typedef struct { - CsrBool unifiFixMaxTxDataRate; + u8 unifiFixMaxTxDataRate; u8 unifiFixTxDataRate; u16 dot11RtsThreshold; u16 dot11FragmentationThreshold; @@ -2294,7 +2294,7 @@ typedef struct typedef struct { CsrWifiMacAddress bssid; - CsrBool preAuthAllowed; + u8 preAuthAllowed; } CsrWifiSmePmkidCandidate; /******************************************************************************* @@ -2339,8 +2339,8 @@ typedef struct *******************************************************************************/ typedef struct { - CsrBool dot11MultiDomainCapabilityImplemented; - CsrBool dot11MultiDomainCapabilityEnabled; + u8 dot11MultiDomainCapabilityImplemented; + u8 dot11MultiDomainCapabilityEnabled; CsrWifiSmeRegulatoryDomain currentRegulatoryDomain; u8 currentCountryCode[2]; } CsrWifiSmeRegulatoryDomainInfo; @@ -2489,7 +2489,7 @@ typedef struct u8 cwMax; u8 aifs; u16 txopLimit; - CsrBool admissionControlMandatory; + u8 admissionControlMandatory; } CsrWifiSmeWmmAcParams; /******************************************************************************* @@ -2523,7 +2523,7 @@ typedef struct *******************************************************************************/ typedef struct { - CsrBool spportWps; + u8 spportWps; u8 deviceType; } CsrWifiSmeWpsDeviceTypeCommon; @@ -2596,13 +2596,13 @@ typedef struct *******************************************************************************/ typedef struct { - CsrBool hasTrafficData; + u8 hasTrafficData; CsrWifiSmeTrafficType currentTrafficType; u16 currentPeriodMs; CsrWifiSmePowerSaveLevel currentPowerSave; u16 currentCoexPeriodMs; u16 currentCoexLatencyMs; - CsrBool hasBtDevice; + u8 hasBtDevice; u32 currentBlackoutDurationUs; u32 currentBlackoutPeriodUs; CsrWifiSmeCoexScheme currentCoexScheme; @@ -2677,7 +2677,7 @@ typedef struct u16 mlmeAssociateReqInformationElementsLength; u8 *mlmeAssociateReqInformationElements; CsrWifiSmeWmmQosInfoMask wmmQosInfo; - CsrBool adhocJoinOnly; + u8 adhocJoinOnly; u8 adhocChannel; } CsrWifiSmeConnectionConfig; @@ -2756,7 +2756,7 @@ typedef struct CsrWifiSmeRadioIF ifIndex; u16 atimWindowTu; u16 beaconPeriodTu; - CsrBool reassociation; + u8 reassociation; u16 beaconFrameLength; u8 *beaconFrame; u16 associationReqFrameLength; @@ -2800,7 +2800,7 @@ typedef struct CsrWifiSme80211dTrustLevel trustLevel; u8 countryCode[2]; CsrWifiSmeFirmwareDriverInterface firmwareDriverInterface; - CsrBool enableStrictDraftN; + u8 enableStrictDraftN; } CsrWifiSmeDeviceConfig; /******************************************************************************* @@ -2925,9 +2925,9 @@ typedef struct { CsrWifiSmeKeyType keyType; u8 keyIndex; - CsrBool wepTxKey; + u8 wepTxKey; u16 keyRsc[8]; - CsrBool authenticator; + u8 authenticator; CsrWifiMacAddress address; u8 keyLength; u8 key[32]; @@ -3001,11 +3001,11 @@ typedef struct { CsrWifiSmePowerSaveLevel powerSaveLevel; u16 listenIntervalTu; - CsrBool rxDtims; + u8 rxDtims; CsrWifiSmeD3AutoScanMode d3AutoScanMode; u8 clientTrafficWindow; - CsrBool opportunisticPowerSave; - CsrBool noticeOfAbsence; + u8 opportunisticPowerSave; + u8 noticeOfAbsence; } CsrWifiSmePowerConfig; /******************************************************************************* @@ -3039,8 +3039,8 @@ typedef struct typedef struct { CsrWifiSmeRoamingBandData roamingBands[3]; - CsrBool disableSmoothRoaming; - CsrBool disableRoamScans; + u8 disableSmoothRoaming; + u8 disableRoamScans; u8 reconnectLimit; u16 reconnectLimitIntervalMs; CsrWifiSmeScanConfigData roamScanCfg[3]; @@ -3085,7 +3085,7 @@ typedef struct typedef struct { CsrWifiSmeScanConfigData scanCfg[4]; - CsrBool disableAutonomousScans; + u8 disableAutonomousScans; u16 maxResults; s8 highRssiThreshold; s8 lowRssiThreshold; @@ -3193,8 +3193,8 @@ typedef struct u8 connectionQualitySnrChangeTrigger; CsrWifiSmeWmmModeMask wmmModeMask; CsrWifiSmeRadioIF ifIndex; - CsrBool allowUnicastUseGroupCipher; - CsrBool enableOpportunisticKeyCaching; + u8 allowUnicastUseGroupCipher; + u8 enableOpportunisticKeyCaching; } CsrWifiSmeStaConfig; /******************************************************************************* @@ -4401,7 +4401,7 @@ typedef struct u8 ssidCount; CsrWifiSsid *ssid; CsrWifiMacAddress bssid; - CsrBool forceScan; + u8 forceScan; CsrWifiSmeBssType bssType; CsrWifiSmeScanType scanType; u16 channelListCount; @@ -4561,7 +4561,7 @@ typedef struct u16 interfaceTag; CsrWifiSmeListAction action; u32 transactionId; - CsrBool strict; + u8 strict; CsrWifiSmeTspecCtrlMask ctrlMask; u16 tspecLength; u8 *tspec; @@ -5383,7 +5383,7 @@ typedef struct { CsrWifiFsmEvent common; CsrWifiMacAddress address; - CsrBool isconnected; + u8 isconnected; } CsrWifiSmeIbssStationInd; /******************************************************************************* @@ -5608,7 +5608,7 @@ typedef struct { CsrWifiFsmEvent common; u16 interfaceTag; - CsrBool secondFailure; + u8 secondFailure; u16 count; CsrWifiMacAddress address; CsrWifiSmeKeyType keyType; diff --git a/drivers/staging/csr/csr_wifi_sme_serialize.c b/drivers/staging/csr/csr_wifi_sme_serialize.c index c9070ca4083..472f9c0d8aa 100644 --- a/drivers/staging/csr/csr_wifi_sme_serialize.c +++ b/drivers/staging/csr/csr_wifi_sme_serialize.c @@ -203,9 +203,9 @@ CsrSize CsrWifiSmeCcxConfigSetReqSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 9) */ bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* u8 primitive->ccxConfig.keepAliveTimeMs */ - bufferSize += 1; /* CsrBool primitive->ccxConfig.apRoamingEnabled */ + bufferSize += 1; /* u8 primitive->ccxConfig.apRoamingEnabled */ bufferSize += 1; /* u8 primitive->ccxConfig.measurementsMask */ - bufferSize += 1; /* CsrBool primitive->ccxConfig.ccxRadioMgtEnabled */ + bufferSize += 1; /* u8 primitive->ccxConfig.ccxRadioMgtEnabled */ return bufferSize; } @@ -246,8 +246,8 @@ CsrSize CsrWifiSmeCoexConfigSetReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 29) */ - bufferSize += 1; /* CsrBool primitive->coexConfig.coexEnableSchemeManagement */ - bufferSize += 1; /* CsrBool primitive->coexConfig.coexPeriodicWakeHost */ + bufferSize += 1; /* u8 primitive->coexConfig.coexEnableSchemeManagement */ + bufferSize += 1; /* u8 primitive->coexConfig.coexPeriodicWakeHost */ bufferSize += 2; /* u16 primitive->coexConfig.coexTrafficBurstyLatencyMs */ bufferSize += 2; /* u16 primitive->coexConfig.coexTrafficContinuousLatencyMs */ bufferSize += 2; /* u16 primitive->coexConfig.coexObexBlackoutDurationMs */ @@ -331,7 +331,7 @@ CsrSize CsrWifiSmeConnectReqSizeof(void *msg) bufferSize += 2; /* u16 primitive->connectionConfig.mlmeAssociateReqInformationElementsLength */ bufferSize += primitive->connectionConfig.mlmeAssociateReqInformationElementsLength; /* u8 primitive->connectionConfig.mlmeAssociateReqInformationElements */ bufferSize += 1; /* CsrWifiSmeWmmQosInfoMask primitive->connectionConfig.wmmQosInfo */ - bufferSize += 1; /* CsrBool primitive->connectionConfig.adhocJoinOnly */ + bufferSize += 1; /* u8 primitive->connectionConfig.adhocJoinOnly */ bufferSize += 1; /* u8 primitive->connectionConfig.adhocChannel */ return bufferSize; } @@ -453,7 +453,7 @@ CsrSize CsrWifiSmeKeyReqSizeof(void *msg) bufferSize += 1; /* CsrWifiSmeListAction primitive->action */ bufferSize += 1; /* CsrWifiSmeKeyType primitive->key.keyType */ bufferSize += 1; /* u8 primitive->key.keyIndex */ - bufferSize += 1; /* CsrBool primitive->key.wepTxKey */ + bufferSize += 1; /* u8 primitive->key.wepTxKey */ { u16 i2; for (i2 = 0; i2 < 8; i2++) @@ -461,7 +461,7 @@ CsrSize CsrWifiSmeKeyReqSizeof(void *msg) bufferSize += 2; /* u16 primitive->key.keyRsc[8] */ } } - bufferSize += 1; /* CsrBool primitive->key.authenticator */ + bufferSize += 1; /* u8 primitive->key.authenticator */ bufferSize += 6; /* u8 primitive->key.address.a[6] */ bufferSize += 1; /* u8 primitive->key.keyLength */ bufferSize += 32; /* u8 primitive->key.key[32] */ @@ -527,7 +527,7 @@ CsrSize CsrWifiSmeMibConfigSetReqSizeof(void *msg) CsrSize bufferSize = 2; /* Calculate the Size of the Serialised Data. Could be more efficient (Try 11) */ - bufferSize += 1; /* CsrBool primitive->mibConfig.unifiFixMaxTxDataRate */ + bufferSize += 1; /* u8 primitive->mibConfig.unifiFixMaxTxDataRate */ bufferSize += 1; /* u8 primitive->mibConfig.unifiFixTxDataRate */ bufferSize += 2; /* u16 primitive->mibConfig.dot11RtsThreshold */ bufferSize += 2; /* u16 primitive->mibConfig.dot11FragmentationThreshold */ @@ -958,11 +958,11 @@ CsrSize CsrWifiSmePowerConfigSetReqSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 11) */ bufferSize += 1; /* CsrWifiSmePowerSaveLevel primitive->powerConfig.powerSaveLevel */ bufferSize += 2; /* u16 primitive->powerConfig.listenIntervalTu */ - bufferSize += 1; /* CsrBool primitive->powerConfig.rxDtims */ + bufferSize += 1; /* u8 primitive->powerConfig.rxDtims */ bufferSize += 1; /* CsrWifiSmeD3AutoScanMode primitive->powerConfig.d3AutoScanMode */ bufferSize += 1; /* u8 primitive->powerConfig.clientTrafficWindow */ - bufferSize += 1; /* CsrBool primitive->powerConfig.opportunisticPowerSave */ - bufferSize += 1; /* CsrBool primitive->powerConfig.noticeOfAbsence */ + bufferSize += 1; /* u8 primitive->powerConfig.opportunisticPowerSave */ + bufferSize += 1; /* u8 primitive->powerConfig.noticeOfAbsence */ return bufferSize; } @@ -1018,8 +1018,8 @@ CsrSize CsrWifiSmeRoamingConfigSetReqSizeof(void *msg) bufferSize += 2; /* s16 primitive->roamingConfig.roamingBands[i2].snrLowThreshold */ } } - bufferSize += 1; /* CsrBool primitive->roamingConfig.disableSmoothRoaming */ - bufferSize += 1; /* CsrBool primitive->roamingConfig.disableRoamScans */ + bufferSize += 1; /* u8 primitive->roamingConfig.disableSmoothRoaming */ + bufferSize += 1; /* u8 primitive->roamingConfig.disableRoamScans */ bufferSize += 1; /* u8 primitive->roamingConfig.reconnectLimit */ bufferSize += 2; /* u16 primitive->roamingConfig.reconnectLimitIntervalMs */ { @@ -1131,7 +1131,7 @@ CsrSize CsrWifiSmeScanConfigSetReqSizeof(void *msg) bufferSize += 2; /* u16 primitive->scanConfig.scanCfg[i2].maxPassiveChannelTimeTu */ } } - bufferSize += 1; /* CsrBool primitive->scanConfig.disableAutonomousScans */ + bufferSize += 1; /* u8 primitive->scanConfig.disableAutonomousScans */ bufferSize += 2; /* u16 primitive->scanConfig.maxResults */ bufferSize += 1; /* s8 primitive->scanConfig.highRssiThreshold */ bufferSize += 1; /* s8 primitive->scanConfig.lowRssiThreshold */ @@ -1245,7 +1245,7 @@ CsrSize CsrWifiSmeScanFullReqSizeof(void *msg) } } bufferSize += 6; /* u8 primitive->bssid.a[6] */ - bufferSize += 1; /* CsrBool primitive->forceScan */ + bufferSize += 1; /* u8 primitive->forceScan */ bufferSize += 1; /* CsrWifiSmeBssType primitive->bssType */ bufferSize += 1; /* CsrWifiSmeScanType primitive->scanType */ bufferSize += 2; /* u16 primitive->channelListCount */ @@ -1358,8 +1358,8 @@ CsrSize CsrWifiSmeSmeStaConfigSetReqSizeof(void *msg) bufferSize += 1; /* u8 primitive->smeConfig.connectionQualitySnrChangeTrigger */ bufferSize += 1; /* CsrWifiSmeWmmModeMask primitive->smeConfig.wmmModeMask */ bufferSize += 1; /* CsrWifiSmeRadioIF primitive->smeConfig.ifIndex */ - bufferSize += 1; /* CsrBool primitive->smeConfig.allowUnicastUseGroupCipher */ - bufferSize += 1; /* CsrBool primitive->smeConfig.enableOpportunisticKeyCaching */ + bufferSize += 1; /* u8 primitive->smeConfig.allowUnicastUseGroupCipher */ + bufferSize += 1; /* u8 primitive->smeConfig.enableOpportunisticKeyCaching */ return bufferSize; } @@ -1408,7 +1408,7 @@ CsrSize CsrWifiSmeTspecReqSizeof(void *msg) bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 1; /* CsrWifiSmeListAction primitive->action */ bufferSize += 4; /* u32 primitive->transactionId */ - bufferSize += 1; /* CsrBool primitive->strict */ + bufferSize += 1; /* u8 primitive->strict */ bufferSize += 1; /* CsrWifiSmeTspecCtrlMask primitive->ctrlMask */ bufferSize += 2; /* u16 primitive->tspecLength */ bufferSize += primitive->tspecLength; /* u8 primitive->tspec */ @@ -1751,7 +1751,7 @@ CsrSize CsrWifiSmeSmeCommonConfigSetReqSizeof(void *msg) bufferSize += 1; /* CsrWifiSme80211dTrustLevel primitive->deviceConfig.trustLevel */ bufferSize += 2; /* u8 primitive->deviceConfig.countryCode[2] */ bufferSize += 1; /* CsrWifiSmeFirmwareDriverInterface primitive->deviceConfig.firmwareDriverInterface */ - bufferSize += 1; /* CsrBool primitive->deviceConfig.enableStrictDraftN */ + bufferSize += 1; /* u8 primitive->deviceConfig.enableStrictDraftN */ return bufferSize; } @@ -2019,7 +2019,7 @@ CsrSize CsrWifiSmeAssociationCompleteIndSizeof(void *msg) bufferSize += 1; /* CsrWifiSmeRadioIF primitive->connectionInfo.ifIndex */ bufferSize += 2; /* u16 primitive->connectionInfo.atimWindowTu */ bufferSize += 2; /* u16 primitive->connectionInfo.beaconPeriodTu */ - bufferSize += 1; /* CsrBool primitive->connectionInfo.reassociation */ + bufferSize += 1; /* u8 primitive->connectionInfo.reassociation */ bufferSize += 2; /* u16 primitive->connectionInfo.beaconFrameLength */ bufferSize += primitive->connectionInfo.beaconFrameLength; /* u8 primitive->connectionInfo.beaconFrame */ bufferSize += 2; /* u16 primitive->connectionInfo.associationReqFrameLength */ @@ -2397,9 +2397,9 @@ CsrSize CsrWifiSmeCcxConfigGetCfmSizeof(void *msg) bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 1; /* u8 primitive->ccxConfig.keepAliveTimeMs */ - bufferSize += 1; /* CsrBool primitive->ccxConfig.apRoamingEnabled */ + bufferSize += 1; /* u8 primitive->ccxConfig.apRoamingEnabled */ bufferSize += 1; /* u8 primitive->ccxConfig.measurementsMask */ - bufferSize += 1; /* CsrBool primitive->ccxConfig.ccxRadioMgtEnabled */ + bufferSize += 1; /* u8 primitive->ccxConfig.ccxRadioMgtEnabled */ return bufferSize; } @@ -2479,8 +2479,8 @@ CsrSize CsrWifiSmeCoexConfigGetCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 31) */ bufferSize += 2; /* CsrResult primitive->status */ - bufferSize += 1; /* CsrBool primitive->coexConfig.coexEnableSchemeManagement */ - bufferSize += 1; /* CsrBool primitive->coexConfig.coexPeriodicWakeHost */ + bufferSize += 1; /* u8 primitive->coexConfig.coexEnableSchemeManagement */ + bufferSize += 1; /* u8 primitive->coexConfig.coexPeriodicWakeHost */ bufferSize += 2; /* u16 primitive->coexConfig.coexTrafficBurstyLatencyMs */ bufferSize += 2; /* u16 primitive->coexConfig.coexTrafficContinuousLatencyMs */ bufferSize += 2; /* u16 primitive->coexConfig.coexObexBlackoutDurationMs */ @@ -2554,13 +2554,13 @@ CsrSize CsrWifiSmeCoexInfoGetCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 24) */ bufferSize += 2; /* CsrResult primitive->status */ - bufferSize += 1; /* CsrBool primitive->coexInfo.hasTrafficData */ + bufferSize += 1; /* u8 primitive->coexInfo.hasTrafficData */ bufferSize += 1; /* CsrWifiSmeTrafficType primitive->coexInfo.currentTrafficType */ bufferSize += 2; /* u16 primitive->coexInfo.currentPeriodMs */ bufferSize += 1; /* CsrWifiSmePowerSaveLevel primitive->coexInfo.currentPowerSave */ bufferSize += 2; /* u16 primitive->coexInfo.currentCoexPeriodMs */ bufferSize += 2; /* u16 primitive->coexInfo.currentCoexLatencyMs */ - bufferSize += 1; /* CsrBool primitive->coexInfo.hasBtDevice */ + bufferSize += 1; /* u8 primitive->coexInfo.hasBtDevice */ bufferSize += 4; /* u32 primitive->coexInfo.currentBlackoutDurationUs */ bufferSize += 4; /* u32 primitive->coexInfo.currentBlackoutPeriodUs */ bufferSize += 1; /* CsrWifiSmeCoexScheme primitive->coexInfo.currentCoexScheme */ @@ -2666,7 +2666,7 @@ CsrSize CsrWifiSmeConnectionConfigGetCfmSizeof(void *msg) bufferSize += 2; /* u16 primitive->connectionConfig.mlmeAssociateReqInformationElementsLength */ bufferSize += primitive->connectionConfig.mlmeAssociateReqInformationElementsLength; /* u8 primitive->connectionConfig.mlmeAssociateReqInformationElements */ bufferSize += 1; /* CsrWifiSmeWmmQosInfoMask primitive->connectionConfig.wmmQosInfo */ - bufferSize += 1; /* CsrBool primitive->connectionConfig.adhocJoinOnly */ + bufferSize += 1; /* u8 primitive->connectionConfig.adhocJoinOnly */ bufferSize += 1; /* u8 primitive->connectionConfig.adhocChannel */ return bufferSize; } @@ -2762,7 +2762,7 @@ CsrSize CsrWifiSmeConnectionInfoGetCfmSizeof(void *msg) bufferSize += 1; /* CsrWifiSmeRadioIF primitive->connectionInfo.ifIndex */ bufferSize += 2; /* u16 primitive->connectionInfo.atimWindowTu */ bufferSize += 2; /* u16 primitive->connectionInfo.beaconPeriodTu */ - bufferSize += 1; /* CsrBool primitive->connectionInfo.reassociation */ + bufferSize += 1; /* u8 primitive->connectionInfo.reassociation */ bufferSize += 2; /* u16 primitive->connectionInfo.beaconFrameLength */ bufferSize += primitive->connectionInfo.beaconFrameLength; /* u8 primitive->connectionInfo.beaconFrame */ bufferSize += 2; /* u16 primitive->connectionInfo.associationReqFrameLength */ @@ -3221,7 +3221,7 @@ CsrSize CsrWifiSmeIbssStationIndSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 10) */ bufferSize += 6; /* u8 primitive->address.a[6] */ - bufferSize += 1; /* CsrBool primitive->isconnected */ + bufferSize += 1; /* u8 primitive->isconnected */ return bufferSize; } @@ -3358,7 +3358,7 @@ CsrSize CsrWifiSmeMediaStatusIndSizeof(void *msg) bufferSize += 1; /* CsrWifiSmeRadioIF primitive->connectionInfo.ifIndex */ bufferSize += 2; /* u16 primitive->connectionInfo.atimWindowTu */ bufferSize += 2; /* u16 primitive->connectionInfo.beaconPeriodTu */ - bufferSize += 1; /* CsrBool primitive->connectionInfo.reassociation */ + bufferSize += 1; /* u8 primitive->connectionInfo.reassociation */ bufferSize += 2; /* u16 primitive->connectionInfo.beaconFrameLength */ bufferSize += primitive->connectionInfo.beaconFrameLength; /* u8 primitive->connectionInfo.beaconFrame */ bufferSize += 2; /* u16 primitive->connectionInfo.associationReqFrameLength */ @@ -3559,7 +3559,7 @@ CsrSize CsrWifiSmeMibConfigGetCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */ bufferSize += 2; /* CsrResult primitive->status */ - bufferSize += 1; /* CsrBool primitive->mibConfig.unifiFixMaxTxDataRate */ + bufferSize += 1; /* u8 primitive->mibConfig.unifiFixMaxTxDataRate */ bufferSize += 1; /* u8 primitive->mibConfig.unifiFixTxDataRate */ bufferSize += 2; /* u16 primitive->mibConfig.dot11RtsThreshold */ bufferSize += 2; /* u16 primitive->mibConfig.dot11FragmentationThreshold */ @@ -3725,7 +3725,7 @@ CsrSize CsrWifiSmeMicFailureIndSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 15) */ bufferSize += 2; /* u16 primitive->interfaceTag */ - bufferSize += 1; /* CsrBool primitive->secondFailure */ + bufferSize += 1; /* u8 primitive->secondFailure */ bufferSize += 2; /* u16 primitive->count */ bufferSize += 6; /* u8 primitive->address.a[6] */ bufferSize += 1; /* CsrWifiSmeKeyType primitive->keyType */ @@ -3926,7 +3926,7 @@ CsrSize CsrWifiSmePmkidCandidateListIndSizeof(void *msg) for (i1 = 0; i1 < primitive->pmkidCandidatesCount; i1++) { bufferSize += 6; /* u8 primitive->pmkidCandidates[i1].bssid.a[6] */ - bufferSize += 1; /* CsrBool primitive->pmkidCandidates[i1].preAuthAllowed */ + bufferSize += 1; /* u8 primitive->pmkidCandidates[i1].preAuthAllowed */ } } return bufferSize; @@ -4075,11 +4075,11 @@ CsrSize CsrWifiSmePowerConfigGetCfmSizeof(void *msg) bufferSize += 2; /* CsrResult primitive->status */ bufferSize += 1; /* CsrWifiSmePowerSaveLevel primitive->powerConfig.powerSaveLevel */ bufferSize += 2; /* u16 primitive->powerConfig.listenIntervalTu */ - bufferSize += 1; /* CsrBool primitive->powerConfig.rxDtims */ + bufferSize += 1; /* u8 primitive->powerConfig.rxDtims */ bufferSize += 1; /* CsrWifiSmeD3AutoScanMode primitive->powerConfig.d3AutoScanMode */ bufferSize += 1; /* u8 primitive->powerConfig.clientTrafficWindow */ - bufferSize += 1; /* CsrBool primitive->powerConfig.opportunisticPowerSave */ - bufferSize += 1; /* CsrBool primitive->powerConfig.noticeOfAbsence */ + bufferSize += 1; /* u8 primitive->powerConfig.opportunisticPowerSave */ + bufferSize += 1; /* u8 primitive->powerConfig.noticeOfAbsence */ return bufferSize; } @@ -4127,8 +4127,8 @@ CsrSize CsrWifiSmeRegulatoryDomainInfoGetCfmSizeof(void *msg) /* Calculate the Size of the Serialised Data. Could be more efficient (Try 10) */ bufferSize += 2; /* CsrResult primitive->status */ - bufferSize += 1; /* CsrBool primitive->regDomInfo.dot11MultiDomainCapabilityImplemented */ - bufferSize += 1; /* CsrBool primitive->regDomInfo.dot11MultiDomainCapabilityEnabled */ + bufferSize += 1; /* u8 primitive->regDomInfo.dot11MultiDomainCapabilityImplemented */ + bufferSize += 1; /* u8 primitive->regDomInfo.dot11MultiDomainCapabilityEnabled */ bufferSize += 1; /* CsrWifiSmeRegulatoryDomain primitive->regDomInfo.currentRegulatoryDomain */ bufferSize += 2; /* u8 primitive->regDomInfo.currentCountryCode[2] */ return bufferSize; @@ -4258,8 +4258,8 @@ CsrSize CsrWifiSmeRoamingConfigGetCfmSizeof(void *msg) bufferSize += 2; /* s16 primitive->roamingConfig.roamingBands[i2].snrLowThreshold */ } } - bufferSize += 1; /* CsrBool primitive->roamingConfig.disableSmoothRoaming */ - bufferSize += 1; /* CsrBool primitive->roamingConfig.disableRoamScans */ + bufferSize += 1; /* u8 primitive->roamingConfig.disableSmoothRoaming */ + bufferSize += 1; /* u8 primitive->roamingConfig.disableRoamScans */ bufferSize += 1; /* u8 primitive->roamingConfig.reconnectLimit */ bufferSize += 2; /* u16 primitive->roamingConfig.reconnectLimitIntervalMs */ { @@ -4410,7 +4410,7 @@ CsrSize CsrWifiSmeScanConfigGetCfmSizeof(void *msg) bufferSize += 2; /* u16 primitive->scanConfig.scanCfg[i2].maxPassiveChannelTimeTu */ } } - bufferSize += 1; /* CsrBool primitive->scanConfig.disableAutonomousScans */ + bufferSize += 1; /* u8 primitive->scanConfig.disableAutonomousScans */ bufferSize += 2; /* u16 primitive->scanConfig.maxResults */ bufferSize += 1; /* s8 primitive->scanConfig.highRssiThreshold */ bufferSize += 1; /* s8 primitive->scanConfig.lowRssiThreshold */ @@ -5143,8 +5143,8 @@ CsrSize CsrWifiSmeSmeStaConfigGetCfmSizeof(void *msg) bufferSize += 1; /* u8 primitive->smeConfig.connectionQualitySnrChangeTrigger */ bufferSize += 1; /* CsrWifiSmeWmmModeMask primitive->smeConfig.wmmModeMask */ bufferSize += 1; /* CsrWifiSmeRadioIF primitive->smeConfig.ifIndex */ - bufferSize += 1; /* CsrBool primitive->smeConfig.allowUnicastUseGroupCipher */ - bufferSize += 1; /* CsrBool primitive->smeConfig.enableOpportunisticKeyCaching */ + bufferSize += 1; /* u8 primitive->smeConfig.allowUnicastUseGroupCipher */ + bufferSize += 1; /* u8 primitive->smeConfig.enableOpportunisticKeyCaching */ return bufferSize; } @@ -5595,7 +5595,7 @@ CsrSize CsrWifiSmeSmeCommonConfigGetCfmSizeof(void *msg) bufferSize += 1; /* CsrWifiSme80211dTrustLevel primitive->deviceConfig.trustLevel */ bufferSize += 2; /* u8 primitive->deviceConfig.countryCode[2] */ bufferSize += 1; /* CsrWifiSmeFirmwareDriverInterface primitive->deviceConfig.firmwareDriverInterface */ - bufferSize += 1; /* CsrBool primitive->deviceConfig.enableStrictDraftN */ + bufferSize += 1; /* u8 primitive->deviceConfig.enableStrictDraftN */ return bufferSize; } diff --git a/drivers/staging/csr/csr_wifi_vif_utils.h b/drivers/staging/csr/csr_wifi_vif_utils.h index 4eafbecf630..523172d1ac9 100644 --- a/drivers/staging/csr/csr_wifi_vif_utils.h +++ b/drivers/staging/csr/csr_wifi_vif_utils.h @@ -64,9 +64,9 @@ extern "C" { * @param[in] CsrWifiInterfaceMode : mode * * @return - * CsrBool : returns true if the interface is allowed to operate in the mode otherwise false. + * u8 : returns true if the interface is allowed to operate in the mode otherwise false. */ -extern CsrBool CsrWifiVifUtilsCheckCompatibility(u8 interfaceCapability, +extern u8 CsrWifiVifUtilsCheckCompatibility(u8 interfaceCapability, u8 *currentInterfaceModes, u16 interfaceTag, CsrWifiInterfaceMode mode); @@ -80,9 +80,9 @@ extern CsrBool CsrWifiVifUtilsCheckCompatibility(u8 interfaceCapabil * @param[in] u16 : interfaceTag * * @return - * CsrBool : returns true if the interface is supported, otherwise false. + * u8 : returns true if the interface is supported, otherwise false. */ -extern CsrBool CsrWifiVifUtilsIsSupported(u16 interfaceTag); +extern u8 CsrWifiVifUtilsIsSupported(u16 interfaceTag); #ifdef CSR_LOG_ENABLE /** diff --git a/drivers/staging/csr/firmware.c b/drivers/staging/csr/firmware.c index b994d1470f8..d14e1183961 100644 --- a/drivers/staging/csr/firmware.c +++ b/drivers/staging/csr/firmware.c @@ -296,7 +296,7 @@ uf_run_unifihelper(unifi_priv_t *priv) } /* uf_run_unifihelper() */ #ifdef CSR_WIFI_SPLIT_PATCH -static CsrBool is_ap_mode(unifi_priv_t *priv) +static u8 is_ap_mode(unifi_priv_t *priv) { if (priv == NULL || priv->interfacePriv[0] == NULL) { diff --git a/drivers/staging/csr/netdev.c b/drivers/staging/csr/netdev.c index 529bd9d0d47..1e6e111a8e1 100644 --- a/drivers/staging/csr/netdev.c +++ b/drivers/staging/csr/netdev.c @@ -552,7 +552,7 @@ uf_alloc_netdevice(CsrSdioFunction *sdio_dev, int bus_id) * and should be freed by freeing the net_device pointer. * --------------------------------------------------------------------------- */ -CsrBool +u8 uf_alloc_netdevice_for_other_interfaces(unifi_priv_t *priv, u16 interfaceTag) { struct net_device *dev; @@ -1371,7 +1371,7 @@ int prepare_and_add_macheader(unifi_priv_t *priv, struct sk_buff *skb, struct sk u16 interfaceTag, const u8 *daddr, const u8 *saddr, - CsrBool protection) + u8 protection) { u16 fc = 0; u8 qc = 0; @@ -1382,7 +1382,7 @@ int prepare_and_add_macheader(unifi_priv_t *priv, struct sk_buff *skb, struct sk u8 direction = 0; netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; u8 *addressOne; - CsrBool bQosNull = false; + u8 bQosNull = false; if (skb == NULL) { unifi_error(priv,"prepare_and_add_macheader: Invalid SKB reference\n"); @@ -1650,7 +1650,7 @@ send_ma_pkt_request(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr { int r; u16 i; - CsrBool eapolStore = FALSE; + u8 eapolStore = FALSE; struct sk_buff *newSkb = NULL; bulk_data_param_t bulkdata; const int proto = ntohs(ehdr->h_proto); @@ -2745,7 +2745,7 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d #ifdef CSR_SUPPORT_SME u8 dataFrameType = 0; - CsrBool powerSaveChanged = FALSE; + u8 powerSaveChanged = FALSE; u8 pmBit = 0; CsrWifiRouterCtrlStaInfo_t *srcStaInfo = NULL; u16 qosControl; diff --git a/drivers/staging/csr/sme_blocking.c b/drivers/staging/csr/sme_blocking.c index 921396712a5..3f0d70d56a2 100644 --- a/drivers/staging/csr/sme_blocking.c +++ b/drivers/staging/csr/sme_blocking.c @@ -321,7 +321,7 @@ int sme_mgt_scan_full(unifi_priv_t *priv, unsigned char *channel_list) { CsrWifiMacAddress bcastAddress = {{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }}; - CsrBool is_active = (num_channels > 0) ? TRUE : FALSE; + u8 is_active = (num_channels > 0) ? TRUE : FALSE; int r; if (priv->smepriv == NULL) { diff --git a/drivers/staging/csr/sme_sys.c b/drivers/staging/csr/sme_sys.c index 7a41c9c5565..99de27e678d 100644 --- a/drivers/staging/csr/sme_sys.c +++ b/drivers/staging/csr/sme_sys.c @@ -1095,7 +1095,7 @@ void CsrWifiRouterCtrlWifiOnResHandler(void* drvpriv, CsrWifiFsmEvent* msg) int i; /* used as a loop counter */ u32 intmode = CSR_WIFI_INTMODE_DEFAULT; #ifdef CSR_WIFI_SPLIT_PATCH - CsrBool switching_ap_fw = FALSE; + u8 switching_ap_fw = FALSE; #endif /* Register the UniFi device with the OS network manager */ unifi_trace(priv, UDBG3, "Card Init Completed Successfully\n"); @@ -1365,7 +1365,7 @@ _sys_packet_req(unifi_priv_t *priv, const CSR_SIGNAL *signal, CsrWifiMacAddress peerMacAddress; CsrResult csrResult; u16 interfaceTag = req.VirtualInterfaceIdentifier & 0xff; - CsrBool eapolStore = FALSE; + u8 eapolStore = FALSE; s8 protection = 0; netInterface_priv_t *interfacePriv; unsigned long flags; @@ -2101,7 +2101,7 @@ void CsrWifiRouterCtrlPeerDelReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) static int peer_add_new_record(unifi_priv_t *priv,CsrWifiRouterCtrlPeerAddReq *req,u32 *handle) { u8 i, powerModeTemp = 0; - CsrBool freeSlotFound = FALSE; + u8 freeSlotFound = FALSE; CsrWifiRouterCtrlStaInfo_t *newRecord = NULL; netInterface_priv_t *interfacePriv = priv->interfacePriv[req->interfaceTag]; CsrTime currentTime, currentTimeHi; @@ -2610,7 +2610,7 @@ static void ba_session_terminate_timer_func(unsigned long data) } -CsrBool blockack_session_stop(unifi_priv_t *priv, +u8 blockack_session_stop(unifi_priv_t *priv, u16 interfaceTag, CsrWifiRouterCtrlBlockAckRole role, u16 tID, @@ -2708,7 +2708,7 @@ CsrBool blockack_session_stop(unifi_priv_t *priv, void CsrWifiRouterCtrlBlockAckDisableReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) { CsrWifiRouterCtrlBlockAckDisableReq* req = (CsrWifiRouterCtrlBlockAckDisableReq*)msg; - CsrBool r; + u8 r; unifi_priv_t *priv = (unifi_priv_t*)drvpriv; unifi_trace(priv, UDBG6, "%s: in ok\n", __FUNCTION__); @@ -2730,7 +2730,7 @@ void CsrWifiRouterCtrlBlockAckDisableReqHandler(void* drvpriv, CsrWifiFsmEvent* } -CsrBool blockack_session_start(unifi_priv_t *priv, +u8 blockack_session_start(unifi_priv_t *priv, u16 interfaceTag, u16 tID, u16 timeout, @@ -2946,7 +2946,7 @@ CsrBool blockack_session_start(unifi_priv_t *priv, void CsrWifiRouterCtrlBlockAckEnableReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) { CsrWifiRouterCtrlBlockAckEnableReq* req = (CsrWifiRouterCtrlBlockAckEnableReq*)msg; - CsrBool r; + u8 r; unifi_priv_t *priv = (unifi_priv_t*)drvpriv; unifi_trace(priv, UDBG6, ">>%s\n", __FUNCTION__); diff --git a/drivers/staging/csr/unifi_event.c b/drivers/staging/csr/unifi_event.c index f5c2e77ba29..c27b23daf39 100644 --- a/drivers/staging/csr/unifi_event.c +++ b/drivers/staging/csr/unifi_event.c @@ -91,25 +91,25 @@ static void send_to_client(unifi_priv_t *priv, ul_client_t *client, * FALSE if the packet is for the driver or network stack * --------------------------------------------------------------------------- */ -static CsrBool check_routing_pkt_data_ind(unifi_priv_t *priv, +static u8 check_routing_pkt_data_ind(unifi_priv_t *priv, u8 *sigdata, const bulk_data_param_t* bulkdata, - CsrBool *freeBulkData, + u8 *freeBulkData, netInterface_priv_t *interfacePriv) { u16 frmCtrl, receptionStatus, frmCtrlSubType; u8 *macHdrLocation; u8 interfaceTag; - CsrBool isDataFrame; - CsrBool isProtocolVerInvalid = FALSE; - CsrBool isDataFrameSubTypeNoData = FALSE; + u8 isDataFrame; + u8 isProtocolVerInvalid = FALSE; + u8 isDataFrameSubTypeNoData = FALSE; #ifdef CSR_WIFI_SECURITY_WAPI_ENABLE static const u8 wapiProtocolIdSNAPHeader[] = {0x88,0xb4}; static const u8 wapiProtocolIdSNAPHeaderOffset = 6; u8 *destAddr; u8 *srcAddr; - CsrBool isWapiUnicastPkt = FALSE; + u8 isWapiUnicastPkt = FALSE; #ifdef CSR_WIFI_SECURITY_WAPI_QOSCTRL_MIC_WORKAROUND u16 qosControl; @@ -374,7 +374,7 @@ unifi_process_receive_event(void *ospriv, int i, receiver_id; int client_id; s16 signal_id; - CsrBool pktIndToSme = FALSE, freeBulkData = FALSE; + u8 pktIndToSme = FALSE, freeBulkData = FALSE; func_enter(); @@ -490,7 +490,7 @@ unifi_process_receive_event(void *ospriv, u8 *destAddr; CsrResult res; u16 interfaceTag = 0; - CsrBool isMcastPkt = TRUE; + u8 isMcastPkt = TRUE; unifi_trace(priv, UDBG6, "Received a WAPI data packet when the Unicast/Multicast filter is set\n"); res = read_unpack_signal(sigdata, &signal); @@ -578,7 +578,7 @@ unifi_process_receive_event(void *ospriv, #ifdef CSR_WIFI_RX_PATH_SPLIT -static CsrBool signal_buffer_is_full(unifi_priv_t* priv) +static u8 signal_buffer_is_full(unifi_priv_t* priv) { return (((priv->rxSignalBuffer.writePointer + 1)% priv->rxSignalBuffer.size) == (priv->rxSignalBuffer.readPointer)); } diff --git a/drivers/staging/csr/unifi_pdu_processing.c b/drivers/staging/csr/unifi_pdu_processing.c index d1afa3a076c..7c7e8d49ae4 100644 --- a/drivers/staging/csr/unifi_pdu_processing.c +++ b/drivers/staging/csr/unifi_pdu_processing.c @@ -129,7 +129,7 @@ unifi_frame_ma_packet_req(unifi_priv_t *priv, CSR_PRIORITY priority, static int frame_and_send_queued_pdu(unifi_priv_t* priv,tx_buffered_packets_t* buffered_pkt, - CsrWifiRouterCtrlStaInfo_t *staRecord,CsrBool moreData , CsrBool eosp) + CsrWifiRouterCtrlStaInfo_t *staRecord,u8 moreData , u8 eosp) { CSR_SIGNAL signal; @@ -300,7 +300,7 @@ void verify_and_accomodate_tx_packet(unifi_priv_t *priv) struct list_head *listHead, *list; struct list_head *placeHolder; u8 i, j,eospFramedeleted=0; - CsrBool thresholdExcedeDueToBroadcast = TRUE; + u8 thresholdExcedeDueToBroadcast = TRUE; /* it will be made it interface Specific in the future when multi interfaces are supported , right now interface 0 is considered */ netInterface_priv_t *interfacePriv = priv->interfacePriv[0]; @@ -385,7 +385,7 @@ void verify_and_accomodate_tx_packet(unifi_priv_t *priv) static CsrResult enque_tx_data_pdu(unifi_priv_t *priv, bulk_data_param_t *bulkdata, struct list_head *list, CSR_SIGNAL *signal, - CsrBool requeueOnSamePos) + u8 requeueOnSamePos) { /* queue the tx data packets on to appropriate queue */ @@ -754,7 +754,7 @@ void uf_handle_tim_cfm(unifi_priv_t *priv, CSR_MLME_SET_TIM_CONFIRM *cfm, u16 re * If failure crosses this Limit, we have to take a call to FIX */ if (retryCount > UNIFI_MAX_RETRY_LIMIT) { - CsrBool moreData = FALSE; + u8 moreData = FALSE; retryCount = 0; /* Because of continuos traffic in fh_cmd_q the tim set request is failing (exceeding retry limit) * but if we didn't synchronize our timSet varible state with firmware then it can cause below issues @@ -959,7 +959,7 @@ void process_peer_active_transition(unifi_priv_t * priv, u16 interfaceTag) { int r,i; - CsrBool spaceAvail[4] = {TRUE,TRUE,TRUE,TRUE}; + u8 spaceAvail[4] = {TRUE,TRUE,TRUE,TRUE}; tx_buffered_packets_t * buffered_pkt = NULL; unsigned long lock_flags; netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; @@ -1514,8 +1514,8 @@ uf_ap_process_data_pdu(unifi_priv_t *priv, struct sk_buff *skb, struct sk_buff *newSkb = NULL; /* pointer to skb or private skb created using skb_copy() */ struct sk_buff *skbPtr = skb; - CsrBool sendToNetdev = FALSE; - CsrBool qosDestination = FALSE; + u8 sendToNetdev = FALSE; + u8 qosDestination = FALSE; CSR_PRIORITY priority = CSR_CONTENTION; CsrWifiRouterCtrlStaInfo_t *dstStaInfo = NULL; netInterface_priv_t *interfacePriv; @@ -1660,13 +1660,13 @@ CsrResult uf_process_ma_packet_req(unifi_priv_t *priv, const u8 *macHdrLocation = bulkdata->d[0].os_data_ptr; CsrWifiPacketType pktType; int frameType = 0; - CsrBool queuePacketDozing = FALSE; + u8 queuePacketDozing = FALSE; u32 priority_q; u16 frmCtrl; struct list_head * list = NULL; /* List to which buffered PDUs are to be enqueued*/ - CsrBool setBcTim=FALSE; + u8 setBcTim=FALSE; netInterface_priv_t *interfacePriv; - CsrBool requeueOnSamePos = FALSE; + u8 requeueOnSamePos = FALSE; u32 handle = 0xFFFFFFFF; unsigned long lock_flags; @@ -2021,7 +2021,7 @@ u8 send_multicast_frames(unifi_priv_t *priv, u16 interfaceTag) { int r; tx_buffered_packets_t * buffered_pkt = NULL; - CsrBool moreData = FALSE; + u8 moreData = FALSE; u8 pduSent =0; unsigned long lock_flags; netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; @@ -2203,7 +2203,7 @@ void uf_process_ma_vif_availibility_ind(unifi_priv_t *priv,u8 *sigdata, #define GET_ACTIVE_INTERFACE_TAG(priv) 0 -static CsrBool uf_is_more_data_for_delivery_ac(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t *staRecord) +static u8 uf_is_more_data_for_delivery_ac(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t *staRecord) { s8 i; @@ -2221,7 +2221,7 @@ static CsrBool uf_is_more_data_for_delivery_ac(unifi_priv_t *priv, CsrWifiRouter return FALSE; } -static CsrBool uf_is_more_data_for_usp_delivery(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t *staRecord, unifi_TrafficQueue queue) +static u8 uf_is_more_data_for_usp_delivery(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t *staRecord, unifi_TrafficQueue queue) { s8 i; @@ -2268,9 +2268,9 @@ void uf_send_buffered_data_from_delivery_ac(unifi_priv_t *priv, u16 interfaceTag = GET_ACTIVE_INTERFACE_TAG(priv); tx_buffered_packets_t * buffered_pkt = NULL; unsigned long lock_flags; - CsrBool eosp=FALSE; + u8 eosp=FALSE; s8 r =0; - CsrBool moreData = FALSE; + u8 moreData = FALSE; netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; unifi_trace(priv, UDBG2, "++uf_send_buffered_data_from_delivery_ac, active=%x\n", staInfo->uapsdActive); @@ -2368,8 +2368,8 @@ void uf_send_buffered_data_from_ac(unifi_priv_t *priv, { tx_buffered_packets_t * buffered_pkt = NULL; unsigned long lock_flags; - CsrBool eosp=FALSE; - CsrBool moreData = FALSE; + u8 eosp=FALSE; + u8 moreData = FALSE; s8 r =0; func_enter(); @@ -2412,7 +2412,7 @@ void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q) u32 startIndex=0,endIndex=0; CsrWifiRouterCtrlStaInfo_t * staInfo = NULL; u8 queue; - CsrBool moreData = FALSE; + u8 moreData = FALSE; netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; @@ -2549,7 +2549,7 @@ void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q) } -CsrBool uf_is_more_data_for_non_delivery_ac(CsrWifiRouterCtrlStaInfo_t *staRecord) +u8 uf_is_more_data_for_non_delivery_ac(CsrWifiRouterCtrlStaInfo_t *staRecord) { u8 i; @@ -2916,7 +2916,7 @@ void uf_send_nulldata(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI return; } -CsrBool uf_check_broadcast_bssid(unifi_priv_t *priv, const bulk_data_param_t *bulkdata) +u8 uf_check_broadcast_bssid(unifi_priv_t *priv, const bulk_data_param_t *bulkdata) { u8 *bssid = NULL; static const CsrWifiMacAddress broadcast_address = {{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}}; @@ -2957,11 +2957,11 @@ CsrBool uf_check_broadcast_bssid(unifi_priv_t *priv, const bulk_data_param_t *bu } -CsrBool uf_process_pm_bit_for_peer(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t * srcStaInfo, +u8 uf_process_pm_bit_for_peer(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t * srcStaInfo, u8 pmBit,u16 interfaceTag) { - CsrBool moreData = FALSE; - CsrBool powerSaveChanged = FALSE; + u8 moreData = FALSE; + u8 powerSaveChanged = FALSE; unsigned long lock_flags; unifi_trace(priv, UDBG3, "entering uf_process_pm_bit_for_peer\n"); @@ -3060,7 +3060,7 @@ void uf_process_ps_poll(unifi_priv_t *priv,u8* sa,u8* da,u8 pmBit,u16 interfaceT CsrWifiMacAddress peerMacAddress; unsigned long lock_flags; s8 r =0; - CsrBool moreData = FALSE; + u8 moreData = FALSE; netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; unifi_trace(priv, UDBG3, "entering uf_process_ps_poll\n"); @@ -3594,7 +3594,7 @@ void resume_unicast_buffered_frames(unifi_priv_t *priv, u16 interfaceTag) u8 i; int j; tx_buffered_packets_t * buffered_pkt = NULL; - CsrBool hipslotFree[4] = {TRUE,TRUE,TRUE,TRUE}; + u8 hipslotFree[4] = {TRUE,TRUE,TRUE,TRUE}; int r; unsigned long lock_flags; diff --git a/drivers/staging/csr/unifi_priv.h b/drivers/staging/csr/unifi_priv.h index 2f8f0311d72..6d6b46191a1 100644 --- a/drivers/staging/csr/unifi_priv.h +++ b/drivers/staging/csr/unifi_priv.h @@ -323,10 +323,10 @@ typedef struct CsrWifiRouterCtrlStaInfo_t { /* Sme sends these parameters */ CsrWifiMacAddress peerMacAddress; u32 assignedHandle; - CsrBool wmmOrQosEnabled; + u8 wmmOrQosEnabled; CsrWifiAcPowersaveMode powersaveMode[MAX_ACCESS_CATOGORY]; u16 maxSpLength; - CsrBool uapsdActive; + u8 uapsdActive; u16 noOfSpFramesSent; /* Router/Driver database */ @@ -337,7 +337,7 @@ typedef struct CsrWifiRouterCtrlStaInfo_t { /* Inactivity feature parameters */ struct netInterface_priv *interfacePriv; struct work_struct send_disconnected_ind_task; - CsrBool activity_flag; + u8 activity_flag; u16 listenIntervalInTus; CSR_CLIENT_TAG nullDataHostTag; @@ -345,7 +345,7 @@ typedef struct CsrWifiRouterCtrlStaInfo_t { CsrTime lastActivity; /* during m/c transmission sp suspended */ - CsrBool uspSuspend; + u8 uspSuspend; CSR_PRIORITY triggerFramePriority; #endif CsrWifiRouterCtrlPeerStatus currentPeerState; @@ -354,9 +354,9 @@ typedef struct CsrWifiRouterCtrlStaInfo_t { u8 spStatus; u8 prevFrmType; u8 prevFrmAccessCatogory; - CsrBool protection; + u8 protection; u16 aid; - CsrBool txSuspend; + u8 txSuspend; u8 timSet; /* Dont change the value of below macro for SET & RESET */ #define CSR_WIFI_TIM_RESET 0 @@ -364,7 +364,7 @@ typedef struct CsrWifiRouterCtrlStaInfo_t { #define CSR_WIFI_TIM_RESETTING 2 #define CSR_WIFI_TIM_SETTING 3 - CsrBool timRequestPendingFlag; + u8 timRequestPendingFlag; u8 updateTimReqQueued; u16 noOfPktQueued; }CsrWifiRouterCtrlStaInfo_t; @@ -501,7 +501,7 @@ struct unifi_priv { #define CSR_WIFI_DRIVER_MAX_PKT_QUEUING_THRESHOLD_PER_PEER 64 #define CSR_WIFI_DRIVER_MINIMUM_BROADCAST_PKT_THRESHOLD 3 - CsrBool routerBufferEnable[MAX_ACCESS_CATOGORY]; + u8 routerBufferEnable[MAX_ACCESS_CATOGORY]; /* lock to protect stainfo members and priv members*/ spinlock_t staRecord_lock; #endif @@ -616,7 +616,7 @@ struct unifi_priv { int ptest_mode; /* Set when in production test mode */ int coredump_mode; /* Set when SME has requested a coredump */ - CsrBool wol_suspend; /* Set when suspending with UniFi powered */ + u8 wol_suspend; /* Set when suspending with UniFi powered */ #define UF_UNCONTROLLED_PORT_Q 0 #define UF_CONTROLLED_PORT_Q 1 @@ -660,7 +660,7 @@ struct unifi_priv { u8 wapi_unicast_filter; u8 wapi_unicast_queued_pkt_filter; #ifdef CSR_WIFI_SECURITY_WAPI_QOSCTRL_MIC_WORKAROUND - CsrBool isWapiConnection; + u8 isWapiConnection; #endif #endif @@ -668,7 +668,7 @@ struct unifi_priv { CsrWifiRouterCtrlModeSetReq pending_mode_set; #endif - CsrBool cmanrTestMode; + u8 cmanrTestMode; CSR_RATE cmanrTestModeTransmitRate; }; @@ -680,7 +680,7 @@ typedef struct { typedef struct { - CsrBool active; + u8 active; bulk_data_param_t bulkdata; CSR_SIGNAL signal; u16 sn; @@ -695,7 +695,7 @@ typedef struct { u16 timeout; u16 expected_sn; u16 start_sn; - CsrBool trigger_ba_after_ssn; + u8 trigger_ba_after_ssn; struct netInterface_priv *interfacePriv; u16 tID; CsrWifiMacAddress macAddress; @@ -724,7 +724,7 @@ typedef struct netInterface_priv #endif struct net_device_stats stats; u8 interfaceMode; - CsrBool protect; + u8 protect; CsrWifiMacAddress bssid; /* * Flag to reflect state of CONNECTED indication signal. @@ -739,9 +739,9 @@ typedef struct netInterface_priv } connected; #ifdef CSR_SUPPORT_WEXT /* Tracks when we are waiting for a netdevice state change callback */ - CsrBool wait_netdev_change; + u8 wait_netdev_change; /* True if we have successfully registered for netdev callbacks */ - CsrBool netdev_callback_registered; + u8 netdev_callback_registered; #endif /* CSR_SUPPORT_WEXT */ unsigned int netdev_registered; #define UNIFI_MAX_MULTICAST_ADDRESSES 10 @@ -764,7 +764,7 @@ typedef struct netInterface_priv /* Timer for detecting station inactivity */ struct timer_list sta_activity_check_timer; - CsrBool sta_activity_check_enabled; + u8 sta_activity_check_enabled; /* Timestamp when the last inactivity check was done */ CsrTime last_inactivity_check; @@ -787,15 +787,15 @@ typedef struct netInterface_priv #endif /* This should be removed and m4_hostTag should be used for checking*/ - CsrBool m4_sent; + u8 m4_sent; CSR_CLIENT_TAG m4_hostTag; - CsrBool dtimActive; - CsrBool intraBssEnabled; + u8 dtimActive; + u8 intraBssEnabled; u32 multicastPduHostTag; /* Used to set the tim after getting a confirm for it */ - CsrBool bcTimSet; - CsrBool bcTimSetReqPendingFlag; - CsrBool bcTimSetReqQueued; + u8 bcTimSet; + u8 bcTimSetReqPendingFlag; + u8 bcTimSetReqQueued; } netInterface_priv_t; #ifndef ALLOW_Q_PAUSE @@ -895,7 +895,7 @@ unifi_priv_t *uf_alloc_netdevice(CsrSdioFunction *sdio_dev, int bus_id); int uf_free_netdevice(unifi_priv_t *priv); /* Allocating function for other interfaces */ -CsrBool uf_alloc_netdevice_for_other_interfaces(unifi_priv_t *priv, u16 interfaceTag); +u8 uf_alloc_netdevice_for_other_interfaces(unifi_priv_t *priv, u16 interfaceTag); /* * Firmware download related functions. @@ -956,15 +956,15 @@ int uf_verify_m4(unifi_priv_t *priv, const unsigned char *packet, unsigned int length); #ifdef CSR_SUPPORT_SME -CsrBool uf_check_broadcast_bssid(unifi_priv_t *priv, const bulk_data_param_t *bulkdata); -CsrBool uf_process_pm_bit_for_peer(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t * srcStaInfo,u8 pmBit,u16 interfaceTag); +u8 uf_check_broadcast_bssid(unifi_priv_t *priv, const bulk_data_param_t *bulkdata); +u8 uf_process_pm_bit_for_peer(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t * srcStaInfo,u8 pmBit,u16 interfaceTag); void uf_process_ps_poll(unifi_priv_t *priv,u8* sa,u8* da,u8 pmBit,u16 interfaceTag); int uf_ap_process_data_pdu(unifi_priv_t *priv, struct sk_buff *skb, struct ethhdr *ehdr, CsrWifiRouterCtrlStaInfo_t * srcStaInfo, const CSR_SIGNAL *signal, bulk_data_param_t *bulkdata, u8 macHeaderLengthInBytes); -CsrBool uf_is_more_data_for_non_delivery_ac(CsrWifiRouterCtrlStaInfo_t *staRecord); +u8 uf_is_more_data_for_non_delivery_ac(CsrWifiRouterCtrlStaInfo_t *staRecord); void uf_process_wmm_deliver_ac_uapsd ( unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t * srcStaInfo, u16 qosControl, @@ -1031,7 +1031,7 @@ int prepare_and_add_macheader(unifi_priv_t *priv, u16 interfaceTag, const u8 *daddr, const u8 *saddr, - CsrBool protection); + u8 protection); CSR_PRIORITY get_packet_priority(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr *ehdr, netInterface_priv_t *interfacePriv); @@ -1064,7 +1064,7 @@ void scroll_ba_window(unifi_priv_t *priv, ba_session_rx_struct *ba_session, u16 sn); -CsrBool blockack_session_stop(unifi_priv_t *priv, +u8 blockack_session_stop(unifi_priv_t *priv, u16 interfaceTag, CsrWifiRouterCtrlBlockAckRole role, u16 tID, diff --git a/drivers/staging/csr/unifi_sme.c b/drivers/staging/csr/unifi_sme.c index 85ea812ef9b..85e0c9e5635 100644 --- a/drivers/staging/csr/unifi_sme.c +++ b/drivers/staging/csr/unifi_sme.c @@ -115,7 +115,7 @@ sme_log_event(ul_client_t *pcli, if (unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_MA_PACKET_INDICATION_ID) { u16 frmCtrl; - CsrBool unicastPdu = TRUE; + u8 unicastPdu = TRUE; u8 *macHdrLocation; u8 *raddr = NULL, *taddr = NULL; CsrWifiMacAddress peerMacAddress; @@ -727,7 +727,7 @@ int unifi_cfg_wmm_delts(unifi_priv_t *priv, unsigned char *arg) int unifi_cfg_strict_draft_n(unifi_priv_t *priv, unsigned char *arg) { - CsrBool strict_draft_n; + u8 strict_draft_n; u8 *strict_draft_n_params; int rc; @@ -735,7 +735,7 @@ int unifi_cfg_strict_draft_n(unifi_priv_t *priv, unsigned char *arg) CsrWifiSmeDeviceConfig deviceConfig; strict_draft_n_params = (u8*)(((unifi_cfg_command_t*)arg) + 1); - if (get_user(strict_draft_n, (CsrBool*)strict_draft_n_params)) { + if (get_user(strict_draft_n, (u8*)strict_draft_n_params)) { unifi_error(priv, "unifi_cfg_strict_draft_n: Failed to get the argument\n"); return -EFAULT; } @@ -763,7 +763,7 @@ int unifi_cfg_strict_draft_n(unifi_priv_t *priv, unsigned char *arg) int unifi_cfg_enable_okc(unifi_priv_t *priv, unsigned char *arg) { - CsrBool enable_okc; + u8 enable_okc; u8 *enable_okc_params; int rc; @@ -771,7 +771,7 @@ int unifi_cfg_enable_okc(unifi_priv_t *priv, unsigned char *arg) CsrWifiSmeDeviceConfig deviceConfig; enable_okc_params = (u8*)(((unifi_cfg_command_t*)arg) + 1); - if (get_user(enable_okc, (CsrBool*)enable_okc_params)) { + if (get_user(enable_okc, (u8*)enable_okc_params)) { unifi_error(priv, "unifi_cfg_enable_okc: Failed to get the argument\n"); return -EFAULT; } @@ -914,7 +914,7 @@ int uf_configure_supported_rates(u8 * supportedRates, u8 phySupportedBitmap) { int i=0; - CsrBool b=FALSE, g = FALSE, n = FALSE; + u8 b=FALSE, g = FALSE, n = FALSE; b = phySupportedBitmap & CSR_WIFI_SME_AP_PHY_SUPPORT_B; n = phySupportedBitmap & CSR_WIFI_SME_AP_PHY_SUPPORT_N; g = phySupportedBitmap & CSR_WIFI_SME_AP_PHY_SUPPORT_G; diff --git a/drivers/staging/csr/unifi_sme.h b/drivers/staging/csr/unifi_sme.h index bdff0f3e915..b689cfe2b10 100644 --- a/drivers/staging/csr/unifi_sme.h +++ b/drivers/staging/csr/unifi_sme.h @@ -27,7 +27,7 @@ typedef int unifi_data_port_action; typedef struct unifi_port_cfg { /* TRUE if this port entry is allocated */ - CsrBool in_use; + u8 in_use; CsrWifiRouterCtrlPortAction port_action; CsrWifiMacAddress mac_address; } unifi_port_cfg_t; diff --git a/drivers/staging/csr/unifi_wext.h b/drivers/staging/csr/unifi_wext.h index 4ce0011d0ec..6d7a9959508 100644 --- a/drivers/staging/csr/unifi_wext.h +++ b/drivers/staging/csr/unifi_wext.h @@ -60,7 +60,7 @@ void wext_send_disassoc_event(unifi_priv_t *priv); void wext_send_michaelmicfailure_event(unifi_priv_t *priv, u16 count, CsrWifiMacAddress address, CsrWifiSmeKeyType keyType, u16 interfaceTag); -void wext_send_pmkid_candidate_event(unifi_priv_t *priv, CsrWifiMacAddress bssid, CsrBool preauth_allowed, u16 interfaceTag); +void wext_send_pmkid_candidate_event(unifi_priv_t *priv, CsrWifiMacAddress bssid, u8 preauth_allowed, u16 interfaceTag); void wext_send_started_event(unifi_priv_t *priv); diff --git a/drivers/staging/csr/unifiio.h b/drivers/staging/csr/unifiio.h index 74720fc3a19..9acf9ee7a8d 100644 --- a/drivers/staging/csr/unifiio.h +++ b/drivers/staging/csr/unifiio.h @@ -314,15 +314,15 @@ typedef struct uf_cfg_ap_config u8 channel; u16 beaconInterval; u8 dtimPeriod; - CsrBool wmmEnabled; + u8 wmmEnabled; u8 shortSlotTimeEnabled; u16 groupkeyTimeout; - CsrBool strictGtkRekeyEnabled; + u8 strictGtkRekeyEnabled; u16 gmkTimeout; u16 responseTimeout; u8 retransLimit; u8 rxStbc; - CsrBool rifsModeAllowed; + u8 rifsModeAllowed; u8 dualCtsProtection; u8 ctsProtectionType; u16 maxListenInterval; diff --git a/drivers/staging/csr/wext_events.c b/drivers/staging/csr/wext_events.c index f250ea60da5..d356887ac4c 100644 --- a/drivers/staging/csr/wext_events.c +++ b/drivers/staging/csr/wext_events.c @@ -238,7 +238,7 @@ wext_send_michaelmicfailure_event(unifi_priv_t *priv, } /* wext_send_michaelmicfailure_event() */ void -wext_send_pmkid_candidate_event(unifi_priv_t *priv, CsrWifiMacAddress bssid, CsrBool preauth_allowed, u16 interfaceTag) +wext_send_pmkid_candidate_event(unifi_priv_t *priv, CsrWifiMacAddress bssid, u8 preauth_allowed, u16 interfaceTag) { #if WIRELESS_EXT > 17 union iwreq_data wrqu; -- cgit v1.2.3-70-g09d2 From 980b5a2b0d90294a8b56cf999ecd1a5c31e5a173 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 20 Jul 2012 13:07:13 -0700 Subject: staging: csr: remove csr_types.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only thing left in here is the TRUE/FALSE #defines, so move them to csr_macro.h and remove the file. Cc: Mikko Virkkilä Cc: Lauri Hintsala Cc: Riku Mettälä Cc: Veli-Pekka Peltola Signed-off-by: Greg Kroah-Hartman --- drivers/staging/csr/csr_formatted_io.c | 1 - drivers/staging/csr/csr_formatted_io.h | 2 +- drivers/staging/csr/csr_framework_ext.c | 1 - drivers/staging/csr/csr_framework_ext.h | 1 - drivers/staging/csr/csr_framework_ext_types.h | 2 -- drivers/staging/csr/csr_lib.h | 1 - drivers/staging/csr/csr_log.h | 1 - drivers/staging/csr/csr_log_configure.h | 1 - drivers/staging/csr/csr_log_text.h | 1 - drivers/staging/csr/csr_macro.h | 5 +++- drivers/staging/csr/csr_msgconv.c | 2 +- drivers/staging/csr/csr_msgconv.h | 2 +- drivers/staging/csr/csr_panic.c | 1 - drivers/staging/csr/csr_panic.h | 2 -- drivers/staging/csr/csr_pmem.h | 2 +- drivers/staging/csr/csr_prim_defs.h | 2 -- drivers/staging/csr/csr_result.h | 2 -- drivers/staging/csr/csr_sched.h | 2 +- drivers/staging/csr/csr_sdio.h | 1 - .../staging/csr/csr_serialize_primitive_types.c | 1 - drivers/staging/csr/csr_time.c | 1 - drivers/staging/csr/csr_time.h | 2 +- drivers/staging/csr/csr_types.h | 33 ---------------------- drivers/staging/csr/csr_unicode.h | 2 -- drivers/staging/csr/csr_utf16.c | 1 - drivers/staging/csr/csr_util.c | 1 - drivers/staging/csr/csr_util.h | 3 +- drivers/staging/csr/csr_wifi_common.h | 2 +- drivers/staging/csr/csr_wifi_fsm.h | 1 - drivers/staging/csr/csr_wifi_fsm_event.h | 1 - drivers/staging/csr/csr_wifi_fsm_types.h | 2 +- drivers/staging/csr/csr_wifi_hip_chiphelper.c | 2 +- drivers/staging/csr/csr_wifi_hip_chiphelper.h | 2 +- drivers/staging/csr/csr_wifi_hip_signals.h | 2 +- drivers/staging/csr/csr_wifi_hip_unifi.h | 1 - drivers/staging/csr/csr_wifi_lib.h | 1 - drivers/staging/csr/csr_wifi_msgconv.h | 1 - drivers/staging/csr/csr_wifi_nme_ap_lib.h | 1 - drivers/staging/csr/csr_wifi_nme_ap_prim.h | 1 - drivers/staging/csr/csr_wifi_nme_ap_serialize.h | 1 - drivers/staging/csr/csr_wifi_nme_lib.h | 1 - drivers/staging/csr/csr_wifi_nme_prim.h | 2 +- drivers/staging/csr/csr_wifi_nme_serialize.h | 1 - drivers/staging/csr/csr_wifi_nme_task.h | 2 +- drivers/staging/csr/csr_wifi_private_common.h | 2 -- drivers/staging/csr/csr_wifi_result.h | 1 - drivers/staging/csr/csr_wifi_router_ctrl_lib.h | 1 - drivers/staging/csr/csr_wifi_router_ctrl_prim.h | 2 +- .../staging/csr/csr_wifi_router_ctrl_serialize.h | 1 - drivers/staging/csr/csr_wifi_router_lib.h | 1 - drivers/staging/csr/csr_wifi_router_prim.h | 2 +- drivers/staging/csr/csr_wifi_router_serialize.h | 1 - drivers/staging/csr/csr_wifi_router_task.h | 1 - drivers/staging/csr/csr_wifi_router_transport.c | 1 - .../csr/csr_wifi_serialize_primitive_types.c | 1 - drivers/staging/csr/csr_wifi_sme_ap_lib.h | 1 - drivers/staging/csr/csr_wifi_sme_ap_prim.h | 1 - drivers/staging/csr/csr_wifi_sme_lib.h | 1 - drivers/staging/csr/csr_wifi_sme_prim.h | 2 +- drivers/staging/csr/csr_wifi_sme_serialize.h | 1 - drivers/staging/csr/csr_wifi_sme_task.h | 1 - drivers/staging/csr/unifiio.h | 1 - 62 files changed, 22 insertions(+), 100 deletions(-) delete mode 100644 drivers/staging/csr/csr_types.h (limited to 'drivers/staging/csr/csr_wifi_fsm.h') diff --git a/drivers/staging/csr/csr_formatted_io.c b/drivers/staging/csr/csr_formatted_io.c index d26fd78c282..51fb988a587 100644 --- a/drivers/staging/csr/csr_formatted_io.c +++ b/drivers/staging/csr/csr_formatted_io.c @@ -8,7 +8,6 @@ *****************************************************************************/ -#include "csr_types.h" #include "csr_formatted_io.h" #include "csr_util.h" diff --git a/drivers/staging/csr/csr_formatted_io.h b/drivers/staging/csr/csr_formatted_io.h index c87f637e209..2e238cb98d5 100644 --- a/drivers/staging/csr/csr_formatted_io.h +++ b/drivers/staging/csr/csr_formatted_io.h @@ -14,7 +14,7 @@ extern "C" { #endif -#include "csr_types.h" +#include s32 CsrSnprintf(char *dest, size_t n, const char *fmt, ...); diff --git a/drivers/staging/csr/csr_framework_ext.c b/drivers/staging/csr/csr_framework_ext.c index 6b9ac928098..7a0d660007f 100644 --- a/drivers/staging/csr/csr_framework_ext.c +++ b/drivers/staging/csr/csr_framework_ext.c @@ -28,7 +28,6 @@ #include -#include "csr_types.h" #include "csr_framework_ext.h" #include "csr_panic.h" diff --git a/drivers/staging/csr/csr_framework_ext.h b/drivers/staging/csr/csr_framework_ext.h index 58cc22c9fcf..46689c173c6 100644 --- a/drivers/staging/csr/csr_framework_ext.h +++ b/drivers/staging/csr/csr_framework_ext.h @@ -10,7 +10,6 @@ *****************************************************************************/ -#include "csr_types.h" #include "csr_result.h" #include "csr_framework_ext_types.h" diff --git a/drivers/staging/csr/csr_framework_ext_types.h b/drivers/staging/csr/csr_framework_ext_types.h index b1ff72f2ccf..57194ee911e 100644 --- a/drivers/staging/csr/csr_framework_ext_types.h +++ b/drivers/staging/csr/csr_framework_ext_types.h @@ -10,8 +10,6 @@ *****************************************************************************/ -#include "csr_types.h" - #ifdef __KERNEL__ #include #include diff --git a/drivers/staging/csr/csr_lib.h b/drivers/staging/csr/csr_lib.h index 841d7eceed2..b1a57d5d06f 100644 --- a/drivers/staging/csr/csr_lib.h +++ b/drivers/staging/csr/csr_lib.h @@ -10,7 +10,6 @@ *****************************************************************************/ -#include "csr_types.h" #include "csr_prim_defs.h" #ifdef __cplusplus diff --git a/drivers/staging/csr/csr_log.h b/drivers/staging/csr/csr_log.h index 2619d2229ec..b2808569f8d 100644 --- a/drivers/staging/csr/csr_log.h +++ b/drivers/staging/csr/csr_log.h @@ -10,7 +10,6 @@ *****************************************************************************/ -#include "csr_types.h" #include "csr_sched.h" #include "csr_panic.h" #include "csr_prim_defs.h" diff --git a/drivers/staging/csr/csr_log_configure.h b/drivers/staging/csr/csr_log_configure.h index 48e8a225716..8842e4bf461 100644 --- a/drivers/staging/csr/csr_log_configure.h +++ b/drivers/staging/csr/csr_log_configure.h @@ -10,7 +10,6 @@ *****************************************************************************/ -#include "csr_types.h" #include "csr_log.h" #ifdef __cplusplus diff --git a/drivers/staging/csr/csr_log_text.h b/drivers/staging/csr/csr_log_text.h index 9fc2aa2bb41..9fe6c90244c 100644 --- a/drivers/staging/csr/csr_log_text.h +++ b/drivers/staging/csr/csr_log_text.h @@ -10,7 +10,6 @@ *****************************************************************************/ -#include "csr_types.h" #include "csr_log_configure.h" #ifdef __cplusplus diff --git a/drivers/staging/csr/csr_macro.h b/drivers/staging/csr/csr_macro.h index 22405cfcf14..57cbfcb0619 100644 --- a/drivers/staging/csr/csr_macro.h +++ b/drivers/staging/csr/csr_macro.h @@ -10,12 +10,15 @@ *****************************************************************************/ -#include "csr_types.h" +#include #ifdef __cplusplus extern "C" { #endif +#define FALSE (0) +#define TRUE (1) + /*------------------------------------------------------------------*/ /* Bits - intended to operate on u32 values */ /*------------------------------------------------------------------*/ diff --git a/drivers/staging/csr/csr_msgconv.c b/drivers/staging/csr/csr_msgconv.c index ad01958f368..a2e08428a11 100644 --- a/drivers/staging/csr/csr_msgconv.c +++ b/drivers/staging/csr/csr_msgconv.c @@ -9,7 +9,7 @@ *****************************************************************************/ #include -#include "csr_types.h" +#include #include "csr_pmem.h" #include "csr_panic.h" #include "csr_sched.h" diff --git a/drivers/staging/csr/csr_msgconv.h b/drivers/staging/csr/csr_msgconv.h index 5aefda312a4..2e1aad8a389 100644 --- a/drivers/staging/csr/csr_msgconv.h +++ b/drivers/staging/csr/csr_msgconv.h @@ -11,7 +11,7 @@ *****************************************************************************/ -#include "csr_types.h" +#include #include "csr_prim_defs.h" #include "csr_sched.h" #include "csr_unicode.h" diff --git a/drivers/staging/csr/csr_panic.c b/drivers/staging/csr/csr_panic.c index 0b78a725cee..353a829bb74 100644 --- a/drivers/staging/csr/csr_panic.c +++ b/drivers/staging/csr/csr_panic.c @@ -12,7 +12,6 @@ #include #include -#include "csr_types.h" #include "csr_panic.h" void CsrPanic(u8 tech, u16 reason, const char *p) diff --git a/drivers/staging/csr/csr_panic.h b/drivers/staging/csr/csr_panic.h index e993baf5058..37989fc15bb 100644 --- a/drivers/staging/csr/csr_panic.h +++ b/drivers/staging/csr/csr_panic.h @@ -9,8 +9,6 @@ on the license terms. *****************************************************************************/ -#include "csr_types.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/drivers/staging/csr/csr_pmem.h b/drivers/staging/csr/csr_pmem.h index 7962815a65c..36adf22fddd 100644 --- a/drivers/staging/csr/csr_pmem.h +++ b/drivers/staging/csr/csr_pmem.h @@ -10,7 +10,7 @@ *****************************************************************************/ -#include "csr_types.h" +#include #include "csr_util.h" #ifdef __cplusplus diff --git a/drivers/staging/csr/csr_prim_defs.h b/drivers/staging/csr/csr_prim_defs.h index 7d47578f18e..6a7f73dbb70 100644 --- a/drivers/staging/csr/csr_prim_defs.h +++ b/drivers/staging/csr/csr_prim_defs.h @@ -9,8 +9,6 @@ on the license terms. *****************************************************************************/ -#include "csr_types.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/drivers/staging/csr/csr_result.h b/drivers/staging/csr/csr_result.h index 68fb7599bb8..c7c36d6b59e 100644 --- a/drivers/staging/csr/csr_result.h +++ b/drivers/staging/csr/csr_result.h @@ -10,8 +10,6 @@ *****************************************************************************/ -#include "csr_types.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/drivers/staging/csr/csr_sched.h b/drivers/staging/csr/csr_sched.h index 663fe5926e7..e42fca9a859 100644 --- a/drivers/staging/csr/csr_sched.h +++ b/drivers/staging/csr/csr_sched.h @@ -9,7 +9,7 @@ on the license terms. *****************************************************************************/ -#include "csr_types.h" +#include #include "csr_time.h" #ifdef __cplusplus diff --git a/drivers/staging/csr/csr_sdio.h b/drivers/staging/csr/csr_sdio.h index 861604de633..f0cda84f6a0 100644 --- a/drivers/staging/csr/csr_sdio.h +++ b/drivers/staging/csr/csr_sdio.h @@ -10,7 +10,6 @@ *****************************************************************************/ -#include "csr_types.h" #include "csr_result.h" #ifdef __cplusplus diff --git a/drivers/staging/csr/csr_serialize_primitive_types.c b/drivers/staging/csr/csr_serialize_primitive_types.c index 169d6bcd42d..5fb026c2710 100644 --- a/drivers/staging/csr/csr_serialize_primitive_types.c +++ b/drivers/staging/csr/csr_serialize_primitive_types.c @@ -9,7 +9,6 @@ *****************************************************************************/ #include -#include "csr_types.h" #include "csr_prim_defs.h" #include "csr_msgconv.h" #include "csr_util.h" diff --git a/drivers/staging/csr/csr_time.c b/drivers/staging/csr/csr_time.c index 9e5aa9002b6..4d836749d6b 100644 --- a/drivers/staging/csr/csr_time.c +++ b/drivers/staging/csr/csr_time.c @@ -20,7 +20,6 @@ #include #include -#include "csr_types.h" #include "csr_time.h" CsrTime CsrTimeGet(CsrTime *high) diff --git a/drivers/staging/csr/csr_time.h b/drivers/staging/csr/csr_time.h index 286b2895915..09eeeee42e9 100644 --- a/drivers/staging/csr/csr_time.h +++ b/drivers/staging/csr/csr_time.h @@ -10,7 +10,7 @@ *****************************************************************************/ -#include "csr_types.h" +#include #ifdef __cplusplus extern "C" { diff --git a/drivers/staging/csr/csr_types.h b/drivers/staging/csr/csr_types.h deleted file mode 100644 index 7018c0a708d..00000000000 --- a/drivers/staging/csr/csr_types.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef CSR_TYPES_H__ -#define CSR_TYPES_H__ -/***************************************************************************** - - (c) Cambridge Silicon Radio Limited 2010 - All rights reserved and confidential information of CSR - - Refer to LICENSE.txt included with this source for details - on the license terms. - -*****************************************************************************/ - -#include -#include -#include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -#undef FALSE -#define FALSE (0) - -#undef TRUE -#define TRUE (1) - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/drivers/staging/csr/csr_unicode.h b/drivers/staging/csr/csr_unicode.h index 701aae8651e..44d7fd95a6b 100644 --- a/drivers/staging/csr/csr_unicode.h +++ b/drivers/staging/csr/csr_unicode.h @@ -10,8 +10,6 @@ *****************************************************************************/ -#include "csr_types.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/drivers/staging/csr/csr_utf16.c b/drivers/staging/csr/csr_utf16.c index c1c3b89c285..46bd130a248 100644 --- a/drivers/staging/csr/csr_utf16.c +++ b/drivers/staging/csr/csr_utf16.c @@ -8,7 +8,6 @@ *****************************************************************************/ #include -#include "csr_types.h" #include "csr_pmem.h" #include "csr_unicode.h" #include "csr_util.h" diff --git a/drivers/staging/csr/csr_util.c b/drivers/staging/csr/csr_util.c index fa2b2b437f1..4a9bde09add 100644 --- a/drivers/staging/csr/csr_util.c +++ b/drivers/staging/csr/csr_util.c @@ -12,7 +12,6 @@ #include #include -#include "csr_types.h" #include "csr_pmem.h" #include "csr_util.h" diff --git a/drivers/staging/csr/csr_util.h b/drivers/staging/csr/csr_util.h index 222e8074605..a124c73a5d6 100644 --- a/drivers/staging/csr/csr_util.h +++ b/drivers/staging/csr/csr_util.h @@ -14,7 +14,8 @@ extern "C" { #endif -#include "csr_types.h" +#include +#include #include "csr_macro.h" /*------------------------------------------------------------------*/ diff --git a/drivers/staging/csr/csr_wifi_common.h b/drivers/staging/csr/csr_wifi_common.h index df04a8bbd4f..cc41a94b8f2 100644 --- a/drivers/staging/csr/csr_wifi_common.h +++ b/drivers/staging/csr/csr_wifi_common.h @@ -11,7 +11,7 @@ #ifndef CSR_WIFI_COMMON_H__ #define CSR_WIFI_COMMON_H__ -#include "csr_types.h" +#include #include "csr_result.h" #ifdef __cplusplus diff --git a/drivers/staging/csr/csr_wifi_fsm.h b/drivers/staging/csr/csr_wifi_fsm.h index d078deefe44..83a9c9e2297 100644 --- a/drivers/staging/csr/csr_wifi_fsm.h +++ b/drivers/staging/csr/csr_wifi_fsm.h @@ -15,7 +15,6 @@ extern "C" { #endif -#include "csr_types.h" #include "csr_pmem.h" #include "csr_prim_defs.h" #include "csr_log_text.h" diff --git a/drivers/staging/csr/csr_wifi_fsm_event.h b/drivers/staging/csr/csr_wifi_fsm_event.h index 47ca24554b6..57a5cafd40b 100644 --- a/drivers/staging/csr/csr_wifi_fsm_event.h +++ b/drivers/staging/csr/csr_wifi_fsm_event.h @@ -15,7 +15,6 @@ extern "C" { #endif -#include "csr_types.h" #include "csr_prim_defs.h" #include "csr_sched.h" diff --git a/drivers/staging/csr/csr_wifi_fsm_types.h b/drivers/staging/csr/csr_wifi_fsm_types.h index f3837c6794d..c378ccadbcf 100644 --- a/drivers/staging/csr/csr_wifi_fsm_types.h +++ b/drivers/staging/csr/csr_wifi_fsm_types.h @@ -15,7 +15,7 @@ extern "C" { #endif -#include "csr_types.h" +#include #include "csr_util.h" #include "csr_pmem.h" #include "csr_panic.h" diff --git a/drivers/staging/csr/csr_wifi_hip_chiphelper.c b/drivers/staging/csr/csr_wifi_hip_chiphelper.c index 1654d2842bb..5cf5b8a5a1e 100644 --- a/drivers/staging/csr/csr_wifi_hip_chiphelper.c +++ b/drivers/staging/csr/csr_wifi_hip_chiphelper.c @@ -8,7 +8,7 @@ *****************************************************************************/ - +#include "csr_macro.h" #include "csr_wifi_hip_chiphelper_private.h" #ifndef nelem diff --git a/drivers/staging/csr/csr_wifi_hip_chiphelper.h b/drivers/staging/csr/csr_wifi_hip_chiphelper.h index 1047f16b607..24737ae8a2d 100644 --- a/drivers/staging/csr/csr_wifi_hip_chiphelper.h +++ b/drivers/staging/csr/csr_wifi_hip_chiphelper.h @@ -12,7 +12,7 @@ #define CSR_WIFI_HIP_CHIPHELPER_H__ -#include "csr_types.h" +#include #ifdef __cplusplus extern "C" { diff --git a/drivers/staging/csr/csr_wifi_hip_signals.h b/drivers/staging/csr/csr_wifi_hip_signals.h index 29c9a7c76cc..5f841556bbe 100644 --- a/drivers/staging/csr/csr_wifi_hip_signals.h +++ b/drivers/staging/csr/csr_wifi_hip_signals.h @@ -24,7 +24,7 @@ #ifndef __CSR_WIFI_HIP_SIGNALS_H__ #define __CSR_WIFI_HIP_SIGNALS_H__ -#include "csr_types.h" +#include #include "csr_wifi_hip_sigs.h" diff --git a/drivers/staging/csr/csr_wifi_hip_unifi.h b/drivers/staging/csr/csr_wifi_hip_unifi.h index 50d458e4970..88f24bacb04 100644 --- a/drivers/staging/csr/csr_wifi_hip_unifi.h +++ b/drivers/staging/csr/csr_wifi_hip_unifi.h @@ -95,7 +95,6 @@ extern "C" { #define UNIFI_SOFT_TRAFFIC_Q_LENGTH (20 + 1) #define UNIFI_SOFT_COMMAND_Q_LENGTH (16 + 1) -#include "csr_types.h" /* from the synergy porting folder */ #include "csr_framework_ext.h" /* from the synergy porting folder */ #include "csr_sdio.h" /* from the synergy porting folder */ #include "csr_pmem.h" /* from the synergy porting folder */ diff --git a/drivers/staging/csr/csr_wifi_lib.h b/drivers/staging/csr/csr_wifi_lib.h index 861e4a42ac9..eb56f620887 100644 --- a/drivers/staging/csr/csr_wifi_lib.h +++ b/drivers/staging/csr/csr_wifi_lib.h @@ -10,7 +10,6 @@ #ifndef CSR_WIFI_LIB_H__ #define CSR_WIFI_LIB_H__ -#include "csr_types.h" #include "csr_wifi_fsm_event.h" diff --git a/drivers/staging/csr/csr_wifi_msgconv.h b/drivers/staging/csr/csr_wifi_msgconv.h index 4508262e943..06314109098 100644 --- a/drivers/staging/csr/csr_wifi_msgconv.h +++ b/drivers/staging/csr/csr_wifi_msgconv.h @@ -11,7 +11,6 @@ #ifndef CSR_WIFI_MSGCONV_H__ #define CSR_WIFI_MSGCONV_H__ -#include "csr_types.h" #include "csr_prim_defs.h" #include "csr_sched.h" #include "csr_unicode.h" diff --git a/drivers/staging/csr/csr_wifi_nme_ap_lib.h b/drivers/staging/csr/csr_wifi_nme_ap_lib.h index a74ec69a5c8..b7ebfe48dc3 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_lib.h +++ b/drivers/staging/csr/csr_wifi_nme_ap_lib.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_NME_AP_LIB_H__ #define CSR_WIFI_NME_AP_LIB_H__ -#include "csr_types.h" #include "csr_pmem.h" #include "csr_sched.h" #include "csr_util.h" diff --git a/drivers/staging/csr/csr_wifi_nme_ap_prim.h b/drivers/staging/csr/csr_wifi_nme_ap_prim.h index 1ca0ec95917..ec670469536 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_prim.h +++ b/drivers/staging/csr/csr_wifi_nme_ap_prim.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_NME_AP_PRIM_H__ #define CSR_WIFI_NME_AP_PRIM_H__ -#include "csr_types.h" #include "csr_prim_defs.h" #include "csr_sched.h" #include "csr_wifi_common.h" diff --git a/drivers/staging/csr/csr_wifi_nme_ap_serialize.h b/drivers/staging/csr/csr_wifi_nme_ap_serialize.h index 5f85b018348..524da1420f1 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_serialize.h +++ b/drivers/staging/csr/csr_wifi_nme_ap_serialize.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_NME_AP_SERIALIZE_H__ #define CSR_WIFI_NME_AP_SERIALIZE_H__ -#include "csr_types.h" #include "csr_pmem.h" #include "csr_wifi_msgconv.h" diff --git a/drivers/staging/csr/csr_wifi_nme_lib.h b/drivers/staging/csr/csr_wifi_nme_lib.h index c38f78ecd86..4ec7b946bd1 100644 --- a/drivers/staging/csr/csr_wifi_nme_lib.h +++ b/drivers/staging/csr/csr_wifi_nme_lib.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_NME_LIB_H__ #define CSR_WIFI_NME_LIB_H__ -#include "csr_types.h" #include "csr_pmem.h" #include "csr_sched.h" #include "csr_util.h" diff --git a/drivers/staging/csr/csr_wifi_nme_prim.h b/drivers/staging/csr/csr_wifi_nme_prim.h index 4676b42771a..20dc77971f9 100644 --- a/drivers/staging/csr/csr_wifi_nme_prim.h +++ b/drivers/staging/csr/csr_wifi_nme_prim.h @@ -13,7 +13,7 @@ #ifndef CSR_WIFI_NME_PRIM_H__ #define CSR_WIFI_NME_PRIM_H__ -#include "csr_types.h" +#include #include "csr_prim_defs.h" #include "csr_sched.h" #include "csr_wifi_common.h" diff --git a/drivers/staging/csr/csr_wifi_nme_serialize.h b/drivers/staging/csr/csr_wifi_nme_serialize.h index 2acc6c1d20b..dca36d9f3a3 100644 --- a/drivers/staging/csr/csr_wifi_nme_serialize.h +++ b/drivers/staging/csr/csr_wifi_nme_serialize.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_NME_SERIALIZE_H__ #define CSR_WIFI_NME_SERIALIZE_H__ -#include "csr_types.h" #include "csr_pmem.h" #include "csr_wifi_msgconv.h" diff --git a/drivers/staging/csr/csr_wifi_nme_task.h b/drivers/staging/csr/csr_wifi_nme_task.h index 2a03a19e402..76f44dbe26a 100644 --- a/drivers/staging/csr/csr_wifi_nme_task.h +++ b/drivers/staging/csr/csr_wifi_nme_task.h @@ -13,7 +13,7 @@ #ifndef CSR_WIFI_NME_TASK_H__ #define CSR_WIFI_NME_TASK_H__ -#include "csr_types.h" +#include #include "csr_sched.h" #ifdef __cplusplus diff --git a/drivers/staging/csr/csr_wifi_private_common.h b/drivers/staging/csr/csr_wifi_private_common.h index 878b23b6577..47309984e2a 100644 --- a/drivers/staging/csr/csr_wifi_private_common.h +++ b/drivers/staging/csr/csr_wifi_private_common.h @@ -11,8 +11,6 @@ #ifndef CSR_WIFI_PRIVATE_COMMON_H__ #define CSR_WIFI_PRIVATE_COMMON_H__ -#include "csr_types.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/drivers/staging/csr/csr_wifi_result.h b/drivers/staging/csr/csr_wifi_result.h index 95b73a0d71e..2f87cda9003 100644 --- a/drivers/staging/csr/csr_wifi_result.h +++ b/drivers/staging/csr/csr_wifi_result.h @@ -11,7 +11,6 @@ #ifndef CSR_WIFI_RESULT_H__ #define CSR_WIFI_RESULT_H__ -#include "csr_types.h" #include "csr_result.h" #ifdef __cplusplus diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h index d837eea4328..df9dd9bf600 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h +++ b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_ROUTER_CTRL_LIB_H__ #define CSR_WIFI_ROUTER_CTRL_LIB_H__ -#include "csr_types.h" #include "csr_pmem.h" #include "csr_sched.h" #include "csr_util.h" diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_prim.h b/drivers/staging/csr/csr_wifi_router_ctrl_prim.h index f5ad3b312b3..ec972ac0b5a 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_prim.h +++ b/drivers/staging/csr/csr_wifi_router_ctrl_prim.h @@ -13,7 +13,7 @@ #ifndef CSR_WIFI_ROUTER_CTRL_PRIM_H__ #define CSR_WIFI_ROUTER_CTRL_PRIM_H__ -#include "csr_types.h" +#include #include "csr_prim_defs.h" #include "csr_sched.h" #include "csr_wifi_common.h" diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h index 458fb96c061..f2703772018 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h +++ b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_ROUTER_CTRL_SERIALIZE_H__ #define CSR_WIFI_ROUTER_CTRL_SERIALIZE_H__ -#include "csr_types.h" #include "csr_pmem.h" #include "csr_wifi_msgconv.h" diff --git a/drivers/staging/csr/csr_wifi_router_lib.h b/drivers/staging/csr/csr_wifi_router_lib.h index ae0965b4464..2ca557c727d 100644 --- a/drivers/staging/csr/csr_wifi_router_lib.h +++ b/drivers/staging/csr/csr_wifi_router_lib.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_ROUTER_LIB_H__ #define CSR_WIFI_ROUTER_LIB_H__ -#include "csr_types.h" #include "csr_pmem.h" #include "csr_sched.h" #include "csr_util.h" diff --git a/drivers/staging/csr/csr_wifi_router_prim.h b/drivers/staging/csr/csr_wifi_router_prim.h index 64b1f4fd7cd..c61486fbb6d 100644 --- a/drivers/staging/csr/csr_wifi_router_prim.h +++ b/drivers/staging/csr/csr_wifi_router_prim.h @@ -13,7 +13,7 @@ #ifndef CSR_WIFI_ROUTER_PRIM_H__ #define CSR_WIFI_ROUTER_PRIM_H__ -#include "csr_types.h" +#include #include "csr_prim_defs.h" #include "csr_sched.h" #include "csr_wifi_common.h" diff --git a/drivers/staging/csr/csr_wifi_router_serialize.h b/drivers/staging/csr/csr_wifi_router_serialize.h index e6fdf322a41..4951c404a3e 100644 --- a/drivers/staging/csr/csr_wifi_router_serialize.h +++ b/drivers/staging/csr/csr_wifi_router_serialize.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_ROUTER_SERIALIZE_H__ #define CSR_WIFI_ROUTER_SERIALIZE_H__ -#include "csr_types.h" #include "csr_pmem.h" #include "csr_wifi_msgconv.h" diff --git a/drivers/staging/csr/csr_wifi_router_task.h b/drivers/staging/csr/csr_wifi_router_task.h index 5bc460e4a39..4e51fae4cda 100644 --- a/drivers/staging/csr/csr_wifi_router_task.h +++ b/drivers/staging/csr/csr_wifi_router_task.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_ROUTER_TASK_H__ #define CSR_WIFI_ROUTER_TASK_H__ -#include "csr_types.h" #include "csr_sched.h" #ifdef __cplusplus diff --git a/drivers/staging/csr/csr_wifi_router_transport.c b/drivers/staging/csr/csr_wifi_router_transport.c index e42b21f396a..f340780a27a 100644 --- a/drivers/staging/csr/csr_wifi_router_transport.c +++ b/drivers/staging/csr/csr_wifi_router_transport.c @@ -10,7 +10,6 @@ #include "unifi_priv.h" -#include "csr_types.h" #include "csr_sched.h" #include "csr_msgconv.h" diff --git a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c index 743dbdc283c..e73f94b0c2a 100644 --- a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c +++ b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c @@ -9,7 +9,6 @@ *****************************************************************************/ #include -#include "csr_types.h" #include "csr_pmem.h" #include "csr_util.h" #include "csr_msgconv.h" diff --git a/drivers/staging/csr/csr_wifi_sme_ap_lib.h b/drivers/staging/csr/csr_wifi_sme_ap_lib.h index cacb3a5b8c4..22a3419b1b1 100644 --- a/drivers/staging/csr/csr_wifi_sme_ap_lib.h +++ b/drivers/staging/csr/csr_wifi_sme_ap_lib.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_SME_AP_LIB_H__ #define CSR_WIFI_SME_AP_LIB_H__ -#include "csr_types.h" #include "csr_pmem.h" #include "csr_sched.h" #include "csr_util.h" diff --git a/drivers/staging/csr/csr_wifi_sme_ap_prim.h b/drivers/staging/csr/csr_wifi_sme_ap_prim.h index 01df2a54966..93b64e9154c 100644 --- a/drivers/staging/csr/csr_wifi_sme_ap_prim.h +++ b/drivers/staging/csr/csr_wifi_sme_ap_prim.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_SME_AP_PRIM_H__ #define CSR_WIFI_SME_AP_PRIM_H__ -#include "csr_types.h" #include "csr_prim_defs.h" #include "csr_sched.h" #include "csr_wifi_common.h" diff --git a/drivers/staging/csr/csr_wifi_sme_lib.h b/drivers/staging/csr/csr_wifi_sme_lib.h index 6960f8fa886..f320bd43e1d 100644 --- a/drivers/staging/csr/csr_wifi_sme_lib.h +++ b/drivers/staging/csr/csr_wifi_sme_lib.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_SME_LIB_H__ #define CSR_WIFI_SME_LIB_H__ -#include "csr_types.h" #include "csr_pmem.h" #include "csr_sched.h" #include "csr_util.h" diff --git a/drivers/staging/csr/csr_wifi_sme_prim.h b/drivers/staging/csr/csr_wifi_sme_prim.h index 84eb6e9f0c2..55cac5059bf 100644 --- a/drivers/staging/csr/csr_wifi_sme_prim.h +++ b/drivers/staging/csr/csr_wifi_sme_prim.h @@ -13,7 +13,7 @@ #ifndef CSR_WIFI_SME_PRIM_H__ #define CSR_WIFI_SME_PRIM_H__ -#include "csr_types.h" +#include #include "csr_prim_defs.h" #include "csr_sched.h" #include "csr_wifi_common.h" diff --git a/drivers/staging/csr/csr_wifi_sme_serialize.h b/drivers/staging/csr/csr_wifi_sme_serialize.h index e8d50006e73..9ea9d15fe0d 100644 --- a/drivers/staging/csr/csr_wifi_sme_serialize.h +++ b/drivers/staging/csr/csr_wifi_sme_serialize.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_SME_SERIALIZE_H__ #define CSR_WIFI_SME_SERIALIZE_H__ -#include "csr_types.h" #include "csr_pmem.h" #include "csr_wifi_msgconv.h" diff --git a/drivers/staging/csr/csr_wifi_sme_task.h b/drivers/staging/csr/csr_wifi_sme_task.h index 62cc8b77fe4..0f725e45493 100644 --- a/drivers/staging/csr/csr_wifi_sme_task.h +++ b/drivers/staging/csr/csr_wifi_sme_task.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_SME_TASK_H__ #define CSR_WIFI_SME_TASK_H__ -#include "csr_types.h" #include "csr_sched.h" #ifdef __cplusplus diff --git a/drivers/staging/csr/unifiio.h b/drivers/staging/csr/unifiio.h index 9acf9ee7a8d..b9de0cb94e9 100644 --- a/drivers/staging/csr/unifiio.h +++ b/drivers/staging/csr/unifiio.h @@ -19,7 +19,6 @@ #define __UNIFIIO_H__ #include -#include "csr_types.h" #define UNIFI_GET_UDI_ENABLE _IOR('u', 1, int) #define UNIFI_SET_UDI_ENABLE _IOW('u', 2, int) -- cgit v1.2.3-70-g09d2 From 786eeeb3756e7fb08174c3a136c16462ccd541d1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 20 Jul 2012 16:41:09 -0700 Subject: staging: csr: remove CsrPmemAlloc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's just a wrapper around kmalloc(, GFP_KERNEL) + a call to panic() if we are out of memory, which is a very foolish thing to do (the panic that is.) So replace it with calls to kmalloc() and ignore the out-of-memory casese for now, odds are it will not be hit, and if it does, hey, we will end up panicing just the same as with the old code. Cc: Mikko Virkkilä Cc: Lauri Hintsala Cc: Riku Mettälä Cc: Veli-Pekka Peltola Signed-off-by: Greg Kroah-Hartman --- drivers/staging/csr/Makefile | 1 - drivers/staging/csr/csr_msgconv.c | 4 +- drivers/staging/csr/csr_pmem.c | 40 --- drivers/staging/csr/csr_pmem.h | 31 --- drivers/staging/csr/csr_sched.h | 4 +- .../staging/csr/csr_serialize_primitive_types.c | 23 +- drivers/staging/csr/csr_utf16.c | 14 +- drivers/staging/csr/csr_wifi_fsm.h | 2 +- drivers/staging/csr/csr_wifi_hip_card_sdio.c | 2 +- drivers/staging/csr/csr_wifi_nme_ap_lib.h | 26 +- drivers/staging/csr/csr_wifi_nme_ap_serialize.c | 26 +- drivers/staging/csr/csr_wifi_nme_lib.h | 56 ++-- drivers/staging/csr/csr_wifi_router_ctrl_lib.h | 124 ++++----- .../staging/csr/csr_wifi_router_ctrl_serialize.c | 136 +++++----- drivers/staging/csr/csr_wifi_router_lib.h | 18 +- drivers/staging/csr/csr_wifi_router_serialize.c | 20 +- drivers/staging/csr/csr_wifi_router_transport.c | 2 +- .../csr/csr_wifi_serialize_primitive_types.c | 11 +- drivers/staging/csr/csr_wifi_sme_ap_lib.h | 42 +-- drivers/staging/csr/csr_wifi_sme_lib.h | 256 +++++++++---------- drivers/staging/csr/csr_wifi_sme_serialize.c | 282 ++++++++++----------- drivers/staging/csr/drv.c | 2 +- drivers/staging/csr/putest.c | 2 +- drivers/staging/csr/sme_mgt.c | 2 +- drivers/staging/csr/ul_int.c | 5 +- drivers/staging/csr/unifi_sme.c | 8 +- 26 files changed, 534 insertions(+), 605 deletions(-) delete mode 100644 drivers/staging/csr/csr_pmem.c (limited to 'drivers/staging/csr/csr_wifi_fsm.h') diff --git a/drivers/staging/csr/Makefile b/drivers/staging/csr/Makefile index f4a8950bfae..814f57a539d 100644 --- a/drivers/staging/csr/Makefile +++ b/drivers/staging/csr/Makefile @@ -69,7 +69,6 @@ csr_wifi-y := bh.o \ csr_helper-y := csr_time.o \ csr_util.o \ csr_framework_ext.o \ - csr_pmem.o \ csr_wifi_serialize_primitive_types.o \ csr_serialize_primitive_types.o \ csr_utf16.o \ diff --git a/drivers/staging/csr/csr_msgconv.c b/drivers/staging/csr/csr_msgconv.c index 42e0a4aef0a..dbf0d64a206 100644 --- a/drivers/staging/csr/csr_msgconv.c +++ b/drivers/staging/csr/csr_msgconv.c @@ -233,7 +233,7 @@ void CsrMsgConvInsert(u16 primType, const CsrMsgConvMsgEntry *ce) } else { - pc = CsrPmemAlloc(sizeof(*pc)); + pc = kmalloc(sizeof(*pc), GFP_KERNEL); pc->primType = primType; pc->conv = ce; pc->lookupFunc = NULL; @@ -279,7 +279,7 @@ CsrMsgConvEntry *CsrMsgConvInit(void) { if (!converter) { - converter = (CsrMsgConvEntry *) CsrPmemAlloc(sizeof(CsrMsgConvEntry)); + converter = kmalloc(sizeof(CsrMsgConvEntry), GFP_KERNEL); converter->profile_converters = NULL; converter->free_message = free_message; diff --git a/drivers/staging/csr/csr_pmem.c b/drivers/staging/csr/csr_pmem.c deleted file mode 100644 index a2779256005..00000000000 --- a/drivers/staging/csr/csr_pmem.c +++ /dev/null @@ -1,40 +0,0 @@ -/***************************************************************************** - - (c) Cambridge Silicon Radio Limited 2010 - All rights reserved and confidential information of CSR - - Refer to LICENSE.txt included with this source for details - on the license terms. - -*****************************************************************************/ - -#include -#include -#include - - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -#include -#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16) -#include -#endif - -#include - -#include "csr_panic.h" -#include "csr_pmem.h" - -void *CsrPmemAlloc(size_t size) -{ - void *ret; - - ret = kmalloc(size, GFP_KERNEL); - if (!ret) - { - CsrPanic(CSR_TECH_FW, CSR_PANIC_FW_HEAP_EXHAUSTION, - "out of memory"); - } - - return ret; -} -EXPORT_SYMBOL_GPL(CsrPmemAlloc); diff --git a/drivers/staging/csr/csr_pmem.h b/drivers/staging/csr/csr_pmem.h index 283aff09d86..1fb74fa0d1c 100644 --- a/drivers/staging/csr/csr_pmem.h +++ b/drivers/staging/csr/csr_pmem.h @@ -17,36 +17,6 @@ extern "C" { #endif -#ifndef CSR_PMEM_DEBUG_ENABLE -/***************************************************************************** - - NAME - CsrPmemAlloc - - DESCRIPTION - This function will allocate a contiguous block of memory of at least - the specified size in bytes and return a pointer to the allocated - memory. This function is not allowed to return NULL. A size of 0 is a - valid request, and a unique and valid (not NULL) pointer must be - returned in this case. - - PARAMETERS - size - Size of memory requested. Note that a size of 0 is valid. - - RETURNS - Pointer to allocated memory. - -*****************************************************************************/ -#ifdef CSR_PMEM_DEBUG -void *CsrPmemAllocDebug(size_t size, - const char *file, u32 line); -#define CsrPmemAlloc(sz) CsrPmemAllocDebug((sz), __FILE__, __LINE__) -#else -void *CsrPmemAlloc(size_t size); -#endif - -#endif - /***************************************************************************** NAME @@ -114,7 +84,6 @@ typedef void (CsrPmemDebugOnFree)(void *ptr, void *userptr, CsrPmemDebugAllocTyp void CsrPmemDebugInstallHooks(u8 headSize, u8 endSize, CsrPmemDebugOnAlloc *onAllocCallback, CsrPmemDebugOnFree *onFreeCallback); void *CsrPmemDebugAlloc(size_t size, CsrPmemDebugAllocType type, const char* file, u32 line); -#define CsrPmemAlloc(size) CsrPmemDebugAlloc(size, CSR_PMEM_DEBUG_TYPE_PMEM_ALLOC, __FILE__, __LINE__) void CsrPmemDebugFree(void *ptr, CsrPmemDebugAllocType type, const char* file, u32 line); diff --git a/drivers/staging/csr/csr_sched.h b/drivers/staging/csr/csr_sched.h index 7ae1ea5b322..cc1b8bf6607 100644 --- a/drivers/staging/csr/csr_sched.h +++ b/drivers/staging/csr/csr_sched.h @@ -120,9 +120,9 @@ void CsrSchedBgintSet(CsrSchedBgint bgint); * be null. * * NOTE - * If "mv" is not null then it will typically be a chunk of CsrPmemAlloc()ed + * If "mv" is not null then it will typically be a chunk of kmalloc()ed * memory, though there is no need for it to be so. Tasks should normally - * obey the convention that when a message built with CsrPmemAlloc()ed memory + * obey the convention that when a message built with kmalloc()ed memory * is given to CsrSchedMessagePut() then ownership of the memory is ceded to the * scheduler - and eventually to the recipient task. I.e., the receiver of * the message will be expected to kfree() the message storage. diff --git a/drivers/staging/csr/csr_serialize_primitive_types.c b/drivers/staging/csr/csr_serialize_primitive_types.c index a4b56323a04..bb08f1952bf 100644 --- a/drivers/staging/csr/csr_serialize_primitive_types.c +++ b/drivers/staging/csr/csr_serialize_primitive_types.c @@ -9,6 +9,7 @@ *****************************************************************************/ #include +#include #include "csr_prim_defs.h" #include "csr_msgconv.h" #include "csr_macro.h" @@ -66,7 +67,7 @@ void CsrUtf16StringDes(u16 **value, u8 *buffer, size_t *offset) CsrUint32Des(&length, buffer, offset); - *value = CsrPmemAlloc(length * sizeof(**value)); + *value = kmalloc(length * sizeof(**value), GFP_KERNEL); for (i = 0; i < length; i++) { CsrUint16Des(&(*value)[i], buffer, offset); @@ -224,7 +225,7 @@ u8 *CsrEventSer(u8 *ptr, size_t *len, void *msg) void *CsrEventDes(u8 *buffer, size_t length) { - CsrEvent *primitive = (CsrEvent *) CsrPmemAlloc(sizeof(CsrEvent)); + CsrEvent *primitive = kmalloc(sizeof(CsrEvent), GFP_KERNEL); size_t offset = 0; CsrUint16Des(&primitive->type, buffer, &offset); @@ -247,7 +248,7 @@ u8 *CsrEventCsrUint8Ser(u8 *ptr, size_t *len, void *msg) void *CsrEventCsrUint8Des(u8 *buffer, size_t length) { - CsrEventCsrUint8 *primitive = (CsrEventCsrUint8 *) CsrPmemAlloc(sizeof(CsrEventCsrUint8)); + CsrEventCsrUint8 *primitive = kmalloc(sizeof(CsrEventCsrUint8), GFP_KERNEL); size_t offset = 0; CsrUint16Des(&primitive->type, buffer, &offset); @@ -272,7 +273,7 @@ u8 *CsrEventCsrUint16Ser(u8 *ptr, size_t *len, void *msg) void *CsrEventCsrUint16Des(u8 *buffer, size_t length) { - CsrEventCsrUint16 *primitive = (CsrEventCsrUint16 *) CsrPmemAlloc(sizeof(CsrEventCsrUint16)); + CsrEventCsrUint16 *primitive = kmalloc(sizeof(CsrEventCsrUint16), GFP_KERNEL); size_t offset = 0; CsrUint16Des(&primitive->type, buffer, &offset); @@ -297,7 +298,7 @@ u8 *CsrEventCsrUint32Ser(u8 *ptr, size_t *len, void *msg) void *CsrEventCsrUint32Des(u8 *buffer, size_t length) { - CsrEventCsrUint32 *primitive = (CsrEventCsrUint32 *) CsrPmemAlloc(sizeof(CsrEventCsrUint32)); + CsrEventCsrUint32 *primitive = kmalloc(sizeof(CsrEventCsrUint32), GFP_KERNEL); size_t offset = 0; CsrUint16Des(&primitive->type, buffer, &offset); @@ -323,7 +324,7 @@ u8 *CsrEventCsrUint16CsrUint8Ser(u8 *ptr, size_t *len, void *msg) void *CsrEventCsrUint16CsrUint8Des(u8 *buffer, size_t length) { - CsrEventCsrUint16CsrUint8 *primitive = (CsrEventCsrUint16CsrUint8 *) CsrPmemAlloc(sizeof(CsrEventCsrUint16CsrUint8)); + CsrEventCsrUint16CsrUint8 *primitive = kmalloc(sizeof(CsrEventCsrUint16CsrUint8), GFP_KERNEL); size_t offset = 0; CsrUint16Des(&primitive->type, buffer, &offset); @@ -350,7 +351,7 @@ u8 *CsrEventCsrUint16CsrUint16Ser(u8 *ptr, size_t *len, void *msg) void *CsrEventCsrUint16CsrUint16Des(u8 *buffer, size_t length) { - CsrEventCsrUint16CsrUint16 *primitive = (CsrEventCsrUint16CsrUint16 *) CsrPmemAlloc(sizeof(CsrEventCsrUint16CsrUint16)); + CsrEventCsrUint16CsrUint16 *primitive = kmalloc(sizeof(CsrEventCsrUint16CsrUint16), GFP_KERNEL); size_t offset = 0; CsrUint16Des(&primitive->type, buffer, &offset); @@ -377,7 +378,7 @@ u8 *CsrEventCsrUint16CsrUint32Ser(u8 *ptr, size_t *len, void *msg) void *CsrEventCsrUint16CsrUint32Des(u8 *buffer, size_t length) { - CsrEventCsrUint16CsrUint32 *primitive = (CsrEventCsrUint16CsrUint32 *) CsrPmemAlloc(sizeof(CsrEventCsrUint16CsrUint32)); + CsrEventCsrUint16CsrUint32 *primitive = kmalloc(sizeof(CsrEventCsrUint16CsrUint32), GFP_KERNEL); size_t offset = 0; CsrUint16Des(&primitive->type, buffer, &offset); @@ -405,7 +406,7 @@ u8 *CsrEventCsrUint16CsrCharStringSer(u8 *ptr, size_t *len, void *msg) void *CsrEventCsrUint16CsrCharStringDes(u8 *buffer, size_t length) { - CsrEventCsrUint16CsrCharString *primitive = (CsrEventCsrUint16CsrCharString *) CsrPmemAlloc(sizeof(CsrEventCsrUint16CsrCharString)); + CsrEventCsrUint16CsrCharString *primitive = kmalloc(sizeof(CsrEventCsrUint16CsrCharString), GFP_KERNEL); size_t offset = 0; CsrUint16Des(&primitive->type, buffer, &offset); @@ -432,7 +433,7 @@ u8 *CsrEventCsrUint32CsrUint16Ser(u8 *ptr, size_t *len, void *msg) void *CsrEventCsrUint32CsrUint16Des(u8 *buffer, size_t length) { - CsrEventCsrUint32CsrUint16 *primitive = (CsrEventCsrUint32CsrUint16 *) CsrPmemAlloc(sizeof(CsrEventCsrUint32CsrUint16)); + CsrEventCsrUint32CsrUint16 *primitive = kmalloc(sizeof(CsrEventCsrUint32CsrUint16), GFP_KERNEL); size_t offset = 0; CsrUint16Des(&primitive->type, buffer, &offset); @@ -460,7 +461,7 @@ u8 *CsrEventCsrUint32CsrCharStringSer(u8 *ptr, size_t *len, void *msg) void *CsrEventCsrUint32CsrCharStringDes(u8 *buffer, size_t length) { - CsrEventCsrUint32CsrCharString *primitive = (CsrEventCsrUint32CsrCharString *) CsrPmemAlloc(sizeof(CsrEventCsrUint32CsrCharString)); + CsrEventCsrUint32CsrCharString *primitive = kmalloc(sizeof(CsrEventCsrUint32CsrCharString), GFP_KERNEL); size_t offset = 0; CsrUint16Des(&primitive->type, buffer, &offset); diff --git a/drivers/staging/csr/csr_utf16.c b/drivers/staging/csr/csr_utf16.c index f827342b148..801d8a8c095 100644 --- a/drivers/staging/csr/csr_utf16.c +++ b/drivers/staging/csr/csr_utf16.c @@ -88,7 +88,7 @@ u16 *CsrUint32ToUtf16String(u32 number) noOfDigits++; } - output = (u16 *) CsrPmemAlloc(sizeof(u16) * (noOfDigits + 1)); /*add space for 0-termination*/ + output = kmalloc(sizeof(u16) * (noOfDigits + 1), GFP_KERNEL); /*add space for 0-termination*/ tempNumber = number; for (count = noOfDigits; count > 0; count--) @@ -185,7 +185,7 @@ u16 *CsrUtf16ConcatenateTexts(const u16 *inputText1, const u16 *inputText2, return NULL; } - outputText = (u16 *) CsrPmemAlloc((textLen + 1) * sizeof(u16)); /* add space for 0-termination*/ + outputText = kmalloc((textLen + 1) * sizeof(u16), GFP_KERNEL); /* add space for 0-termination*/ if (inputText1 != NULL) @@ -320,7 +320,7 @@ u8 *CsrUtf16String2Utf8(const u16 *source) } } - dest = CsrPmemAlloc(length); + dest = kmalloc(length, GFP_KERNEL); destStart = dest; for (i = 0; i < sourceLength; i++) @@ -610,7 +610,7 @@ u16 *CsrUtf82Utf16String(const u8 *utf8String) } /* Create space for the null terminated character */ - dest = (u16 *) CsrPmemAlloc((1 + length) * sizeof(u16)); + dest = kmalloc((1 + length) * sizeof(u16), GFP_KERNEL); destStart = dest; for (i = 0; i < sourceLength; i++) @@ -736,7 +736,7 @@ u16 *CsrUtf16StringDuplicate(const u16 *source) if (source) /* if source is not NULL*/ { length = (CsrUtf16StrLen(source) + 1) * sizeof(u16); - target = (u16 *) CsrPmemAlloc(length); + target = kmalloc(length, GFP_KERNEL); memcpy(target, source, length); } return target; @@ -844,7 +844,7 @@ u16 *CsrUtf16String2XML(u16 *str) if (encodeChars) { - resultString = outputString = CsrPmemAlloc(stringLength * sizeof(u16)); + resultString = outputString = kmalloc(stringLength * sizeof(u16), GFP_KERNEL); scanString = str; @@ -958,7 +958,7 @@ u16 *CsrXML2Utf16String(u16 *str) if (encodeChars) { - resultString = outputString = CsrPmemAlloc(stringLength * sizeof(u16)); + resultString = outputString = kmalloc(stringLength * sizeof(u16), GFP_KERNEL); scanString = str; diff --git a/drivers/staging/csr/csr_wifi_fsm.h b/drivers/staging/csr/csr_wifi_fsm.h index 83a9c9e2297..e933ab1be43 100644 --- a/drivers/staging/csr/csr_wifi_fsm.h +++ b/drivers/staging/csr/csr_wifi_fsm.h @@ -160,7 +160,7 @@ extern void CsrWifiFsmSendEventExternal(CsrWifiFsmContext *context, CsrWifiFsmEv */ #define CsrWifiFsmSendAlienEventExternal(_context, _alienEvent, _source, _destination, _primtype, _id) \ { \ - CsrWifiFsmAlienEvent *_evt = (CsrWifiFsmAlienEvent *)CsrPmemAlloc(sizeof(CsrWifiFsmAlienEvent)); \ + CsrWifiFsmAlienEvent *_evt = kmalloc(sizeof(CsrWifiFsmAlienEvent), GFP_KERNEL); \ _evt->alienEvent = _alienEvent; \ CsrWifiFsmSendEventExternal(_context, (CsrWifiFsmEvent *)_evt, _source, _destination, _primtype, _id); \ } diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio.c b/drivers/staging/csr/csr_wifi_hip_card_sdio.c index d4c92814c65..44ab00c53fe 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio.c +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio.c @@ -1655,7 +1655,7 @@ static CsrResult card_allocate_memory_resources(card_t *card) /* * Allocate memory for the from-host and to-host bulk data slots. - * This is done as separate CsrPmemAllocs because lots of smaller + * This is done as separate kmallocs because lots of smaller * allocations are more likely to succeed than one huge one. */ diff --git a/drivers/staging/csr/csr_wifi_nme_ap_lib.h b/drivers/staging/csr/csr_wifi_nme_ap_lib.h index 45b8d267dd0..fed0ea2c033 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_lib.h +++ b/drivers/staging/csr/csr_wifi_nme_ap_lib.h @@ -95,7 +95,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiNmeApConfigSetReqCreate(msg__, dst__, src__, apConfig__, apMacConfig__) \ - msg__ = (CsrWifiNmeApConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApConfigSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeApConfigSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_CONFIG_SET_REQ, dst__, src__); \ msg__->apConfig = (apConfig__); \ msg__->apMacConfig = (apMacConfig__); @@ -124,7 +124,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiNmeApConfigSetCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiNmeApConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeApConfigSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeApConfigSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_CONFIG_SET_CFM, dst__, src__); \ msg__->status = (status__); @@ -159,7 +159,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiNmeApStaRemoveReqCreate(msg__, dst__, src__, interfaceTag__, staMacAddress__, keepBlocking__) \ - msg__ = (CsrWifiNmeApStaRemoveReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApStaRemoveReq)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeApStaRemoveReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_STA_REMOVE_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->staMacAddress = (staMacAddress__); \ @@ -199,7 +199,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiNmeApStartReqCreate(msg__, dst__, src__, interfaceTag__, apType__, cloakSsid__, ssid__, ifIndex__, channel__, apCredentials__, maxConnections__, p2pGoParam__, wpsEnabled__) \ - msg__ = (CsrWifiNmeApStartReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApStartReq)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeApStartReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_START_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->apType = (apType__); \ @@ -238,7 +238,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiNmeApStartCfmCreate(msg__, dst__, src__, interfaceTag__, status__, ssid__) \ - msg__ = (CsrWifiNmeApStartCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeApStartCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeApStartCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_START_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -273,7 +273,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiNmeApStationIndCreate(msg__, dst__, src__, interfaceTag__, mediaStatus__, peerMacAddress__, peerDeviceAddress__) \ - msg__ = (CsrWifiNmeApStationInd *) CsrPmemAlloc(sizeof(CsrWifiNmeApStationInd)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeApStationInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_STATION_IND, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->mediaStatus = (mediaStatus__); \ @@ -304,7 +304,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiNmeApStopReqCreate(msg__, dst__, src__, interfaceTag__) \ - msg__ = (CsrWifiNmeApStopReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApStopReq)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeApStopReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_STOP_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); @@ -336,7 +336,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiNmeApStopIndCreate(msg__, dst__, src__, interfaceTag__, apType__, status__) \ - msg__ = (CsrWifiNmeApStopInd *) CsrPmemAlloc(sizeof(CsrWifiNmeApStopInd)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeApStopInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_STOP_IND, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->apType = (apType__); \ @@ -369,7 +369,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiNmeApStopCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiNmeApStopCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeApStopCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeApStopCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_STOP_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); @@ -402,7 +402,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiNmeApWmmParamUpdateReqCreate(msg__, dst__, src__, wmmApParams__, wmmApBcParams__) \ - msg__ = (CsrWifiNmeApWmmParamUpdateReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApWmmParamUpdateReq)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeApWmmParamUpdateReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_WMM_PARAM_UPDATE_REQ, dst__, src__); \ memcpy(msg__->wmmApParams, (wmmApParams__), sizeof(CsrWifiSmeWmmAcParams) * 4); \ memcpy(msg__->wmmApBcParams, (wmmApBcParams__), sizeof(CsrWifiSmeWmmAcParams) * 4); @@ -431,7 +431,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiNmeApWmmParamUpdateCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiNmeApWmmParamUpdateCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeApWmmParamUpdateCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeApWmmParamUpdateCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_WMM_PARAM_UPDATE_CFM, dst__, src__); \ msg__->status = (status__); @@ -469,7 +469,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiNmeApWpsRegisterReqCreate(msg__, dst__, src__, interfaceTag__, selectedDevicePasswordId__, selectedConfigMethod__, pin__) \ - msg__ = (CsrWifiNmeApWpsRegisterReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApWpsRegisterReq)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeApWpsRegisterReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_WPS_REGISTER_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->selectedDevicePasswordId = (selectedDevicePasswordId__); \ @@ -501,7 +501,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiNmeApWpsRegisterCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiNmeApWpsRegisterCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeApWpsRegisterCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeApWpsRegisterCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_WPS_REGISTER_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); diff --git a/drivers/staging/csr/csr_wifi_nme_ap_serialize.c b/drivers/staging/csr/csr_wifi_nme_ap_serialize.c index dcdcc32b597..8112aa04328 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_serialize.c +++ b/drivers/staging/csr/csr_wifi_nme_ap_serialize.c @@ -152,7 +152,7 @@ u8* CsrWifiNmeApConfigSetReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiNmeApConfigSetReqDes(u8 *buffer, size_t length) { - CsrWifiNmeApConfigSetReq *primitive = (CsrWifiNmeApConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApConfigSetReq)); + CsrWifiNmeApConfigSetReq *primitive = kmalloc(sizeof(CsrWifiNmeApConfigSetReq), GFP_KERNEL); size_t offset; offset = 0; @@ -199,7 +199,7 @@ void* CsrWifiNmeApConfigSetReqDes(u8 *buffer, size_t length) primitive->apMacConfig.macAddressList = NULL; if (primitive->apMacConfig.macAddressListCount) { - primitive->apMacConfig.macAddressList = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->apMacConfig.macAddressListCount); + primitive->apMacConfig.macAddressList = kmalloc(sizeof(CsrWifiMacAddress) * primitive->apMacConfig.macAddressListCount, GFP_KERNEL); } { u16 i2; @@ -255,7 +255,7 @@ u8* CsrWifiNmeApWpsRegisterReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiNmeApWpsRegisterReqDes(u8 *buffer, size_t length) { - CsrWifiNmeApWpsRegisterReq *primitive = (CsrWifiNmeApWpsRegisterReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApWpsRegisterReq)); + CsrWifiNmeApWpsRegisterReq *primitive = kmalloc(sizeof(CsrWifiNmeApWpsRegisterReq), GFP_KERNEL); size_t offset; offset = 0; @@ -447,7 +447,7 @@ u8* CsrWifiNmeApStartReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiNmeApStartReqDes(u8 *buffer, size_t length) { - CsrWifiNmeApStartReq *primitive = (CsrWifiNmeApStartReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApStartReq)); + CsrWifiNmeApStartReq *primitive = kmalloc(sizeof(CsrWifiNmeApStartReq), GFP_KERNEL); size_t offset; offset = 0; @@ -518,7 +518,7 @@ void* CsrWifiNmeApStartReqDes(u8 *buffer, size_t length) primitive->p2pGoParam.operatingChanList.channelEntryList = NULL; if (primitive->p2pGoParam.operatingChanList.channelEntryListCount) { - primitive->p2pGoParam.operatingChanList.channelEntryList = (CsrWifiSmeApP2pOperatingChanEntry *)CsrPmemAlloc(sizeof(CsrWifiSmeApP2pOperatingChanEntry) * primitive->p2pGoParam.operatingChanList.channelEntryListCount); + primitive->p2pGoParam.operatingChanList.channelEntryList = kmalloc(sizeof(CsrWifiSmeApP2pOperatingChanEntry) * primitive->p2pGoParam.operatingChanList.channelEntryListCount, GFP_KERNEL); } { u16 i3; @@ -528,7 +528,7 @@ void* CsrWifiNmeApStartReqDes(u8 *buffer, size_t length) CsrUint8Des((u8 *) &primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount, buffer, &offset); if (primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount) { - primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel = (u8 *)CsrPmemAlloc(primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount); + primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel = kmalloc(primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount, GFP_KERNEL); CsrMemCpyDes(primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel, buffer, &offset, ((u16) (primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount))); } else @@ -641,7 +641,7 @@ u8* CsrWifiNmeApWmmParamUpdateReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiNmeApWmmParamUpdateReqDes(u8 *buffer, size_t length) { - CsrWifiNmeApWmmParamUpdateReq *primitive = (CsrWifiNmeApWmmParamUpdateReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApWmmParamUpdateReq)); + CsrWifiNmeApWmmParamUpdateReq *primitive = kmalloc(sizeof(CsrWifiNmeApWmmParamUpdateReq), GFP_KERNEL); size_t offset; offset = 0; @@ -699,7 +699,7 @@ u8* CsrWifiNmeApStaRemoveReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiNmeApStaRemoveReqDes(u8 *buffer, size_t length) { - CsrWifiNmeApStaRemoveReq *primitive = (CsrWifiNmeApStaRemoveReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApStaRemoveReq)); + CsrWifiNmeApStaRemoveReq *primitive = kmalloc(sizeof(CsrWifiNmeApStaRemoveReq), GFP_KERNEL); size_t offset; offset = 0; @@ -736,7 +736,7 @@ u8* CsrWifiNmeApWpsRegisterCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiNmeApWpsRegisterCfmDes(u8 *buffer, size_t length) { - CsrWifiNmeApWpsRegisterCfm *primitive = (CsrWifiNmeApWpsRegisterCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeApWpsRegisterCfm)); + CsrWifiNmeApWpsRegisterCfm *primitive = kmalloc(sizeof(CsrWifiNmeApWpsRegisterCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -776,7 +776,7 @@ u8* CsrWifiNmeApStartCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiNmeApStartCfmDes(u8 *buffer, size_t length) { - CsrWifiNmeApStartCfm *primitive = (CsrWifiNmeApStartCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeApStartCfm)); + CsrWifiNmeApStartCfm *primitive = kmalloc(sizeof(CsrWifiNmeApStartCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -814,7 +814,7 @@ u8* CsrWifiNmeApStopCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiNmeApStopCfmDes(u8 *buffer, size_t length) { - CsrWifiNmeApStopCfm *primitive = (CsrWifiNmeApStopCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeApStopCfm)); + CsrWifiNmeApStopCfm *primitive = kmalloc(sizeof(CsrWifiNmeApStopCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -852,7 +852,7 @@ u8* CsrWifiNmeApStopIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiNmeApStopIndDes(u8 *buffer, size_t length) { - CsrWifiNmeApStopInd *primitive = (CsrWifiNmeApStopInd *) CsrPmemAlloc(sizeof(CsrWifiNmeApStopInd)); + CsrWifiNmeApStopInd *primitive = kmalloc(sizeof(CsrWifiNmeApStopInd), GFP_KERNEL); size_t offset; offset = 0; @@ -893,7 +893,7 @@ u8* CsrWifiNmeApStationIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiNmeApStationIndDes(u8 *buffer, size_t length) { - CsrWifiNmeApStationInd *primitive = (CsrWifiNmeApStationInd *) CsrPmemAlloc(sizeof(CsrWifiNmeApStationInd)); + CsrWifiNmeApStationInd *primitive = kmalloc(sizeof(CsrWifiNmeApStationInd), GFP_KERNEL); size_t offset; offset = 0; diff --git a/drivers/staging/csr/csr_wifi_nme_lib.h b/drivers/staging/csr/csr_wifi_nme_lib.h index 4d8f3f14ce6..04b7c31342c 100644 --- a/drivers/staging/csr/csr_wifi_nme_lib.h +++ b/drivers/staging/csr/csr_wifi_nme_lib.h @@ -100,7 +100,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeConnectionStatusGetReqCreate(msg__, dst__, src__, interfaceTag__) \ - msg__ = (CsrWifiNmeConnectionStatusGetReq *) CsrPmemAlloc(sizeof(CsrWifiNmeConnectionStatusGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeConnectionStatusGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_CONNECTION_STATUS_GET_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); @@ -131,7 +131,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeConnectionStatusGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, connectionStatus__) \ - msg__ = (CsrWifiNmeConnectionStatusGetCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeConnectionStatusGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeConnectionStatusGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_CONNECTION_STATUS_GET_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -164,7 +164,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeEventMaskSetReqCreate(msg__, dst__, src__, indMask__) \ - msg__ = (CsrWifiNmeEventMaskSetReq *) CsrPmemAlloc(sizeof(CsrWifiNmeEventMaskSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeEventMaskSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_EVENT_MASK_SET_REQ, dst__, src__); \ msg__->indMask = (indMask__); @@ -193,7 +193,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeEventMaskSetCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiNmeEventMaskSetCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeEventMaskSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeEventMaskSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_EVENT_MASK_SET_CFM, dst__, src__); \ msg__->status = (status__); @@ -224,7 +224,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeProfileConnectReqCreate(msg__, dst__, src__, interfaceTag__, profileIdentity__) \ - msg__ = (CsrWifiNmeProfileConnectReq *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileConnectReq)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeProfileConnectReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_CONNECT_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->profileIdentity = (profileIdentity__); @@ -269,7 +269,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeProfileConnectCfmCreate(msg__, dst__, src__, interfaceTag__, status__, connectAttemptsCount__, connectAttempts__) \ - msg__ = (CsrWifiNmeProfileConnectCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileConnectCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeProfileConnectCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_CONNECT_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -300,7 +300,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeProfileDeleteAllReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiNmeProfileDeleteAllReq *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileDeleteAllReq)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeProfileDeleteAllReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_DELETE_ALL_REQ, dst__, src__); #define CsrWifiNmeProfileDeleteAllReqSendTo(dst__, src__) \ @@ -329,7 +329,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeProfileDeleteAllCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiNmeProfileDeleteAllCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileDeleteAllCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeProfileDeleteAllCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_DELETE_ALL_CFM, dst__, src__); \ msg__->status = (status__); @@ -358,7 +358,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeProfileDeleteReqCreate(msg__, dst__, src__, profileIdentity__) \ - msg__ = (CsrWifiNmeProfileDeleteReq *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileDeleteReq)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeProfileDeleteReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_DELETE_REQ, dst__, src__); \ msg__->profileIdentity = (profileIdentity__); @@ -387,7 +387,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeProfileDeleteCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiNmeProfileDeleteCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileDeleteCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeProfileDeleteCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_DELETE_CFM, dst__, src__); \ msg__->status = (status__); @@ -427,7 +427,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeProfileDisconnectIndCreate(msg__, dst__, src__, interfaceTag__, connectAttemptsCount__, connectAttempts__) \ - msg__ = (CsrWifiNmeProfileDisconnectInd *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileDisconnectInd)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeProfileDisconnectInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_DISCONNECT_IND, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->connectAttemptsCount = (connectAttemptsCount__); \ @@ -469,7 +469,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeProfileOrderSetReqCreate(msg__, dst__, src__, interfaceTag__, profileIdentitysCount__, profileIdentitys__) \ - msg__ = (CsrWifiNmeProfileOrderSetReq *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileOrderSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeProfileOrderSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_ORDER_SET_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->profileIdentitysCount = (profileIdentitysCount__); \ @@ -501,7 +501,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeProfileOrderSetCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiNmeProfileOrderSetCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileOrderSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeProfileOrderSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_ORDER_SET_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); @@ -535,7 +535,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeProfileSetReqCreate(msg__, dst__, src__, profile__) \ - msg__ = (CsrWifiNmeProfileSetReq *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeProfileSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_SET_REQ, dst__, src__); \ msg__->profile = (profile__); @@ -568,7 +568,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeProfileSetCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiNmeProfileSetCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeProfileSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_SET_CFM, dst__, src__); \ msg__->status = (status__); @@ -603,7 +603,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeProfileUpdateIndCreate(msg__, dst__, src__, interfaceTag__, profile__) \ - msg__ = (CsrWifiNmeProfileUpdateInd *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileUpdateInd)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeProfileUpdateInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_UPDATE_IND, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->profile = (profile__); @@ -642,7 +642,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeSimGsmAuthIndCreate(msg__, dst__, src__, randsLength__, rands__) \ - msg__ = (CsrWifiNmeSimGsmAuthInd *) CsrPmemAlloc(sizeof(CsrWifiNmeSimGsmAuthInd)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeSimGsmAuthInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_GSM_AUTH_IND, dst__, src__); \ msg__->randsLength = (randsLength__); \ msg__->rands = (rands__); @@ -682,7 +682,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeSimGsmAuthResCreate(msg__, dst__, src__, status__, kcsLength__, kcs__, sresLength__, sres__) \ - msg__ = (CsrWifiNmeSimGsmAuthRes *) CsrPmemAlloc(sizeof(CsrWifiNmeSimGsmAuthRes)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeSimGsmAuthRes), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_GSM_AUTH_RES, dst__, src__); \ msg__->status = (status__); \ msg__->kcsLength = (kcsLength__); \ @@ -719,7 +719,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeSimImsiGetIndCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiNmeSimImsiGetInd *) CsrPmemAlloc(sizeof(CsrWifiNmeSimImsiGetInd)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeSimImsiGetInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_IMSI_GET_IND, dst__, src__); #define CsrWifiNmeSimImsiGetIndSendTo(dst__, src__) \ @@ -748,7 +748,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeSimImsiGetResCreate(msg__, dst__, src__, status__, imsi__, cardType__) \ - msg__ = (CsrWifiNmeSimImsiGetRes *) CsrPmemAlloc(sizeof(CsrWifiNmeSimImsiGetRes)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeSimImsiGetRes), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_IMSI_GET_RES, dst__, src__); \ msg__->status = (status__); \ msg__->imsi = (imsi__); \ @@ -787,7 +787,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeSimUmtsAuthIndCreate(msg__, dst__, src__, rand__, autn__) \ - msg__ = (CsrWifiNmeSimUmtsAuthInd *) CsrPmemAlloc(sizeof(CsrWifiNmeSimUmtsAuthInd)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeSimUmtsAuthInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_UMTS_AUTH_IND, dst__, src__); \ memcpy(msg__->rand, (rand__), sizeof(u8) * 16); \ memcpy(msg__->autn, (autn__), sizeof(u8) * 16); @@ -834,7 +834,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeSimUmtsAuthResCreate(msg__, dst__, src__, status__, result__, umtsCipherKey__, umtsIntegrityKey__, resParameterLength__, resParameter__, auts__) \ - msg__ = (CsrWifiNmeSimUmtsAuthRes *) CsrPmemAlloc(sizeof(CsrWifiNmeSimUmtsAuthRes)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeSimUmtsAuthRes), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_UMTS_AUTH_RES, dst__, src__); \ msg__->status = (status__); \ msg__->result = (result__); \ @@ -870,7 +870,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeWpsCancelReqCreate(msg__, dst__, src__, interfaceTag__) \ - msg__ = (CsrWifiNmeWpsCancelReq *) CsrPmemAlloc(sizeof(CsrWifiNmeWpsCancelReq)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeWpsCancelReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_CANCEL_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); @@ -899,7 +899,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeWpsCancelCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiNmeWpsCancelCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeWpsCancelCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeWpsCancelCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_CANCEL_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); @@ -935,7 +935,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeWpsCfmCreate(msg__, dst__, src__, interfaceTag__, status__, profile__) \ - msg__ = (CsrWifiNmeWpsCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeWpsCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeWpsCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -966,7 +966,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeWpsConfigSetReqCreate(msg__, dst__, src__, wpsConfig__) \ - msg__ = (CsrWifiNmeWpsConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiNmeWpsConfigSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeWpsConfigSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_CONFIG_SET_REQ, dst__, src__); \ msg__->wpsConfig = (wpsConfig__); @@ -994,7 +994,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeWpsConfigSetCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiNmeWpsConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeWpsConfigSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeWpsConfigSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_CONFIG_SET_CFM, dst__, src__); \ msg__->status = (status__); @@ -1030,7 +1030,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiNmeWpsReqCreate(msg__, dst__, src__, interfaceTag__, pin__, ssid__, bssid__) \ - msg__ = (CsrWifiNmeWpsReq *) CsrPmemAlloc(sizeof(CsrWifiNmeWpsReq)); \ + msg__ = kmalloc(sizeof(CsrWifiNmeWpsReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ memcpy(msg__->pin, (pin__), sizeof(u8) * 8); \ diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h index fd214672f19..ba8e9836e43 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h +++ b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h @@ -101,7 +101,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlBlockAckDisableReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, macAddress__, trafficStreamID__, role__) \ - msg__ = (CsrWifiRouterCtrlBlockAckDisableReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckDisableReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckDisableReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_DISABLE_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->clientData = (clientData__); \ @@ -134,7 +134,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlBlockAckDisableCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__) \ - msg__ = (CsrWifiRouterCtrlBlockAckDisableCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckDisableCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckDisableCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_DISABLE_CFM, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -170,7 +170,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlBlockAckEnableReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, macAddress__, trafficStreamID__, role__, bufferSize__, timeout__, ssn__) \ - msg__ = (CsrWifiRouterCtrlBlockAckEnableReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckEnableReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckEnableReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_ENABLE_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->clientData = (clientData__); \ @@ -206,7 +206,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlBlockAckEnableCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__) \ - msg__ = (CsrWifiRouterCtrlBlockAckEnableCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckEnableCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckEnableCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_ENABLE_CFM, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -239,7 +239,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlBlockAckErrorIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, trafficStreamID__, peerMacAddress__, status__) \ - msg__ = (CsrWifiRouterCtrlBlockAckErrorInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckErrorInd)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckErrorInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_ERROR_IND, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -270,7 +270,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlCapabilitiesReqCreate(msg__, dst__, src__, clientData__) \ - msg__ = (CsrWifiRouterCtrlCapabilitiesReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlCapabilitiesReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlCapabilitiesReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_CAPABILITIES_REQ, dst__, src__); \ msg__->clientData = (clientData__); @@ -301,7 +301,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlCapabilitiesCfmCreate(msg__, dst__, src__, clientData__, commandQueueSize__, trafficQueueSize__) \ - msg__ = (CsrWifiRouterCtrlCapabilitiesCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlCapabilitiesCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlCapabilitiesCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_CAPABILITIES_CFM, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->commandQueueSize = (commandQueueSize__); \ @@ -332,7 +332,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlConfigurePowerModeReqCreate(msg__, dst__, src__, clientData__, mode__, wakeHost__) \ - msg__ = (CsrWifiRouterCtrlConfigurePowerModeReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlConfigurePowerModeReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlConfigurePowerModeReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_CONFIGURE_POWER_MODE_REQ, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->mode = (mode__); \ @@ -364,7 +364,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlConnectedIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, peerMacAddress__, peerStatus__) \ - msg__ = (CsrWifiRouterCtrlConnectedInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlConnectedInd)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlConnectedInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_CONNECTED_IND, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -400,7 +400,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlHipReqCreate(msg__, dst__, src__, mlmeCommandLength__, mlmeCommand__, dataRef1Length__, dataRef1__, dataRef2Length__, dataRef2__) \ - msg__ = (CsrWifiRouterCtrlHipReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlHipReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlHipReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_HIP_REQ, dst__, src__); \ msg__->mlmeCommandLength = (mlmeCommandLength__); \ msg__->mlmeCommand = (mlmeCommand__); \ @@ -438,7 +438,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlHipIndCreate(msg__, dst__, src__, mlmeCommandLength__, mlmeCommand__, dataRef1Length__, dataRef1__, dataRef2Length__, dataRef2__) \ - msg__ = (CsrWifiRouterCtrlHipInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlHipInd)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlHipInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_HIP_IND, dst__, src__); \ msg__->mlmeCommandLength = (mlmeCommandLength__); \ msg__->mlmeCommand = (mlmeCommand__); \ @@ -472,7 +472,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlM4ReadyToSendIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, peerMacAddress__) \ - msg__ = (CsrWifiRouterCtrlM4ReadyToSendInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlM4ReadyToSendInd)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlM4ReadyToSendInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_M4_READY_TO_SEND_IND, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -502,7 +502,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlM4TransmitReqCreate(msg__, dst__, src__, interfaceTag__, clientData__) \ - msg__ = (CsrWifiRouterCtrlM4TransmitReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlM4TransmitReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlM4TransmitReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_M4_TRANSMIT_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->clientData = (clientData__); @@ -533,7 +533,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlM4TransmittedIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, peerMacAddress__, status__) \ - msg__ = (CsrWifiRouterCtrlM4TransmittedInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlM4TransmittedInd)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlM4TransmittedInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_M4_TRANSMITTED_IND, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -565,7 +565,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlMediaStatusReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, mediaStatus__) \ - msg__ = (CsrWifiRouterCtrlMediaStatusReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlMediaStatusReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlMediaStatusReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_MEDIA_STATUS_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->clientData = (clientData__); \ @@ -597,7 +597,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlMicFailureIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, peerMacAddress__, unicastPdu__) \ - msg__ = (CsrWifiRouterCtrlMicFailureInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlMicFailureInd)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlMicFailureInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_MIC_FAILURE_IND, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -638,7 +638,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlModeSetReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, mode__, bssid__, protection__, intraBssDistEnabled__) \ - msg__ = (CsrWifiRouterCtrlModeSetReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlModeSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlModeSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_MODE_SET_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->clientData = (clientData__); \ @@ -673,7 +673,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlModeSetCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, mode__, status__) \ - msg__ = (CsrWifiRouterCtrlModeSetCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlModeSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlModeSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_MODE_SET_CFM, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -707,7 +707,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlMulticastAddressIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, action__, setAddressesCount__, setAddresses__) \ - msg__ = (CsrWifiRouterCtrlMulticastAddressInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlMulticastAddressInd)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlMulticastAddressInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_MULTICAST_ADDRESS_IND, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -742,7 +742,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlMulticastAddressResCreate(msg__, dst__, src__, interfaceTag__, clientData__, status__, action__, getAddressesCount__, getAddresses__) \ - msg__ = (CsrWifiRouterCtrlMulticastAddressRes *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlMulticastAddressRes)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlMulticastAddressRes), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_MULTICAST_ADDRESS_RES, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->clientData = (clientData__); \ @@ -778,7 +778,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlPeerAddReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, peerMacAddress__, associationId__, staInfo__) \ - msg__ = (CsrWifiRouterCtrlPeerAddReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerAddReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlPeerAddReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PEER_ADD_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->clientData = (clientData__); \ @@ -813,7 +813,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlPeerAddCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, peerMacAddress__, peerRecordHandle__, status__) \ - msg__ = (CsrWifiRouterCtrlPeerAddCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerAddCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlPeerAddCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PEER_ADD_CFM, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -846,7 +846,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlPeerDelReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, peerRecordHandle__) \ - msg__ = (CsrWifiRouterCtrlPeerDelReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerDelReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlPeerDelReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PEER_DEL_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->clientData = (clientData__); \ @@ -877,7 +877,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlPeerDelCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__) \ - msg__ = (CsrWifiRouterCtrlPeerDelCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerDelCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlPeerDelCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PEER_DEL_CFM, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -909,7 +909,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlPeerUpdateReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, peerRecordHandle__, powersaveMode__) \ - msg__ = (CsrWifiRouterCtrlPeerUpdateReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerUpdateReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlPeerUpdateReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PEER_UPDATE_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->clientData = (clientData__); \ @@ -941,7 +941,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlPeerUpdateCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__) \ - msg__ = (CsrWifiRouterCtrlPeerUpdateCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerUpdateCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlPeerUpdateCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PEER_UPDATE_CFM, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -975,7 +975,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlPortConfigureReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, uncontrolledPortAction__, controlledPortAction__, macAddress__, setProtection__) \ - msg__ = (CsrWifiRouterCtrlPortConfigureReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPortConfigureReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlPortConfigureReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PORT_CONFIGURE_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->clientData = (clientData__); \ @@ -1010,7 +1010,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlPortConfigureCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__, macAddress__) \ - msg__ = (CsrWifiRouterCtrlPortConfigureCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPortConfigureCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlPortConfigureCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PORT_CONFIGURE_CFM, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -1043,7 +1043,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlQosControlReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, control__, queueConfig__) \ - msg__ = (CsrWifiRouterCtrlQosControlReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlQosControlReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlQosControlReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_QOS_CONTROL_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->clientData = (clientData__); \ @@ -1073,7 +1073,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlRawSdioDeinitialiseReqCreate(msg__, dst__, src__, clientData__) \ - msg__ = (CsrWifiRouterCtrlRawSdioDeinitialiseReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlRawSdioDeinitialiseReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlRawSdioDeinitialiseReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_RAW_SDIO_DEINITIALISE_REQ, dst__, src__); \ msg__->clientData = (clientData__); @@ -1101,7 +1101,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlRawSdioDeinitialiseCfmCreate(msg__, dst__, src__, clientData__, result__) \ - msg__ = (CsrWifiRouterCtrlRawSdioDeinitialiseCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlRawSdioDeinitialiseCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlRawSdioDeinitialiseCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_RAW_SDIO_DEINITIALISE_CFM, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->result = (result__); @@ -1129,7 +1129,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlRawSdioInitialiseReqCreate(msg__, dst__, src__, clientData__) \ - msg__ = (CsrWifiRouterCtrlRawSdioInitialiseReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlRawSdioInitialiseReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlRawSdioInitialiseReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_RAW_SDIO_INITIALISE_REQ, dst__, src__); \ msg__->clientData = (clientData__); @@ -1165,7 +1165,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlRawSdioInitialiseCfmCreate(msg__, dst__, src__, clientData__, result__, byteRead__, byteWrite__, firmwareDownload__, reset__, coreDumpPrepare__, byteBlockRead__, gpRead16__, gpWrite16__) \ - msg__ = (CsrWifiRouterCtrlRawSdioInitialiseCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlRawSdioInitialiseCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlRawSdioInitialiseCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_RAW_SDIO_INITIALISE_CFM, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->result = (result__); \ @@ -1202,7 +1202,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlResumeIndCreate(msg__, dst__, src__, clientData__, powerMaintained__) \ - msg__ = (CsrWifiRouterCtrlResumeInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlResumeInd)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlResumeInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_RESUME_IND, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->powerMaintained = (powerMaintained__); @@ -1230,7 +1230,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlResumeResCreate(msg__, dst__, src__, clientData__, status__) \ - msg__ = (CsrWifiRouterCtrlResumeRes *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlResumeRes)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlResumeRes), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_RESUME_RES, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->status = (status__); @@ -1260,7 +1260,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlStaInactiveIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, staAddress__) \ - msg__ = (CsrWifiRouterCtrlStaInactiveInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlStaInactiveInd)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlStaInactiveInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_STA_INACTIVE_IND, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -1291,7 +1291,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlSuspendIndCreate(msg__, dst__, src__, clientData__, hardSuspend__, d3Suspend__) \ - msg__ = (CsrWifiRouterCtrlSuspendInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlSuspendInd)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlSuspendInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_SUSPEND_IND, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->hardSuspend = (hardSuspend__); \ @@ -1320,7 +1320,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlSuspendResCreate(msg__, dst__, src__, clientData__, status__) \ - msg__ = (CsrWifiRouterCtrlSuspendRes *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlSuspendRes)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlSuspendRes), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_SUSPEND_RES, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->status = (status__); @@ -1351,7 +1351,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlTclasAddReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, tclasLength__, tclas__) \ - msg__ = (CsrWifiRouterCtrlTclasAddReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTclasAddReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlTclasAddReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TCLAS_ADD_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->clientData = (clientData__); \ @@ -1383,7 +1383,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlTclasAddCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__) \ - msg__ = (CsrWifiRouterCtrlTclasAddCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTclasAddCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlTclasAddCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TCLAS_ADD_CFM, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -1415,7 +1415,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlTclasDelReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, tclasLength__, tclas__) \ - msg__ = (CsrWifiRouterCtrlTclasDelReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTclasDelReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlTclasDelReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TCLAS_DEL_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->clientData = (clientData__); \ @@ -1447,7 +1447,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlTclasDelCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__) \ - msg__ = (CsrWifiRouterCtrlTclasDelCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTclasDelCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlTclasDelCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TCLAS_DEL_CFM, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -1479,7 +1479,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlTrafficClassificationReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, trafficType__, period__) \ - msg__ = (CsrWifiRouterCtrlTrafficClassificationReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTrafficClassificationReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlTrafficClassificationReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TRAFFIC_CLASSIFICATION_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->clientData = (clientData__); \ @@ -1512,7 +1512,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlTrafficConfigReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, trafficConfigType__, config__) \ - msg__ = (CsrWifiRouterCtrlTrafficConfigReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTrafficConfigReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlTrafficConfigReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TRAFFIC_CONFIG_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->clientData = (clientData__); \ @@ -1546,7 +1546,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlTrafficProtocolIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, packetType__, direction__, srcAddress__) \ - msg__ = (CsrWifiRouterCtrlTrafficProtocolInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTrafficProtocolInd)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlTrafficProtocolInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TRAFFIC_PROTOCOL_IND, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -1579,7 +1579,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlTrafficSampleIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, stats__) \ - msg__ = (CsrWifiRouterCtrlTrafficSampleInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTrafficSampleInd)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlTrafficSampleInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TRAFFIC_SAMPLE_IND, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -1610,7 +1610,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlUnexpectedFrameIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, peerMacAddress__) \ - msg__ = (CsrWifiRouterCtrlUnexpectedFrameInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlUnexpectedFrameInd)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlUnexpectedFrameInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_UNEXPECTED_FRAME_IND, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -1640,7 +1640,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlWapiFilterReqCreate(msg__, dst__, src__, interfaceTag__, isWapiConnected__) \ - msg__ = (CsrWifiRouterCtrlWapiFilterReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiFilterReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWapiFilterReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_FILTER_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->isWapiConnected = (isWapiConnected__); @@ -1669,7 +1669,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlWapiMulticastFilterReqCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiRouterCtrlWapiMulticastFilterReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiMulticastFilterReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWapiMulticastFilterReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_MULTICAST_FILTER_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); @@ -1702,7 +1702,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlWapiRxMicCheckIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, signalLength__, signal__, dataLength__, data__) \ - msg__ = (CsrWifiRouterCtrlWapiRxMicCheckInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiRxMicCheckInd)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWapiRxMicCheckInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_RX_MIC_CHECK_IND, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -1738,7 +1738,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlWapiRxPktReqCreate(msg__, dst__, src__, interfaceTag__, signalLength__, signal__, dataLength__, data__) \ - msg__ = (CsrWifiRouterCtrlWapiRxPktReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiRxPktReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWapiRxPktReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_RX_PKT_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->signalLength = (signalLength__); \ @@ -1770,7 +1770,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlWapiUnicastFilterReqCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiRouterCtrlWapiUnicastFilterReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiUnicastFilterReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWapiUnicastFilterReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_UNICAST_FILTER_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); @@ -1801,7 +1801,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlWapiUnicastTxEncryptIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, dataLength__, data__) \ - msg__ = (CsrWifiRouterCtrlWapiUnicastTxEncryptInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiUnicastTxEncryptInd)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWapiUnicastTxEncryptInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_UNICAST_TX_ENCRYPT_IND, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->interfaceTag = (interfaceTag__); \ @@ -1833,7 +1833,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlWapiUnicastTxPktReqCreate(msg__, dst__, src__, interfaceTag__, dataLength__, data__) \ - msg__ = (CsrWifiRouterCtrlWapiUnicastTxPktReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiUnicastTxPktReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWapiUnicastTxPktReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_UNICAST_TX_PKT_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->dataLength = (dataLength__); \ @@ -1862,7 +1862,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlWifiOffReqCreate(msg__, dst__, src__, clientData__) \ - msg__ = (CsrWifiRouterCtrlWifiOffReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOffReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWifiOffReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_OFF_REQ, dst__, src__); \ msg__->clientData = (clientData__); @@ -1890,7 +1890,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlWifiOffIndCreate(msg__, dst__, src__, clientData__, controlIndication__) \ - msg__ = (CsrWifiRouterCtrlWifiOffInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOffInd)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWifiOffInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_OFF_IND, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->controlIndication = (controlIndication__); @@ -1917,7 +1917,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlWifiOffResCreate(msg__, dst__, src__, clientData__) \ - msg__ = (CsrWifiRouterCtrlWifiOffRes *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOffRes)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWifiOffRes), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_OFF_RES, dst__, src__); \ msg__->clientData = (clientData__); @@ -1944,7 +1944,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlWifiOffCfmCreate(msg__, dst__, src__, clientData__) \ - msg__ = (CsrWifiRouterCtrlWifiOffCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOffCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWifiOffCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_OFF_CFM, dst__, src__); \ msg__->clientData = (clientData__); @@ -1973,7 +1973,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlWifiOnReqCreate(msg__, dst__, src__, clientData__, dataLength__, data__) \ - msg__ = (CsrWifiRouterCtrlWifiOnReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOnReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWifiOnReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_ON_REQ, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->dataLength = (dataLength__); \ @@ -2004,7 +2004,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlWifiOnIndCreate(msg__, dst__, src__, clientData__, status__, versions__) \ - msg__ = (CsrWifiRouterCtrlWifiOnInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOnInd)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWifiOnInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_ON_IND, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->status = (status__); \ @@ -2037,7 +2037,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlWifiOnResCreate(msg__, dst__, src__, clientData__, status__, numInterfaceAddress__, stationMacAddress__, smeVersions__, scheduledInterrupt__) \ - msg__ = (CsrWifiRouterCtrlWifiOnRes *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOnRes)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWifiOnRes), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_ON_RES, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->status = (status__); \ @@ -2070,7 +2070,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI *******************************************************************************/ #define CsrWifiRouterCtrlWifiOnCfmCreate(msg__, dst__, src__, clientData__, status__) \ - msg__ = (CsrWifiRouterCtrlWifiOnCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOnCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWifiOnCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_ON_CFM, dst__, src__); \ msg__->clientData = (clientData__); \ msg__->status = (status__); diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c index 7340f58b659..e4b7ec94549 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c +++ b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c @@ -51,7 +51,7 @@ u8* CsrWifiRouterCtrlConfigurePowerModeReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlConfigurePowerModeReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlConfigurePowerModeReq *primitive = (CsrWifiRouterCtrlConfigurePowerModeReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlConfigurePowerModeReq)); + CsrWifiRouterCtrlConfigurePowerModeReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlConfigurePowerModeReq), GFP_KERNEL); size_t offset; offset = 0; @@ -106,7 +106,7 @@ u8* CsrWifiRouterCtrlHipReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlHipReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlHipReq *primitive = (CsrWifiRouterCtrlHipReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlHipReq)); + CsrWifiRouterCtrlHipReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlHipReq), GFP_KERNEL); size_t offset; offset = 0; @@ -114,7 +114,7 @@ void* CsrWifiRouterCtrlHipReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->mlmeCommandLength, buffer, &offset); if (primitive->mlmeCommandLength) { - primitive->mlmeCommand = (u8 *)CsrPmemAlloc(primitive->mlmeCommandLength); + primitive->mlmeCommand = kmalloc(primitive->mlmeCommandLength, GFP_KERNEL); CsrMemCpyDes(primitive->mlmeCommand, buffer, &offset, ((u16) (primitive->mlmeCommandLength))); } else @@ -124,7 +124,7 @@ void* CsrWifiRouterCtrlHipReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->dataRef1Length, buffer, &offset); if (primitive->dataRef1Length) { - primitive->dataRef1 = (u8 *)CsrPmemAlloc(primitive->dataRef1Length); + primitive->dataRef1 = kmalloc(primitive->dataRef1Length, GFP_KERNEL); CsrMemCpyDes(primitive->dataRef1, buffer, &offset, ((u16) (primitive->dataRef1Length))); } else @@ -134,7 +134,7 @@ void* CsrWifiRouterCtrlHipReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->dataRef2Length, buffer, &offset); if (primitive->dataRef2Length) { - primitive->dataRef2 = (u8 *)CsrPmemAlloc(primitive->dataRef2Length); + primitive->dataRef2 = kmalloc(primitive->dataRef2Length, GFP_KERNEL); CsrMemCpyDes(primitive->dataRef2, buffer, &offset, ((u16) (primitive->dataRef2Length))); } else @@ -182,7 +182,7 @@ u8* CsrWifiRouterCtrlMediaStatusReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlMediaStatusReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlMediaStatusReq *primitive = (CsrWifiRouterCtrlMediaStatusReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlMediaStatusReq)); + CsrWifiRouterCtrlMediaStatusReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlMediaStatusReq), GFP_KERNEL); size_t offset; offset = 0; @@ -240,7 +240,7 @@ u8* CsrWifiRouterCtrlMulticastAddressResSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlMulticastAddressResDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlMulticastAddressRes *primitive = (CsrWifiRouterCtrlMulticastAddressRes *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlMulticastAddressRes)); + CsrWifiRouterCtrlMulticastAddressRes *primitive = kmalloc(sizeof(CsrWifiRouterCtrlMulticastAddressRes), GFP_KERNEL); size_t offset; offset = 0; @@ -253,7 +253,7 @@ void* CsrWifiRouterCtrlMulticastAddressResDes(u8 *buffer, size_t length) primitive->getAddresses = NULL; if (primitive->getAddressesCount) { - primitive->getAddresses = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->getAddressesCount); + primitive->getAddresses = kmalloc(sizeof(CsrWifiMacAddress) * primitive->getAddressesCount, GFP_KERNEL); } { u16 i1; @@ -307,7 +307,7 @@ u8* CsrWifiRouterCtrlPortConfigureReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlPortConfigureReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlPortConfigureReq *primitive = (CsrWifiRouterCtrlPortConfigureReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPortConfigureReq)); + CsrWifiRouterCtrlPortConfigureReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlPortConfigureReq), GFP_KERNEL); size_t offset; offset = 0; @@ -351,7 +351,7 @@ u8* CsrWifiRouterCtrlQosControlReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlQosControlReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlQosControlReq *primitive = (CsrWifiRouterCtrlQosControlReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlQosControlReq)); + CsrWifiRouterCtrlQosControlReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlQosControlReq), GFP_KERNEL); size_t offset; offset = 0; @@ -389,7 +389,7 @@ u8* CsrWifiRouterCtrlSuspendResSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlSuspendResDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlSuspendRes *primitive = (CsrWifiRouterCtrlSuspendRes *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlSuspendRes)); + CsrWifiRouterCtrlSuspendRes *primitive = kmalloc(sizeof(CsrWifiRouterCtrlSuspendRes), GFP_KERNEL); size_t offset; offset = 0; @@ -433,7 +433,7 @@ u8* CsrWifiRouterCtrlTclasAddReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlTclasAddReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlTclasAddReq *primitive = (CsrWifiRouterCtrlTclasAddReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTclasAddReq)); + CsrWifiRouterCtrlTclasAddReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlTclasAddReq), GFP_KERNEL); size_t offset; offset = 0; @@ -443,7 +443,7 @@ void* CsrWifiRouterCtrlTclasAddReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->tclasLength, buffer, &offset); if (primitive->tclasLength) { - primitive->tclas = (u8 *)CsrPmemAlloc(primitive->tclasLength); + primitive->tclas = kmalloc(primitive->tclasLength, GFP_KERNEL); CsrMemCpyDes(primitive->tclas, buffer, &offset, ((u16) (primitive->tclasLength))); } else @@ -487,7 +487,7 @@ u8* CsrWifiRouterCtrlResumeResSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlResumeResDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlResumeRes *primitive = (CsrWifiRouterCtrlResumeRes *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlResumeRes)); + CsrWifiRouterCtrlResumeRes *primitive = kmalloc(sizeof(CsrWifiRouterCtrlResumeRes), GFP_KERNEL); size_t offset; offset = 0; @@ -531,7 +531,7 @@ u8* CsrWifiRouterCtrlTclasDelReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlTclasDelReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlTclasDelReq *primitive = (CsrWifiRouterCtrlTclasDelReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTclasDelReq)); + CsrWifiRouterCtrlTclasDelReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlTclasDelReq), GFP_KERNEL); size_t offset; offset = 0; @@ -541,7 +541,7 @@ void* CsrWifiRouterCtrlTclasDelReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->tclasLength, buffer, &offset); if (primitive->tclasLength) { - primitive->tclas = (u8 *)CsrPmemAlloc(primitive->tclasLength); + primitive->tclas = kmalloc(primitive->tclasLength, GFP_KERNEL); CsrMemCpyDes(primitive->tclas, buffer, &offset, ((u16) (primitive->tclasLength))); } else @@ -589,7 +589,7 @@ u8* CsrWifiRouterCtrlTrafficClassificationReqSer(u8 *ptr, size_t *len, void *msg void* CsrWifiRouterCtrlTrafficClassificationReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlTrafficClassificationReq *primitive = (CsrWifiRouterCtrlTrafficClassificationReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTrafficClassificationReq)); + CsrWifiRouterCtrlTrafficClassificationReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlTrafficClassificationReq), GFP_KERNEL); size_t offset; offset = 0; @@ -639,7 +639,7 @@ u8* CsrWifiRouterCtrlTrafficConfigReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlTrafficConfigReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlTrafficConfigReq *primitive = (CsrWifiRouterCtrlTrafficConfigReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTrafficConfigReq)); + CsrWifiRouterCtrlTrafficConfigReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlTrafficConfigReq), GFP_KERNEL); size_t offset; offset = 0; @@ -687,7 +687,7 @@ u8* CsrWifiRouterCtrlWifiOnReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlWifiOnReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlWifiOnReq *primitive = (CsrWifiRouterCtrlWifiOnReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOnReq)); + CsrWifiRouterCtrlWifiOnReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlWifiOnReq), GFP_KERNEL); size_t offset; offset = 0; @@ -696,7 +696,7 @@ void* CsrWifiRouterCtrlWifiOnReqDes(u8 *buffer, size_t length) CsrUint32Des((u32 *) &primitive->dataLength, buffer, &offset); if (primitive->dataLength) { - primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); + primitive->data = kmalloc(primitive->dataLength, GFP_KERNEL); CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); } else @@ -765,7 +765,7 @@ u8* CsrWifiRouterCtrlWifiOnResSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlWifiOnResDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlWifiOnRes *primitive = (CsrWifiRouterCtrlWifiOnRes *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOnRes)); + CsrWifiRouterCtrlWifiOnRes *primitive = kmalloc(sizeof(CsrWifiRouterCtrlWifiOnRes), GFP_KERNEL); size_t offset; offset = 0; @@ -821,7 +821,7 @@ u8* CsrWifiRouterCtrlM4TransmitReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlM4TransmitReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlM4TransmitReq *primitive = (CsrWifiRouterCtrlM4TransmitReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlM4TransmitReq)); + CsrWifiRouterCtrlM4TransmitReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlM4TransmitReq), GFP_KERNEL); size_t offset; offset = 0; @@ -865,7 +865,7 @@ u8* CsrWifiRouterCtrlModeSetReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlModeSetReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlModeSetReq *primitive = (CsrWifiRouterCtrlModeSetReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlModeSetReq)); + CsrWifiRouterCtrlModeSetReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlModeSetReq), GFP_KERNEL); size_t offset; offset = 0; @@ -917,7 +917,7 @@ u8* CsrWifiRouterCtrlPeerAddReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlPeerAddReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlPeerAddReq *primitive = (CsrWifiRouterCtrlPeerAddReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerAddReq)); + CsrWifiRouterCtrlPeerAddReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlPeerAddReq), GFP_KERNEL); size_t offset; offset = 0; @@ -961,7 +961,7 @@ u8* CsrWifiRouterCtrlPeerDelReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlPeerDelReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlPeerDelReq *primitive = (CsrWifiRouterCtrlPeerDelReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerDelReq)); + CsrWifiRouterCtrlPeerDelReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlPeerDelReq), GFP_KERNEL); size_t offset; offset = 0; @@ -1002,7 +1002,7 @@ u8* CsrWifiRouterCtrlPeerUpdateReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlPeerUpdateReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlPeerUpdateReq *primitive = (CsrWifiRouterCtrlPeerUpdateReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerUpdateReq)); + CsrWifiRouterCtrlPeerUpdateReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlPeerUpdateReq), GFP_KERNEL); size_t offset; offset = 0; @@ -1052,7 +1052,7 @@ u8* CsrWifiRouterCtrlBlockAckEnableReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlBlockAckEnableReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlBlockAckEnableReq *primitive = (CsrWifiRouterCtrlBlockAckEnableReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckEnableReq)); + CsrWifiRouterCtrlBlockAckEnableReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckEnableReq), GFP_KERNEL); size_t offset; offset = 0; @@ -1100,7 +1100,7 @@ u8* CsrWifiRouterCtrlBlockAckDisableReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlBlockAckDisableReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlBlockAckDisableReq *primitive = (CsrWifiRouterCtrlBlockAckDisableReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckDisableReq)); + CsrWifiRouterCtrlBlockAckDisableReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckDisableReq), GFP_KERNEL); size_t offset; offset = 0; @@ -1152,7 +1152,7 @@ u8* CsrWifiRouterCtrlWapiRxPktReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlWapiRxPktReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlWapiRxPktReq *primitive = (CsrWifiRouterCtrlWapiRxPktReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiRxPktReq)); + CsrWifiRouterCtrlWapiRxPktReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlWapiRxPktReq), GFP_KERNEL); size_t offset; offset = 0; @@ -1161,7 +1161,7 @@ void* CsrWifiRouterCtrlWapiRxPktReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->signalLength, buffer, &offset); if (primitive->signalLength) { - primitive->signal = (u8 *)CsrPmemAlloc(primitive->signalLength); + primitive->signal = kmalloc(primitive->signalLength, GFP_KERNEL); CsrMemCpyDes(primitive->signal, buffer, &offset, ((u16) (primitive->signalLength))); } else @@ -1171,7 +1171,7 @@ void* CsrWifiRouterCtrlWapiRxPktReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->dataLength, buffer, &offset); if (primitive->dataLength) { - primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); + primitive->data = kmalloc(primitive->dataLength, GFP_KERNEL); CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); } else @@ -1222,7 +1222,7 @@ u8* CsrWifiRouterCtrlWapiUnicastTxPktReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlWapiUnicastTxPktReqDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlWapiUnicastTxPktReq *primitive = (CsrWifiRouterCtrlWapiUnicastTxPktReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiUnicastTxPktReq)); + CsrWifiRouterCtrlWapiUnicastTxPktReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlWapiUnicastTxPktReq), GFP_KERNEL); size_t offset; offset = 0; @@ -1231,7 +1231,7 @@ void* CsrWifiRouterCtrlWapiUnicastTxPktReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->dataLength, buffer, &offset); if (primitive->dataLength) { - primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); + primitive->data = kmalloc(primitive->dataLength, GFP_KERNEL); CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); } else @@ -1293,7 +1293,7 @@ u8* CsrWifiRouterCtrlHipIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlHipIndDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlHipInd *primitive = (CsrWifiRouterCtrlHipInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlHipInd)); + CsrWifiRouterCtrlHipInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlHipInd), GFP_KERNEL); size_t offset; offset = 0; @@ -1301,7 +1301,7 @@ void* CsrWifiRouterCtrlHipIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->mlmeCommandLength, buffer, &offset); if (primitive->mlmeCommandLength) { - primitive->mlmeCommand = (u8 *)CsrPmemAlloc(primitive->mlmeCommandLength); + primitive->mlmeCommand = kmalloc(primitive->mlmeCommandLength, GFP_KERNEL); CsrMemCpyDes(primitive->mlmeCommand, buffer, &offset, ((u16) (primitive->mlmeCommandLength))); } else @@ -1311,7 +1311,7 @@ void* CsrWifiRouterCtrlHipIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->dataRef1Length, buffer, &offset); if (primitive->dataRef1Length) { - primitive->dataRef1 = (u8 *)CsrPmemAlloc(primitive->dataRef1Length); + primitive->dataRef1 = kmalloc(primitive->dataRef1Length, GFP_KERNEL); CsrMemCpyDes(primitive->dataRef1, buffer, &offset, ((u16) (primitive->dataRef1Length))); } else @@ -1321,7 +1321,7 @@ void* CsrWifiRouterCtrlHipIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->dataRef2Length, buffer, &offset); if (primitive->dataRef2Length) { - primitive->dataRef2 = (u8 *)CsrPmemAlloc(primitive->dataRef2Length); + primitive->dataRef2 = kmalloc(primitive->dataRef2Length, GFP_KERNEL); CsrMemCpyDes(primitive->dataRef2, buffer, &offset, ((u16) (primitive->dataRef2Length))); } else @@ -1386,7 +1386,7 @@ u8* CsrWifiRouterCtrlMulticastAddressIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlMulticastAddressIndDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlMulticastAddressInd *primitive = (CsrWifiRouterCtrlMulticastAddressInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlMulticastAddressInd)); + CsrWifiRouterCtrlMulticastAddressInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlMulticastAddressInd), GFP_KERNEL); size_t offset; offset = 0; @@ -1398,7 +1398,7 @@ void* CsrWifiRouterCtrlMulticastAddressIndDes(u8 *buffer, size_t length) primitive->setAddresses = NULL; if (primitive->setAddressesCount) { - primitive->setAddresses = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->setAddressesCount); + primitive->setAddresses = kmalloc(sizeof(CsrWifiMacAddress) * primitive->setAddressesCount, GFP_KERNEL); } { u16 i1; @@ -1448,7 +1448,7 @@ u8* CsrWifiRouterCtrlPortConfigureCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlPortConfigureCfmDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlPortConfigureCfm *primitive = (CsrWifiRouterCtrlPortConfigureCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPortConfigureCfm)); + CsrWifiRouterCtrlPortConfigureCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlPortConfigureCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -1488,7 +1488,7 @@ u8* CsrWifiRouterCtrlSuspendIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlSuspendIndDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlSuspendInd *primitive = (CsrWifiRouterCtrlSuspendInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlSuspendInd)); + CsrWifiRouterCtrlSuspendInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlSuspendInd), GFP_KERNEL); size_t offset; offset = 0; @@ -1527,7 +1527,7 @@ u8* CsrWifiRouterCtrlTclasAddCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlTclasAddCfmDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlTclasAddCfm *primitive = (CsrWifiRouterCtrlTclasAddCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTclasAddCfm)); + CsrWifiRouterCtrlTclasAddCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlTclasAddCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -1564,7 +1564,7 @@ u8* CsrWifiRouterCtrlRawSdioDeinitialiseCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlRawSdioDeinitialiseCfmDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlRawSdioDeinitialiseCfm *primitive = (CsrWifiRouterCtrlRawSdioDeinitialiseCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlRawSdioDeinitialiseCfm)); + CsrWifiRouterCtrlRawSdioDeinitialiseCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlRawSdioDeinitialiseCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -1616,7 +1616,7 @@ u8* CsrWifiRouterCtrlRawSdioInitialiseCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlRawSdioInitialiseCfmDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlRawSdioInitialiseCfm *primitive = (CsrWifiRouterCtrlRawSdioInitialiseCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlRawSdioInitialiseCfm)); + CsrWifiRouterCtrlRawSdioInitialiseCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlRawSdioInitialiseCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -1670,7 +1670,7 @@ u8* CsrWifiRouterCtrlTclasDelCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlTclasDelCfmDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlTclasDelCfm *primitive = (CsrWifiRouterCtrlTclasDelCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTclasDelCfm)); + CsrWifiRouterCtrlTclasDelCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlTclasDelCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -1713,7 +1713,7 @@ u8* CsrWifiRouterCtrlTrafficProtocolIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlTrafficProtocolIndDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlTrafficProtocolInd *primitive = (CsrWifiRouterCtrlTrafficProtocolInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTrafficProtocolInd)); + CsrWifiRouterCtrlTrafficProtocolInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlTrafficProtocolInd), GFP_KERNEL); size_t offset; offset = 0; @@ -1764,7 +1764,7 @@ u8* CsrWifiRouterCtrlTrafficSampleIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlTrafficSampleIndDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlTrafficSampleInd *primitive = (CsrWifiRouterCtrlTrafficSampleInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTrafficSampleInd)); + CsrWifiRouterCtrlTrafficSampleInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlTrafficSampleInd), GFP_KERNEL); size_t offset; offset = 0; @@ -1819,7 +1819,7 @@ u8* CsrWifiRouterCtrlWifiOnIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlWifiOnIndDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlWifiOnInd *primitive = (CsrWifiRouterCtrlWifiOnInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOnInd)); + CsrWifiRouterCtrlWifiOnInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlWifiOnInd), GFP_KERNEL); size_t offset; offset = 0; @@ -1869,7 +1869,7 @@ u8* CsrWifiRouterCtrlWifiOnCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlWifiOnCfmDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlWifiOnCfm *primitive = (CsrWifiRouterCtrlWifiOnCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOnCfm)); + CsrWifiRouterCtrlWifiOnCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlWifiOnCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -1907,7 +1907,7 @@ u8* CsrWifiRouterCtrlM4ReadyToSendIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlM4ReadyToSendIndDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlM4ReadyToSendInd *primitive = (CsrWifiRouterCtrlM4ReadyToSendInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlM4ReadyToSendInd)); + CsrWifiRouterCtrlM4ReadyToSendInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlM4ReadyToSendInd), GFP_KERNEL); size_t offset; offset = 0; @@ -1948,7 +1948,7 @@ u8* CsrWifiRouterCtrlM4TransmittedIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlM4TransmittedIndDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlM4TransmittedInd *primitive = (CsrWifiRouterCtrlM4TransmittedInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlM4TransmittedInd)); + CsrWifiRouterCtrlM4TransmittedInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlM4TransmittedInd), GFP_KERNEL); size_t offset; offset = 0; @@ -1990,7 +1990,7 @@ u8* CsrWifiRouterCtrlMicFailureIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlMicFailureIndDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlMicFailureInd *primitive = (CsrWifiRouterCtrlMicFailureInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlMicFailureInd)); + CsrWifiRouterCtrlMicFailureInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlMicFailureInd), GFP_KERNEL); size_t offset; offset = 0; @@ -2032,7 +2032,7 @@ u8* CsrWifiRouterCtrlConnectedIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlConnectedIndDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlConnectedInd *primitive = (CsrWifiRouterCtrlConnectedInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlConnectedInd)); + CsrWifiRouterCtrlConnectedInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlConnectedInd), GFP_KERNEL); size_t offset; offset = 0; @@ -2076,7 +2076,7 @@ u8* CsrWifiRouterCtrlPeerAddCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlPeerAddCfmDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlPeerAddCfm *primitive = (CsrWifiRouterCtrlPeerAddCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerAddCfm)); + CsrWifiRouterCtrlPeerAddCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlPeerAddCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -2117,7 +2117,7 @@ u8* CsrWifiRouterCtrlPeerDelCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlPeerDelCfmDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlPeerDelCfm *primitive = (CsrWifiRouterCtrlPeerDelCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerDelCfm)); + CsrWifiRouterCtrlPeerDelCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlPeerDelCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -2156,7 +2156,7 @@ u8* CsrWifiRouterCtrlUnexpectedFrameIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlUnexpectedFrameIndDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlUnexpectedFrameInd *primitive = (CsrWifiRouterCtrlUnexpectedFrameInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlUnexpectedFrameInd)); + CsrWifiRouterCtrlUnexpectedFrameInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlUnexpectedFrameInd), GFP_KERNEL); size_t offset; offset = 0; @@ -2195,7 +2195,7 @@ u8* CsrWifiRouterCtrlPeerUpdateCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlPeerUpdateCfmDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlPeerUpdateCfm *primitive = (CsrWifiRouterCtrlPeerUpdateCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerUpdateCfm)); + CsrWifiRouterCtrlPeerUpdateCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlPeerUpdateCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -2234,7 +2234,7 @@ u8* CsrWifiRouterCtrlCapabilitiesCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlCapabilitiesCfmDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlCapabilitiesCfm *primitive = (CsrWifiRouterCtrlCapabilitiesCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlCapabilitiesCfm)); + CsrWifiRouterCtrlCapabilitiesCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlCapabilitiesCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -2273,7 +2273,7 @@ u8* CsrWifiRouterCtrlBlockAckEnableCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlBlockAckEnableCfmDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlBlockAckEnableCfm *primitive = (CsrWifiRouterCtrlBlockAckEnableCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckEnableCfm)); + CsrWifiRouterCtrlBlockAckEnableCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckEnableCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -2312,7 +2312,7 @@ u8* CsrWifiRouterCtrlBlockAckDisableCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlBlockAckDisableCfmDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlBlockAckDisableCfm *primitive = (CsrWifiRouterCtrlBlockAckDisableCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckDisableCfm)); + CsrWifiRouterCtrlBlockAckDisableCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckDisableCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -2355,7 +2355,7 @@ u8* CsrWifiRouterCtrlBlockAckErrorIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlBlockAckErrorIndDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlBlockAckErrorInd *primitive = (CsrWifiRouterCtrlBlockAckErrorInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckErrorInd)); + CsrWifiRouterCtrlBlockAckErrorInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckErrorInd), GFP_KERNEL); size_t offset; offset = 0; @@ -2396,7 +2396,7 @@ u8* CsrWifiRouterCtrlStaInactiveIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlStaInactiveIndDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlStaInactiveInd *primitive = (CsrWifiRouterCtrlStaInactiveInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlStaInactiveInd)); + CsrWifiRouterCtrlStaInactiveInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlStaInactiveInd), GFP_KERNEL); size_t offset; offset = 0; @@ -2448,7 +2448,7 @@ u8* CsrWifiRouterCtrlWapiRxMicCheckIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlWapiRxMicCheckIndDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlWapiRxMicCheckInd *primitive = (CsrWifiRouterCtrlWapiRxMicCheckInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiRxMicCheckInd)); + CsrWifiRouterCtrlWapiRxMicCheckInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlWapiRxMicCheckInd), GFP_KERNEL); size_t offset; offset = 0; @@ -2458,7 +2458,7 @@ void* CsrWifiRouterCtrlWapiRxMicCheckIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->signalLength, buffer, &offset); if (primitive->signalLength) { - primitive->signal = (u8 *)CsrPmemAlloc(primitive->signalLength); + primitive->signal = kmalloc(primitive->signalLength, GFP_KERNEL); CsrMemCpyDes(primitive->signal, buffer, &offset, ((u16) (primitive->signalLength))); } else @@ -2468,7 +2468,7 @@ void* CsrWifiRouterCtrlWapiRxMicCheckIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->dataLength, buffer, &offset); if (primitive->dataLength) { - primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); + primitive->data = kmalloc(primitive->dataLength, GFP_KERNEL); CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); } else @@ -2517,7 +2517,7 @@ u8* CsrWifiRouterCtrlModeSetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlModeSetCfmDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlModeSetCfm *primitive = (CsrWifiRouterCtrlModeSetCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlModeSetCfm)); + CsrWifiRouterCtrlModeSetCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlModeSetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -2563,7 +2563,7 @@ u8* CsrWifiRouterCtrlWapiUnicastTxEncryptIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterCtrlWapiUnicastTxEncryptIndDes(u8 *buffer, size_t length) { - CsrWifiRouterCtrlWapiUnicastTxEncryptInd *primitive = (CsrWifiRouterCtrlWapiUnicastTxEncryptInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiUnicastTxEncryptInd)); + CsrWifiRouterCtrlWapiUnicastTxEncryptInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlWapiUnicastTxEncryptInd), GFP_KERNEL); size_t offset; offset = 0; @@ -2573,7 +2573,7 @@ void* CsrWifiRouterCtrlWapiUnicastTxEncryptIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->dataLength, buffer, &offset); if (primitive->dataLength) { - primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); + primitive->data = kmalloc(primitive->dataLength, GFP_KERNEL); CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); } else diff --git a/drivers/staging/csr/csr_wifi_router_lib.h b/drivers/staging/csr/csr_wifi_router_lib.h index e5f1f638d86..f2f5196d126 100644 --- a/drivers/staging/csr/csr_wifi_router_lib.h +++ b/drivers/staging/csr/csr_wifi_router_lib.h @@ -99,7 +99,7 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR *******************************************************************************/ #define CsrWifiRouterMaPacketCancelReqCreate(msg__, dst__, src__, interfaceTag__, hostTag__, priority__, peerMacAddress__) \ - msg__ = (CsrWifiRouterMaPacketCancelReq *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketCancelReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterMaPacketCancelReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_CANCEL_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->hostTag = (hostTag__); \ @@ -149,7 +149,7 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR *******************************************************************************/ #define CsrWifiRouterMaPacketReqCreate(msg__, dst__, src__, interfaceTag__, subscriptionHandle__, frameLength__, frame__, freeFunction__, priority__, hostTag__, cfmRequested__) \ - msg__ = (CsrWifiRouterMaPacketReq *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterMaPacketReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->subscriptionHandle = (subscriptionHandle__); \ @@ -193,7 +193,7 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR *******************************************************************************/ #define CsrWifiRouterMaPacketIndCreate(msg__, dst__, src__, interfaceTag__, subscriptionHandle__, result__, frameLength__, frame__, freeFunction__, rssi__, snr__, rate__) \ - msg__ = (CsrWifiRouterMaPacketInd *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketInd)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterMaPacketInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_IND, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->subscriptionHandle = (subscriptionHandle__); \ @@ -231,7 +231,7 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR *******************************************************************************/ #define CsrWifiRouterMaPacketResCreate(msg__, dst__, src__, interfaceTag__, subscriptionHandle__, result__) \ - msg__ = (CsrWifiRouterMaPacketRes *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketRes)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterMaPacketRes), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_RES, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->subscriptionHandle = (subscriptionHandle__); \ @@ -265,7 +265,7 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR *******************************************************************************/ #define CsrWifiRouterMaPacketCfmCreate(msg__, dst__, src__, interfaceTag__, result__, hostTag__, rate__) \ - msg__ = (CsrWifiRouterMaPacketCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterMaPacketCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->result = (result__); \ @@ -306,7 +306,7 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR *******************************************************************************/ #define CsrWifiRouterMaPacketSubscribeReqCreate(msg__, dst__, src__, interfaceTag__, encapsulation__, protocol__, oui__) \ - msg__ = (CsrWifiRouterMaPacketSubscribeReq *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketSubscribeReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterMaPacketSubscribeReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_SUBSCRIBE_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->encapsulation = (encapsulation__); \ @@ -342,7 +342,7 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR *******************************************************************************/ #define CsrWifiRouterMaPacketSubscribeCfmCreate(msg__, dst__, src__, interfaceTag__, subscriptionHandle__, status__, allocOffset__) \ - msg__ = (CsrWifiRouterMaPacketSubscribeCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketSubscribeCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterMaPacketSubscribeCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_SUBSCRIBE_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->subscriptionHandle = (subscriptionHandle__); \ @@ -374,7 +374,7 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR *******************************************************************************/ #define CsrWifiRouterMaPacketUnsubscribeReqCreate(msg__, dst__, src__, interfaceTag__, subscriptionHandle__) \ - msg__ = (CsrWifiRouterMaPacketUnsubscribeReq *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketUnsubscribeReq)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterMaPacketUnsubscribeReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_UNSUBSCRIBE_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->subscriptionHandle = (subscriptionHandle__); @@ -405,7 +405,7 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR *******************************************************************************/ #define CsrWifiRouterMaPacketUnsubscribeCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiRouterMaPacketUnsubscribeCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketUnsubscribeCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiRouterMaPacketUnsubscribeCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_UNSUBSCRIBE_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); diff --git a/drivers/staging/csr/csr_wifi_router_serialize.c b/drivers/staging/csr/csr_wifi_router_serialize.c index dd2c2cee5de..adf37d472d2 100644 --- a/drivers/staging/csr/csr_wifi_router_serialize.c +++ b/drivers/staging/csr/csr_wifi_router_serialize.c @@ -52,7 +52,7 @@ u8* CsrWifiRouterMaPacketSubscribeReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterMaPacketSubscribeReqDes(u8 *buffer, size_t length) { - CsrWifiRouterMaPacketSubscribeReq *primitive = (CsrWifiRouterMaPacketSubscribeReq *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketSubscribeReq)); + CsrWifiRouterMaPacketSubscribeReq *primitive = kmalloc(sizeof(CsrWifiRouterMaPacketSubscribeReq), GFP_KERNEL); size_t offset; offset = 0; @@ -106,7 +106,7 @@ u8* CsrWifiRouterMaPacketReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterMaPacketReqDes(u8 *buffer, size_t length) { - CsrWifiRouterMaPacketReq *primitive = (CsrWifiRouterMaPacketReq *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketReq)); + CsrWifiRouterMaPacketReq *primitive = kmalloc(sizeof(CsrWifiRouterMaPacketReq), GFP_KERNEL); size_t offset; offset = 0; @@ -116,7 +116,7 @@ void* CsrWifiRouterMaPacketReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->frameLength, buffer, &offset); if (primitive->frameLength) { - primitive->frame = (u8 *)CsrPmemAlloc(primitive->frameLength); + primitive->frame = kmalloc(primitive->frameLength, GFP_KERNEL); CsrMemCpyDes(primitive->frame, buffer, &offset, ((u16) (primitive->frameLength))); } else @@ -167,7 +167,7 @@ u8* CsrWifiRouterMaPacketResSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterMaPacketResDes(u8 *buffer, size_t length) { - CsrWifiRouterMaPacketRes *primitive = (CsrWifiRouterMaPacketRes *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketRes)); + CsrWifiRouterMaPacketRes *primitive = kmalloc(sizeof(CsrWifiRouterMaPacketRes), GFP_KERNEL); size_t offset; offset = 0; @@ -208,7 +208,7 @@ u8* CsrWifiRouterMaPacketCancelReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterMaPacketCancelReqDes(u8 *buffer, size_t length) { - CsrWifiRouterMaPacketCancelReq *primitive = (CsrWifiRouterMaPacketCancelReq *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketCancelReq)); + CsrWifiRouterMaPacketCancelReq *primitive = kmalloc(sizeof(CsrWifiRouterMaPacketCancelReq), GFP_KERNEL); size_t offset; offset = 0; @@ -250,7 +250,7 @@ u8* CsrWifiRouterMaPacketSubscribeCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterMaPacketSubscribeCfmDes(u8 *buffer, size_t length) { - CsrWifiRouterMaPacketSubscribeCfm *primitive = (CsrWifiRouterMaPacketSubscribeCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketSubscribeCfm)); + CsrWifiRouterMaPacketSubscribeCfm *primitive = kmalloc(sizeof(CsrWifiRouterMaPacketSubscribeCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -288,7 +288,7 @@ u8* CsrWifiRouterMaPacketUnsubscribeCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterMaPacketUnsubscribeCfmDes(u8 *buffer, size_t length) { - CsrWifiRouterMaPacketUnsubscribeCfm *primitive = (CsrWifiRouterMaPacketUnsubscribeCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketUnsubscribeCfm)); + CsrWifiRouterMaPacketUnsubscribeCfm *primitive = kmalloc(sizeof(CsrWifiRouterMaPacketUnsubscribeCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -328,7 +328,7 @@ u8* CsrWifiRouterMaPacketCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterMaPacketCfmDes(u8 *buffer, size_t length) { - CsrWifiRouterMaPacketCfm *primitive = (CsrWifiRouterMaPacketCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketCfm)); + CsrWifiRouterMaPacketCfm *primitive = kmalloc(sizeof(CsrWifiRouterMaPacketCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -384,7 +384,7 @@ u8* CsrWifiRouterMaPacketIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiRouterMaPacketIndDes(u8 *buffer, size_t length) { - CsrWifiRouterMaPacketInd *primitive = (CsrWifiRouterMaPacketInd *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketInd)); + CsrWifiRouterMaPacketInd *primitive = kmalloc(sizeof(CsrWifiRouterMaPacketInd), GFP_KERNEL); size_t offset; offset = 0; @@ -395,7 +395,7 @@ void* CsrWifiRouterMaPacketIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->frameLength, buffer, &offset); if (primitive->frameLength) { - primitive->frame = (u8 *)CsrPmemAlloc(primitive->frameLength); + primitive->frame = kmalloc(primitive->frameLength, GFP_KERNEL); CsrMemCpyDes(primitive->frame, buffer, &offset, ((u16) (primitive->frameLength))); } else diff --git a/drivers/staging/csr/csr_wifi_router_transport.c b/drivers/staging/csr/csr_wifi_router_transport.c index 5d86aa88a40..4bff4354714 100644 --- a/drivers/staging/csr/csr_wifi_router_transport.c +++ b/drivers/staging/csr/csr_wifi_router_transport.c @@ -180,7 +180,7 @@ static void CsrWifiRouterTransportSerialiseAndSend(u16 primType, void* msg) msgSize = 6 + (msgEntry->sizeofFunc)((void*)msg); - encodeBuffer = CsrPmemAlloc(msgSize); + encodeBuffer = kmalloc(msgSize, GFP_KERNEL); /* Encode PrimType */ CsrUint16Ser(encodeBuffer, &encodeBufferLen, primType); diff --git a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c index 661d3201613..23b0e5154a0 100644 --- a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c +++ b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c @@ -9,6 +9,7 @@ *****************************************************************************/ #include +#include #include "csr_pmem.h" #include "csr_macro.h" #include "csr_msgconv.h" @@ -125,7 +126,7 @@ EXPORT_SYMBOL_GPL(CsrWifiEventSer); void* CsrWifiEventDes(u8 *buffer, size_t length) { - CsrWifiFsmEvent *primitive = (CsrWifiFsmEvent *) CsrPmemAlloc(sizeof(CsrWifiFsmEvent)); + CsrWifiFsmEvent *primitive = kmalloc(sizeof(CsrWifiFsmEvent), GFP_KERNEL); size_t offset = 0; CsrUint16Des(&primitive->type, buffer, &offset); @@ -152,7 +153,7 @@ EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint8Ser); void* CsrWifiEventCsrUint8Des(u8 *buffer, size_t length) { - CsrWifiEventCsrUint8 *primitive = (CsrWifiEventCsrUint8 *) CsrPmemAlloc(sizeof(CsrWifiEventCsrUint8)); + CsrWifiEventCsrUint8 *primitive = kmalloc(sizeof(CsrWifiEventCsrUint8), GFP_KERNEL); size_t offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); @@ -182,7 +183,7 @@ EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint16Ser); void* CsrWifiEventCsrUint16Des(u8 *buffer, size_t length) { - CsrWifiEventCsrUint16 *primitive = (CsrWifiEventCsrUint16 *) CsrPmemAlloc(sizeof(CsrWifiEventCsrUint16)); + CsrWifiEventCsrUint16 *primitive = kmalloc(sizeof(CsrWifiEventCsrUint16), GFP_KERNEL); size_t offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); @@ -212,7 +213,7 @@ EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint32Ser); void* CsrWifiEventCsrUint32Des(u8 *buffer, size_t length) { - CsrWifiEventCsrUint32 *primitive = (CsrWifiEventCsrUint32 *) CsrPmemAlloc(sizeof(CsrWifiEventCsrUint32)); + CsrWifiEventCsrUint32 *primitive = kmalloc(sizeof(CsrWifiEventCsrUint32), GFP_KERNEL); size_t offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); @@ -242,7 +243,7 @@ EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint16CsrUint8Ser); void* CsrWifiEventCsrUint16CsrUint8Des(u8 *buffer, size_t length) { - CsrWifiEventCsrUint16CsrUint8 *primitive = (CsrWifiEventCsrUint16CsrUint8 *) CsrPmemAlloc(sizeof(CsrWifiEventCsrUint16CsrUint8)); + CsrWifiEventCsrUint16CsrUint8 *primitive = kmalloc(sizeof(CsrWifiEventCsrUint16CsrUint8), GFP_KERNEL); size_t offset = 0; CsrUint16Des(&primitive->common.type, buffer, &offset); diff --git a/drivers/staging/csr/csr_wifi_sme_ap_lib.h b/drivers/staging/csr/csr_wifi_sme_ap_lib.h index 8834a3b8a6c..8825172724a 100644 --- a/drivers/staging/csr/csr_wifi_sme_ap_lib.h +++ b/drivers/staging/csr/csr_wifi_sme_ap_lib.h @@ -94,7 +94,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApActiveBaGetReqCreate(msg__, dst__, src__, interfaceTag__) \ - msg__ = (CsrWifiSmeApActiveBaGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApActiveBaGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApActiveBaGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_ACTIVE_BA_GET_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); @@ -126,7 +126,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApActiveBaGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, activeBaCount__, activeBaSessions__) \ - msg__ = (CsrWifiSmeApActiveBaGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeApActiveBaGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApActiveBaGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_ACTIVE_BA_GET_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -159,7 +159,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApBaDeleteReqCreate(msg__, dst__, src__, interfaceTag__, reason__, baSession__) \ - msg__ = (CsrWifiSmeApBaDeleteReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApBaDeleteReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApBaDeleteReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_BA_DELETE_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->reason = (reason__); \ @@ -191,7 +191,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApBaDeleteCfmCreate(msg__, dst__, src__, interfaceTag__, status__, baSession__) \ - msg__ = (CsrWifiSmeApBaDeleteCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeApBaDeleteCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApBaDeleteCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_BA_DELETE_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -233,7 +233,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApBeaconingStartReqCreate(msg__, dst__, src__, interfaceTag__, initialPresence__, apType__, cloakSsid__, ssid__, ifIndex__, channel__, maxConnections__, apCredentials__, smeApConfig__, p2pGoParam__) \ - msg__ = (CsrWifiSmeApBeaconingStartReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApBeaconingStartReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApBeaconingStartReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_BEACONING_START_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->initialPresence = (initialPresence__); \ @@ -275,7 +275,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApBeaconingStartCfmCreate(msg__, dst__, src__, interfaceTag__, status__, secIeLength__, secIe__) \ - msg__ = (CsrWifiSmeApBeaconingStartCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeApBeaconingStartCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApBeaconingStartCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_BEACONING_START_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -306,7 +306,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApBeaconingStopReqCreate(msg__, dst__, src__, interfaceTag__) \ - msg__ = (CsrWifiSmeApBeaconingStopReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApBeaconingStopReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApBeaconingStopReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_BEACONING_STOP_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); @@ -335,7 +335,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApBeaconingStopCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiSmeApBeaconingStopCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeApBeaconingStopCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApBeaconingStopCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_BEACONING_STOP_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); @@ -369,7 +369,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApErrorIndCreate(msg__, dst__, src__, interfaceTag__, apType__, status__) \ - msg__ = (CsrWifiSmeApErrorInd *) CsrPmemAlloc(sizeof(CsrWifiSmeApErrorInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApErrorInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_ERROR_IND, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->apType = (apType__); \ @@ -401,7 +401,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApStaConnectStartIndCreate(msg__, dst__, src__, interfaceTag__, peerMacAddress__) \ - msg__ = (CsrWifiSmeApStaConnectStartInd *) CsrPmemAlloc(sizeof(CsrWifiSmeApStaConnectStartInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApStaConnectStartInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_STA_CONNECT_START_IND, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->peerMacAddress = (peerMacAddress__); @@ -437,7 +437,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApStaDisconnectReqCreate(msg__, dst__, src__, interfaceTag__, deauthReason__, disassocReason__, peerMacaddress__, keepBlocking__) \ - msg__ = (CsrWifiSmeApStaDisconnectReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApStaDisconnectReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApStaDisconnectReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_STA_DISCONNECT_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->deauthReason = (deauthReason__); \ @@ -471,7 +471,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApStaDisconnectCfmCreate(msg__, dst__, src__, interfaceTag__, status__, peerMacaddress__) \ - msg__ = (CsrWifiSmeApStaDisconnectCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeApStaDisconnectCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApStaDisconnectCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_STA_DISCONNECT_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -512,7 +512,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApStaNotifyIndCreate(msg__, dst__, src__, interfaceTag__, mediaStatus__, peerMacAddress__, peerDeviceAddress__, disassocReason__, deauthReason__, WpsRegistration__, secIeLength__, secIe__, groupKeyId__, seqNumber__) \ - msg__ = (CsrWifiSmeApStaNotifyInd *) CsrPmemAlloc(sizeof(CsrWifiSmeApStaNotifyInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApStaNotifyInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_STA_NOTIFY_IND, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->mediaStatus = (mediaStatus__); \ @@ -553,7 +553,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApWmmParamUpdateReqCreate(msg__, dst__, src__, interfaceTag__, wmmApParams__, wmmApBcParams__) \ - msg__ = (CsrWifiSmeApWmmParamUpdateReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApWmmParamUpdateReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApWmmParamUpdateReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WMM_PARAM_UPDATE_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ memcpy(msg__->wmmApParams, (wmmApParams__), sizeof(CsrWifiSmeWmmAcParams) * 4); \ @@ -584,7 +584,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApWmmParamUpdateCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiSmeApWmmParamUpdateCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeApWmmParamUpdateCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApWmmParamUpdateCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WMM_PARAM_UPDATE_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); @@ -614,7 +614,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApWpsConfigurationReqCreate(msg__, dst__, src__, wpsConfig__) \ - msg__ = (CsrWifiSmeApWpsConfigurationReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApWpsConfigurationReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApWpsConfigurationReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WPS_CONFIGURATION_REQ, dst__, src__); \ msg__->wpsConfig = (wpsConfig__); @@ -642,7 +642,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApWpsConfigurationCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmeApWpsConfigurationCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeApWpsConfigurationCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApWpsConfigurationCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WPS_CONFIGURATION_CFM, dst__, src__); \ msg__->status = (status__); @@ -670,7 +670,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApWpsRegistrationFinishedReqCreate(msg__, dst__, src__, interfaceTag__) \ - msg__ = (CsrWifiSmeApWpsRegistrationFinishedReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApWpsRegistrationFinishedReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApWpsRegistrationFinishedReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WPS_REGISTRATION_FINISHED_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); @@ -699,7 +699,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApWpsRegistrationFinishedCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiSmeApWpsRegistrationFinishedCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeApWpsRegistrationFinishedCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApWpsRegistrationFinishedCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WPS_REGISTRATION_FINISHED_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); @@ -730,7 +730,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApWpsRegistrationStartedReqCreate(msg__, dst__, src__, interfaceTag__, SelectedDevicePasswordId__, SelectedconfigMethod__) \ - msg__ = (CsrWifiSmeApWpsRegistrationStartedReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApWpsRegistrationStartedReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApWpsRegistrationStartedReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WPS_REGISTRATION_STARTED_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->SelectedDevicePasswordId = (SelectedDevicePasswordId__); \ @@ -761,7 +761,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE *******************************************************************************/ #define CsrWifiSmeApWpsRegistrationStartedCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiSmeApWpsRegistrationStartedCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeApWpsRegistrationStartedCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeApWpsRegistrationStartedCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WPS_REGISTRATION_STARTED_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); diff --git a/drivers/staging/csr/csr_wifi_sme_lib.h b/drivers/staging/csr/csr_wifi_sme_lib.h index 7fa9c2353c7..e20ae9895a2 100644 --- a/drivers/staging/csr/csr_wifi_sme_lib.h +++ b/drivers/staging/csr/csr_wifi_sme_lib.h @@ -137,7 +137,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeActivateReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmeActivateReq *) CsrPmemAlloc(sizeof(CsrWifiSmeActivateReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeActivateReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ACTIVATE_REQ, dst__, src__); #define CsrWifiSmeActivateReqSendTo(dst__, src__) \ @@ -164,7 +164,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeActivateCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmeActivateCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeActivateCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeActivateCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ACTIVATE_CFM, dst__, src__); \ msg__->status = (status__); @@ -191,7 +191,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeAdhocConfigGetReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmeAdhocConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeAdhocConfigGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeAdhocConfigGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ADHOC_CONFIG_GET_REQ, dst__, src__); #define CsrWifiSmeAdhocConfigGetReqSendTo(dst__, src__) \ @@ -220,7 +220,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeAdhocConfigGetCfmCreate(msg__, dst__, src__, status__, adHocConfig__) \ - msg__ = (CsrWifiSmeAdhocConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeAdhocConfigGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeAdhocConfigGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ADHOC_CONFIG_GET_CFM, dst__, src__); \ msg__->status = (status__); \ msg__->adHocConfig = (adHocConfig__); @@ -249,7 +249,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeAdhocConfigSetReqCreate(msg__, dst__, src__, adHocConfig__) \ - msg__ = (CsrWifiSmeAdhocConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeAdhocConfigSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeAdhocConfigSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ADHOC_CONFIG_SET_REQ, dst__, src__); \ msg__->adHocConfig = (adHocConfig__); @@ -277,7 +277,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeAdhocConfigSetCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmeAdhocConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeAdhocConfigSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeAdhocConfigSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ADHOC_CONFIG_SET_CFM, dst__, src__); \ msg__->status = (status__); @@ -307,7 +307,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeAmpStatusChangeIndCreate(msg__, dst__, src__, interfaceTag__, ampStatus__) \ - msg__ = (CsrWifiSmeAmpStatusChangeInd *) CsrPmemAlloc(sizeof(CsrWifiSmeAmpStatusChangeInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeAmpStatusChangeInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_AMP_STATUS_CHANGE_IND, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->ampStatus = (ampStatus__); @@ -348,7 +348,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeAssociationCompleteIndCreate(msg__, dst__, src__, interfaceTag__, status__, connectionInfo__, deauthReason__) \ - msg__ = (CsrWifiSmeAssociationCompleteInd *) CsrPmemAlloc(sizeof(CsrWifiSmeAssociationCompleteInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeAssociationCompleteInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ASSOCIATION_COMPLETE_IND, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -382,7 +382,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeAssociationStartIndCreate(msg__, dst__, src__, interfaceTag__, address__, ssid__) \ - msg__ = (CsrWifiSmeAssociationStartInd *) CsrPmemAlloc(sizeof(CsrWifiSmeAssociationStartInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeAssociationStartInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ASSOCIATION_START_IND, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->address = (address__); \ @@ -425,7 +425,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeBlacklistReqCreate(msg__, dst__, src__, interfaceTag__, action__, setAddressCount__, setAddresses__) \ - msg__ = (CsrWifiSmeBlacklistReq *) CsrPmemAlloc(sizeof(CsrWifiSmeBlacklistReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeBlacklistReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_BLACKLIST_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->action = (action__); \ @@ -465,7 +465,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeBlacklistCfmCreate(msg__, dst__, src__, interfaceTag__, status__, action__, getAddressCount__, getAddresses__) \ - msg__ = (CsrWifiSmeBlacklistCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeBlacklistCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeBlacklistCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_BLACKLIST_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -496,7 +496,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCalibrationDataGetReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmeCalibrationDataGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCalibrationDataGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCalibrationDataGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CALIBRATION_DATA_GET_REQ, dst__, src__); #define CsrWifiSmeCalibrationDataGetReqSendTo(dst__, src__) \ @@ -527,7 +527,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCalibrationDataGetCfmCreate(msg__, dst__, src__, status__, calibrationDataLength__, calibrationData__) \ - msg__ = (CsrWifiSmeCalibrationDataGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCalibrationDataGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCalibrationDataGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CALIBRATION_DATA_GET_CFM, dst__, src__); \ msg__->status = (status__); \ msg__->calibrationDataLength = (calibrationDataLength__); \ @@ -562,7 +562,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCalibrationDataSetReqCreate(msg__, dst__, src__, calibrationDataLength__, calibrationData__) \ - msg__ = (CsrWifiSmeCalibrationDataSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCalibrationDataSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCalibrationDataSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CALIBRATION_DATA_SET_REQ, dst__, src__); \ msg__->calibrationDataLength = (calibrationDataLength__); \ msg__->calibrationData = (calibrationData__); @@ -591,7 +591,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCalibrationDataSetCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmeCalibrationDataSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCalibrationDataSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCalibrationDataSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CALIBRATION_DATA_SET_CFM, dst__, src__); \ msg__->status = (status__); @@ -620,7 +620,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCcxConfigGetReqCreate(msg__, dst__, src__, interfaceTag__) \ - msg__ = (CsrWifiSmeCcxConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCcxConfigGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCcxConfigGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CCX_CONFIG_GET_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); @@ -650,7 +650,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCcxConfigGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, ccxConfig__) \ - msg__ = (CsrWifiSmeCcxConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCcxConfigGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCcxConfigGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CCX_CONFIG_GET_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -682,7 +682,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCcxConfigSetReqCreate(msg__, dst__, src__, interfaceTag__, ccxConfig__) \ - msg__ = (CsrWifiSmeCcxConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCcxConfigSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCcxConfigSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CCX_CONFIG_SET_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->ccxConfig = (ccxConfig__); @@ -712,7 +712,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCcxConfigSetCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiSmeCcxConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCcxConfigSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCcxConfigSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CCX_CONFIG_SET_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); @@ -740,7 +740,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCloakedSsidsGetReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmeCloakedSsidsGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCloakedSsidsGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCloakedSsidsGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CLOAKED_SSIDS_GET_REQ, dst__, src__); #define CsrWifiSmeCloakedSsidsGetReqSendTo(dst__, src__) \ @@ -769,7 +769,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCloakedSsidsGetCfmCreate(msg__, dst__, src__, status__, cloakedSsids__) \ - msg__ = (CsrWifiSmeCloakedSsidsGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCloakedSsidsGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCloakedSsidsGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CLOAKED_SSIDS_GET_CFM, dst__, src__); \ msg__->status = (status__); \ msg__->cloakedSsids = (cloakedSsids__); @@ -803,7 +803,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCloakedSsidsSetReqCreate(msg__, dst__, src__, cloakedSsids__) \ - msg__ = (CsrWifiSmeCloakedSsidsSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCloakedSsidsSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCloakedSsidsSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CLOAKED_SSIDS_SET_REQ, dst__, src__); \ msg__->cloakedSsids = (cloakedSsids__); @@ -831,7 +831,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCloakedSsidsSetCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmeCloakedSsidsSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCloakedSsidsSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCloakedSsidsSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CLOAKED_SSIDS_SET_CFM, dst__, src__); \ msg__->status = (status__); @@ -858,7 +858,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCoexConfigGetReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmeCoexConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCoexConfigGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCoexConfigGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_COEX_CONFIG_GET_REQ, dst__, src__); #define CsrWifiSmeCoexConfigGetReqSendTo(dst__, src__) \ @@ -887,7 +887,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCoexConfigGetCfmCreate(msg__, dst__, src__, status__, coexConfig__) \ - msg__ = (CsrWifiSmeCoexConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCoexConfigGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCoexConfigGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_COEX_CONFIG_GET_CFM, dst__, src__); \ msg__->status = (status__); \ msg__->coexConfig = (coexConfig__); @@ -916,7 +916,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCoexConfigSetReqCreate(msg__, dst__, src__, coexConfig__) \ - msg__ = (CsrWifiSmeCoexConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCoexConfigSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCoexConfigSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_COEX_CONFIG_SET_REQ, dst__, src__); \ msg__->coexConfig = (coexConfig__); @@ -944,7 +944,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCoexConfigSetCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmeCoexConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCoexConfigSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCoexConfigSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_COEX_CONFIG_SET_CFM, dst__, src__); \ msg__->status = (status__); @@ -971,7 +971,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCoexInfoGetReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmeCoexInfoGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCoexInfoGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCoexInfoGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_COEX_INFO_GET_REQ, dst__, src__); #define CsrWifiSmeCoexInfoGetReqSendTo(dst__, src__) \ @@ -999,7 +999,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCoexInfoGetCfmCreate(msg__, dst__, src__, status__, coexInfo__) \ - msg__ = (CsrWifiSmeCoexInfoGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCoexInfoGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCoexInfoGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_COEX_INFO_GET_CFM, dst__, src__); \ msg__->status = (status__); \ msg__->coexInfo = (coexInfo__); @@ -1065,7 +1065,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeConnectReqCreate(msg__, dst__, src__, interfaceTag__, connectionConfig__) \ - msg__ = (CsrWifiSmeConnectReq *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeConnectReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECT_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->connectionConfig = (connectionConfig__); @@ -1098,7 +1098,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeConnectCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiSmeConnectCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeConnectCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECT_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); @@ -1127,7 +1127,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeConnectionConfigGetReqCreate(msg__, dst__, src__, interfaceTag__) \ - msg__ = (CsrWifiSmeConnectionConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionConfigGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeConnectionConfigGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_CONFIG_GET_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); @@ -1157,7 +1157,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeConnectionConfigGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, connectionConfig__) \ - msg__ = (CsrWifiSmeConnectionConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionConfigGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeConnectionConfigGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_CONFIG_GET_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -1187,7 +1187,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeConnectionInfoGetReqCreate(msg__, dst__, src__, interfaceTag__) \ - msg__ = (CsrWifiSmeConnectionInfoGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionInfoGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeConnectionInfoGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_INFO_GET_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); @@ -1217,7 +1217,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeConnectionInfoGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, connectionInfo__) \ - msg__ = (CsrWifiSmeConnectionInfoGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionInfoGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeConnectionInfoGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_INFO_GET_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -1255,7 +1255,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeConnectionQualityIndCreate(msg__, dst__, src__, interfaceTag__, linkQuality__) \ - msg__ = (CsrWifiSmeConnectionQualityInd *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionQualityInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeConnectionQualityInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_QUALITY_IND, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->linkQuality = (linkQuality__); @@ -1284,7 +1284,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeConnectionStatsGetReqCreate(msg__, dst__, src__, interfaceTag__) \ - msg__ = (CsrWifiSmeConnectionStatsGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionStatsGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeConnectionStatsGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_STATS_GET_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); @@ -1314,7 +1314,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeConnectionStatsGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, connectionStats__) \ - msg__ = (CsrWifiSmeConnectionStatsGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionStatsGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeConnectionStatsGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_STATS_GET_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -1351,7 +1351,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeCoreDumpIndCreate(msg__, dst__, src__, dataLength__, data__) \ - msg__ = (CsrWifiSmeCoreDumpInd *) CsrPmemAlloc(sizeof(CsrWifiSmeCoreDumpInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeCoreDumpInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CORE_DUMP_IND, dst__, src__); \ msg__->dataLength = (dataLength__); \ msg__->data = (data__); @@ -1379,7 +1379,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeDeactivateReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmeDeactivateReq *) CsrPmemAlloc(sizeof(CsrWifiSmeDeactivateReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeDeactivateReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_DEACTIVATE_REQ, dst__, src__); #define CsrWifiSmeDeactivateReqSendTo(dst__, src__) \ @@ -1408,7 +1408,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeDeactivateCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmeDeactivateCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeDeactivateCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeDeactivateCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_DEACTIVATE_CFM, dst__, src__); \ msg__->status = (status__); @@ -1437,7 +1437,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeDisconnectReqCreate(msg__, dst__, src__, interfaceTag__) \ - msg__ = (CsrWifiSmeDisconnectReq *) CsrPmemAlloc(sizeof(CsrWifiSmeDisconnectReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeDisconnectReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_DISCONNECT_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); @@ -1469,7 +1469,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeDisconnectCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiSmeDisconnectCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeDisconnectCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeDisconnectCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_DISCONNECT_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); @@ -1498,7 +1498,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeErrorIndCreate(msg__, dst__, src__, errorMessage__) \ - msg__ = (CsrWifiSmeErrorInd *) CsrPmemAlloc(sizeof(CsrWifiSmeErrorInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeErrorInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ERROR_IND, dst__, src__); \ msg__->errorMessage = (errorMessage__); @@ -1529,7 +1529,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeEventMaskSetReqCreate(msg__, dst__, src__, indMask__) \ - msg__ = (CsrWifiSmeEventMaskSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeEventMaskSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeEventMaskSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_EVENT_MASK_SET_REQ, dst__, src__); \ msg__->indMask = (indMask__); @@ -1558,7 +1558,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeEventMaskSetCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmeEventMaskSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeEventMaskSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeEventMaskSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_EVENT_MASK_SET_CFM, dst__, src__); \ msg__->status = (status__); @@ -1586,7 +1586,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeHostConfigGetReqCreate(msg__, dst__, src__, interfaceTag__) \ - msg__ = (CsrWifiSmeHostConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeHostConfigGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeHostConfigGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_HOST_CONFIG_GET_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); @@ -1616,7 +1616,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeHostConfigGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, hostConfig__) \ - msg__ = (CsrWifiSmeHostConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeHostConfigGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeHostConfigGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_HOST_CONFIG_GET_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -1649,7 +1649,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeHostConfigSetReqCreate(msg__, dst__, src__, interfaceTag__, hostConfig__) \ - msg__ = (CsrWifiSmeHostConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeHostConfigSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeHostConfigSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_HOST_CONFIG_SET_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->hostConfig = (hostConfig__); @@ -1679,7 +1679,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeHostConfigSetCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiSmeHostConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeHostConfigSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeHostConfigSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_HOST_CONFIG_SET_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); @@ -1710,7 +1710,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeIbssStationIndCreate(msg__, dst__, src__, address__, isconnected__) \ - msg__ = (CsrWifiSmeIbssStationInd *) CsrPmemAlloc(sizeof(CsrWifiSmeIbssStationInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeIbssStationInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_IBSS_STATION_IND, dst__, src__); \ msg__->address = (address__); \ msg__->isconnected = (isconnected__); @@ -1740,7 +1740,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeInfoIndCreate(msg__, dst__, src__, infoMessage__) \ - msg__ = (CsrWifiSmeInfoInd *) CsrPmemAlloc(sizeof(CsrWifiSmeInfoInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeInfoInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_INFO_IND, dst__, src__); \ msg__->infoMessage = (infoMessage__); @@ -1768,7 +1768,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeInterfaceCapabilityGetReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmeInterfaceCapabilityGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeInterfaceCapabilityGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeInterfaceCapabilityGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_INTERFACE_CAPABILITY_GET_REQ, dst__, src__); #define CsrWifiSmeInterfaceCapabilityGetReqSendTo(dst__, src__) \ @@ -1804,7 +1804,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeInterfaceCapabilityGetCfmCreate(msg__, dst__, src__, status__, numInterfaces__, capBitmap__) \ - msg__ = (CsrWifiSmeInterfaceCapabilityGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeInterfaceCapabilityGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeInterfaceCapabilityGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_INTERFACE_CAPABILITY_GET_CFM, dst__, src__); \ msg__->status = (status__); \ msg__->numInterfaces = (numInterfaces__); \ @@ -1841,7 +1841,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeKeyReqCreate(msg__, dst__, src__, interfaceTag__, action__, key__) \ - msg__ = (CsrWifiSmeKeyReq *) CsrPmemAlloc(sizeof(CsrWifiSmeKeyReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeKeyReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_KEY_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->action = (action__); \ @@ -1876,7 +1876,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeKeyCfmCreate(msg__, dst__, src__, interfaceTag__, status__, action__, keyType__, peerMacAddress__) \ - msg__ = (CsrWifiSmeKeyCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeKeyCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeKeyCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_KEY_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -1908,7 +1908,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeLinkQualityGetReqCreate(msg__, dst__, src__, interfaceTag__) \ - msg__ = (CsrWifiSmeLinkQualityGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeLinkQualityGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeLinkQualityGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_LINK_QUALITY_GET_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); @@ -1938,7 +1938,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeLinkQualityGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, linkQuality__) \ - msg__ = (CsrWifiSmeLinkQualityGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeLinkQualityGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeLinkQualityGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_LINK_QUALITY_GET_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -1982,7 +1982,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeMediaStatusIndCreate(msg__, dst__, src__, interfaceTag__, mediaStatus__, connectionInfo__, disassocReason__, deauthReason__) \ - msg__ = (CsrWifiSmeMediaStatusInd *) CsrPmemAlloc(sizeof(CsrWifiSmeMediaStatusInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeMediaStatusInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MEDIA_STATUS_IND, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->mediaStatus = (mediaStatus__); \ @@ -2013,7 +2013,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeMibConfigGetReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmeMibConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMibConfigGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeMibConfigGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_CONFIG_GET_REQ, dst__, src__); #define CsrWifiSmeMibConfigGetReqSendTo(dst__, src__) \ @@ -2041,7 +2041,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeMibConfigGetCfmCreate(msg__, dst__, src__, status__, mibConfig__) \ - msg__ = (CsrWifiSmeMibConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMibConfigGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeMibConfigGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_CONFIG_GET_CFM, dst__, src__); \ msg__->status = (status__); \ msg__->mibConfig = (mibConfig__); @@ -2071,7 +2071,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeMibConfigSetReqCreate(msg__, dst__, src__, mibConfig__) \ - msg__ = (CsrWifiSmeMibConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMibConfigSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeMibConfigSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_CONFIG_SET_REQ, dst__, src__); \ msg__->mibConfig = (mibConfig__); @@ -2099,7 +2099,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeMibConfigSetCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmeMibConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMibConfigSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeMibConfigSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_CONFIG_SET_CFM, dst__, src__); \ msg__->status = (status__); @@ -2130,7 +2130,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeMibGetCfmCreate(msg__, dst__, src__, status__, mibAttributeLength__, mibAttribute__) \ - msg__ = (CsrWifiSmeMibGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMibGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeMibGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_GET_CFM, dst__, src__); \ msg__->status = (status__); \ msg__->mibAttributeLength = (mibAttributeLength__); \ @@ -2163,7 +2163,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeMibGetNextReqCreate(msg__, dst__, src__, mibAttributeLength__, mibAttribute__) \ - msg__ = (CsrWifiSmeMibGetNextReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMibGetNextReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeMibGetNextReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_GET_NEXT_REQ, dst__, src__); \ msg__->mibAttributeLength = (mibAttributeLength__); \ msg__->mibAttribute = (mibAttribute__); @@ -2198,7 +2198,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeMibGetNextCfmCreate(msg__, dst__, src__, status__, mibAttributeLength__, mibAttribute__) \ - msg__ = (CsrWifiSmeMibGetNextCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMibGetNextCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeMibGetNextCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_GET_NEXT_CFM, dst__, src__); \ msg__->status = (status__); \ msg__->mibAttributeLength = (mibAttributeLength__); \ @@ -2231,7 +2231,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeMibGetReqCreate(msg__, dst__, src__, mibAttributeLength__, mibAttribute__) \ - msg__ = (CsrWifiSmeMibGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMibGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeMibGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_GET_REQ, dst__, src__); \ msg__->mibAttributeLength = (mibAttributeLength__); \ msg__->mibAttribute = (mibAttribute__); @@ -2271,7 +2271,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeMibSetReqCreate(msg__, dst__, src__, mibAttributeLength__, mibAttribute__) \ - msg__ = (CsrWifiSmeMibSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMibSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeMibSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_SET_REQ, dst__, src__); \ msg__->mibAttributeLength = (mibAttributeLength__); \ msg__->mibAttribute = (mibAttribute__); @@ -2300,7 +2300,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeMibSetCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmeMibSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMibSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeMibSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_SET_CFM, dst__, src__); \ msg__->status = (status__); @@ -2335,7 +2335,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeMicFailureIndCreate(msg__, dst__, src__, interfaceTag__, secondFailure__, count__, address__, keyType__) \ - msg__ = (CsrWifiSmeMicFailureInd *) CsrPmemAlloc(sizeof(CsrWifiSmeMicFailureInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeMicFailureInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIC_FAILURE_IND, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->secondFailure = (secondFailure__); \ @@ -2377,7 +2377,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeMulticastAddressReqCreate(msg__, dst__, src__, interfaceTag__, action__, setAddressesCount__, setAddresses__) \ - msg__ = (CsrWifiSmeMulticastAddressReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMulticastAddressReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeMulticastAddressReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MULTICAST_ADDRESS_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->action = (action__); \ @@ -2416,7 +2416,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeMulticastAddressCfmCreate(msg__, dst__, src__, interfaceTag__, status__, action__, getAddressesCount__, getAddresses__) \ - msg__ = (CsrWifiSmeMulticastAddressCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMulticastAddressCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeMulticastAddressCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MULTICAST_ADDRESS_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -2476,7 +2476,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmePacketFilterSetReqCreate(msg__, dst__, src__, interfaceTag__, filterLength__, filter__, mode__, arpFilterAddress__) \ - msg__ = (CsrWifiSmePacketFilterSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmePacketFilterSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmePacketFilterSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PACKET_FILTER_SET_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->filterLength = (filterLength__); \ @@ -2509,7 +2509,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmePacketFilterSetCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiSmePacketFilterSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmePacketFilterSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmePacketFilterSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PACKET_FILTER_SET_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); @@ -2537,7 +2537,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmePermanentMacAddressGetReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmePermanentMacAddressGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmePermanentMacAddressGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmePermanentMacAddressGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PERMANENT_MAC_ADDRESS_GET_REQ, dst__, src__); #define CsrWifiSmePermanentMacAddressGetReqSendTo(dst__, src__) \ @@ -2565,7 +2565,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmePermanentMacAddressGetCfmCreate(msg__, dst__, src__, status__, permanentMacAddress__) \ - msg__ = (CsrWifiSmePermanentMacAddressGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmePermanentMacAddressGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmePermanentMacAddressGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PERMANENT_MAC_ADDRESS_GET_CFM, dst__, src__); \ msg__->status = (status__); \ msg__->permanentMacAddress = (permanentMacAddress__); @@ -2599,7 +2599,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmePmkidCandidateListIndCreate(msg__, dst__, src__, interfaceTag__, pmkidCandidatesCount__, pmkidCandidates__) \ - msg__ = (CsrWifiSmePmkidCandidateListInd *) CsrPmemAlloc(sizeof(CsrWifiSmePmkidCandidateListInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmePmkidCandidateListInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PMKID_CANDIDATE_LIST_IND, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->pmkidCandidatesCount = (pmkidCandidatesCount__); \ @@ -2641,7 +2641,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmePmkidReqCreate(msg__, dst__, src__, interfaceTag__, action__, setPmkidsCount__, setPmkids__) \ - msg__ = (CsrWifiSmePmkidReq *) CsrPmemAlloc(sizeof(CsrWifiSmePmkidReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmePmkidReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PMKID_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->action = (action__); \ @@ -2680,7 +2680,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmePmkidCfmCreate(msg__, dst__, src__, interfaceTag__, status__, action__, getPmkidsCount__, getPmkids__) \ - msg__ = (CsrWifiSmePmkidCfm *) CsrPmemAlloc(sizeof(CsrWifiSmePmkidCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmePmkidCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PMKID_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -2711,7 +2711,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmePowerConfigGetReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmePowerConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmePowerConfigGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmePowerConfigGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_POWER_CONFIG_GET_REQ, dst__, src__); #define CsrWifiSmePowerConfigGetReqSendTo(dst__, src__) \ @@ -2740,7 +2740,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmePowerConfigGetCfmCreate(msg__, dst__, src__, status__, powerConfig__) \ - msg__ = (CsrWifiSmePowerConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmePowerConfigGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmePowerConfigGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_POWER_CONFIG_GET_CFM, dst__, src__); \ msg__->status = (status__); \ msg__->powerConfig = (powerConfig__); @@ -2769,7 +2769,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmePowerConfigSetReqCreate(msg__, dst__, src__, powerConfig__) \ - msg__ = (CsrWifiSmePowerConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmePowerConfigSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmePowerConfigSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_POWER_CONFIG_SET_REQ, dst__, src__); \ msg__->powerConfig = (powerConfig__); @@ -2797,7 +2797,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmePowerConfigSetCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmePowerConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmePowerConfigSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmePowerConfigSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_POWER_CONFIG_SET_CFM, dst__, src__); \ msg__->status = (status__); @@ -2824,7 +2824,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeRegulatoryDomainInfoGetReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmeRegulatoryDomainInfoGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeRegulatoryDomainInfoGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeRegulatoryDomainInfoGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_REGULATORY_DOMAIN_INFO_GET_REQ, dst__, src__); #define CsrWifiSmeRegulatoryDomainInfoGetReqSendTo(dst__, src__) \ @@ -2853,7 +2853,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeRegulatoryDomainInfoGetCfmCreate(msg__, dst__, src__, status__, regDomInfo__) \ - msg__ = (CsrWifiSmeRegulatoryDomainInfoGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeRegulatoryDomainInfoGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeRegulatoryDomainInfoGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_REGULATORY_DOMAIN_INFO_GET_CFM, dst__, src__); \ msg__->status = (status__); \ msg__->regDomInfo = (regDomInfo__); @@ -2886,7 +2886,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeRoamCompleteIndCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiSmeRoamCompleteInd *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamCompleteInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeRoamCompleteInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ROAM_COMPLETE_IND, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); @@ -2935,7 +2935,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeRoamStartIndCreate(msg__, dst__, src__, interfaceTag__, roamReason__, reason80211__) \ - msg__ = (CsrWifiSmeRoamStartInd *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamStartInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeRoamStartInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ROAM_START_IND, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->roamReason = (roamReason__); \ @@ -2965,7 +2965,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeRoamingConfigGetReqCreate(msg__, dst__, src__, interfaceTag__) \ - msg__ = (CsrWifiSmeRoamingConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamingConfigGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeRoamingConfigGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ROAMING_CONFIG_GET_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); @@ -2995,7 +2995,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeRoamingConfigGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, roamingConfig__) \ - msg__ = (CsrWifiSmeRoamingConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamingConfigGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeRoamingConfigGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ROAMING_CONFIG_GET_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -3026,7 +3026,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeRoamingConfigSetReqCreate(msg__, dst__, src__, interfaceTag__, roamingConfig__) \ - msg__ = (CsrWifiSmeRoamingConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamingConfigSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeRoamingConfigSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ROAMING_CONFIG_SET_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->roamingConfig = (roamingConfig__); @@ -3056,7 +3056,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeRoamingConfigSetCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiSmeRoamingConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamingConfigSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeRoamingConfigSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ROAMING_CONFIG_SET_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); @@ -3084,7 +3084,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeScanConfigGetReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmeScanConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeScanConfigGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeScanConfigGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_CONFIG_GET_REQ, dst__, src__); #define CsrWifiSmeScanConfigGetReqSendTo(dst__, src__) \ @@ -3113,7 +3113,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeScanConfigGetCfmCreate(msg__, dst__, src__, status__, scanConfig__) \ - msg__ = (CsrWifiSmeScanConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeScanConfigGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeScanConfigGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_CONFIG_GET_CFM, dst__, src__); \ msg__->status = (status__); \ msg__->scanConfig = (scanConfig__); @@ -3153,7 +3153,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeScanConfigSetReqCreate(msg__, dst__, src__, scanConfig__) \ - msg__ = (CsrWifiSmeScanConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeScanConfigSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeScanConfigSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_CONFIG_SET_REQ, dst__, src__); \ msg__->scanConfig = (scanConfig__); @@ -3181,7 +3181,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeScanConfigSetCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmeScanConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeScanConfigSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeScanConfigSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_CONFIG_SET_CFM, dst__, src__); \ msg__->status = (status__); @@ -3236,7 +3236,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeScanFullReqCreate(msg__, dst__, src__, ssidCount__, ssid__, bssid__, forceScan__, bssType__, scanType__, channelListCount__, channelList__, probeIeLength__, probeIe__) \ - msg__ = (CsrWifiSmeScanFullReq *) CsrPmemAlloc(sizeof(CsrWifiSmeScanFullReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeScanFullReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_FULL_REQ, dst__, src__); \ msg__->ssidCount = (ssidCount__); \ msg__->ssid = (ssid__); \ @@ -3274,7 +3274,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeScanFullCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmeScanFullCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeScanFullCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeScanFullCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_FULL_CFM, dst__, src__); \ msg__->status = (status__); @@ -3303,7 +3303,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeScanResultIndCreate(msg__, dst__, src__, result__) \ - msg__ = (CsrWifiSmeScanResultInd *) CsrPmemAlloc(sizeof(CsrWifiSmeScanResultInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeScanResultInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_RESULT_IND, dst__, src__); \ msg__->result = (result__); @@ -3339,7 +3339,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeScanResultsFlushReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmeScanResultsFlushReq *) CsrPmemAlloc(sizeof(CsrWifiSmeScanResultsFlushReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeScanResultsFlushReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_RESULTS_FLUSH_REQ, dst__, src__); #define CsrWifiSmeScanResultsFlushReqSendTo(dst__, src__) \ @@ -3366,7 +3366,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeScanResultsFlushCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmeScanResultsFlushCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeScanResultsFlushCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeScanResultsFlushCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_RESULTS_FLUSH_CFM, dst__, src__); \ msg__->status = (status__); @@ -3395,7 +3395,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeScanResultsGetReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmeScanResultsGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeScanResultsGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeScanResultsGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_RESULTS_GET_REQ, dst__, src__); #define CsrWifiSmeScanResultsGetReqSendTo(dst__, src__) \ @@ -3425,7 +3425,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeScanResultsGetCfmCreate(msg__, dst__, src__, status__, scanResultsCount__, scanResults__) \ - msg__ = (CsrWifiSmeScanResultsGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeScanResultsGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeScanResultsGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_RESULTS_GET_CFM, dst__, src__); \ msg__->status = (status__); \ msg__->scanResultsCount = (scanResultsCount__); \ @@ -3459,7 +3459,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeSetReqCreate(msg__, dst__, src__, dataLength__, data__) \ - msg__ = (CsrWifiSmeSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SET_REQ, dst__, src__); \ msg__->dataLength = (dataLength__); \ msg__->data = (data__); @@ -3487,7 +3487,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeSmeCommonConfigGetReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmeSmeCommonConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeCommonConfigGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeSmeCommonConfigGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_COMMON_CONFIG_GET_REQ, dst__, src__); #define CsrWifiSmeSmeCommonConfigGetReqSendTo(dst__, src__) \ @@ -3515,7 +3515,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeSmeCommonConfigGetCfmCreate(msg__, dst__, src__, status__, deviceConfig__) \ - msg__ = (CsrWifiSmeSmeCommonConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeCommonConfigGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeSmeCommonConfigGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_COMMON_CONFIG_GET_CFM, dst__, src__); \ msg__->status = (status__); \ msg__->deviceConfig = (deviceConfig__); @@ -3544,7 +3544,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeSmeCommonConfigSetReqCreate(msg__, dst__, src__, deviceConfig__) \ - msg__ = (CsrWifiSmeSmeCommonConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeCommonConfigSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeSmeCommonConfigSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_COMMON_CONFIG_SET_REQ, dst__, src__); \ msg__->deviceConfig = (deviceConfig__); @@ -3572,7 +3572,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeSmeCommonConfigSetCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmeSmeCommonConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeCommonConfigSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeSmeCommonConfigSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_COMMON_CONFIG_SET_CFM, dst__, src__); \ msg__->status = (status__); @@ -3600,7 +3600,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeSmeStaConfigGetReqCreate(msg__, dst__, src__, interfaceTag__) \ - msg__ = (CsrWifiSmeSmeStaConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeStaConfigGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeSmeStaConfigGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_STA_CONFIG_GET_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); @@ -3630,7 +3630,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeSmeStaConfigGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, smeConfig__) \ - msg__ = (CsrWifiSmeSmeStaConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeStaConfigGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeSmeStaConfigGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_STA_CONFIG_GET_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -3661,7 +3661,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeSmeStaConfigSetReqCreate(msg__, dst__, src__, interfaceTag__, smeConfig__) \ - msg__ = (CsrWifiSmeSmeStaConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeStaConfigSetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeSmeStaConfigSetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_STA_CONFIG_SET_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->smeConfig = (smeConfig__); @@ -3691,7 +3691,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeSmeStaConfigSetCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ - msg__ = (CsrWifiSmeSmeStaConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeStaConfigSetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeSmeStaConfigSetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_STA_CONFIG_SET_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); @@ -3720,7 +3720,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeStationMacAddressGetReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmeStationMacAddressGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeStationMacAddressGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeStationMacAddressGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_STATION_MAC_ADDRESS_GET_REQ, dst__, src__); #define CsrWifiSmeStationMacAddressGetReqSendTo(dst__, src__) \ @@ -3748,7 +3748,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeStationMacAddressGetCfmCreate(msg__, dst__, src__, status__, stationMacAddress__) \ - msg__ = (CsrWifiSmeStationMacAddressGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeStationMacAddressGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeStationMacAddressGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_STATION_MAC_ADDRESS_GET_CFM, dst__, src__); \ msg__->status = (status__); \ memcpy(msg__->stationMacAddress, (stationMacAddress__), sizeof(CsrWifiMacAddress) * 2); @@ -3806,7 +3806,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeTspecReqCreate(msg__, dst__, src__, interfaceTag__, action__, transactionId__, strict__, ctrlMask__, tspecLength__, tspec__, tclasLength__, tclas__) \ - msg__ = (CsrWifiSmeTspecReq *) CsrPmemAlloc(sizeof(CsrWifiSmeTspecReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeTspecReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_TSPEC_REQ, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->action = (action__); \ @@ -3849,7 +3849,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeTspecIndCreate(msg__, dst__, src__, interfaceTag__, transactionId__, tspecResultCode__, tspecLength__, tspec__) \ - msg__ = (CsrWifiSmeTspecInd *) CsrPmemAlloc(sizeof(CsrWifiSmeTspecInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeTspecInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_TSPEC_IND, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->transactionId = (transactionId__); \ @@ -3888,7 +3888,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeTspecCfmCreate(msg__, dst__, src__, interfaceTag__, status__, transactionId__, tspecResultCode__, tspecLength__, tspec__) \ - msg__ = (CsrWifiSmeTspecCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeTspecCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeTspecCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_TSPEC_CFM, dst__, src__); \ msg__->interfaceTag = (interfaceTag__); \ msg__->status = (status__); \ @@ -3920,7 +3920,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeVersionsGetReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmeVersionsGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeVersionsGetReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeVersionsGetReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_VERSIONS_GET_REQ, dst__, src__); #define CsrWifiSmeVersionsGetReqSendTo(dst__, src__) \ @@ -3948,7 +3948,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeVersionsGetCfmCreate(msg__, dst__, src__, status__, versions__) \ - msg__ = (CsrWifiSmeVersionsGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeVersionsGetCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeVersionsGetCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_VERSIONS_GET_CFM, dst__, src__); \ msg__->status = (status__); \ msg__->versions = (versions__); @@ -4005,7 +4005,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeWifiFlightmodeReqCreate(msg__, dst__, src__, address__, mibFilesCount__, mibFiles__) \ - msg__ = (CsrWifiSmeWifiFlightmodeReq *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiFlightmodeReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeWifiFlightmodeReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_FLIGHTMODE_REQ, dst__, src__); \ msg__->address = (address__); \ msg__->mibFilesCount = (mibFilesCount__); \ @@ -4038,7 +4038,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeWifiFlightmodeCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmeWifiFlightmodeCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiFlightmodeCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeWifiFlightmodeCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_FLIGHTMODE_CFM, dst__, src__); \ msg__->status = (status__); @@ -4066,7 +4066,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeWifiOffReqCreate(msg__, dst__, src__) \ - msg__ = (CsrWifiSmeWifiOffReq *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiOffReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeWifiOffReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_OFF_REQ, dst__, src__); #define CsrWifiSmeWifiOffReqSendTo(dst__, src__) \ @@ -4094,7 +4094,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeWifiOffIndCreate(msg__, dst__, src__, reason__) \ - msg__ = (CsrWifiSmeWifiOffInd *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiOffInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeWifiOffInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_OFF_IND, dst__, src__); \ msg__->reason = (reason__); @@ -4126,7 +4126,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeWifiOffCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmeWifiOffCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiOffCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeWifiOffCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_OFF_CFM, dst__, src__); \ msg__->status = (status__); @@ -4175,7 +4175,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeWifiOnReqCreate(msg__, dst__, src__, address__, mibFilesCount__, mibFiles__) \ - msg__ = (CsrWifiSmeWifiOnReq *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiOnReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeWifiOnReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_ON_REQ, dst__, src__); \ msg__->address = (address__); \ msg__->mibFilesCount = (mibFilesCount__); \ @@ -4206,7 +4206,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeWifiOnIndCreate(msg__, dst__, src__, address__) \ - msg__ = (CsrWifiSmeWifiOnInd *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiOnInd)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeWifiOnInd), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_ON_IND, dst__, src__); \ msg__->address = (address__); @@ -4235,7 +4235,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeWifiOnCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmeWifiOnCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiOnCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeWifiOnCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_ON_CFM, dst__, src__); \ msg__->status = (status__); @@ -4264,7 +4264,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeWpsConfigurationReqCreate(msg__, dst__, src__, wpsConfig__) \ - msg__ = (CsrWifiSmeWpsConfigurationReq *) CsrPmemAlloc(sizeof(CsrWifiSmeWpsConfigurationReq)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeWpsConfigurationReq), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WPS_CONFIGURATION_REQ, dst__, src__); \ msg__->wpsConfig = (wpsConfig__); @@ -4292,7 +4292,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO *******************************************************************************/ #define CsrWifiSmeWpsConfigurationCfmCreate(msg__, dst__, src__, status__) \ - msg__ = (CsrWifiSmeWpsConfigurationCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeWpsConfigurationCfm)); \ + msg__ = kmalloc(sizeof(CsrWifiSmeWpsConfigurationCfm), GFP_KERNEL); \ CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WPS_CONFIGURATION_CFM, dst__, src__); \ msg__->status = (status__); diff --git a/drivers/staging/csr/csr_wifi_sme_serialize.c b/drivers/staging/csr/csr_wifi_sme_serialize.c index 57b4cf060f7..a1db2118995 100644 --- a/drivers/staging/csr/csr_wifi_sme_serialize.c +++ b/drivers/staging/csr/csr_wifi_sme_serialize.c @@ -53,7 +53,7 @@ u8* CsrWifiSmeAdhocConfigSetReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeAdhocConfigSetReqDes(u8 *buffer, size_t length) { - CsrWifiSmeAdhocConfigSetReq *primitive = (CsrWifiSmeAdhocConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeAdhocConfigSetReq)); + CsrWifiSmeAdhocConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmeAdhocConfigSetReq), GFP_KERNEL); size_t offset; offset = 0; @@ -108,7 +108,7 @@ u8* CsrWifiSmeBlacklistReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeBlacklistReqDes(u8 *buffer, size_t length) { - CsrWifiSmeBlacklistReq *primitive = (CsrWifiSmeBlacklistReq *) CsrPmemAlloc(sizeof(CsrWifiSmeBlacklistReq)); + CsrWifiSmeBlacklistReq *primitive = kmalloc(sizeof(CsrWifiSmeBlacklistReq), GFP_KERNEL); size_t offset; offset = 0; @@ -119,7 +119,7 @@ void* CsrWifiSmeBlacklistReqDes(u8 *buffer, size_t length) primitive->setAddresses = NULL; if (primitive->setAddressCount) { - primitive->setAddresses = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->setAddressCount); + primitive->setAddresses = kmalloc(sizeof(CsrWifiMacAddress) * primitive->setAddressCount, GFP_KERNEL); } { u16 i1; @@ -169,7 +169,7 @@ u8* CsrWifiSmeCalibrationDataSetReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeCalibrationDataSetReqDes(u8 *buffer, size_t length) { - CsrWifiSmeCalibrationDataSetReq *primitive = (CsrWifiSmeCalibrationDataSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCalibrationDataSetReq)); + CsrWifiSmeCalibrationDataSetReq *primitive = kmalloc(sizeof(CsrWifiSmeCalibrationDataSetReq), GFP_KERNEL); size_t offset; offset = 0; @@ -177,7 +177,7 @@ void* CsrWifiSmeCalibrationDataSetReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->calibrationDataLength, buffer, &offset); if (primitive->calibrationDataLength) { - primitive->calibrationData = (u8 *)CsrPmemAlloc(primitive->calibrationDataLength); + primitive->calibrationData = kmalloc(primitive->calibrationDataLength, GFP_KERNEL); CsrMemCpyDes(primitive->calibrationData, buffer, &offset, ((u16) (primitive->calibrationDataLength))); } else @@ -227,7 +227,7 @@ u8* CsrWifiSmeCcxConfigSetReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeCcxConfigSetReqDes(u8 *buffer, size_t length) { - CsrWifiSmeCcxConfigSetReq *primitive = (CsrWifiSmeCcxConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCcxConfigSetReq)); + CsrWifiSmeCcxConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmeCcxConfigSetReq), GFP_KERNEL); size_t offset; offset = 0; @@ -290,7 +290,7 @@ u8* CsrWifiSmeCoexConfigSetReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeCoexConfigSetReqDes(u8 *buffer, size_t length) { - CsrWifiSmeCoexConfigSetReq *primitive = (CsrWifiSmeCoexConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCoexConfigSetReq)); + CsrWifiSmeCoexConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmeCoexConfigSetReq), GFP_KERNEL); size_t offset; offset = 0; @@ -366,7 +366,7 @@ u8* CsrWifiSmeConnectReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeConnectReqDes(u8 *buffer, size_t length) { - CsrWifiSmeConnectReq *primitive = (CsrWifiSmeConnectReq *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectReq)); + CsrWifiSmeConnectReq *primitive = kmalloc(sizeof(CsrWifiSmeConnectReq), GFP_KERNEL); size_t offset; offset = 0; @@ -383,7 +383,7 @@ void* CsrWifiSmeConnectReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionConfig.mlmeAssociateReqInformationElementsLength, buffer, &offset); if (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength) { - primitive->connectionConfig.mlmeAssociateReqInformationElements = (u8 *)CsrPmemAlloc(primitive->connectionConfig.mlmeAssociateReqInformationElementsLength); + primitive->connectionConfig.mlmeAssociateReqInformationElements = kmalloc(primitive->connectionConfig.mlmeAssociateReqInformationElementsLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionConfig.mlmeAssociateReqInformationElements, buffer, &offset, ((u16) (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength))); } else @@ -432,7 +432,7 @@ u8* CsrWifiSmeHostConfigSetReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeHostConfigSetReqDes(u8 *buffer, size_t length) { - CsrWifiSmeHostConfigSetReq *primitive = (CsrWifiSmeHostConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeHostConfigSetReq)); + CsrWifiSmeHostConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmeHostConfigSetReq), GFP_KERNEL); size_t offset; offset = 0; @@ -497,7 +497,7 @@ u8* CsrWifiSmeKeyReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeKeyReqDes(u8 *buffer, size_t length) { - CsrWifiSmeKeyReq *primitive = (CsrWifiSmeKeyReq *) CsrPmemAlloc(sizeof(CsrWifiSmeKeyReq)); + CsrWifiSmeKeyReq *primitive = kmalloc(sizeof(CsrWifiSmeKeyReq), GFP_KERNEL); size_t offset; offset = 0; @@ -553,7 +553,7 @@ u8* CsrWifiSmeMibConfigSetReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeMibConfigSetReqDes(u8 *buffer, size_t length) { - CsrWifiSmeMibConfigSetReq *primitive = (CsrWifiSmeMibConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMibConfigSetReq)); + CsrWifiSmeMibConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmeMibConfigSetReq), GFP_KERNEL); size_t offset; offset = 0; @@ -596,7 +596,7 @@ u8* CsrWifiSmeMibGetNextReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeMibGetNextReqDes(u8 *buffer, size_t length) { - CsrWifiSmeMibGetNextReq *primitive = (CsrWifiSmeMibGetNextReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMibGetNextReq)); + CsrWifiSmeMibGetNextReq *primitive = kmalloc(sizeof(CsrWifiSmeMibGetNextReq), GFP_KERNEL); size_t offset; offset = 0; @@ -604,7 +604,7 @@ void* CsrWifiSmeMibGetNextReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset); if (primitive->mibAttributeLength) { - primitive->mibAttribute = (u8 *)CsrPmemAlloc(primitive->mibAttributeLength); + primitive->mibAttribute = kmalloc(primitive->mibAttributeLength, GFP_KERNEL); CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength))); } else @@ -652,7 +652,7 @@ u8* CsrWifiSmeMibGetReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeMibGetReqDes(u8 *buffer, size_t length) { - CsrWifiSmeMibGetReq *primitive = (CsrWifiSmeMibGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMibGetReq)); + CsrWifiSmeMibGetReq *primitive = kmalloc(sizeof(CsrWifiSmeMibGetReq), GFP_KERNEL); size_t offset; offset = 0; @@ -660,7 +660,7 @@ void* CsrWifiSmeMibGetReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset); if (primitive->mibAttributeLength) { - primitive->mibAttribute = (u8 *)CsrPmemAlloc(primitive->mibAttributeLength); + primitive->mibAttribute = kmalloc(primitive->mibAttributeLength, GFP_KERNEL); CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength))); } else @@ -708,7 +708,7 @@ u8* CsrWifiSmeMibSetReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeMibSetReqDes(u8 *buffer, size_t length) { - CsrWifiSmeMibSetReq *primitive = (CsrWifiSmeMibSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMibSetReq)); + CsrWifiSmeMibSetReq *primitive = kmalloc(sizeof(CsrWifiSmeMibSetReq), GFP_KERNEL); size_t offset; offset = 0; @@ -716,7 +716,7 @@ void* CsrWifiSmeMibSetReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset); if (primitive->mibAttributeLength) { - primitive->mibAttribute = (u8 *)CsrPmemAlloc(primitive->mibAttributeLength); + primitive->mibAttribute = kmalloc(primitive->mibAttributeLength, GFP_KERNEL); CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength))); } else @@ -777,7 +777,7 @@ u8* CsrWifiSmeMulticastAddressReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeMulticastAddressReqDes(u8 *buffer, size_t length) { - CsrWifiSmeMulticastAddressReq *primitive = (CsrWifiSmeMulticastAddressReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMulticastAddressReq)); + CsrWifiSmeMulticastAddressReq *primitive = kmalloc(sizeof(CsrWifiSmeMulticastAddressReq), GFP_KERNEL); size_t offset; offset = 0; @@ -788,7 +788,7 @@ void* CsrWifiSmeMulticastAddressReqDes(u8 *buffer, size_t length) primitive->setAddresses = NULL; if (primitive->setAddressesCount) { - primitive->setAddresses = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->setAddressesCount); + primitive->setAddresses = kmalloc(sizeof(CsrWifiMacAddress) * primitive->setAddressesCount, GFP_KERNEL); } { u16 i1; @@ -844,7 +844,7 @@ u8* CsrWifiSmePacketFilterSetReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmePacketFilterSetReqDes(u8 *buffer, size_t length) { - CsrWifiSmePacketFilterSetReq *primitive = (CsrWifiSmePacketFilterSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmePacketFilterSetReq)); + CsrWifiSmePacketFilterSetReq *primitive = kmalloc(sizeof(CsrWifiSmePacketFilterSetReq), GFP_KERNEL); size_t offset; offset = 0; @@ -853,7 +853,7 @@ void* CsrWifiSmePacketFilterSetReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->filterLength, buffer, &offset); if (primitive->filterLength) { - primitive->filter = (u8 *)CsrPmemAlloc(primitive->filterLength); + primitive->filter = kmalloc(primitive->filterLength, GFP_KERNEL); CsrMemCpyDes(primitive->filter, buffer, &offset, ((u16) (primitive->filterLength))); } else @@ -918,7 +918,7 @@ u8* CsrWifiSmePmkidReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmePmkidReqDes(u8 *buffer, size_t length) { - CsrWifiSmePmkidReq *primitive = (CsrWifiSmePmkidReq *) CsrPmemAlloc(sizeof(CsrWifiSmePmkidReq)); + CsrWifiSmePmkidReq *primitive = kmalloc(sizeof(CsrWifiSmePmkidReq), GFP_KERNEL); size_t offset; offset = 0; @@ -929,7 +929,7 @@ void* CsrWifiSmePmkidReqDes(u8 *buffer, size_t length) primitive->setPmkids = NULL; if (primitive->setPmkidsCount) { - primitive->setPmkids = (CsrWifiSmePmkid *)CsrPmemAlloc(sizeof(CsrWifiSmePmkid) * primitive->setPmkidsCount); + primitive->setPmkids = kmalloc(sizeof(CsrWifiSmePmkid) * primitive->setPmkidsCount, GFP_KERNEL); } { u16 i1; @@ -986,7 +986,7 @@ u8* CsrWifiSmePowerConfigSetReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmePowerConfigSetReqDes(u8 *buffer, size_t length) { - CsrWifiSmePowerConfigSetReq *primitive = (CsrWifiSmePowerConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmePowerConfigSetReq)); + CsrWifiSmePowerConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmePowerConfigSetReq), GFP_KERNEL); size_t offset; offset = 0; @@ -1077,7 +1077,7 @@ u8* CsrWifiSmeRoamingConfigSetReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeRoamingConfigSetReqDes(u8 *buffer, size_t length) { - CsrWifiSmeRoamingConfigSetReq *primitive = (CsrWifiSmeRoamingConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamingConfigSetReq)); + CsrWifiSmeRoamingConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmeRoamingConfigSetReq), GFP_KERNEL); size_t offset; offset = 0; @@ -1182,7 +1182,7 @@ u8* CsrWifiSmeScanConfigSetReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeScanConfigSetReqDes(u8 *buffer, size_t length) { - CsrWifiSmeScanConfigSetReq *primitive = (CsrWifiSmeScanConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeScanConfigSetReq)); + CsrWifiSmeScanConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmeScanConfigSetReq), GFP_KERNEL); size_t offset; offset = 0; @@ -1210,7 +1210,7 @@ void* CsrWifiSmeScanConfigSetReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->scanConfig.passiveChannelListCount, buffer, &offset); if (primitive->scanConfig.passiveChannelListCount) { - primitive->scanConfig.passiveChannelList = (u8 *)CsrPmemAlloc(primitive->scanConfig.passiveChannelListCount); + primitive->scanConfig.passiveChannelList = kmalloc(primitive->scanConfig.passiveChannelListCount, GFP_KERNEL); CsrMemCpyDes(primitive->scanConfig.passiveChannelList, buffer, &offset, ((u16) (primitive->scanConfig.passiveChannelListCount))); } else @@ -1291,7 +1291,7 @@ u8* CsrWifiSmeScanFullReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeScanFullReqDes(u8 *buffer, size_t length) { - CsrWifiSmeScanFullReq *primitive = (CsrWifiSmeScanFullReq *) CsrPmemAlloc(sizeof(CsrWifiSmeScanFullReq)); + CsrWifiSmeScanFullReq *primitive = kmalloc(sizeof(CsrWifiSmeScanFullReq), GFP_KERNEL); size_t offset; offset = 0; @@ -1300,7 +1300,7 @@ void* CsrWifiSmeScanFullReqDes(u8 *buffer, size_t length) primitive->ssid = NULL; if (primitive->ssidCount) { - primitive->ssid = (CsrWifiSsid *)CsrPmemAlloc(sizeof(CsrWifiSsid) * primitive->ssidCount); + primitive->ssid = kmalloc(sizeof(CsrWifiSsid) * primitive->ssidCount, GFP_KERNEL); } { u16 i1; @@ -1317,7 +1317,7 @@ void* CsrWifiSmeScanFullReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->channelListCount, buffer, &offset); if (primitive->channelListCount) { - primitive->channelList = (u8 *)CsrPmemAlloc(primitive->channelListCount); + primitive->channelList = kmalloc(primitive->channelListCount, GFP_KERNEL); CsrMemCpyDes(primitive->channelList, buffer, &offset, ((u16) (primitive->channelListCount))); } else @@ -1327,7 +1327,7 @@ void* CsrWifiSmeScanFullReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->probeIeLength, buffer, &offset); if (primitive->probeIeLength) { - primitive->probeIe = (u8 *)CsrPmemAlloc(primitive->probeIeLength); + primitive->probeIe = kmalloc(primitive->probeIeLength, GFP_KERNEL); CsrMemCpyDes(primitive->probeIe, buffer, &offset, ((u16) (primitive->probeIeLength))); } else @@ -1383,7 +1383,7 @@ u8* CsrWifiSmeSmeStaConfigSetReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeSmeStaConfigSetReqDes(u8 *buffer, size_t length) { - CsrWifiSmeSmeStaConfigSetReq *primitive = (CsrWifiSmeSmeStaConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeStaConfigSetReq)); + CsrWifiSmeSmeStaConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmeSmeStaConfigSetReq), GFP_KERNEL); size_t offset; offset = 0; @@ -1445,7 +1445,7 @@ u8* CsrWifiSmeTspecReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeTspecReqDes(u8 *buffer, size_t length) { - CsrWifiSmeTspecReq *primitive = (CsrWifiSmeTspecReq *) CsrPmemAlloc(sizeof(CsrWifiSmeTspecReq)); + CsrWifiSmeTspecReq *primitive = kmalloc(sizeof(CsrWifiSmeTspecReq), GFP_KERNEL); size_t offset; offset = 0; @@ -1458,7 +1458,7 @@ void* CsrWifiSmeTspecReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->tspecLength, buffer, &offset); if (primitive->tspecLength) { - primitive->tspec = (u8 *)CsrPmemAlloc(primitive->tspecLength); + primitive->tspec = kmalloc(primitive->tspecLength, GFP_KERNEL); CsrMemCpyDes(primitive->tspec, buffer, &offset, ((u16) (primitive->tspecLength))); } else @@ -1468,7 +1468,7 @@ void* CsrWifiSmeTspecReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->tclasLength, buffer, &offset); if (primitive->tclasLength) { - primitive->tclas = (u8 *)CsrPmemAlloc(primitive->tclasLength); + primitive->tclas = kmalloc(primitive->tclasLength, GFP_KERNEL); CsrMemCpyDes(primitive->tclas, buffer, &offset, ((u16) (primitive->tclasLength))); } else @@ -1533,7 +1533,7 @@ u8* CsrWifiSmeWifiFlightmodeReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeWifiFlightmodeReqDes(u8 *buffer, size_t length) { - CsrWifiSmeWifiFlightmodeReq *primitive = (CsrWifiSmeWifiFlightmodeReq *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiFlightmodeReq)); + CsrWifiSmeWifiFlightmodeReq *primitive = kmalloc(sizeof(CsrWifiSmeWifiFlightmodeReq), GFP_KERNEL); size_t offset; offset = 0; @@ -1543,7 +1543,7 @@ void* CsrWifiSmeWifiFlightmodeReqDes(u8 *buffer, size_t length) primitive->mibFiles = NULL; if (primitive->mibFilesCount) { - primitive->mibFiles = (CsrWifiSmeDataBlock *)CsrPmemAlloc(sizeof(CsrWifiSmeDataBlock) * primitive->mibFilesCount); + primitive->mibFiles = kmalloc(sizeof(CsrWifiSmeDataBlock) * primitive->mibFilesCount, GFP_KERNEL); } { u16 i1; @@ -1552,7 +1552,7 @@ void* CsrWifiSmeWifiFlightmodeReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->mibFiles[i1].length, buffer, &offset); if (primitive->mibFiles[i1].length) { - primitive->mibFiles[i1].data = (u8 *)CsrPmemAlloc(primitive->mibFiles[i1].length); + primitive->mibFiles[i1].data = kmalloc(primitive->mibFiles[i1].length, GFP_KERNEL); CsrMemCpyDes(primitive->mibFiles[i1].data, buffer, &offset, ((u16) (primitive->mibFiles[i1].length))); } else @@ -1625,7 +1625,7 @@ u8* CsrWifiSmeWifiOnReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeWifiOnReqDes(u8 *buffer, size_t length) { - CsrWifiSmeWifiOnReq *primitive = (CsrWifiSmeWifiOnReq *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiOnReq)); + CsrWifiSmeWifiOnReq *primitive = kmalloc(sizeof(CsrWifiSmeWifiOnReq), GFP_KERNEL); size_t offset; offset = 0; @@ -1635,7 +1635,7 @@ void* CsrWifiSmeWifiOnReqDes(u8 *buffer, size_t length) primitive->mibFiles = NULL; if (primitive->mibFilesCount) { - primitive->mibFiles = (CsrWifiSmeDataBlock *)CsrPmemAlloc(sizeof(CsrWifiSmeDataBlock) * primitive->mibFilesCount); + primitive->mibFiles = kmalloc(sizeof(CsrWifiSmeDataBlock) * primitive->mibFilesCount, GFP_KERNEL); } { u16 i1; @@ -1644,7 +1644,7 @@ void* CsrWifiSmeWifiOnReqDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->mibFiles[i1].length, buffer, &offset); if (primitive->mibFiles[i1].length) { - primitive->mibFiles[i1].data = (u8 *)CsrPmemAlloc(primitive->mibFiles[i1].length); + primitive->mibFiles[i1].data = kmalloc(primitive->mibFiles[i1].length, GFP_KERNEL); CsrMemCpyDes(primitive->mibFiles[i1].data, buffer, &offset, ((u16) (primitive->mibFiles[i1].length))); } else @@ -1712,7 +1712,7 @@ u8* CsrWifiSmeCloakedSsidsSetReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeCloakedSsidsSetReqDes(u8 *buffer, size_t length) { - CsrWifiSmeCloakedSsidsSetReq *primitive = (CsrWifiSmeCloakedSsidsSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCloakedSsidsSetReq)); + CsrWifiSmeCloakedSsidsSetReq *primitive = kmalloc(sizeof(CsrWifiSmeCloakedSsidsSetReq), GFP_KERNEL); size_t offset; offset = 0; @@ -1721,7 +1721,7 @@ void* CsrWifiSmeCloakedSsidsSetReqDes(u8 *buffer, size_t length) primitive->cloakedSsids.cloakedSsids = NULL; if (primitive->cloakedSsids.cloakedSsidsCount) { - primitive->cloakedSsids.cloakedSsids = (CsrWifiSsid *)CsrPmemAlloc(sizeof(CsrWifiSsid) * primitive->cloakedSsids.cloakedSsidsCount); + primitive->cloakedSsids.cloakedSsids = kmalloc(sizeof(CsrWifiSsid) * primitive->cloakedSsids.cloakedSsidsCount, GFP_KERNEL); } { u16 i2; @@ -1772,7 +1772,7 @@ u8* CsrWifiSmeSmeCommonConfigSetReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeSmeCommonConfigSetReqDes(u8 *buffer, size_t length) { - CsrWifiSmeSmeCommonConfigSetReq *primitive = (CsrWifiSmeSmeCommonConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeCommonConfigSetReq)); + CsrWifiSmeSmeCommonConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmeSmeCommonConfigSetReq), GFP_KERNEL); size_t offset; offset = 0; @@ -1853,7 +1853,7 @@ u8* CsrWifiSmeWpsConfigurationReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeWpsConfigurationReqDes(u8 *buffer, size_t length) { - CsrWifiSmeWpsConfigurationReq *primitive = (CsrWifiSmeWpsConfigurationReq *) CsrPmemAlloc(sizeof(CsrWifiSmeWpsConfigurationReq)); + CsrWifiSmeWpsConfigurationReq *primitive = kmalloc(sizeof(CsrWifiSmeWpsConfigurationReq), GFP_KERNEL); size_t offset; offset = 0; @@ -1874,7 +1874,7 @@ void* CsrWifiSmeWpsConfigurationReqDes(u8 *buffer, size_t length) primitive->wpsConfig.secondaryDeviceType = NULL; if (primitive->wpsConfig.secondaryDeviceTypeCount) { - primitive->wpsConfig.secondaryDeviceType = (CsrWifiSmeWpsDeviceType *)CsrPmemAlloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->wpsConfig.secondaryDeviceTypeCount); + primitive->wpsConfig.secondaryDeviceType = kmalloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->wpsConfig.secondaryDeviceTypeCount, GFP_KERNEL); } { u16 i2; @@ -1927,7 +1927,7 @@ u8* CsrWifiSmeSetReqSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeSetReqDes(u8 *buffer, size_t length) { - CsrWifiSmeSetReq *primitive = (CsrWifiSmeSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeSetReq)); + CsrWifiSmeSetReq *primitive = kmalloc(sizeof(CsrWifiSmeSetReq), GFP_KERNEL); size_t offset; offset = 0; @@ -1935,7 +1935,7 @@ void* CsrWifiSmeSetReqDes(u8 *buffer, size_t length) CsrUint32Des((u32 *) &primitive->dataLength, buffer, &offset); if (primitive->dataLength) { - primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); + primitive->data = kmalloc(primitive->dataLength, GFP_KERNEL); CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); } else @@ -1985,7 +1985,7 @@ u8* CsrWifiSmeAdhocConfigGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeAdhocConfigGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeAdhocConfigGetCfm *primitive = (CsrWifiSmeAdhocConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeAdhocConfigGetCfm)); + CsrWifiSmeAdhocConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeAdhocConfigGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -2107,7 +2107,7 @@ u8* CsrWifiSmeAssociationCompleteIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t length) { - CsrWifiSmeAssociationCompleteInd *primitive = (CsrWifiSmeAssociationCompleteInd *) CsrPmemAlloc(sizeof(CsrWifiSmeAssociationCompleteInd)); + CsrWifiSmeAssociationCompleteInd *primitive = kmalloc(sizeof(CsrWifiSmeAssociationCompleteInd), GFP_KERNEL); size_t offset; offset = 0; @@ -2130,7 +2130,7 @@ void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionInfo.beaconFrameLength, buffer, &offset); if (primitive->connectionInfo.beaconFrameLength) { - primitive->connectionInfo.beaconFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.beaconFrameLength); + primitive->connectionInfo.beaconFrame = kmalloc(primitive->connectionInfo.beaconFrameLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionInfo.beaconFrame, buffer, &offset, ((u16) (primitive->connectionInfo.beaconFrameLength))); } else @@ -2140,7 +2140,7 @@ void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionInfo.associationReqFrameLength, buffer, &offset); if (primitive->connectionInfo.associationReqFrameLength) { - primitive->connectionInfo.associationReqFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.associationReqFrameLength); + primitive->connectionInfo.associationReqFrame = kmalloc(primitive->connectionInfo.associationReqFrameLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionInfo.associationReqFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationReqFrameLength))); } else @@ -2150,7 +2150,7 @@ void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionInfo.associationRspFrameLength, buffer, &offset); if (primitive->connectionInfo.associationRspFrameLength) { - primitive->connectionInfo.associationRspFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.associationRspFrameLength); + primitive->connectionInfo.associationRspFrame = kmalloc(primitive->connectionInfo.associationRspFrameLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionInfo.associationRspFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationRspFrameLength))); } else @@ -2160,7 +2160,7 @@ void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionInfo.assocScanInfoElementsLength, buffer, &offset); if (primitive->connectionInfo.assocScanInfoElementsLength) { - primitive->connectionInfo.assocScanInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocScanInfoElementsLength); + primitive->connectionInfo.assocScanInfoElements = kmalloc(primitive->connectionInfo.assocScanInfoElementsLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionInfo.assocScanInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocScanInfoElementsLength))); } else @@ -2173,7 +2173,7 @@ void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionInfo.assocReqInfoElementsLength, buffer, &offset); if (primitive->connectionInfo.assocReqInfoElementsLength) { - primitive->connectionInfo.assocReqInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocReqInfoElementsLength); + primitive->connectionInfo.assocReqInfoElements = kmalloc(primitive->connectionInfo.assocReqInfoElementsLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionInfo.assocReqInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocReqInfoElementsLength))); } else @@ -2186,7 +2186,7 @@ void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspInfoElementsLength, buffer, &offset); if (primitive->connectionInfo.assocRspInfoElementsLength) { - primitive->connectionInfo.assocRspInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocRspInfoElementsLength); + primitive->connectionInfo.assocRspInfoElements = kmalloc(primitive->connectionInfo.assocRspInfoElementsLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionInfo.assocRspInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocRspInfoElementsLength))); } else @@ -2240,7 +2240,7 @@ u8* CsrWifiSmeAssociationStartIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeAssociationStartIndDes(u8 *buffer, size_t length) { - CsrWifiSmeAssociationStartInd *primitive = (CsrWifiSmeAssociationStartInd *) CsrPmemAlloc(sizeof(CsrWifiSmeAssociationStartInd)); + CsrWifiSmeAssociationStartInd *primitive = kmalloc(sizeof(CsrWifiSmeAssociationStartInd), GFP_KERNEL); size_t offset; offset = 0; @@ -2297,7 +2297,7 @@ u8* CsrWifiSmeBlacklistCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeBlacklistCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeBlacklistCfm *primitive = (CsrWifiSmeBlacklistCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeBlacklistCfm)); + CsrWifiSmeBlacklistCfm *primitive = kmalloc(sizeof(CsrWifiSmeBlacklistCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -2309,7 +2309,7 @@ void* CsrWifiSmeBlacklistCfmDes(u8 *buffer, size_t length) primitive->getAddresses = NULL; if (primitive->getAddressCount) { - primitive->getAddresses = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->getAddressCount); + primitive->getAddresses = kmalloc(sizeof(CsrWifiMacAddress) * primitive->getAddressCount, GFP_KERNEL); } { u16 i1; @@ -2361,7 +2361,7 @@ u8* CsrWifiSmeCalibrationDataGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeCalibrationDataGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeCalibrationDataGetCfm *primitive = (CsrWifiSmeCalibrationDataGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCalibrationDataGetCfm)); + CsrWifiSmeCalibrationDataGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeCalibrationDataGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -2370,7 +2370,7 @@ void* CsrWifiSmeCalibrationDataGetCfmDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->calibrationDataLength, buffer, &offset); if (primitive->calibrationDataLength) { - primitive->calibrationData = (u8 *)CsrPmemAlloc(primitive->calibrationDataLength); + primitive->calibrationData = kmalloc(primitive->calibrationDataLength, GFP_KERNEL); CsrMemCpyDes(primitive->calibrationData, buffer, &offset, ((u16) (primitive->calibrationDataLength))); } else @@ -2422,7 +2422,7 @@ u8* CsrWifiSmeCcxConfigGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeCcxConfigGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeCcxConfigGetCfm *primitive = (CsrWifiSmeCcxConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCcxConfigGetCfm)); + CsrWifiSmeCcxConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeCcxConfigGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -2462,7 +2462,7 @@ u8* CsrWifiSmeCcxConfigSetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeCcxConfigSetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeCcxConfigSetCfm *primitive = (CsrWifiSmeCcxConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCcxConfigSetCfm)); + CsrWifiSmeCcxConfigSetCfm *primitive = kmalloc(sizeof(CsrWifiSmeCcxConfigSetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -2524,7 +2524,7 @@ u8* CsrWifiSmeCoexConfigGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeCoexConfigGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeCoexConfigGetCfm *primitive = (CsrWifiSmeCoexConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCoexConfigGetCfm)); + CsrWifiSmeCoexConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeCoexConfigGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -2591,7 +2591,7 @@ u8* CsrWifiSmeCoexInfoGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeCoexInfoGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeCoexInfoGetCfm *primitive = (CsrWifiSmeCoexInfoGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCoexInfoGetCfm)); + CsrWifiSmeCoexInfoGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeCoexInfoGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -2636,7 +2636,7 @@ u8* CsrWifiSmeConnectCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeConnectCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeConnectCfm *primitive = (CsrWifiSmeConnectCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectCfm)); + CsrWifiSmeConnectCfm *primitive = kmalloc(sizeof(CsrWifiSmeConnectCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -2702,7 +2702,7 @@ u8* CsrWifiSmeConnectionConfigGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeConnectionConfigGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeConnectionConfigGetCfm *primitive = (CsrWifiSmeConnectionConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionConfigGetCfm)); + CsrWifiSmeConnectionConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeConnectionConfigGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -2720,7 +2720,7 @@ void* CsrWifiSmeConnectionConfigGetCfmDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionConfig.mlmeAssociateReqInformationElementsLength, buffer, &offset); if (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength) { - primitive->connectionConfig.mlmeAssociateReqInformationElements = (u8 *)CsrPmemAlloc(primitive->connectionConfig.mlmeAssociateReqInformationElementsLength); + primitive->connectionConfig.mlmeAssociateReqInformationElements = kmalloc(primitive->connectionConfig.mlmeAssociateReqInformationElementsLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionConfig.mlmeAssociateReqInformationElements, buffer, &offset, ((u16) (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength))); } else @@ -2848,7 +2848,7 @@ u8* CsrWifiSmeConnectionInfoGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeConnectionInfoGetCfm *primitive = (CsrWifiSmeConnectionInfoGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionInfoGetCfm)); + CsrWifiSmeConnectionInfoGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeConnectionInfoGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -2871,7 +2871,7 @@ void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionInfo.beaconFrameLength, buffer, &offset); if (primitive->connectionInfo.beaconFrameLength) { - primitive->connectionInfo.beaconFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.beaconFrameLength); + primitive->connectionInfo.beaconFrame = kmalloc(primitive->connectionInfo.beaconFrameLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionInfo.beaconFrame, buffer, &offset, ((u16) (primitive->connectionInfo.beaconFrameLength))); } else @@ -2881,7 +2881,7 @@ void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionInfo.associationReqFrameLength, buffer, &offset); if (primitive->connectionInfo.associationReqFrameLength) { - primitive->connectionInfo.associationReqFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.associationReqFrameLength); + primitive->connectionInfo.associationReqFrame = kmalloc(primitive->connectionInfo.associationReqFrameLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionInfo.associationReqFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationReqFrameLength))); } else @@ -2891,7 +2891,7 @@ void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionInfo.associationRspFrameLength, buffer, &offset); if (primitive->connectionInfo.associationRspFrameLength) { - primitive->connectionInfo.associationRspFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.associationRspFrameLength); + primitive->connectionInfo.associationRspFrame = kmalloc(primitive->connectionInfo.associationRspFrameLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionInfo.associationRspFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationRspFrameLength))); } else @@ -2901,7 +2901,7 @@ void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionInfo.assocScanInfoElementsLength, buffer, &offset); if (primitive->connectionInfo.assocScanInfoElementsLength) { - primitive->connectionInfo.assocScanInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocScanInfoElementsLength); + primitive->connectionInfo.assocScanInfoElements = kmalloc(primitive->connectionInfo.assocScanInfoElementsLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionInfo.assocScanInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocScanInfoElementsLength))); } else @@ -2914,7 +2914,7 @@ void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionInfo.assocReqInfoElementsLength, buffer, &offset); if (primitive->connectionInfo.assocReqInfoElementsLength) { - primitive->connectionInfo.assocReqInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocReqInfoElementsLength); + primitive->connectionInfo.assocReqInfoElements = kmalloc(primitive->connectionInfo.assocReqInfoElementsLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionInfo.assocReqInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocReqInfoElementsLength))); } else @@ -2927,7 +2927,7 @@ void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspInfoElementsLength, buffer, &offset); if (primitive->connectionInfo.assocRspInfoElementsLength) { - primitive->connectionInfo.assocRspInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocRspInfoElementsLength); + primitive->connectionInfo.assocRspInfoElements = kmalloc(primitive->connectionInfo.assocRspInfoElementsLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionInfo.assocRspInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocRspInfoElementsLength))); } else @@ -2978,7 +2978,7 @@ u8* CsrWifiSmeConnectionQualityIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeConnectionQualityIndDes(u8 *buffer, size_t length) { - CsrWifiSmeConnectionQualityInd *primitive = (CsrWifiSmeConnectionQualityInd *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionQualityInd)); + CsrWifiSmeConnectionQualityInd *primitive = kmalloc(sizeof(CsrWifiSmeConnectionQualityInd), GFP_KERNEL); size_t offset; offset = 0; @@ -3065,7 +3065,7 @@ u8* CsrWifiSmeConnectionStatsGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeConnectionStatsGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeConnectionStatsGetCfm *primitive = (CsrWifiSmeConnectionStatsGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionStatsGetCfm)); + CsrWifiSmeConnectionStatsGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeConnectionStatsGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -3126,7 +3126,7 @@ u8* CsrWifiSmeDisconnectCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeDisconnectCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeDisconnectCfm *primitive = (CsrWifiSmeDisconnectCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeDisconnectCfm)); + CsrWifiSmeDisconnectCfm *primitive = kmalloc(sizeof(CsrWifiSmeDisconnectCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -3166,7 +3166,7 @@ u8* CsrWifiSmeHostConfigGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeHostConfigGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeHostConfigGetCfm *primitive = (CsrWifiSmeHostConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeHostConfigGetCfm)); + CsrWifiSmeHostConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeHostConfigGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -3204,7 +3204,7 @@ u8* CsrWifiSmeHostConfigSetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeHostConfigSetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeHostConfigSetCfm *primitive = (CsrWifiSmeHostConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeHostConfigSetCfm)); + CsrWifiSmeHostConfigSetCfm *primitive = kmalloc(sizeof(CsrWifiSmeHostConfigSetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -3240,7 +3240,7 @@ u8* CsrWifiSmeIbssStationIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeIbssStationIndDes(u8 *buffer, size_t length) { - CsrWifiSmeIbssStationInd *primitive = (CsrWifiSmeIbssStationInd *) CsrPmemAlloc(sizeof(CsrWifiSmeIbssStationInd)); + CsrWifiSmeIbssStationInd *primitive = kmalloc(sizeof(CsrWifiSmeIbssStationInd), GFP_KERNEL); size_t offset; offset = 0; @@ -3282,7 +3282,7 @@ u8* CsrWifiSmeKeyCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeKeyCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeKeyCfm *primitive = (CsrWifiSmeKeyCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeKeyCfm)); + CsrWifiSmeKeyCfm *primitive = kmalloc(sizeof(CsrWifiSmeKeyCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -3325,7 +3325,7 @@ u8* CsrWifiSmeLinkQualityGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeLinkQualityGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeLinkQualityGetCfm *primitive = (CsrWifiSmeLinkQualityGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeLinkQualityGetCfm)); + CsrWifiSmeLinkQualityGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeLinkQualityGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -3448,7 +3448,7 @@ u8* CsrWifiSmeMediaStatusIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t length) { - CsrWifiSmeMediaStatusInd *primitive = (CsrWifiSmeMediaStatusInd *) CsrPmemAlloc(sizeof(CsrWifiSmeMediaStatusInd)); + CsrWifiSmeMediaStatusInd *primitive = kmalloc(sizeof(CsrWifiSmeMediaStatusInd), GFP_KERNEL); size_t offset; offset = 0; @@ -3471,7 +3471,7 @@ void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionInfo.beaconFrameLength, buffer, &offset); if (primitive->connectionInfo.beaconFrameLength) { - primitive->connectionInfo.beaconFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.beaconFrameLength); + primitive->connectionInfo.beaconFrame = kmalloc(primitive->connectionInfo.beaconFrameLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionInfo.beaconFrame, buffer, &offset, ((u16) (primitive->connectionInfo.beaconFrameLength))); } else @@ -3481,7 +3481,7 @@ void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionInfo.associationReqFrameLength, buffer, &offset); if (primitive->connectionInfo.associationReqFrameLength) { - primitive->connectionInfo.associationReqFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.associationReqFrameLength); + primitive->connectionInfo.associationReqFrame = kmalloc(primitive->connectionInfo.associationReqFrameLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionInfo.associationReqFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationReqFrameLength))); } else @@ -3491,7 +3491,7 @@ void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionInfo.associationRspFrameLength, buffer, &offset); if (primitive->connectionInfo.associationRspFrameLength) { - primitive->connectionInfo.associationRspFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.associationRspFrameLength); + primitive->connectionInfo.associationRspFrame = kmalloc(primitive->connectionInfo.associationRspFrameLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionInfo.associationRspFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationRspFrameLength))); } else @@ -3501,7 +3501,7 @@ void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionInfo.assocScanInfoElementsLength, buffer, &offset); if (primitive->connectionInfo.assocScanInfoElementsLength) { - primitive->connectionInfo.assocScanInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocScanInfoElementsLength); + primitive->connectionInfo.assocScanInfoElements = kmalloc(primitive->connectionInfo.assocScanInfoElementsLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionInfo.assocScanInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocScanInfoElementsLength))); } else @@ -3514,7 +3514,7 @@ void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionInfo.assocReqInfoElementsLength, buffer, &offset); if (primitive->connectionInfo.assocReqInfoElementsLength) { - primitive->connectionInfo.assocReqInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocReqInfoElementsLength); + primitive->connectionInfo.assocReqInfoElements = kmalloc(primitive->connectionInfo.assocReqInfoElementsLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionInfo.assocReqInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocReqInfoElementsLength))); } else @@ -3527,7 +3527,7 @@ void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspInfoElementsLength, buffer, &offset); if (primitive->connectionInfo.assocRspInfoElementsLength) { - primitive->connectionInfo.assocRspInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocRspInfoElementsLength); + primitive->connectionInfo.assocRspInfoElements = kmalloc(primitive->connectionInfo.assocRspInfoElementsLength, GFP_KERNEL); CsrMemCpyDes(primitive->connectionInfo.assocRspInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocRspInfoElementsLength))); } else @@ -3586,7 +3586,7 @@ u8* CsrWifiSmeMibConfigGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeMibConfigGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeMibConfigGetCfm *primitive = (CsrWifiSmeMibConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMibConfigGetCfm)); + CsrWifiSmeMibConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeMibConfigGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -3632,7 +3632,7 @@ u8* CsrWifiSmeMibGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeMibGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeMibGetCfm *primitive = (CsrWifiSmeMibGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMibGetCfm)); + CsrWifiSmeMibGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeMibGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -3641,7 +3641,7 @@ void* CsrWifiSmeMibGetCfmDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset); if (primitive->mibAttributeLength) { - primitive->mibAttribute = (u8 *)CsrPmemAlloc(primitive->mibAttributeLength); + primitive->mibAttribute = kmalloc(primitive->mibAttributeLength, GFP_KERNEL); CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength))); } else @@ -3691,7 +3691,7 @@ u8* CsrWifiSmeMibGetNextCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeMibGetNextCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeMibGetNextCfm *primitive = (CsrWifiSmeMibGetNextCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMibGetNextCfm)); + CsrWifiSmeMibGetNextCfm *primitive = kmalloc(sizeof(CsrWifiSmeMibGetNextCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -3700,7 +3700,7 @@ void* CsrWifiSmeMibGetNextCfmDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset); if (primitive->mibAttributeLength) { - primitive->mibAttribute = (u8 *)CsrPmemAlloc(primitive->mibAttributeLength); + primitive->mibAttribute = kmalloc(primitive->mibAttributeLength, GFP_KERNEL); CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength))); } else @@ -3750,7 +3750,7 @@ u8* CsrWifiSmeMicFailureIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeMicFailureIndDes(u8 *buffer, size_t length) { - CsrWifiSmeMicFailureInd *primitive = (CsrWifiSmeMicFailureInd *) CsrPmemAlloc(sizeof(CsrWifiSmeMicFailureInd)); + CsrWifiSmeMicFailureInd *primitive = kmalloc(sizeof(CsrWifiSmeMicFailureInd), GFP_KERNEL); size_t offset; offset = 0; @@ -3808,7 +3808,7 @@ u8* CsrWifiSmeMulticastAddressCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeMulticastAddressCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeMulticastAddressCfm *primitive = (CsrWifiSmeMulticastAddressCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMulticastAddressCfm)); + CsrWifiSmeMulticastAddressCfm *primitive = kmalloc(sizeof(CsrWifiSmeMulticastAddressCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -3820,7 +3820,7 @@ void* CsrWifiSmeMulticastAddressCfmDes(u8 *buffer, size_t length) primitive->getAddresses = NULL; if (primitive->getAddressesCount) { - primitive->getAddresses = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->getAddressesCount); + primitive->getAddresses = kmalloc(sizeof(CsrWifiMacAddress) * primitive->getAddressesCount, GFP_KERNEL); } { u16 i1; @@ -3866,7 +3866,7 @@ u8* CsrWifiSmePacketFilterSetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmePacketFilterSetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmePacketFilterSetCfm *primitive = (CsrWifiSmePacketFilterSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmePacketFilterSetCfm)); + CsrWifiSmePacketFilterSetCfm *primitive = kmalloc(sizeof(CsrWifiSmePacketFilterSetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -3902,7 +3902,7 @@ u8* CsrWifiSmePermanentMacAddressGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmePermanentMacAddressGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmePermanentMacAddressGetCfm *primitive = (CsrWifiSmePermanentMacAddressGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmePermanentMacAddressGetCfm)); + CsrWifiSmePermanentMacAddressGetCfm *primitive = kmalloc(sizeof(CsrWifiSmePermanentMacAddressGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -3955,7 +3955,7 @@ u8* CsrWifiSmePmkidCandidateListIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmePmkidCandidateListIndDes(u8 *buffer, size_t length) { - CsrWifiSmePmkidCandidateListInd *primitive = (CsrWifiSmePmkidCandidateListInd *) CsrPmemAlloc(sizeof(CsrWifiSmePmkidCandidateListInd)); + CsrWifiSmePmkidCandidateListInd *primitive = kmalloc(sizeof(CsrWifiSmePmkidCandidateListInd), GFP_KERNEL); size_t offset; offset = 0; @@ -3965,7 +3965,7 @@ void* CsrWifiSmePmkidCandidateListIndDes(u8 *buffer, size_t length) primitive->pmkidCandidates = NULL; if (primitive->pmkidCandidatesCount) { - primitive->pmkidCandidates = (CsrWifiSmePmkidCandidate *)CsrPmemAlloc(sizeof(CsrWifiSmePmkidCandidate) * primitive->pmkidCandidatesCount); + primitive->pmkidCandidates = kmalloc(sizeof(CsrWifiSmePmkidCandidate) * primitive->pmkidCandidatesCount, GFP_KERNEL); } { u16 i1; @@ -4033,7 +4033,7 @@ u8* CsrWifiSmePmkidCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmePmkidCfmDes(u8 *buffer, size_t length) { - CsrWifiSmePmkidCfm *primitive = (CsrWifiSmePmkidCfm *) CsrPmemAlloc(sizeof(CsrWifiSmePmkidCfm)); + CsrWifiSmePmkidCfm *primitive = kmalloc(sizeof(CsrWifiSmePmkidCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -4045,7 +4045,7 @@ void* CsrWifiSmePmkidCfmDes(u8 *buffer, size_t length) primitive->getPmkids = NULL; if (primitive->getPmkidsCount) { - primitive->getPmkids = (CsrWifiSmePmkid *)CsrPmemAlloc(sizeof(CsrWifiSmePmkid) * primitive->getPmkidsCount); + primitive->getPmkids = kmalloc(sizeof(CsrWifiSmePmkid) * primitive->getPmkidsCount, GFP_KERNEL); } { u16 i1; @@ -4104,7 +4104,7 @@ u8* CsrWifiSmePowerConfigGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmePowerConfigGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmePowerConfigGetCfm *primitive = (CsrWifiSmePowerConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmePowerConfigGetCfm)); + CsrWifiSmePowerConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmePowerConfigGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -4152,7 +4152,7 @@ u8* CsrWifiSmeRegulatoryDomainInfoGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeRegulatoryDomainInfoGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeRegulatoryDomainInfoGetCfm *primitive = (CsrWifiSmeRegulatoryDomainInfoGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeRegulatoryDomainInfoGetCfm)); + CsrWifiSmeRegulatoryDomainInfoGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeRegulatoryDomainInfoGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -4191,7 +4191,7 @@ u8* CsrWifiSmeRoamCompleteIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeRoamCompleteIndDes(u8 *buffer, size_t length) { - CsrWifiSmeRoamCompleteInd *primitive = (CsrWifiSmeRoamCompleteInd *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamCompleteInd)); + CsrWifiSmeRoamCompleteInd *primitive = kmalloc(sizeof(CsrWifiSmeRoamCompleteInd), GFP_KERNEL); size_t offset; offset = 0; @@ -4229,7 +4229,7 @@ u8* CsrWifiSmeRoamStartIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeRoamStartIndDes(u8 *buffer, size_t length) { - CsrWifiSmeRoamStartInd *primitive = (CsrWifiSmeRoamStartInd *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamStartInd)); + CsrWifiSmeRoamStartInd *primitive = kmalloc(sizeof(CsrWifiSmeRoamStartInd), GFP_KERNEL); size_t offset; offset = 0; @@ -4318,7 +4318,7 @@ u8* CsrWifiSmeRoamingConfigGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeRoamingConfigGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeRoamingConfigGetCfm *primitive = (CsrWifiSmeRoamingConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamingConfigGetCfm)); + CsrWifiSmeRoamingConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeRoamingConfigGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -4380,7 +4380,7 @@ u8* CsrWifiSmeRoamingConfigSetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeRoamingConfigSetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeRoamingConfigSetCfm *primitive = (CsrWifiSmeRoamingConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamingConfigSetCfm)); + CsrWifiSmeRoamingConfigSetCfm *primitive = kmalloc(sizeof(CsrWifiSmeRoamingConfigSetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -4462,7 +4462,7 @@ u8* CsrWifiSmeScanConfigGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeScanConfigGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeScanConfigGetCfm *primitive = (CsrWifiSmeScanConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeScanConfigGetCfm)); + CsrWifiSmeScanConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeScanConfigGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -4491,7 +4491,7 @@ void* CsrWifiSmeScanConfigGetCfmDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->scanConfig.passiveChannelListCount, buffer, &offset); if (primitive->scanConfig.passiveChannelListCount) { - primitive->scanConfig.passiveChannelList = (u8 *)CsrPmemAlloc(primitive->scanConfig.passiveChannelListCount); + primitive->scanConfig.passiveChannelList = kmalloc(primitive->scanConfig.passiveChannelListCount, GFP_KERNEL); CsrMemCpyDes(primitive->scanConfig.passiveChannelList, buffer, &offset, ((u16) (primitive->scanConfig.passiveChannelListCount))); } else @@ -4675,7 +4675,7 @@ u8* CsrWifiSmeScanResultIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeScanResultIndDes(u8 *buffer, size_t length) { - CsrWifiSmeScanResultInd *primitive = (CsrWifiSmeScanResultInd *) CsrPmemAlloc(sizeof(CsrWifiSmeScanResultInd)); + CsrWifiSmeScanResultInd *primitive = kmalloc(sizeof(CsrWifiSmeScanResultInd), GFP_KERNEL); size_t offset; offset = 0; @@ -4697,7 +4697,7 @@ void* CsrWifiSmeScanResultIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->result.informationElementsLength, buffer, &offset); if (primitive->result.informationElementsLength) { - primitive->result.informationElements = (u8 *)CsrPmemAlloc(primitive->result.informationElementsLength); + primitive->result.informationElements = kmalloc(primitive->result.informationElementsLength, GFP_KERNEL); CsrMemCpyDes(primitive->result.informationElements, buffer, &offset, ((u16) (primitive->result.informationElementsLength))); } else @@ -4717,7 +4717,7 @@ void* CsrWifiSmeScanResultIndDes(u8 *buffer, size_t length) primitive->result.deviceInfo.groupInfo.p2PClientInfo = NULL; if (primitive->result.deviceInfo.groupInfo.p2pClientInfoCount) { - primitive->result.deviceInfo.groupInfo.p2PClientInfo = (CsrWifiSmeP2pClientInfoType *)CsrPmemAlloc(sizeof(CsrWifiSmeP2pClientInfoType) * primitive->result.deviceInfo.groupInfo.p2pClientInfoCount); + primitive->result.deviceInfo.groupInfo.p2PClientInfo = kmalloc(sizeof(CsrWifiSmeP2pClientInfoType) * primitive->result.deviceInfo.groupInfo.p2pClientInfoCount, GFP_KERNEL); } { u16 i4; @@ -4732,7 +4732,7 @@ void* CsrWifiSmeScanResultIndDes(u8 *buffer, size_t length) primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = NULL; if (primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount) { - primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = (CsrWifiSmeWpsDeviceType *)CsrPmemAlloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount); + primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = kmalloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount, GFP_KERNEL); } { u16 i6; @@ -4758,7 +4758,7 @@ void* CsrWifiSmeScanResultIndDes(u8 *buffer, size_t length) primitive->result.deviceInfo.standalonedevInfo.secDeviceType = NULL; if (primitive->result.deviceInfo.standalonedevInfo.secondaryDeviceTypeCount) { - primitive->result.deviceInfo.standalonedevInfo.secDeviceType = (CsrWifiSmeWpsDeviceType *)CsrPmemAlloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->result.deviceInfo.standalonedevInfo.secondaryDeviceTypeCount); + primitive->result.deviceInfo.standalonedevInfo.secDeviceType = kmalloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->result.deviceInfo.standalonedevInfo.secondaryDeviceTypeCount, GFP_KERNEL); } { u16 i4; @@ -4984,7 +4984,7 @@ u8* CsrWifiSmeScanResultsGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeScanResultsGetCfm *primitive = (CsrWifiSmeScanResultsGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeScanResultsGetCfm)); + CsrWifiSmeScanResultsGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeScanResultsGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -4994,7 +4994,7 @@ void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, size_t length) primitive->scanResults = NULL; if (primitive->scanResultsCount) { - primitive->scanResults = (CsrWifiSmeScanResult *)CsrPmemAlloc(sizeof(CsrWifiSmeScanResult) * primitive->scanResultsCount); + primitive->scanResults = kmalloc(sizeof(CsrWifiSmeScanResult) * primitive->scanResultsCount, GFP_KERNEL); } { u16 i1; @@ -5017,7 +5017,7 @@ void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->scanResults[i1].informationElementsLength, buffer, &offset); if (primitive->scanResults[i1].informationElementsLength) { - primitive->scanResults[i1].informationElements = (u8 *)CsrPmemAlloc(primitive->scanResults[i1].informationElementsLength); + primitive->scanResults[i1].informationElements = kmalloc(primitive->scanResults[i1].informationElementsLength, GFP_KERNEL); CsrMemCpyDes(primitive->scanResults[i1].informationElements, buffer, &offset, ((u16) (primitive->scanResults[i1].informationElementsLength))); } else @@ -5037,7 +5037,7 @@ void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, size_t length) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo = NULL; if (primitive->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount) { - primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo = (CsrWifiSmeP2pClientInfoType *)CsrPmemAlloc(sizeof(CsrWifiSmeP2pClientInfoType) * primitive->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount); + primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo = kmalloc(sizeof(CsrWifiSmeP2pClientInfoType) * primitive->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount, GFP_KERNEL); } { u16 i4; @@ -5052,7 +5052,7 @@ void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, size_t length) primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = NULL; if (primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount) { - primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = (CsrWifiSmeWpsDeviceType *)CsrPmemAlloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount); + primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = kmalloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount, GFP_KERNEL); } { u16 i6; @@ -5078,7 +5078,7 @@ void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, size_t length) primitive->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType = NULL; if (primitive->scanResults[i1].deviceInfo.standalonedevInfo.secondaryDeviceTypeCount) { - primitive->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType = (CsrWifiSmeWpsDeviceType *)CsrPmemAlloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->scanResults[i1].deviceInfo.standalonedevInfo.secondaryDeviceTypeCount); + primitive->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType = kmalloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->scanResults[i1].deviceInfo.standalonedevInfo.secondaryDeviceTypeCount, GFP_KERNEL); } { u16 i4; @@ -5169,7 +5169,7 @@ u8* CsrWifiSmeSmeStaConfigGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeSmeStaConfigGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeSmeStaConfigGetCfm *primitive = (CsrWifiSmeSmeStaConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeStaConfigGetCfm)); + CsrWifiSmeSmeStaConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeSmeStaConfigGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -5211,7 +5211,7 @@ u8* CsrWifiSmeSmeStaConfigSetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeSmeStaConfigSetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeSmeStaConfigSetCfm *primitive = (CsrWifiSmeSmeStaConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeStaConfigSetCfm)); + CsrWifiSmeSmeStaConfigSetCfm *primitive = kmalloc(sizeof(CsrWifiSmeSmeStaConfigSetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -5259,7 +5259,7 @@ u8* CsrWifiSmeStationMacAddressGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeStationMacAddressGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeStationMacAddressGetCfm *primitive = (CsrWifiSmeStationMacAddressGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeStationMacAddressGetCfm)); + CsrWifiSmeStationMacAddressGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeStationMacAddressGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -5311,7 +5311,7 @@ u8* CsrWifiSmeTspecIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeTspecIndDes(u8 *buffer, size_t length) { - CsrWifiSmeTspecInd *primitive = (CsrWifiSmeTspecInd *) CsrPmemAlloc(sizeof(CsrWifiSmeTspecInd)); + CsrWifiSmeTspecInd *primitive = kmalloc(sizeof(CsrWifiSmeTspecInd), GFP_KERNEL); size_t offset; offset = 0; @@ -5322,7 +5322,7 @@ void* CsrWifiSmeTspecIndDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->tspecLength, buffer, &offset); if (primitive->tspecLength) { - primitive->tspec = (u8 *)CsrPmemAlloc(primitive->tspecLength); + primitive->tspec = kmalloc(primitive->tspecLength, GFP_KERNEL); CsrMemCpyDes(primitive->tspec, buffer, &offset, ((u16) (primitive->tspecLength))); } else @@ -5378,7 +5378,7 @@ u8* CsrWifiSmeTspecCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeTspecCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeTspecCfm *primitive = (CsrWifiSmeTspecCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeTspecCfm)); + CsrWifiSmeTspecCfm *primitive = kmalloc(sizeof(CsrWifiSmeTspecCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -5390,7 +5390,7 @@ void* CsrWifiSmeTspecCfmDes(u8 *buffer, size_t length) CsrUint16Des((u16 *) &primitive->tspecLength, buffer, &offset); if (primitive->tspecLength) { - primitive->tspec = (u8 *)CsrPmemAlloc(primitive->tspecLength); + primitive->tspec = kmalloc(primitive->tspecLength, GFP_KERNEL); CsrMemCpyDes(primitive->tspec, buffer, &offset, ((u16) (primitive->tspecLength))); } else @@ -5451,7 +5451,7 @@ u8* CsrWifiSmeVersionsGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeVersionsGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeVersionsGetCfm *primitive = (CsrWifiSmeVersionsGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeVersionsGetCfm)); + CsrWifiSmeVersionsGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeVersionsGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -5521,7 +5521,7 @@ u8* CsrWifiSmeCloakedSsidsGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeCloakedSsidsGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeCloakedSsidsGetCfm *primitive = (CsrWifiSmeCloakedSsidsGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCloakedSsidsGetCfm)); + CsrWifiSmeCloakedSsidsGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeCloakedSsidsGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -5531,7 +5531,7 @@ void* CsrWifiSmeCloakedSsidsGetCfmDes(u8 *buffer, size_t length) primitive->cloakedSsids.cloakedSsids = NULL; if (primitive->cloakedSsids.cloakedSsidsCount) { - primitive->cloakedSsids.cloakedSsids = (CsrWifiSsid *)CsrPmemAlloc(sizeof(CsrWifiSsid) * primitive->cloakedSsids.cloakedSsidsCount); + primitive->cloakedSsids.cloakedSsids = kmalloc(sizeof(CsrWifiSsid) * primitive->cloakedSsids.cloakedSsidsCount, GFP_KERNEL); } { u16 i2; @@ -5576,7 +5576,7 @@ u8* CsrWifiSmeWifiOnIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeWifiOnIndDes(u8 *buffer, size_t length) { - CsrWifiSmeWifiOnInd *primitive = (CsrWifiSmeWifiOnInd *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiOnInd)); + CsrWifiSmeWifiOnInd *primitive = kmalloc(sizeof(CsrWifiSmeWifiOnInd), GFP_KERNEL); size_t offset; offset = 0; @@ -5617,7 +5617,7 @@ u8* CsrWifiSmeSmeCommonConfigGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeSmeCommonConfigGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeSmeCommonConfigGetCfm *primitive = (CsrWifiSmeSmeCommonConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeCommonConfigGetCfm)); + CsrWifiSmeSmeCommonConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeSmeCommonConfigGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -5658,7 +5658,7 @@ u8* CsrWifiSmeInterfaceCapabilityGetCfmSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeInterfaceCapabilityGetCfmDes(u8 *buffer, size_t length) { - CsrWifiSmeInterfaceCapabilityGetCfm *primitive = (CsrWifiSmeInterfaceCapabilityGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeInterfaceCapabilityGetCfm)); + CsrWifiSmeInterfaceCapabilityGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeInterfaceCapabilityGetCfm), GFP_KERNEL); size_t offset; offset = 0; @@ -5694,7 +5694,7 @@ u8* CsrWifiSmeErrorIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeErrorIndDes(u8 *buffer, size_t length) { - CsrWifiSmeErrorInd *primitive = (CsrWifiSmeErrorInd *) CsrPmemAlloc(sizeof(CsrWifiSmeErrorInd)); + CsrWifiSmeErrorInd *primitive = kmalloc(sizeof(CsrWifiSmeErrorInd), GFP_KERNEL); size_t offset; offset = 0; @@ -5736,7 +5736,7 @@ u8* CsrWifiSmeInfoIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeInfoIndDes(u8 *buffer, size_t length) { - CsrWifiSmeInfoInd *primitive = (CsrWifiSmeInfoInd *) CsrPmemAlloc(sizeof(CsrWifiSmeInfoInd)); + CsrWifiSmeInfoInd *primitive = kmalloc(sizeof(CsrWifiSmeInfoInd), GFP_KERNEL); size_t offset; offset = 0; @@ -5783,7 +5783,7 @@ u8* CsrWifiSmeCoreDumpIndSer(u8 *ptr, size_t *len, void *msg) void* CsrWifiSmeCoreDumpIndDes(u8 *buffer, size_t length) { - CsrWifiSmeCoreDumpInd *primitive = (CsrWifiSmeCoreDumpInd *) CsrPmemAlloc(sizeof(CsrWifiSmeCoreDumpInd)); + CsrWifiSmeCoreDumpInd *primitive = kmalloc(sizeof(CsrWifiSmeCoreDumpInd), GFP_KERNEL); size_t offset; offset = 0; @@ -5791,7 +5791,7 @@ void* CsrWifiSmeCoreDumpIndDes(u8 *buffer, size_t length) CsrUint32Des((u32 *) &primitive->dataLength, buffer, &offset); if (primitive->dataLength) { - primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); + primitive->data = kmalloc(primitive->dataLength, GFP_KERNEL); CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); } else diff --git a/drivers/staging/csr/drv.c b/drivers/staging/csr/drv.c index 6f5b3dd7ce1..b2c27f4f03d 100644 --- a/drivers/staging/csr/drv.c +++ b/drivers/staging/csr/drv.c @@ -1483,7 +1483,7 @@ unifi_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) break; } - pcli->snap_filter.protocols = CsrPmemAlloc(snap_filter.count * sizeof(u16)); + pcli->snap_filter.protocols = kmalloc(snap_filter.count * sizeof(u16), GFP_KERNEL); if (!pcli->snap_filter.protocols) { r = -ENOMEM; goto out; diff --git a/drivers/staging/csr/putest.c b/drivers/staging/csr/putest.c index f2cb11e1b21..5613cf0e16b 100644 --- a/drivers/staging/csr/putest.c +++ b/drivers/staging/csr/putest.c @@ -489,7 +489,7 @@ int unifi_putest_dl_fw_buff(unifi_priv_t *priv, unsigned char *arg) } /* Buffer for kernel copy of the f/w image */ - fw_buf = CsrPmemAlloc(fw_length); + fw_buf = kmalloc(fw_length, GFP_KERNEL); if (!fw_buf) { unifi_error(priv, "unifi_putest_dl_fw_buff: malloc fail\n"); return -ENOMEM; diff --git a/drivers/staging/csr/sme_mgt.c b/drivers/staging/csr/sme_mgt.c index e252883d70e..58d1b3b7293 100644 --- a/drivers/staging/csr/sme_mgt.c +++ b/drivers/staging/csr/sme_mgt.c @@ -141,7 +141,7 @@ void CsrWifiSmeScanResultsGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg) } /* Take a Copy of the scan Results :-) */ - scanCopy = CsrPmemAlloc(bytesRequired); + scanCopy = kmalloc(bytesRequired, GFP_KERNEL); memcpy(scanCopy, cfm->scanResults, sizeof(CsrWifiSmeScanResult) * cfm->scanResultsCount); /* Take a Copy of the Info Elements AND update the scan result pointers */ diff --git a/drivers/staging/csr/ul_int.c b/drivers/staging/csr/ul_int.c index d8a728b1a1b..46d3507fd8f 100644 --- a/drivers/staging/csr/ul_int.c +++ b/drivers/staging/csr/ul_int.c @@ -105,15 +105,14 @@ ul_register_client(unifi_priv_t *priv, unsigned int configuration, ul_clients[id].configuration = configuration; /* Allocate memory for the reply signal.. */ - ul_clients[id].reply_signal = (CSR_SIGNAL*) CsrPmemAlloc(sizeof(CSR_SIGNAL)); + ul_clients[id].reply_signal = kmalloc(sizeof(CSR_SIGNAL), GFP_KERNEL); if (ul_clients[id].reply_signal == NULL) { unifi_error(priv, "Failed to allocate reply signal for client.\n"); return NULL; } /* .. and the bulk data of the reply signal. */ for (ref = 0; ref < UNIFI_MAX_DATA_REFERENCES; ref ++) { - ul_clients[id].reply_bulkdata[ref] = - (bulk_data_t*) CsrPmemAlloc(sizeof(bulk_data_t)); + ul_clients[id].reply_bulkdata[ref] = kmalloc(sizeof(bulk_data_t), GFP_KERNEL); /* If allocation fails, free allocated memory. */ if (ul_clients[id].reply_bulkdata[ref] == NULL) { for (; ref > 0; ref --) { diff --git a/drivers/staging/csr/unifi_sme.c b/drivers/staging/csr/unifi_sme.c index 0cb7b0145ed..ff639d47d07 100644 --- a/drivers/staging/csr/unifi_sme.c +++ b/drivers/staging/csr/unifi_sme.c @@ -411,7 +411,7 @@ uf_multicast_list_wq(struct work_struct *work) * Allocate a new list, need to free it later * in unifi_mgt_multicast_address_cfm(). */ - multicast_address_list = CsrPmemAlloc(mc_count * sizeof(CsrWifiMacAddress)); + multicast_address_list = kmalloc(mc_count * sizeof(CsrWifiMacAddress), GFP_KERNEL); if (multicast_address_list == NULL) { return; @@ -590,7 +590,7 @@ int unifi_cfg_packet_filters(unifi_priv_t *priv, unsigned char *arg) priv->packet_filters.tclas_ies_length += sizeof(tclas_t); } if (priv->packet_filters.tclas_ies_length > 0) { - priv->filter_tclas_ies = CsrPmemAlloc(priv->packet_filters.tclas_ies_length); + priv->filter_tclas_ies = kmalloc(priv->packet_filters.tclas_ies_length, GFP_KERNEL); if (priv->filter_tclas_ies == NULL) { return -ENOMEM; } @@ -671,7 +671,7 @@ int unifi_cfg_wmm_addts(unifi_priv_t *priv, unsigned char *arg) unifi_trace(priv, UDBG4, "addts: tid = 0x%x ie_length = %d\n", addts_tid, addts_ie_length); - addts_ie = CsrPmemAlloc(addts_ie_length); + addts_ie = kmalloc(addts_ie_length, GFP_KERNEL); if (addts_ie == NULL) { unifi_error(priv, "unifi_cfg_wmm_addts: Failed to malloc %d bytes for addts_ie buffer\n", @@ -1209,7 +1209,7 @@ void uf_send_pkt_to_encrypt(struct work_struct *work) pktBulkDataLength = interfacePriv->wapi_unicast_bulk_data.data_length; if (pktBulkDataLength > 0) { - pktBulkData = (u8 *)CsrPmemAlloc(pktBulkDataLength); + pktBulkData = kmalloc(pktBulkDataLength, GFP_KERNEL); memset(pktBulkData, 0, pktBulkDataLength); } else { unifi_error(priv, "uf_send_pkt_to_encrypt() : invalid buffer\n"); -- cgit v1.2.3-70-g09d2 From eaae2e9223e859cd968b58bd3173a3f17b50538d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 20 Jul 2012 16:50:34 -0700 Subject: staging: csr: remove csr_pmem.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's no longer needed. Cc: Mikko Virkkilä Cc: Lauri Hintsala Cc: Riku Mettälä Cc: Veli-Pekka Peltola Signed-off-by: Greg Kroah-Hartman --- drivers/staging/csr/csr_msgconv.c | 1 - drivers/staging/csr/csr_pmem.h | 97 ---------------------- .../staging/csr/csr_serialize_primitive_types.c | 1 - drivers/staging/csr/csr_utf16.c | 1 - drivers/staging/csr/csr_wifi_fsm.h | 1 - drivers/staging/csr/csr_wifi_fsm_types.h | 1 - drivers/staging/csr/csr_wifi_hip_unifi.h | 1 - .../staging/csr/csr_wifi_nme_ap_converter_init.c | 1 - .../csr/csr_wifi_nme_ap_free_downstream_contents.c | 1 - .../csr/csr_wifi_nme_ap_free_upstream_contents.c | 1 - drivers/staging/csr/csr_wifi_nme_ap_lib.h | 1 - drivers/staging/csr/csr_wifi_nme_ap_prim.h | 1 + drivers/staging/csr/csr_wifi_nme_ap_serialize.c | 1 - drivers/staging/csr/csr_wifi_nme_ap_serialize.h | 1 - drivers/staging/csr/csr_wifi_nme_lib.h | 1 - drivers/staging/csr/csr_wifi_nme_serialize.h | 2 - .../staging/csr/csr_wifi_router_converter_init.c | 1 - .../csr/csr_wifi_router_ctrl_converter_init.c | 1 - ...csr_wifi_router_ctrl_free_downstream_contents.c | 1 - .../csr_wifi_router_ctrl_free_upstream_contents.c | 1 - drivers/staging/csr/csr_wifi_router_ctrl_lib.h | 1 - .../staging/csr/csr_wifi_router_ctrl_serialize.c | 1 - .../staging/csr/csr_wifi_router_ctrl_serialize.h | 1 - .../csr/csr_wifi_router_free_downstream_contents.c | 1 - .../csr/csr_wifi_router_free_upstream_contents.c | 1 - drivers/staging/csr/csr_wifi_router_lib.h | 1 - drivers/staging/csr/csr_wifi_router_serialize.c | 1 - drivers/staging/csr/csr_wifi_router_serialize.h | 2 - .../csr/csr_wifi_serialize_primitive_types.c | 1 - drivers/staging/csr/csr_wifi_sme_ap_lib.h | 1 - drivers/staging/csr/csr_wifi_sme_converter_init.c | 1 - .../csr/csr_wifi_sme_free_downstream_contents.c | 1 - .../csr/csr_wifi_sme_free_upstream_contents.c | 1 - drivers/staging/csr/csr_wifi_sme_lib.h | 1 - drivers/staging/csr/csr_wifi_sme_serialize.c | 1 - drivers/staging/csr/csr_wifi_sme_serialize.h | 2 - 36 files changed, 1 insertion(+), 134 deletions(-) delete mode 100644 drivers/staging/csr/csr_pmem.h (limited to 'drivers/staging/csr/csr_wifi_fsm.h') diff --git a/drivers/staging/csr/csr_msgconv.c b/drivers/staging/csr/csr_msgconv.c index dbf0d64a206..69ae790945b 100644 --- a/drivers/staging/csr/csr_msgconv.c +++ b/drivers/staging/csr/csr_msgconv.c @@ -11,7 +11,6 @@ #include #include #include -#include "csr_pmem.h" #include "csr_panic.h" #include "csr_sched.h" #include "csr_msgconv.h" diff --git a/drivers/staging/csr/csr_pmem.h b/drivers/staging/csr/csr_pmem.h deleted file mode 100644 index 1fb74fa0d1c..00000000000 --- a/drivers/staging/csr/csr_pmem.h +++ /dev/null @@ -1,97 +0,0 @@ -#ifndef CSR_PMEM_H__ -#define CSR_PMEM_H__ -/***************************************************************************** - - (c) Cambridge Silicon Radio Limited 2010 - All rights reserved and confidential information of CSR - - Refer to LICENSE.txt included with this source for details - on the license terms. - -*****************************************************************************/ - -#include -#include "csr_macro.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/***************************************************************************** - - NAME - CsrPmemZalloc - - DESCRIPTION - This function is equivalent to CsrPmemAlloc, but the allocated memory - is initialised to zero. - - PARAMETERS - size - Size of memory requested. Note that a size of 0 is valid. - - RETURNS - Pointer to allocated memory. - -*****************************************************************************/ -#define CsrPmemZalloc(s) (CsrMemSet(CsrPmemAlloc(s), 0x00, (s))) - - -/***************************************************************************** - - NAME - pnew and zpnew - - DESCRIPTIOM - Type-safe wrappers for CsrPmemAlloc and CsrPmemZalloc, for allocating - single instances of a specified and named type. - - PARAMETERS - t - type to allocate. - -*****************************************************************************/ -#define pnew(t) ((t *) (CsrPmemAlloc(sizeof(t)))) -#define zpnew(t) ((t *) (CsrPmemZalloc(sizeof(t)))) - - -/*----------------------------------------------------------------------------* - * Csr Pmem Debug code. Allows custom callbacks on CsrPmemAlloc and CsrPmemFree - *----------------------------------------------------------------------------*/ -#ifdef CSR_PMEM_DEBUG_ENABLE - -typedef u8 CsrPmemDebugAllocType; -#define CSR_PMEM_DEBUG_TYPE_PMEM_ALLOC 1 -#define CSR_PMEM_DEBUG_TYPE_MEM_ALLOC 2 -#define CSR_PMEM_DEBUG_TYPE_MEM_CALLOC 3 -#define CSR_PMEM_DEBUG_TYPE_MEM_ALLOC_DMA 4 - -typedef void (CsrPmemDebugOnAlloc)(void *ptr, void *userptr, size_t size, CsrPmemDebugAllocType type, const char* file, u32 line); -typedef void (CsrPmemDebugOnFree)(void *ptr, void *userptr, CsrPmemDebugAllocType type, const char* file, u32 line); - -/*----------------------------------------------------------------------------* - * NAME - * CsrPmemInstallHooks - * - * DESCRIPTION - * Install debug hooks for memory allocation - * Use NULL values to uninstall the hooks - * headSize = The number of extra bytes to allocate in the head of the Allocated buffer - * footSize = The number of extra bytes to allocate in the end of the Allocated buffer - * - * RETURNS - * void - * - *----------------------------------------------------------------------------*/ -void CsrPmemDebugInstallHooks(u8 headSize, u8 endSize, CsrPmemDebugOnAlloc *onAllocCallback, CsrPmemDebugOnFree *onFreeCallback); - -void *CsrPmemDebugAlloc(size_t size, CsrPmemDebugAllocType type, const char* file, u32 line); - -void CsrPmemDebugFree(void *ptr, CsrPmemDebugAllocType type, const char* file, u32 line); - -#endif - - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/drivers/staging/csr/csr_serialize_primitive_types.c b/drivers/staging/csr/csr_serialize_primitive_types.c index bb08f1952bf..39406fd1f1a 100644 --- a/drivers/staging/csr/csr_serialize_primitive_types.c +++ b/drivers/staging/csr/csr_serialize_primitive_types.c @@ -13,7 +13,6 @@ #include "csr_prim_defs.h" #include "csr_msgconv.h" #include "csr_macro.h" -#include "csr_pmem.h" #include "csr_lib.h" void CsrUint8Des(u8 *value, u8 *buffer, size_t *offset) diff --git a/drivers/staging/csr/csr_utf16.c b/drivers/staging/csr/csr_utf16.c index 801d8a8c095..4854f85aa92 100644 --- a/drivers/staging/csr/csr_utf16.c +++ b/drivers/staging/csr/csr_utf16.c @@ -9,7 +9,6 @@ *****************************************************************************/ #include #include -#include "csr_pmem.h" #include "csr_unicode.h" #include "csr_macro.h" diff --git a/drivers/staging/csr/csr_wifi_fsm.h b/drivers/staging/csr/csr_wifi_fsm.h index e933ab1be43..073e2f8b553 100644 --- a/drivers/staging/csr/csr_wifi_fsm.h +++ b/drivers/staging/csr/csr_wifi_fsm.h @@ -15,7 +15,6 @@ extern "C" { #endif -#include "csr_pmem.h" #include "csr_prim_defs.h" #include "csr_log_text.h" #include "csr_wifi_fsm_event.h" diff --git a/drivers/staging/csr/csr_wifi_fsm_types.h b/drivers/staging/csr/csr_wifi_fsm_types.h index 3251fa900d1..26752bf316e 100644 --- a/drivers/staging/csr/csr_wifi_fsm_types.h +++ b/drivers/staging/csr/csr_wifi_fsm_types.h @@ -17,7 +17,6 @@ extern "C" { #include #include "csr_macro.h" -#include "csr_pmem.h" #include "csr_panic.h" #include "csr_sched.h" diff --git a/drivers/staging/csr/csr_wifi_hip_unifi.h b/drivers/staging/csr/csr_wifi_hip_unifi.h index cabcf56b1fb..dc3c60b4970 100644 --- a/drivers/staging/csr/csr_wifi_hip_unifi.h +++ b/drivers/staging/csr/csr_wifi_hip_unifi.h @@ -97,7 +97,6 @@ extern "C" { #include "csr_framework_ext.h" /* from the synergy porting folder */ #include "csr_sdio.h" /* from the synergy porting folder */ -#include "csr_pmem.h" /* from the synergy porting folder */ #include "csr_macro.h" /* from the synergy porting folder */ #include "csr_formatted_io.h" /* from the synergy gsp folder */ #include "csr_wifi_result.h" diff --git a/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c b/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c index ce2c7d51b04..0689d6f1cab 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c +++ b/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c @@ -11,7 +11,6 @@ /* Note: this is an auto-generated file. */ #include "csr_msgconv.h" -#include "csr_pmem.h" #include "csr_macro.h" #ifdef CSR_WIFI_NME_ENABLE diff --git a/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c index bfc511ed49d..ab9358873ec 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c +++ b/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c @@ -10,7 +10,6 @@ /* Note: this is an auto-generated file. */ #include -#include "csr_pmem.h" #include "csr_wifi_nme_ap_prim.h" #include "csr_wifi_nme_ap_lib.h" diff --git a/drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c index d9ebce3e961..2786a6bbff9 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c +++ b/drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c @@ -10,7 +10,6 @@ /* Note: this is an auto-generated file. */ -#include "csr_pmem.h" #include "csr_wifi_nme_ap_prim.h" #include "csr_wifi_nme_ap_lib.h" diff --git a/drivers/staging/csr/csr_wifi_nme_ap_lib.h b/drivers/staging/csr/csr_wifi_nme_ap_lib.h index fed0ea2c033..d4014709112 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_lib.h +++ b/drivers/staging/csr/csr_wifi_nme_ap_lib.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_NME_AP_LIB_H__ #define CSR_WIFI_NME_AP_LIB_H__ -#include "csr_pmem.h" #include "csr_sched.h" #include "csr_macro.h" #include "csr_msg_transport.h" diff --git a/drivers/staging/csr/csr_wifi_nme_ap_prim.h b/drivers/staging/csr/csr_wifi_nme_ap_prim.h index ec670469536..fc44560b28b 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_prim.h +++ b/drivers/staging/csr/csr_wifi_nme_ap_prim.h @@ -13,6 +13,7 @@ #ifndef CSR_WIFI_NME_AP_PRIM_H__ #define CSR_WIFI_NME_AP_PRIM_H__ +#include #include "csr_prim_defs.h" #include "csr_sched.h" #include "csr_wifi_common.h" diff --git a/drivers/staging/csr/csr_wifi_nme_ap_serialize.c b/drivers/staging/csr/csr_wifi_nme_ap_serialize.c index 8112aa04328..493e33e95e2 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_serialize.c +++ b/drivers/staging/csr/csr_wifi_nme_ap_serialize.c @@ -11,7 +11,6 @@ /* Note: this is an auto-generated file. */ #include #include -#include "csr_pmem.h" #include "csr_msgconv.h" #include "csr_unicode.h" diff --git a/drivers/staging/csr/csr_wifi_nme_ap_serialize.h b/drivers/staging/csr/csr_wifi_nme_ap_serialize.h index 524da1420f1..0f578294722 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_serialize.h +++ b/drivers/staging/csr/csr_wifi_nme_ap_serialize.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_NME_AP_SERIALIZE_H__ #define CSR_WIFI_NME_AP_SERIALIZE_H__ -#include "csr_pmem.h" #include "csr_wifi_msgconv.h" #include "csr_wifi_nme_ap_prim.h" diff --git a/drivers/staging/csr/csr_wifi_nme_lib.h b/drivers/staging/csr/csr_wifi_nme_lib.h index 04b7c31342c..709ece46497 100644 --- a/drivers/staging/csr/csr_wifi_nme_lib.h +++ b/drivers/staging/csr/csr_wifi_nme_lib.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_NME_LIB_H__ #define CSR_WIFI_NME_LIB_H__ -#include "csr_pmem.h" #include "csr_sched.h" #include "csr_macro.h" #include "csr_msg_transport.h" diff --git a/drivers/staging/csr/csr_wifi_nme_serialize.h b/drivers/staging/csr/csr_wifi_nme_serialize.h index dca36d9f3a3..c6b163660a3 100644 --- a/drivers/staging/csr/csr_wifi_nme_serialize.h +++ b/drivers/staging/csr/csr_wifi_nme_serialize.h @@ -13,9 +13,7 @@ #ifndef CSR_WIFI_NME_SERIALIZE_H__ #define CSR_WIFI_NME_SERIALIZE_H__ -#include "csr_pmem.h" #include "csr_wifi_msgconv.h" - #include "csr_wifi_nme_prim.h" #ifdef __cplusplus diff --git a/drivers/staging/csr/csr_wifi_router_converter_init.c b/drivers/staging/csr/csr_wifi_router_converter_init.c index a3217865954..775c013d051 100644 --- a/drivers/staging/csr/csr_wifi_router_converter_init.c +++ b/drivers/staging/csr/csr_wifi_router_converter_init.c @@ -11,7 +11,6 @@ /* Note: this is an auto-generated file. */ #include "csr_msgconv.h" -#include "csr_pmem.h" #include "csr_macro.h" diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c b/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c index 503f1afcb63..a02e307e5a8 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c +++ b/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c @@ -11,7 +11,6 @@ /* Note: this is an auto-generated file. */ #include "csr_msgconv.h" -#include "csr_pmem.h" #include "csr_macro.h" #ifdef CSR_LOG_ENABLE diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c index b4b724356c1..7fa85fb4d6c 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c +++ b/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c @@ -10,7 +10,6 @@ /* Note: this is an auto-generated file. */ #include -#include "csr_pmem.h" #include "csr_wifi_router_ctrl_prim.h" #include "csr_wifi_router_ctrl_lib.h" diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c index 4605c535b3b..954b3defc49 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c +++ b/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c @@ -10,7 +10,6 @@ /* Note: this is an auto-generated file. */ #include -#include "csr_pmem.h" #include "csr_wifi_router_ctrl_prim.h" #include "csr_wifi_router_ctrl_lib.h" diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h index ba8e9836e43..93d0fadf5e6 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h +++ b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_ROUTER_CTRL_LIB_H__ #define CSR_WIFI_ROUTER_CTRL_LIB_H__ -#include "csr_pmem.h" #include "csr_sched.h" #include "csr_macro.h" #include "csr_msg_transport.h" diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c index e4b7ec94549..b9f9adb5ad5 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c +++ b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c @@ -11,7 +11,6 @@ /* Note: this is an auto-generated file. */ #include #include -#include "csr_pmem.h" #include "csr_msgconv.h" #include "csr_unicode.h" diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h index f2703772018..2c2a229f4bf 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h +++ b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_ROUTER_CTRL_SERIALIZE_H__ #define CSR_WIFI_ROUTER_CTRL_SERIALIZE_H__ -#include "csr_pmem.h" #include "csr_wifi_msgconv.h" #include "csr_wifi_router_ctrl_prim.h" diff --git a/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c index fbd5b35551c..c4badc565a9 100644 --- a/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c +++ b/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c @@ -10,7 +10,6 @@ /* Note: this is an auto-generated file. */ #include -#include "csr_pmem.h" #include "csr_wifi_router_prim.h" #include "csr_wifi_router_lib.h" diff --git a/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c index 60f6ecd4472..de1086d7158 100644 --- a/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c +++ b/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c @@ -10,7 +10,6 @@ /* Note: this is an auto-generated file. */ #include -#include "csr_pmem.h" #include "csr_wifi_router_prim.h" #include "csr_wifi_router_lib.h" diff --git a/drivers/staging/csr/csr_wifi_router_lib.h b/drivers/staging/csr/csr_wifi_router_lib.h index f2f5196d126..06a2214714b 100644 --- a/drivers/staging/csr/csr_wifi_router_lib.h +++ b/drivers/staging/csr/csr_wifi_router_lib.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_ROUTER_LIB_H__ #define CSR_WIFI_ROUTER_LIB_H__ -#include "csr_pmem.h" #include "csr_sched.h" #include "csr_macro.h" #include "csr_msg_transport.h" diff --git a/drivers/staging/csr/csr_wifi_router_serialize.c b/drivers/staging/csr/csr_wifi_router_serialize.c index adf37d472d2..5717ebc05b0 100644 --- a/drivers/staging/csr/csr_wifi_router_serialize.c +++ b/drivers/staging/csr/csr_wifi_router_serialize.c @@ -10,7 +10,6 @@ /* Note: this is an auto-generated file. */ #include -#include "csr_pmem.h" #include "csr_msgconv.h" #include "csr_unicode.h" diff --git a/drivers/staging/csr/csr_wifi_router_serialize.h b/drivers/staging/csr/csr_wifi_router_serialize.h index 4951c404a3e..07e21b2b436 100644 --- a/drivers/staging/csr/csr_wifi_router_serialize.h +++ b/drivers/staging/csr/csr_wifi_router_serialize.h @@ -13,9 +13,7 @@ #ifndef CSR_WIFI_ROUTER_SERIALIZE_H__ #define CSR_WIFI_ROUTER_SERIALIZE_H__ -#include "csr_pmem.h" #include "csr_wifi_msgconv.h" - #include "csr_wifi_router_prim.h" #ifdef __cplusplus diff --git a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c index 23b0e5154a0..dd93d006119 100644 --- a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c +++ b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c @@ -10,7 +10,6 @@ #include #include -#include "csr_pmem.h" #include "csr_macro.h" #include "csr_msgconv.h" #include "csr_wifi_msgconv.h" diff --git a/drivers/staging/csr/csr_wifi_sme_ap_lib.h b/drivers/staging/csr/csr_wifi_sme_ap_lib.h index 8825172724a..350cb9ec301 100644 --- a/drivers/staging/csr/csr_wifi_sme_ap_lib.h +++ b/drivers/staging/csr/csr_wifi_sme_ap_lib.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_SME_AP_LIB_H__ #define CSR_WIFI_SME_AP_LIB_H__ -#include "csr_pmem.h" #include "csr_sched.h" #include "csr_macro.h" #include "csr_msg_transport.h" diff --git a/drivers/staging/csr/csr_wifi_sme_converter_init.c b/drivers/staging/csr/csr_wifi_sme_converter_init.c index 2d9c683e7cd..31835f06bbc 100644 --- a/drivers/staging/csr/csr_wifi_sme_converter_init.c +++ b/drivers/staging/csr/csr_wifi_sme_converter_init.c @@ -11,7 +11,6 @@ /* Note: this is an auto-generated file. */ #include "csr_msgconv.h" -#include "csr_pmem.h" #include "csr_macro.h" diff --git a/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c index ae3fec896aa..03b5ddb22cd 100644 --- a/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c +++ b/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c @@ -10,7 +10,6 @@ /* Note: this is an auto-generated file. */ #include -#include "csr_pmem.h" #include "csr_wifi_sme_prim.h" #include "csr_wifi_sme_lib.h" diff --git a/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c index 1977747a51d..c04767baaa5 100644 --- a/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c +++ b/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c @@ -10,7 +10,6 @@ /* Note: this is an auto-generated file. */ #include -#include "csr_pmem.h" #include "csr_wifi_sme_prim.h" #include "csr_wifi_sme_lib.h" diff --git a/drivers/staging/csr/csr_wifi_sme_lib.h b/drivers/staging/csr/csr_wifi_sme_lib.h index e20ae9895a2..3ca74560825 100644 --- a/drivers/staging/csr/csr_wifi_sme_lib.h +++ b/drivers/staging/csr/csr_wifi_sme_lib.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_SME_LIB_H__ #define CSR_WIFI_SME_LIB_H__ -#include "csr_pmem.h" #include "csr_sched.h" #include "csr_macro.h" #include "csr_msg_transport.h" diff --git a/drivers/staging/csr/csr_wifi_sme_serialize.c b/drivers/staging/csr/csr_wifi_sme_serialize.c index a1db2118995..d55e3ee6921 100644 --- a/drivers/staging/csr/csr_wifi_sme_serialize.c +++ b/drivers/staging/csr/csr_wifi_sme_serialize.c @@ -11,7 +11,6 @@ /* Note: this is an auto-generated file. */ #include #include -#include "csr_pmem.h" #include "csr_msgconv.h" #include "csr_unicode.h" diff --git a/drivers/staging/csr/csr_wifi_sme_serialize.h b/drivers/staging/csr/csr_wifi_sme_serialize.h index 9ea9d15fe0d..4f3af0a6be7 100644 --- a/drivers/staging/csr/csr_wifi_sme_serialize.h +++ b/drivers/staging/csr/csr_wifi_sme_serialize.h @@ -13,9 +13,7 @@ #ifndef CSR_WIFI_SME_SERIALIZE_H__ #define CSR_WIFI_SME_SERIALIZE_H__ -#include "csr_pmem.h" #include "csr_wifi_msgconv.h" - #include "csr_wifi_sme_prim.h" #ifdef __cplusplus -- cgit v1.2.3-70-g09d2