diff options
Diffstat (limited to 'drivers/staging/csr')
104 files changed, 752 insertions, 3073 deletions
diff --git a/drivers/staging/csr/Makefile b/drivers/staging/csr/Makefile index ab626edc5ba4..dbd135a8b177 100644 --- a/drivers/staging/csr/Makefile +++ b/drivers/staging/csr/Makefile @@ -70,5 +70,4 @@ csr_helper-y := csr_time.o \ csr_framework_ext.o \ csr_wifi_serialize_primitive_types.o \ csr_serialize_primitive_types.o \ - csr_msgconv.o \ - csr_panic.o + csr_msgconv.o diff --git a/drivers/staging/csr/bh.c b/drivers/staging/csr/bh.c index addee05a4516..1a1f5c79822a 100644 --- a/drivers/staging/csr/bh.c +++ b/drivers/staging/csr/bh.c @@ -228,20 +228,19 @@ handle_bh_error(unifi_priv_t *priv) * * --------------------------------------------------------------------------- */ -static int -bh_thread_function(void *arg) +static int bh_thread_function(void *arg) { - unifi_priv_t *priv = (unifi_priv_t*)arg; - CsrResult csrResult; - long ret; - u32 timeout, t; - struct uf_thread *this_thread; + unifi_priv_t *priv = (unifi_priv_t *)arg; + CsrResult csrResult; + long ret; + u32 timeout, t; + struct uf_thread *this_thread; - unifi_trace(priv, UDBG2, "bh_thread_function starting\n"); + unifi_trace(priv, UDBG2, "bh_thread_function starting\n"); - this_thread = &priv->bh_thread; + this_thread = &priv->bh_thread; - t = timeout = 0; + t = timeout = 0; while (!kthread_should_stop()) { /* wait until an error occurs, or we need to process something. */ unifi_trace(priv, UDBG3, "bh_thread goes to sleep.\n"); diff --git a/drivers/staging/csr/csr_framework_ext.c b/drivers/staging/csr/csr_framework_ext.c index f91a4bf4e68f..2aabb6c6b0af 100644 --- a/drivers/staging/csr/csr_framework_ext.c +++ b/drivers/staging/csr/csr_framework_ext.c @@ -9,7 +9,6 @@ *****************************************************************************/ #include <linux/kernel.h> -#include <linux/version.h> #include <linux/kthread.h> #include <linux/module.h> #include <linux/freezer.h> @@ -18,102 +17,6 @@ #include <linux/bitops.h> #include "csr_framework_ext.h" -#include "csr_panic.h" - -/*----------------------------------------------------------------------------* - * NAME - * CsrMutexCreate - * - * DESCRIPTION - * Create a mutex and return a handle to the created mutex. - * - * RETURNS - * Possible values: - * CSR_RESULT_SUCCESS in case of success - * CSR_FE_RESULT_NO_MORE_MUTEXES in case of out of mutex resources - * CSR_FE_RESULT_INVALID_POINTER in case the mutexHandle pointer is invalid - * - *----------------------------------------------------------------------------*/ -CsrResult CsrMutexCreate(CsrMutexHandle *mutexHandle) -{ - if (mutexHandle == NULL) - { - return CSR_FE_RESULT_INVALID_POINTER; - } - - sema_init(mutexHandle, 1); - - return CSR_RESULT_SUCCESS; -} - -/*----------------------------------------------------------------------------* - * NAME - * CsrMutexDestroy - * - * DESCRIPTION - * Destroy the previously created mutex. - * - * RETURNS - * void - * - *----------------------------------------------------------------------------*/ -void CsrMutexDestroy(CsrMutexHandle *mutexHandle) -{ -} - -/*----------------------------------------------------------------------------* - * NAME - * CsrMutexLock - * - * DESCRIPTION - * Lock the mutex refered to by the provided handle. - * - * RETURNS - * Possible values: - * CSR_RESULT_SUCCESS in case of success - * CSR_FE_RESULT_INVALID_HANDLE in case the mutexHandle is invalid - * - *----------------------------------------------------------------------------*/ -CsrResult CsrMutexLock(CsrMutexHandle *mutexHandle) -{ - if (mutexHandle == NULL) - { - return CSR_FE_RESULT_INVALID_POINTER; - } - - if (down_interruptible(mutexHandle)) - { - CsrPanic(CSR_TECH_FW, CSR_PANIC_FW_UNEXPECTED_VALUE, "CsrMutexLock Failed"); - return CSR_FE_RESULT_INVALID_POINTER; - } - - return CSR_RESULT_SUCCESS; -} - -/*----------------------------------------------------------------------------* - * NAME - * CsrMutexUnlock - * - * DESCRIPTION - * Unlock the mutex refered to by the provided handle. - * - * RETURNS - * Possible values: - * CSR_RESULT_SUCCESS in case of success - * CSR_FE_RESULT_INVALID_HANDLE in case the mutexHandle is invalid - * - *----------------------------------------------------------------------------*/ -CsrResult CsrMutexUnlock(CsrMutexHandle *mutexHandle) -{ - if (mutexHandle == NULL) - { - return CSR_FE_RESULT_INVALID_POINTER; - } - - up(mutexHandle); - - return CSR_RESULT_SUCCESS; -} /*----------------------------------------------------------------------------* * NAME diff --git a/drivers/staging/csr/csr_framework_ext.h b/drivers/staging/csr/csr_framework_ext.h index 66973e93a6bc..e8ae490c09d6 100644 --- a/drivers/staging/csr/csr_framework_ext.h +++ b/drivers/staging/csr/csr_framework_ext.h @@ -13,10 +13,6 @@ #include "csr_result.h" #include "csr_framework_ext_types.h" -#ifdef __cplusplus -extern "C" { -#endif - /* Result codes */ #define CSR_FE_RESULT_NO_MORE_EVENTS ((CsrResult) 0x0001) #define CSR_FE_RESULT_INVALID_POINTER ((CsrResult) 0x0002) @@ -34,215 +30,6 @@ extern "C" { #define CSR_EVENT_WAIT_INFINITE ((u16) 0xFFFF) -/*----------------------------------------------------------------------------* - * NAME - * CsrEventCreate - * - * DESCRIPTION - * Creates an event and returns a handle to the created event. - * - * RETURNS - * Possible values: - * CSR_RESULT_SUCCESS in case of success - * CSR_FE_RESULT_NO_MORE_EVENTS in case of out of event resources - * CSR_FE_RESULT_INVALID_POINTER in case the eventHandle pointer is invalid - * - *----------------------------------------------------------------------------*/ -CsrResult CsrEventCreate(CsrEventHandle *eventHandle); - -/*----------------------------------------------------------------------------* - * NAME - * CsrEventWait - * - * DESCRIPTION - * Wait fore one or more of the event bits to be set. - * - * RETURNS - * Possible values: - * CSR_RESULT_SUCCESS in case of success - * CSR_FE_RESULT_TIMEOUT in case of timeout - * CSR_FE_RESULT_INVALID_HANDLE in case the eventHandle is invalid - * CSR_FE_RESULT_INVALID_POINTER in case the eventBits pointer is invalid - * - *----------------------------------------------------------------------------*/ -CsrResult CsrEventWait(CsrEventHandle *eventHandle, u16 timeoutInMs, u32 *eventBits); - -/*----------------------------------------------------------------------------* - * NAME - * CsrEventSet - * - * DESCRIPTION - * Set an event. - * - * RETURNS - * Possible values: - * CSR_RESULT_SUCCESS in case of success - * CSR_FE_RESULT_INVALID_HANDLE in case the eventHandle is invalid - * - *----------------------------------------------------------------------------*/ -CsrResult CsrEventSet(CsrEventHandle *eventHandle, u32 eventBits); - -/*----------------------------------------------------------------------------* - * NAME - * CsrEventDestroy - * - * DESCRIPTION - * Destroy the event associated. - * - * RETURNS - * void - * - *----------------------------------------------------------------------------*/ -void CsrEventDestroy(CsrEventHandle *eventHandle); - -/*----------------------------------------------------------------------------* - * NAME - * CsrMutexCreate - * - * DESCRIPTION - * Create a mutex and return a handle to the created mutex. - * - * RETURNS - * Possible values: - * CSR_RESULT_SUCCESS in case of success - * CSR_FE_RESULT_NO_MORE_MUTEXES in case of out of mutex resources - * CSR_FE_RESULT_INVALID_POINTER in case the mutexHandle pointer is invalid - * - *----------------------------------------------------------------------------*/ -CsrResult CsrMutexCreate(CsrMutexHandle *mutexHandle); - -/*----------------------------------------------------------------------------* - * NAME - * CsrMutexLock - * - * DESCRIPTION - * Lock the mutex refered to by the provided handle. - * - * RETURNS - * Possible values: - * CSR_RESULT_SUCCESS in case of success - * CSR_FE_RESULT_INVALID_HANDLE in case the mutexHandle is invalid - * - *----------------------------------------------------------------------------*/ -CsrResult CsrMutexLock(CsrMutexHandle *mutexHandle); - -/*----------------------------------------------------------------------------* - * NAME - * CsrMutexUnlock - * - * DESCRIPTION - * Unlock the mutex refered to by the provided handle. - * - * RETURNS - * Possible values: - * CSR_RESULT_SUCCESS in case of success - * CSR_FE_RESULT_INVALID_HANDLE in case the mutexHandle is invalid - * - *----------------------------------------------------------------------------*/ -CsrResult CsrMutexUnlock(CsrMutexHandle *mutexHandle); - -/*----------------------------------------------------------------------------* - * NAME - * CsrMutexDestroy - * - * DESCRIPTION - * Destroy the previously created mutex. - * - * RETURNS - * void - * - *----------------------------------------------------------------------------*/ -void CsrMutexDestroy(CsrMutexHandle *mutexHandle); - -/*----------------------------------------------------------------------------* - * NAME - * CsrGlobalMutexLock - * - * DESCRIPTION - * Lock the global mutex. The global mutex is a single pre-initialised - * shared mutex, spinlock or similar that does not need to be created prior - * to use. The limitation is that there is only one single lock shared - * between all code. Consequently, it must only be used very briefly to - * either protect simple one-time initialisation or to protect the creation - * of a dedicated mutex by calling CsrMutexCreate. - * - *----------------------------------------------------------------------------*/ -void CsrGlobalMutexLock(void); - -/*----------------------------------------------------------------------------* - * NAME - * CsrGlobalMutexUnlock - * - * DESCRIPTION - * Unlock the global mutex. - * - *----------------------------------------------------------------------------*/ -void CsrGlobalMutexUnlock(void); - -/*----------------------------------------------------------------------------* - * NAME - * CsrThreadCreate - * - * DESCRIPTION - * Create thread function and return a handle to the created thread. - * - * RETURNS - * Possible values: - * CSR_RESULT_SUCCESS in case of success - * CSR_FE_RESULT_NO_MORE_THREADS in case of out of thread resources - * CSR_FE_RESULT_INVALID_POINTER in case one of the supplied pointers is invalid - * - *----------------------------------------------------------------------------*/ -CsrResult CsrThreadCreate(void (*threadFunction)(void *pointer), void *pointer, - u32 stackSize, u16 priority, - const char *threadName, CsrThreadHandle *threadHandle); - -/*----------------------------------------------------------------------------* - * NAME - * CsrThreadGetHandle - * - * DESCRIPTION - * Return thread handle of calling thread. - * - * RETURNS - * Possible values: - * CSR_RESULT_SUCCESS in case of success - * CSR_FE_RESULT_INVALID_POINTER in case the threadHandle pointer is invalid - * - *----------------------------------------------------------------------------*/ -CsrResult CsrThreadGetHandle(CsrThreadHandle *threadHandle); - -/*----------------------------------------------------------------------------* - * NAME - * CsrThreadEqual - * - * DESCRIPTION - * Compare thread handles - * - * RETURNS - * Possible values: - * CSR_RESULT_SUCCESS in case thread handles are identical - * CSR_FE_RESULT_INVALID_POINTER in case either threadHandle pointer is invalid - * CSR_RESULT_FAILURE otherwise - * - *----------------------------------------------------------------------------*/ -CsrResult CsrThreadEqual(CsrThreadHandle *threadHandle1, CsrThreadHandle *threadHandle2); - -/*----------------------------------------------------------------------------* - * NAME - * CsrThreadSleep - * - * DESCRIPTION - * Sleep for a given period. - * - * RETURNS - * void - * - *----------------------------------------------------------------------------*/ void CsrThreadSleep(u16 sleepTimeInMs); -#ifdef __cplusplus -} -#endif - #endif diff --git a/drivers/staging/csr/csr_framework_ext_types.h b/drivers/staging/csr/csr_framework_ext_types.h index 57194ee911ea..575598cf69b2 100644 --- a/drivers/staging/csr/csr_framework_ext_types.h +++ b/drivers/staging/csr/csr_framework_ext_types.h @@ -2,11 +2,11 @@ #define CSR_FRAMEWORK_EXT_TYPES_H__ /***************************************************************************** - (c) Cambridge Silicon Radio Limited 2010 - All rights reserved and confidential information of CSR + (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. + Refer to LICENSE.txt included with this source for details + on the license terms. *****************************************************************************/ @@ -17,47 +17,14 @@ #include <pthread.h> #endif -#ifdef __cplusplus -extern "C" { -#endif - - #ifdef __KERNEL__ -struct CsrThread -{ - struct task_struct *thread_task; - char name[16]; -}; - -struct CsrEvent -{ - /* wait_queue for waking the kernel thread */ - wait_queue_head_t wakeup_q; - unsigned int wakeup_flag; -}; - -typedef struct CsrEvent CsrEventHandle; typedef struct semaphore CsrMutexHandle; -typedef struct CsrThread CsrThreadHandle; #else /* __KERNEL __ */ -struct CsrEvent -{ - pthread_cond_t event; - pthread_mutex_t mutex; - u32 eventBits; -}; - -typedef struct CsrEvent CsrEventHandle; typedef pthread_mutex_t CsrMutexHandle; -typedef pthread_t CsrThreadHandle; #endif /* __KERNEL__ */ -#ifdef __cplusplus -} -#endif - #endif diff --git a/drivers/staging/csr/csr_lib.h b/drivers/staging/csr/csr_lib.h deleted file mode 100644 index b1a57d5d06f9..000000000000 --- a/drivers/staging/csr/csr_lib.h +++ /dev/null @@ -1,188 +0,0 @@ -#ifndef CSR_LIB_H__ -#define CSR_LIB_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 "csr_prim_defs.h" - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct -{ - CsrPrim type; -} CsrEvent; - -/*----------------------------------------------------------------------------* - * CsrEvent_struct - * - * DESCRIPTION - * Generic message creator. - * Allocates and fills in a message with the signature CsrEvent - * - *----------------------------------------------------------------------------*/ -CsrEvent *CsrEvent_struct(u16 primtype, u16 msgtype); - -typedef struct -{ - CsrPrim type; - u8 value; -} CsrEventCsrUint8; - -/*----------------------------------------------------------------------------* - * CsrEventCsrUint8_struct - * - * DESCRIPTION - * Generic message creator. - * Allocates and fills in a message with the signature CsrEventCsrUint8 - * - *----------------------------------------------------------------------------*/ -CsrEventCsrUint8 *CsrEventCsrUint8_struct(u16 primtype, u16 msgtype, u8 value); - -typedef struct -{ - CsrPrim type; - u16 value; -} CsrEventCsrUint16; - -/*----------------------------------------------------------------------------* - * CsrEventCsrUint16_struct - * - * DESCRIPTION - * Generic message creator. - * Allocates and fills in a message with the signature CsrEventCsrUint16 - * - *----------------------------------------------------------------------------*/ -CsrEventCsrUint16 *CsrEventCsrUint16_struct(u16 primtype, u16 msgtype, u16 value); - -typedef struct -{ - CsrPrim type; - u16 value1; - u8 value2; -} CsrEventCsrUint16CsrUint8; - -/*----------------------------------------------------------------------------* - * CsrEventCsrUint16CsrUint8_struct - * - * DESCRIPTION - * Generic message creator. - * Allocates and fills in a message with the signature CsrEventCsrUint16CsrUint8 - * - *----------------------------------------------------------------------------*/ -CsrEventCsrUint16CsrUint8 *CsrEventCsrUint16CsrUint8_struct(u16 primtype, u16 msgtype, u16 value1, u8 value2); - -typedef struct -{ - CsrPrim type; - u16 value1; - u16 value2; -} CsrEventCsrUint16CsrUint16; - -/*----------------------------------------------------------------------------* - * CsrEventCsrUint16CsrUint16_struct - * - * DESCRIPTION - * Generic message creator. - * Allocates and fills in a message with the signature CsrEventCsrUint16CsrUint16 - * - *----------------------------------------------------------------------------*/ -CsrEventCsrUint16CsrUint16 *CsrEventCsrUint16CsrUint16_struct(u16 primtype, u16 msgtype, u16 value1, u16 value2); - -typedef struct -{ - CsrPrim type; - u16 value1; - u32 value2; -} CsrEventCsrUint16CsrUint32; - -/*----------------------------------------------------------------------------* - * CsrEventCsrUint16_struct - * - * DESCRIPTION - * Generic message creator. - * Allocates and fills in a message with the signature CsrEventCsrUint16 - * - *----------------------------------------------------------------------------*/ -CsrEventCsrUint16CsrUint32 *CsrEventCsrUint16CsrUint32_struct(u16 primtype, u16 msgtype, u16 value1, u32 value2); - -typedef struct -{ - CsrPrim type; - u16 value1; - char *value2; -} CsrEventCsrUint16CsrCharString; - -/*----------------------------------------------------------------------------* - * CsrEventCsrUint16CsrCharString_struct - * - * DESCRIPTION - * Generic message creator. - * Allocates and fills in a message with the signature CsrEventCsrUint16CsrCharString - * - *----------------------------------------------------------------------------*/ -CsrEventCsrUint16CsrCharString *CsrEventCsrUint16CsrCharString_struct(u16 primtype, u16 msgtype, u16 value1, char *value2); - -typedef struct -{ - CsrPrim type; - u32 value; -} CsrEventCsrUint32; - -/*----------------------------------------------------------------------------* - * CsrEventCsrUint32_struct - * - * DESCRIPTION - * Generic message creator. - * Allocates and fills in a message with the signature CsrEventCsrUint32 - * - *----------------------------------------------------------------------------*/ -CsrEventCsrUint32 *CsrEventCsrUint32_struct(u16 primtype, u16 msgtype, u32 value); - -typedef struct -{ - CsrPrim type; - u32 value1; - u16 value2; -} CsrEventCsrUint32CsrUint16; - -/*----------------------------------------------------------------------------* - * CsrEventCsrUint32CsrUint16_struct - * - * DESCRIPTION - * Generic message creator. - * Allocates and fills in a message with the signature CsrEventCsrUint32CsrUint16 - * - *----------------------------------------------------------------------------*/ -CsrEventCsrUint32CsrUint16 *CsrEventCsrUint32CsrUint16_struct(u16 primtype, u16 msgtype, u32 value1, u32 value2); - -typedef struct -{ - CsrPrim type; - u32 value1; - char *value2; -} CsrEventCsrUint32CsrCharString; - -/*----------------------------------------------------------------------------* - * CsrEventCsrUint32CsrCharString_struct - * - * DESCRIPTION - * Generic message creator. - * Allocates and fills in a message with the signature CsrEventCsrUint32CsrCharString - * - *----------------------------------------------------------------------------*/ -CsrEventCsrUint32CsrCharString *CsrEventCsrUint32CsrCharString_struct(u16 primtype, u16 msgtype, u32 value1, char *value2); - -#ifdef __cplusplus -} -#endif - -#endif /* CSR_LIB_H__ */ diff --git a/drivers/staging/csr/csr_log.h b/drivers/staging/csr/csr_log.h index b2808569f8de..5de5650767de 100644 --- a/drivers/staging/csr/csr_log.h +++ b/drivers/staging/csr/csr_log.h @@ -2,23 +2,18 @@ #define CSR_LOG_H__ /***************************************************************************** - (c) Cambridge Silicon Radio Limited 2010 - All rights reserved and confidential information of CSR + (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. + Refer to LICENSE.txt included with this source for details + on the license terms. *****************************************************************************/ #include "csr_sched.h" -#include "csr_panic.h" #include "csr_prim_defs.h" #include "csr_msgconv.h" -#ifdef __cplusplus -extern "C" { -#endif - /* * Log filtering */ @@ -77,34 +72,19 @@ u8 CsrLogTaskIsFiltered(CsrSchedQid taskId, CsrLogLevelTask level); /* * Logging stuff */ -#define CSR_LOG_STRINGIFY_REAL(a) #a +#define CSR_LOG_STRINGIFY_REAL(a) (#a) #define CSR_LOG_STRINGIFY(a) CSR_LOG_STRINGIFY_REAL(a) -#ifdef CSR_LOG_ASSERT_ENABLE -#define CSR_LOG_ASSERT(cond) \ - do { \ - if (!(cond)) \ - { \ - char *panic_arg = "[" __FILE__ ":" CSR_LOG_STRINGIFY(__LINE__) "] - " CSR_LOG_STRINGIFY(cond); \ - CsrPanic(CSR_TECH_FW, CSR_PANIC_FW_ASSERTION_FAIL, panic_arg); \ - } \ - } while (0) -#else -#define CSR_LOG_ASSERT(cond) -#endif - -typedef struct -{ - u16 primitiveType; - const char *primitiveName; - CsrMsgConvMsgEntry *messageConv; /* Private - do not use */ +typedef struct { + u16 primitiveType; + const char *primitiveName; + CsrMsgConvMsgEntry *messageConv; /* Private - do not use */ } CsrLogPrimitiveInformation; -typedef struct -{ - const char *techVer; - u32 primitiveInfoCount; - CsrLogPrimitiveInformation *primitiveInfo; +typedef struct { + const char *techVer; + u32 primitiveInfoCount; + CsrLogPrimitiveInformation *primitiveInfo; } CsrLogTechInformation; /*---------------------------------*/ @@ -118,21 +98,19 @@ typedef u32 bitmask32_t; #ifdef CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER /* DEPRECATED - replaced by csr_log_text.h */ #define CSR_LOG_TEXT(text) \ - do { \ - if (!CsrLogTaskIsFiltered(CsrSchedTaskQueueGet(), CSR_LOG_LEVEL_TASK_TEXT)) \ - { \ - CsrLogTaskText(text, __LINE__, __FILE__); \ - } \ - } while (0) + do { \ + if (!CsrLogTaskIsFiltered(CsrSchedTaskQueueGet(), CSR_LOG_LEVEL_TASK_TEXT)) { \ + CsrLogTaskText(text, __LINE__, __FILE__); \ + } \ + } while (0) #else /* DEPRECATED - replaced by csr_log_text.h */ #define CSR_LOG_TEXT(text) \ - do { \ - if (!CsrLogTaskIsFiltered(CsrSchedTaskQueueGet(), CSR_LOG_LEVEL_TASK_TEXT)) \ - { \ - CsrLogTaskText(text, 0, NULL); \ - } \ - } while (0) + do { \ + if (!CsrLogTaskIsFiltered(CsrSchedTaskQueueGet(), CSR_LOG_LEVEL_TASK_TEXT)) { \ + CsrLogTaskText(text, 0, NULL); \ + } \ + } while (0) #endif #else #define CSR_LOG_TEXT(text) @@ -140,8 +118,8 @@ typedef u32 bitmask32_t; /* DEPRECATED - replaced by csr_log_text.h */ void CsrLogTaskText(const char *text, - u32 line, - const char *file); + u32 line, + const char *file); #define CSR_LOG_STATE_TRANSITION_MASK_FSM_NAME (0x001) #define CSR_LOG_STATE_TRANSITION_MASK_NEXT_STATE (0x002) @@ -153,16 +131,16 @@ void CsrLogTaskText(const char *text, /* DEPRECATED - replaced by csr_log_text.h */ void CsrLogStateTransition(bitmask16_t mask, - u32 identifier, - const char *fsm_name, - u32 prev_state, - const char *prev_state_str, - u32 in_event, - const char *in_event_str, - u32 next_state, - const char *next_state_str, - u32 line, - const char *file); + u32 identifier, + const char *fsm_name, + u32 prev_state, + const char *prev_state_str, + u32 in_event, + const char *in_event_str, + u32 next_state, + const char *next_state_str, + u32 line, + const char *file); /*---------------------------------*/ /* BSP logging */ @@ -183,67 +161,63 @@ void CsrLogDeactivate(CsrSchedQid tskid); #define SYNERGY_SERIALIZER_TYPE_SER (0x001) void CsrLogMessagePut(u32 line, - const char *file, - CsrSchedQid src_task_id, - CsrSchedQid dst_taskid, - CsrSchedMsgId msg_id, - u16 prim_type, - const void *msg); + const char *file, + CsrSchedQid src_task_id, + CsrSchedQid dst_taskid, + CsrSchedMsgId msg_id, + u16 prim_type, + const void *msg); void CsrLogMessageGet(CsrSchedQid src_task_id, - CsrSchedQid dst_taskid, - u8 get_res, - CsrSchedMsgId msg_id, - u16 prim_type, - const void *msg); + CsrSchedQid dst_taskid, + u8 get_res, + CsrSchedMsgId msg_id, + u16 prim_type, + const void *msg); void CsrLogTimedEventIn(u32 line, - const char *file, - CsrSchedQid task_id, - CsrSchedTid tid, - CsrTime requested_delay, - u16 fniarg, - const void *fnvarg); + const char *file, + CsrSchedQid task_id, + CsrSchedTid tid, + u32 requested_delay, + u16 fniarg, + const void *fnvarg); void CsrLogTimedEventFire(CsrSchedQid task_id, - CsrSchedTid tid); + CsrSchedTid tid); void CsrLogTimedEventDone(CsrSchedQid task_id, - CsrSchedTid tid); + CsrSchedTid tid); void CsrLogTimedEventCancel(u32 line, - const char *file, - CsrSchedQid task_id, - CsrSchedTid tid, - u8 cancel_res); + const char *file, + CsrSchedQid task_id, + CsrSchedTid tid, + u8 cancel_res); void CsrLogBgintRegister(u8 thread_id, - CsrSchedBgint irq, - const char *callback, - const void *ptr); + CsrSchedBgint irq, + const char *callback, + const void *ptr); void CsrLogBgintUnregister(CsrSchedBgint irq); void CsrLogBgintSet(CsrSchedBgint irq); void CsrLogBgintServiceStart(CsrSchedBgint irq); void CsrLogBgintServiceDone(CsrSchedBgint irq); void CsrLogExceptionStateEvent(u16 prim_type, - CsrPrim msg_type, - u16 state, - u32 line, - const char *file); + CsrPrim msg_type, + u16 state, + u32 line, + const char *file); void CsrLogExceptionGeneral(u16 prim_type, - u16 state, - const char *text, - u32 line, - const char *file); + u16 state, + const char *text, + u32 line, + const char *file); void CsrLogExceptionWarning(u16 prim_type, - u16 state, - const char *text, - u32 line, - const char *file); - -#ifdef __cplusplus -} -#endif + u16 state, + const char *text, + u32 line, + const char *file); #endif diff --git a/drivers/staging/csr/csr_log_configure.h b/drivers/staging/csr/csr_log_configure.h index 8842e4bf4611..283647cf9702 100644 --- a/drivers/staging/csr/csr_log_configure.h +++ b/drivers/staging/csr/csr_log_configure.h @@ -2,45 +2,16 @@ #define CSR_LOG_CONFIGURE_H__ /***************************************************************************** - (c) Cambridge Silicon Radio Limited 2010 - All rights reserved and confidential information of CSR + (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. + Refer to LICENSE.txt included with this source for details + on the license terms. -*****************************************************************************/ + *****************************************************************************/ #include "csr_log.h" -#ifdef __cplusplus -extern "C" { -#endif - -/*---------------------------------*/ -/* Log init/deinit */ -/*---------------------------------*/ -void CsrLogInit(u8 size); -void CsrLogDeinit(void); - -/*---------------------------------*/ -/* Log Framework Tech info */ -/*---------------------------------*/ -void CsrLogTechInfoRegister(void); - -/* Set the logging level for the environment outside the scheduler context */ -void CsrLogLevelEnvironmentSet(CsrLogLevelEnvironment environmentLogLevel); - - -/* Set the logging level for all scheduler tasks */ -/* This function call takes precedence over all previous calls to CsrLogLevelTaskSetSpecific() */ -void CsrLogLevelTaskSetAll(CsrLogLevelTask tasksLogLevelMask); - -/* Set the logging level for a given Task */ -/* This function can be used as a complement to CsrLogLevelTaskSetAll() to add more _or_ less log from a given task than what is set -generally with CsrLogLevelTaskSetAll(). */ -void CsrLogLevelTaskSetSpecific(CsrSchedQid taskId, CsrLogLevelTask taskLogLevelMask); - - /*--------------------------------------------*/ /* Filtering on log text warning levels */ /*--------------------------------------------*/ @@ -65,70 +36,4 @@ typedef u32 CsrLogLevelText; * taskId's in the range 0x0600xxxx to 0x06FFxxxx. And so on for other technologies. */ typedef u32 CsrLogTextTaskId; -/* Set the text logging level for all Tasks */ -/* This function call takes precedence over all previous calls to CsrLogLevelTextSetTask() and CsrLogLevelTextSetTaskSubOrigin() */ -void CsrLogLevelTextSetAll(CsrLogLevelText warningLevelMask); - -/* Set the text logging level for a given Task */ -/* This function call takes precedence over all previous calls to CsrLogLevelTextSetTaskSubOrigin(), but it can be used as a complement to - * CsrLogLevelTextSetAll() to add more _or_ less log from a given task than what is set generally with CsrLogLevelTextSetAll(). */ -void CsrLogLevelTextSetTask(CsrLogTextTaskId taskId, CsrLogLevelText warningLevelMask); - -/* 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, u16 subOrigin, CsrLogLevelText warningLevelMask); - -/******************************************************************************* - - NAME - CsrLogLevelTextSet - - DESCRIPTION - Set the text logging level for a given origin and optionally sub origin - by name. If either string is NULL or zero length, it is interpreted as - all origins and/or all sub origins respectively. If originName is NULL - or zero length, subOriginName is ignored. - - Passing NULL or zero length strings in both originName and subOriginName - is equivalent to calling CsrLogLevelTextSetAll, and overrides all - previous filter configurations for all origins and sub origins. - - Passing NULL or a zero length string in subOriginName overrides all - previous filter configurations for all sub origins of the specified - origin. - - Note: the supplied strings may be accessed after the function returns - and must remain valid and constant until CsrLogDeinit is called. - - Note: when specifying an origin (originName is not NULL and not zero - length), this function can only be used for origins that use the - csr_log_text_2.h interface for registration and logging. Filtering for - origins that use the legacy csr_log_text.h interface must be be - configured using the legacy filter configuration functions that accept - a CsrLogTextTaskId as origin specifier. However, when not specifying an - origin this function also affects origins that have been registered with - the legacy csr_log_text.h interface. Furthermore, using this function - and the legacy filter configuration functions on the same origin is not - allowed. - - PARAMETERS - originName - a string containing the name of the origin. Can be NULL or - zero length to set the log level for all origins. In this case, the - subOriginName parameter will be ignored. - subOriginName - a string containing the name of the sub origin. Can be - NULL or zero length to set the log level for all sub origins of the - specified origin. - warningLevelMask - The desired log level for the specified origin(s) and - sub origin(s). - -*******************************************************************************/ -void CsrLogLevelTextSet(const char *originName, - const char *subOriginName, - CsrLogLevelText warningLevelMask); - -#ifdef __cplusplus -} -#endif - #endif diff --git a/drivers/staging/csr/csr_log_text.h b/drivers/staging/csr/csr_log_text.h index 9fe6c90244c4..cfcf64aa6225 100644 --- a/drivers/staging/csr/csr_log_text.h +++ b/drivers/staging/csr/csr_log_text.h @@ -12,10 +12,6 @@ #include "csr_log_configure.h" -#ifdef __cplusplus -extern "C" { -#endif - typedef struct CsrLogSubOrigin { u16 subOriginNumber; /* Id of the given SubOrigin */ @@ -125,8 +121,4 @@ void CsrLogTextBufferDebug(CsrLogTextTaskId taskId, u16 subOrigin, size_t buffer #define CSR_LOG_TEXT_UNHANDLED_PRIMITIVE(origin, suborigin, primClass, primType) #endif -#ifdef __cplusplus -} -#endif - #endif diff --git a/drivers/staging/csr/csr_macro.h b/drivers/staging/csr/csr_macro.h index 57cbfcb0619b..c47f1d91b6fa 100644 --- a/drivers/staging/csr/csr_macro.h +++ b/drivers/staging/csr/csr_macro.h @@ -12,26 +12,10 @@ #include <linux/types.h> -#ifdef __cplusplus -extern "C" { -#endif - #define FALSE (0) #define TRUE (1) /*------------------------------------------------------------------*/ -/* 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)) -#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) ((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))) - -/*------------------------------------------------------------------*/ /* Endian conversion */ /*------------------------------------------------------------------*/ #define CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr) (((u16) ((u8 *) (ptr))[0]) | ((u16) ((u8 *) (ptr))[1]) << 8) @@ -43,72 +27,13 @@ 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) (((u16) ((u8 *) (ptr))[1]) | ((u16) ((u8 *) (ptr))[0]) << 8) -#define CSR_GET_UINT24_FROM_BIG_ENDIAN(ptr) (((u32) ((u8 *) (ptr))[2]) | \ - ((u32) ((u8 *) (ptr))[1]) << 8 | ((u32) ((u8 *) (ptr))[0]) << 16) -#define CSR_GET_UINT32_FROM_BIG_ENDIAN(ptr) (((u32) ((u8 *) (ptr))[3]) | ((u32) ((u8 *) (ptr))[2]) << 8 | \ - ((u32) ((u8 *) (ptr))[1]) << 16 | ((u32) ((u8 *) (ptr))[0]) << 24) -#define CSR_COPY_UINT16_TO_BIG_ENDIAN(uint, ptr) ((u8 *) (ptr))[1] = ((u8) ((uint) & 0x00FF)); \ - ((u8 *) (ptr))[0] = ((u8) ((uint) >> 8)) -#define CSR_COPY_UINT24_TO_BIG_ENDIAN(uint, ptr) ((u8 *) (ptr))[2] = ((u8) ((uint) & 0x000000FF)); \ - ((u8 *) (ptr))[1] = ((u8) (((uint) >> 8) & 0x000000FF)); \ - ((u8 *) (ptr))[0] = ((u8) (((uint) >> 16) & 0x000000FF)) -#define CSR_COPY_UINT32_TO_BIG_ENDIAN(uint, ptr) ((u8 *) (ptr))[3] = ((u8) ((uint) & 0x000000FF)); \ - ((u8 *) (ptr))[2] = ((u8) (((uint) >> 8) & 0x000000FF)); \ - ((u8 *) (ptr))[1] = ((u8) (((uint) >> 16) & 0x000000FF)); \ - ((u8 *) (ptr))[0] = ((u8) (((uint) >> 24) & 0x000000FF)) - -/*------------------------------------------------------------------*/ -/* XAP conversion macros */ -/*------------------------------------------------------------------*/ - -#define CSR_LSB16(a) ((u8) ((a) & 0x00ff)) -#define CSR_MSB16(b) ((u8) ((b) >> 8)) - -#define CSR_CONVERT_8_FROM_XAP(output, input) \ - (output) = ((u8) (input));(input) += 2 - -#define CSR_CONVERT_16_FROM_XAP(output, input) \ - (output) = (u16) ((((u16) (input)[1]) << 8) | \ - ((u16) (input)[0]));(input) += 2 - -#define CSR_CONVERT_32_FROM_XAP(output, input) \ - (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); \ - (output)[1] = 0;(output) += 2 - -#define CSR_ADD_UINT16_TO_XAP(output, input) \ - (output)[0] = ((u8) ((input) & 0x00FF)); \ - (output)[1] = ((u8) ((input) >> 8));(output) += 2 - -#define CSR_ADD_UINT32_TO_XAP(output, input) \ - (output)[0] = ((u8) (((input) >> 16) & 0x00FF)); \ - (output)[1] = ((u8) ((input) >> 24)); \ - (output)[2] = ((u8) ((input) & 0x00FF)); \ - (output)[3] = ((u8) (((input) >> 8) & 0x00FF));(output) += 4 /*------------------------------------------------------------------*/ /* Misc */ /*------------------------------------------------------------------*/ -#define CSRMAX(a, b) (((a) > (b)) ? (a) : (b)) -#define CSRMIN(a, b) (((a) < (b)) ? (a) : (b)) - /* Use this macro on unused local variables that cannot be removed (such as unused function parameters). This will quell warnings from certain compilers and static code analysis tools like Lint and Valgrind. */ #define CSR_UNUSED(x) ((void) (x)) -#define CSR_TOUPPER(character) (((character) >= 'a') && ((character) <= 'z') ? ((character) - 0x20) : (character)) -#define CSR_TOLOWER(character) (((character) >= 'A') && ((character) <= 'Z') ? ((character) + 0x20) : (character)) -#define CSR_ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) - -#ifdef __cplusplus -} -#endif - #endif diff --git a/drivers/staging/csr/csr_msg_transport.h b/drivers/staging/csr/csr_msg_transport.h index b0095b023817..8d88e7836567 100644 --- a/drivers/staging/csr/csr_msg_transport.h +++ b/drivers/staging/csr/csr_msg_transport.h @@ -10,16 +10,8 @@ *****************************************************************************/ -#ifdef __cplusplus -extern "C" { -#endif - #ifndef CsrMsgTransport #define CsrMsgTransport CsrSchedMessagePut #endif -#ifdef __cplusplus -} -#endif - #endif /* CSR_MSG_TRANSPORT */ diff --git a/drivers/staging/csr/csr_msgconv.c b/drivers/staging/csr/csr_msgconv.c index 0081a255e91c..db5e845e60f5 100644 --- a/drivers/staging/csr/csr_msgconv.c +++ b/drivers/staging/csr/csr_msgconv.c @@ -11,7 +11,6 @@ #include <linux/module.h> #include <linux/types.h> #include <linux/slab.h> -#include "csr_panic.h" #include "csr_sched.h" #include "csr_msgconv.h" #include "csr_macro.h" diff --git a/drivers/staging/csr/csr_msgconv.h b/drivers/staging/csr/csr_msgconv.h index 09489f38e52d..7e4dd388ae37 100644 --- a/drivers/staging/csr/csr_msgconv.h +++ b/drivers/staging/csr/csr_msgconv.h @@ -15,10 +15,6 @@ #include "csr_prim_defs.h" #include "csr_sched.h" -#ifdef __cplusplus -extern "C" { -#endif - typedef size_t (CsrMsgSizeofFunc)(void *msg); typedef u8 *(CsrMsgSerializeFunc)(u8 *buffer, size_t *length, void *msg); typedef void (CsrMsgFreeFunc)(void *msg); @@ -79,9 +75,4 @@ void CsrUint32Des(u32 *value, u8 *buffer, size_t *offset); void CsrMemCpyDes(void *value, u8 *buffer, size_t *offset, size_t length); void CsrCharStringDes(char **value, u8 *buffer, size_t *offset); - -#ifdef __cplusplus -} -#endif - #endif diff --git a/drivers/staging/csr/csr_panic.c b/drivers/staging/csr/csr_panic.c deleted file mode 100644 index 095f7fa3ae2c..000000000000 --- a/drivers/staging/csr/csr_panic.c +++ /dev/null @@ -1,20 +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 <linux/kernel.h> -#include <linux/module.h> - -#include "csr_panic.h" - -void CsrPanic(u8 tech, u16 reason, const char *p) -{ - BUG_ON(1); -} -EXPORT_SYMBOL_GPL(CsrPanic); diff --git a/drivers/staging/csr/csr_panic.h b/drivers/staging/csr/csr_panic.h deleted file mode 100644 index 37989fc15bbe..000000000000 --- a/drivers/staging/csr/csr_panic.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef CSR_PANIC_H__ -#define CSR_PANIC_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. - -*****************************************************************************/ -#ifdef __cplusplus -extern "C" { -#endif - -/* Synergy techonology ID definitions */ -#define CSR_TECH_FW 0 -#define CSR_TECH_BT 1 -#define CSR_TECH_WIFI 2 -#define CSR_TECH_GPS 3 -#define CSR_TECH_NFC 4 - -/* Panic type ID definitions for technology type CSR_TECH_FW */ -#define CSR_PANIC_FW_UNEXPECTED_VALUE 0 -#define CSR_PANIC_FW_HEAP_EXHAUSTION 1 -#define CSR_PANIC_FW_INVALID_PFREE_POINTER 2 -#define CSR_PANIC_FW_EXCEPTION 3 -#define CSR_PANIC_FW_ASSERTION_FAIL 4 -#define CSR_PANIC_FW_NULL_TASK_HANDLER 5 -#define CSR_PANIC_FW_UNKNOWN_TASK 6 -#define CSR_PANIC_FW_QUEUE_ACCESS_VIOLATION 7 -#define CSR_PANIC_FW_TOO_MANY_MESSAGES 8 -#define CSR_PANIC_FW_TOO_MANY_TIMED_EVENTS 9 -#define CSR_PANIC_FW_ABCSP_SYNC_LOST 10 -#define CSR_PANIC_FW_OVERSIZE_ABCSP_PRIM 11 -#define CSR_PANIC_FW_H4_CORRUPTION 12 -#define CSR_PANIC_FW_H4_SYNC_LOST 13 -#define CSR_PANIC_FW_H4_RX_OVERRUN 14 -#define CSR_PANIC_FW_H4_TX_OVERRUN 15 -#define CSR_PANIC_FW_TM_BC_RESTART_FAIL 16 -#define CSR_PANIC_FW_TM_BC_START_FAIL 17 -#define CSR_PANIC_FW_TM_BC_BAD_STATE 18 -#define CSR_PANIC_FW_TM_BC_TRANSPORT_LOST 19 - -/* Panic interface used by technologies */ -/* DEPRECATED - replaced by csr_log_text.h */ -void CsrPanic(u8 tech, u16 reason, const char *p); - -#ifdef __cplusplus -} -#endif - -#endif /* CSR_PANIC_H__ */ diff --git a/drivers/staging/csr/csr_prim_defs.h b/drivers/staging/csr/csr_prim_defs.h index 6a7f73dbb706..81a1eaac30d9 100644 --- a/drivers/staging/csr/csr_prim_defs.h +++ b/drivers/staging/csr/csr_prim_defs.h @@ -9,9 +9,6 @@ on the license terms. *****************************************************************************/ -#ifdef __cplusplus -extern "C" { -#endif /************************************************************************************ * Segmentation of primitives in upstream and downstream segment @@ -55,8 +52,4 @@ typedef u16 CsrPrim; #define CSR_ENV_PRIM ((u16) (0x00FF | CSR_SYNERGY_EVENT_CLASS_MISC_BASE)) -#ifdef __cplusplus -} -#endif - #endif /* CSR_PRIM_DEFS_H__ */ diff --git a/drivers/staging/csr/csr_result.h b/drivers/staging/csr/csr_result.h index c7c36d6b59ef..cbb607d943c7 100644 --- a/drivers/staging/csr/csr_result.h +++ b/drivers/staging/csr/csr_result.h @@ -10,16 +10,8 @@ *****************************************************************************/ -#ifdef __cplusplus -extern "C" { -#endif - typedef u16 CsrResult; #define CSR_RESULT_SUCCESS ((CsrResult) 0x0000) #define CSR_RESULT_FAILURE ((CsrResult) 0xFFFF) -#ifdef __cplusplus -} -#endif - #endif diff --git a/drivers/staging/csr/csr_sched.h b/drivers/staging/csr/csr_sched.h index cc1b8bf66079..c7d672c59f5b 100644 --- a/drivers/staging/csr/csr_sched.h +++ b/drivers/staging/csr/csr_sched.h @@ -12,10 +12,6 @@ #include <linux/types.h> #include "csr_time.h" -#ifdef __cplusplus -extern "C" { -#endif - /* An identifier issued by the scheduler. */ typedef u32 CsrSchedIdentifier; @@ -24,7 +20,6 @@ typedef u16 CsrSchedTaskId; /* A queue identifier */ typedef u16 CsrSchedQid; -#define CSR_SCHED_QID_INVALID ((CsrSchedQid) 0xFFFF) /* A message identifier */ typedef CsrSchedIdentifier CsrSchedMsgId; @@ -33,14 +28,11 @@ typedef CsrSchedIdentifier CsrSchedMsgId; typedef CsrSchedIdentifier CsrSchedTid; #define CSR_SCHED_TID_INVALID ((CsrSchedTid) 0) -/* Scheduler entry functions share this structure */ -typedef void (*schedEntryFunction_t)(void **inst); - /* Time constants. */ -#define CSR_SCHED_TIME_MAX ((CsrTime) 0xFFFFFFFF) -#define CSR_SCHED_MILLISECOND ((CsrTime) (1000)) -#define CSR_SCHED_SECOND ((CsrTime) (1000 * CSR_SCHED_MILLISECOND)) -#define CSR_SCHED_MINUTE ((CsrTime) (60 * CSR_SCHED_SECOND)) +#define CSR_SCHED_TIME_MAX (0xFFFFFFFF) +#define CSR_SCHED_MILLISECOND (1000) +#define CSR_SCHED_SECOND (1000 * CSR_SCHED_MILLISECOND) +#define CSR_SCHED_MINUTE (60 * CSR_SCHED_SECOND) /* Queue and primitive that identifies the environment */ #define CSR_SCHED_TASK_ID 0xFFFF @@ -53,60 +45,6 @@ typedef void (*schedEntryFunction_t)(void **inst); typedef u16 CsrSchedBgint; #define CSR_SCHED_BGINT_INVALID ((CsrSchedBgint) 0xFFFF) -typedef void (*CsrSchedBgintHandler)(void *); - -/*----------------------------------------------------------------------------* - * NAME - * CsrSchedBgintReg - * - * DESCRIPTION - * Register a background interrupt handler function with the scheduler. - * When CsrSchedBgint() is called from the foreground (e.g. an interrupt - * routine) the registered function is called. - * - * If "cb" is null then the interrupt is effectively disabled. If a - * no bgints are available, CSR_SCHED_BGINT_INVALID is returned, otherwise - * a CsrSchedBgint value is returned to be used in subsequent calls to - * CsrSchedBgint(). id is a possibly NULL identifier used for logging - * purposes only. - * - * RETURNS - * CsrSchedBgint -- CSR_SCHED_BGINT_INVALID denotes failure to obtain a CsrSchedBgintSet. - * - *----------------------------------------------------------------------------*/ -CsrSchedBgint CsrSchedBgintReg(CsrSchedBgintHandler cb, - void *context, - const char *id); - -/*----------------------------------------------------------------------------* - * NAME - * CsrSchedBgintUnreg - * - * DESCRIPTION - * Unregister a background interrupt handler function. - * - * ``irq'' is a background interrupt handle previously obtained - * from a call to CsrSchedBgintReg(). - * - * RETURNS - * void. - * - *----------------------------------------------------------------------------*/ -void CsrSchedBgintUnreg(CsrSchedBgint bgint); - -/*----------------------------------------------------------------------------* - * NAME - * CsrSchedBgintSet - * - * DESCRIPTION - * Set background interrupt. - * - * RETURNS - * void. - * - *----------------------------------------------------------------------------*/ -void CsrSchedBgintSet(CsrSchedBgint bgint); - /*----------------------------------------------------------------------------* * NAME * CsrSchedMessagePut @@ -144,149 +82,4 @@ void CsrSchedMessagePut(CsrSchedQid q, void *mv); #endif -/*----------------------------------------------------------------------------* - * NAME - * CsrSchedMessageBroadcast - * - * DESCRIPTION - * Sends a message to all tasks. - * - * The user must supply a "factory function" that is called once - * for every task that exists. The "factory function", msg_build_func, - * must allocate and initialise the message and set the msg_build_ptr - * to point to the message when done. - * - * NOTE - * N/A - * - * RETURNS - * void - * - *----------------------------------------------------------------------------*/ -#if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER) -void CsrSchedMessageBroadcastStringLog(u16 mi, - void *(*msg_build_func)(void *), - void *msg_build_ptr, - u32 line, - const char *file); -#define CsrSchedMessageBroadcast(mi, fn, ptr) CsrSchedMessageBroadcastStringLog((mi), (fn), (ptr), __LINE__, __FILE__) -#else -void CsrSchedMessageBroadcast(u16 mi, - void *(*msg_build_func)(void *), - void *msg_build_ptr); -#endif - -/*----------------------------------------------------------------------------* - * NAME - * CsrSchedMessageGet - * - * DESCRIPTION - * Obtains a message from the message queue belonging to the calling task. - * The message consists of one or both of a u16 and a void *. - * - * RETURNS - * 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. - * - * "pmi" and "pmv" can be null, in which case the corresponding value from - * them message is discarded. - * - *----------------------------------------------------------------------------*/ -u8 CsrSchedMessageGet(u16 *pmi, void **pmv); - -/*----------------------------------------------------------------------------* - * NAME - * CsrSchedTimerSet - * - * DESCRIPTION - * Causes the void function "fn" to be called with the arguments - * "fniarg" and "fnvarg" after "delay" has elapsed. - * - * "delay" must be less than half the range of a CsrTime. - * - * CsrSchedTimerSet() does nothing with "fniarg" and "fnvarg" except - * deliver them via a call to "fn()". (Unless CsrSchedTimerCancel() - * is used to prevent delivery.) - * - * NOTE - * The function will be called at or after "delay"; the actual delay will - * depend on the timing behaviour of the scheduler's tasks. - * - * RETURNS - * CsrSchedTid - A timed event identifier, can be used in CsrSchedTimerCancel(). - * - *----------------------------------------------------------------------------*/ -#if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER) -CsrSchedTid CsrSchedTimerSetStringLog(CsrTime delay, - void (*fn)(u16 mi, void *mv), - u16 fniarg, - void *fnvarg, - u32 line, - const char *file); -#define CsrSchedTimerSet(d, fn, fni, fnv) CsrSchedTimerSetStringLog((d), (fn), (fni), (fnv), __LINE__, __FILE__) -#else -CsrSchedTid CsrSchedTimerSet(CsrTime delay, - void (*fn)(u16 mi, void *mv), - u16 fniarg, - void *fnvarg); -#endif - -/*----------------------------------------------------------------------------* - * NAME - * CsrSchedTimerCancel - * - * DESCRIPTION - * Attempts to prevent the timed event with identifier "eventid" from - * occurring. - * - * RETURNS - * 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) -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 -u8 CsrSchedTimerCancel(CsrSchedTid eventid, - u16 *pmi, - void **pmv); -#endif - -/*----------------------------------------------------------------------------* - * NAME - * CsrSchedTaskQueueGet - * - * DESCRIPTION - * Return the queue identifier for the currently running queue - * - * RETURNS - * CsrSchedQid - The current task queue identifier, or 0xFFFF if not available. - * - *----------------------------------------------------------------------------*/ -CsrSchedQid CsrSchedTaskQueueGet(void); - - -/*----------------------------------------------------------------------------* - * NAME - * CsrSchedTaskQueueGet - * - * DESCRIPTION - * Return the queue identifier for the currently running queue - * - * RETURNS - * char - The current task queue identifier, or 0xFFFF if not available. - * - *----------------------------------------------------------------------------*/ -char* CsrSchedTaskNameGet(CsrSchedQid ); - - -#ifdef __cplusplus -} -#endif - #endif diff --git a/drivers/staging/csr/csr_sdio.h b/drivers/staging/csr/csr_sdio.h index f0cda84f6a00..624a53fa1d7e 100644 --- a/drivers/staging/csr/csr_sdio.h +++ b/drivers/staging/csr/csr_sdio.h @@ -12,10 +12,6 @@ #include "csr_result.h" -#ifdef __cplusplus -extern "C" { -#endif - /* Result Codes */ #define CSR_SDIO_RESULT_INVALID_VALUE ((CsrResult) 1) /* Invalid argument value */ #define CSR_SDIO_RESULT_NO_DEVICE ((CsrResult) 2) /* The specified device is no longer present */ @@ -724,8 +720,4 @@ CsrResult CsrSdioHardReset(CsrSdioFunction *function); void CsrSdioFunctionActive(CsrSdioFunction *function); void CsrSdioFunctionIdle(CsrSdioFunction *function); -#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 bf5e4ab9f959..9713b9afef64 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_lib.h" void CsrUint8Des(u8 *value, u8 *buffer, size_t *offset) { diff --git a/drivers/staging/csr/csr_time.c b/drivers/staging/csr/csr_time.c index 7b597f7622a2..f3f4a9c9c67a 100644 --- a/drivers/staging/csr/csr_time.c +++ b/drivers/staging/csr/csr_time.c @@ -9,25 +9,24 @@ *****************************************************************************/ #include <linux/kernel.h> -#include <linux/version.h> #include <linux/time.h> #include <linux/module.h> #include "csr_time.h" -CsrTime CsrTimeGet(CsrTime *high) +u32 CsrTimeGet(u32 *high) { struct timespec ts; u64 time; - CsrTime low; + u32 low; ts = current_kernel_time(); time = (u64) ts.tv_sec * 1000000 + ts.tv_nsec / 1000; if (high != NULL) - *high = (CsrTime) ((time >> 32) & 0xFFFFFFFF); + *high = (u32) ((time >> 32) & 0xFFFFFFFF); - low = (CsrTime) (time & 0xFFFFFFFF); + low = (u32) (time & 0xFFFFFFFF); return low; } diff --git a/drivers/staging/csr/csr_time.h b/drivers/staging/csr/csr_time.h index 2a45f3e4024d..fc29e8e5e478 100644 --- a/drivers/staging/csr/csr_time.h +++ b/drivers/staging/csr/csr_time.h @@ -2,77 +2,43 @@ #define CSR_TIME_H__ /***************************************************************************** - (c) Cambridge Silicon Radio Limited 2010 - All rights reserved and confidential information of CSR +(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. +Refer to LICENSE.txt included with this source for details +on the license terms. *****************************************************************************/ #include <linux/types.h> -#ifdef __cplusplus -extern "C" { -#endif - -/******************************************************************************* - - NAME - CsrTime - - DESCRIPTION - Type to hold a value describing the current system time, which is a - measure of time elapsed since some arbitrarily defined fixed time - reference, usually associated with system startup. - -*******************************************************************************/ -typedef u32 CsrTime; - - /******************************************************************************* - NAME - CsrTimeUtc +NAME + CsrTimeGet - DESCRIPTION - Type to hold a value describing a UTC wallclock time expressed in - seconds and milliseconds elapsed since midnight January 1st 1970. +DESCRIPTION + Returns the current system time in a low and a high part. The low part + is expressed in microseconds. The high part is incremented when the low + part wraps to provide an extended range. -*******************************************************************************/ -typedef struct -{ - u32 sec; - u16 msec; -} CsrTimeUtc; - - -/******************************************************************************* - - NAME - CsrTimeGet + The caller may provide a NULL pointer as the high parameter. + In this case the function just returns the low part and ignores the + high parameter. - DESCRIPTION - Returns the current system time in a low and a high part. The low part - is expressed in microseconds. The high part is incremented when the low - part wraps to provide an extended range. + Although the time is expressed in microseconds the actual resolution is + platform dependent and can be less. It is recommended that the + resolution is at least 10 milliseconds. - The caller may provide a NULL pointer as the high parameter. In this case - the function just returns the low part and ignores the high parameter. +PARAMETERS + high - Pointer to variable that will receive the high part of the + current system time. Passing NULL is valid. - Although the time is expressed in microseconds the actual resolution is - platform dependent and can be less. It is recommended that the - resolution is at least 10 milliseconds. - - PARAMETERS - high - Pointer to variable that will receive the high part of the - current system time. Passing NULL is valid. - - RETURNS - Low part of current system time in microseconds. +RETURNS + Low part of current system time in microseconds. *******************************************************************************/ -CsrTime CsrTimeGet(CsrTime *high); +u32 CsrTimeGet(u32 *high); /*------------------------------------------------------------------*/ @@ -107,8 +73,4 @@ CsrTime CsrTimeGet(CsrTime *high); *----------------------------------------------------------------------------*/ #define CsrTimeSub(t1, t2) ((s32) (t1) - (s32) (t2)) -#ifdef __cplusplus -} -#endif - #endif diff --git a/drivers/staging/csr/csr_wifi_common.h b/drivers/staging/csr/csr_wifi_common.h index cc41a94b8f25..efc43a525a3d 100644 --- a/drivers/staging/csr/csr_wifi_common.h +++ b/drivers/staging/csr/csr_wifi_common.h @@ -14,10 +14,6 @@ #include <linux/types.h> #include "csr_result.h" -#ifdef __cplusplus -extern "C" { -#endif - /* MAC address */ typedef struct { @@ -101,9 +97,5 @@ typedef struct #define CSR_WIFI_VERSION "5.1.0.0" -#ifdef __cplusplus -} -#endif - #endif diff --git a/drivers/staging/csr/csr_wifi_fsm.h b/drivers/staging/csr/csr_wifi_fsm.h index 073e2f8b5532..fde1508c1eae 100644 --- a/drivers/staging/csr/csr_wifi_fsm.h +++ b/drivers/staging/csr/csr_wifi_fsm.h @@ -11,10 +11,6 @@ #ifndef CSR_WIFI_FSM_H #define CSR_WIFI_FSM_H -#ifdef __cplusplus -extern "C" { -#endif - #include "csr_prim_defs.h" #include "csr_log_text.h" #include "csr_wifi_fsm_event.h" @@ -240,9 +236,5 @@ extern u8 CsrWifiFsmHasEvents(CsrWifiFsmContext *context); */ extern void CsrWifiFsmInstallWakeupCallback(CsrWifiFsmContext *context, CsrWifiFsmExternalWakupCallbackPtr callback); -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_FSM_H */ diff --git a/drivers/staging/csr/csr_wifi_fsm_event.h b/drivers/staging/csr/csr_wifi_fsm_event.h index 57a5cafd40bd..0690ca955ef5 100644 --- a/drivers/staging/csr/csr_wifi_fsm_event.h +++ b/drivers/staging/csr/csr_wifi_fsm_event.h @@ -11,10 +11,6 @@ #ifndef CSR_WIFI_FSM_EVENT_H #define CSR_WIFI_FSM_EVENT_H -#ifdef __cplusplus -extern "C" { -#endif - #include "csr_prim_defs.h" #include "csr_sched.h" @@ -42,9 +38,5 @@ typedef struct CsrWifiFsmEvent struct CsrWifiFsmEvent *next; } CsrWifiFsmEvent; -#ifdef __cplusplus -} -#endif - #endif /* 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 26752bf316e0..d21c60a81fcf 100644 --- a/drivers/staging/csr/csr_wifi_fsm_types.h +++ b/drivers/staging/csr/csr_wifi_fsm_types.h @@ -11,13 +11,8 @@ #ifndef CSR_WIFI_FSM_TYPES_H #define CSR_WIFI_FSM_TYPES_H -#ifdef __cplusplus -extern "C" { -#endif - #include <linux/types.h> #include "csr_macro.h" -#include "csr_panic.h" #include "csr_sched.h" #ifdef CSR_WIFI_FSM_MUTEX_ENABLE @@ -432,9 +427,4 @@ struct CsrWifiFsmContext #endif }; - -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_FSM_TYPES_H */ diff --git a/drivers/staging/csr/csr_wifi_hip_card.h b/drivers/staging/csr/csr_wifi_hip_card.h index 9caf88c7887d..bd47f606e0de 100644 --- a/drivers/staging/csr/csr_wifi_hip_card.h +++ b/drivers/staging/csr/csr_wifi_hip_card.h @@ -21,10 +21,6 @@ #ifndef __CARD_H__ #define __CARD_H__ -#ifdef __cplusplus -extern "C" { -#endif - #include "csr_wifi_hip_card_sdio.h" #include "csr_wifi_hip_signals.h" #include "csr_wifi_hip_unifi_udi.h" @@ -115,9 +111,4 @@ void unifi_debug_string_to_buf(const char *str); void unifi_debug_hex_to_buf(const char *buff, u16 length); #endif - -#ifdef __cplusplus -} -#endif - #endif /* __CARD_H__ */ diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio.c b/drivers/staging/csr/csr_wifi_hip_card_sdio.c index cf148a0fec6a..25cabf3234c2 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio.c +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio.c @@ -70,8 +70,6 @@ card_t* unifi_alloc_card(CsrSdioFunction *sdio, void *ospriv) card_t *card; u32 i; - func_enter(); - card = kzalloc(sizeof(card_t), GFP_KERNEL); if (card == NULL) @@ -148,7 +146,6 @@ card_t* unifi_alloc_card(CsrSdioFunction *sdio, void *ospriv) } } #endif - func_exit(); return card; } /* unifi_alloc_card() */ @@ -171,35 +168,29 @@ CsrResult unifi_init_card(card_t *card, s32 led_mask) { CsrResult r; - func_enter(); if (card == NULL) { - func_exit_r(CSR_WIFI_HIP_RESULT_INVALID_VALUE); return CSR_WIFI_HIP_RESULT_INVALID_VALUE; } r = unifi_init(card); if (r != CSR_RESULT_SUCCESS) { - func_exit_r(r); return r; } r = unifi_hip_init(card); if (r == CSR_WIFI_HIP_RESULT_NO_DEVICE) { - func_exit_r(r); return r; } if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to start host protocol.\n"); - func_exit_r(r); return r; } - func_exit(); return CSR_RESULT_SUCCESS; } @@ -223,11 +214,8 @@ CsrResult unifi_init(card_t *card) CsrResult r; CsrResult csrResult; - func_enter(); - if (card == NULL) { - func_exit_r(CSR_WIFI_HIP_RESULT_INVALID_VALUE); return CSR_WIFI_HIP_RESULT_INVALID_VALUE; } @@ -250,7 +238,6 @@ CsrResult unifi_init(card_t *card) if (csrResult != CSR_RESULT_SUCCESS) { r = ConvertCsrSdioToCsrHipResult(card, csrResult); - func_exit_r(r); return r; } card->sdio_clock_speed = UNIFI_SDIO_CLOCK_SAFE_HZ; @@ -268,7 +255,6 @@ CsrResult unifi_init(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to reset UniFi\n"); - func_exit_r(r); return r; } @@ -278,7 +264,6 @@ CsrResult unifi_init(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to set power save mode\n"); - func_exit_r(r); return r; } @@ -298,7 +283,6 @@ CsrResult unifi_init(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to write SHARED_DMEM_PAGE\n"); - func_exit_r(r); return r; } r = unifi_write_direct16(card, ChipHelper_HOST_WINDOW2_PAGE(card->helper) * 2, 0); @@ -309,7 +293,6 @@ CsrResult unifi_init(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to write PROG_MEM2_PAGE\n"); - func_exit_r(r); return r; } @@ -338,7 +321,6 @@ CsrResult unifi_init(card_t *card) unifi_error(card->ospriv, "Probe for Flash failed\n"); } - func_exit_r(r); return r; } /* unifi_init() */ @@ -363,11 +345,8 @@ CsrResult unifi_download(card_t *card, s32 led_mask) CsrResult r; void *dlpriv; - func_enter(); - if (card == NULL) { - func_exit_r(CSR_WIFI_HIP_RESULT_INVALID_VALUE); return CSR_WIFI_HIP_RESULT_INVALID_VALUE; } @@ -380,7 +359,6 @@ CsrResult unifi_download(card_t *card, s32 led_mask) dlpriv = unifi_dl_fw_read_start(card, UNIFI_FW_STA); if (dlpriv == NULL) { - func_exit_r(CSR_WIFI_HIP_RESULT_NOT_FOUND); return CSR_WIFI_HIP_RESULT_NOT_FOUND; } @@ -389,15 +367,12 @@ CsrResult unifi_download(card_t *card, s32 led_mask) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to download firmware\n"); - func_exit_r(r); return r; } /* Free the firmware file information. */ unifi_fw_read_stop(card->ospriv, dlpriv); - func_exit(); - return CSR_RESULT_SUCCESS; } /* unifi_download() */ @@ -425,8 +400,6 @@ static CsrResult unifi_hip_init(card_t *card) CsrResult r; CsrResult csrResult; - func_enter(); - r = card_hw_init(card); if (r == CSR_WIFI_HIP_RESULT_NO_DEVICE) { @@ -435,7 +408,6 @@ static CsrResult unifi_hip_init(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to establish communication with UniFi\n"); - func_exit_r(r); return r; } #ifdef CSR_PRE_ALLOC_NET_DATA @@ -455,7 +427,6 @@ static CsrResult unifi_hip_init(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Init slots failed: %d\n", r); - func_exit_r(r); return r; } @@ -464,7 +435,6 @@ static CsrResult unifi_hip_init(card_t *card) r = unifi_set_host_state(card, UNIFI_HOST_STATE_AWAKE); if (r != CSR_RESULT_SUCCESS) { - func_exit_r(r); return r; } @@ -479,12 +449,9 @@ static CsrResult unifi_hip_init(card_t *card) r = CardGenInt(card); if (r != CSR_RESULT_SUCCESS) { - func_exit_r(r); return r; } - func_exit(); - return CSR_RESULT_SUCCESS; } /* unifi_hip_init() */ @@ -609,8 +576,6 @@ static CsrResult card_hw_init(card_t *card) s16 search_4slut_again; CsrResult csrResult; - func_enter(); - /* * The device revision from the TPLMID_MANF and TPLMID_CARD fields * of the CIS are available as @@ -635,7 +600,6 @@ static CsrResult card_hw_init(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Firmware hasn't started\n"); - func_exit_r(r); return r; } unifi_trace(card->ospriv, UDBG4, "SLUT addr 0x%lX\n", slut_address); @@ -652,7 +616,6 @@ static CsrResult card_hw_init(card_t *card) if (csrResult != CSR_RESULT_SUCCESS) { r = ConvertCsrSdioToCsrHipResult(card, csrResult); - func_exit_r(r); return r; } card->sdio_clock_speed = UNIFI_SDIO_CLOCK_INIT_HZ; @@ -671,14 +634,12 @@ static CsrResult card_hw_init(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to read SLUT finger print\n"); - func_exit_r(r); return r; } if (finger_print != SLUT_FINGERPRINT) { unifi_error(card->ospriv, "Failed to find Symbol lookup table fingerprint\n"); - func_exit_r(CSR_RESULT_FAILURE); return CSR_RESULT_FAILURE; } @@ -696,7 +657,6 @@ static CsrResult card_hw_init(card_t *card) r = unifi_card_read16(card, slut_address, &s); if (r != CSR_RESULT_SUCCESS) { - func_exit_r(r); return r; } slut_address += 2; @@ -710,7 +670,6 @@ static CsrResult card_hw_init(card_t *card) r = unifi_read32(card, slut_address, &l); if (r != CSR_RESULT_SUCCESS) { - func_exit_r(r); return r; } slut_address += 4; @@ -739,7 +698,6 @@ static CsrResult card_hw_init(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to read config data\n"); - func_exit_r(r); return r; } /* .. and then we copy the data to the host structure */ @@ -753,7 +711,6 @@ static CsrResult card_hw_init(card_t *card) { unifi_error(card->ospriv, "From host data slots %d\n", cfg_data->num_fromhost_data_slots); unifi_error(card->ospriv, "need to be (queues * x + 2) (UNIFI_RESERVED_COMMAND_SLOTS for commands)\n"); - func_exit_r(CSR_RESULT_FAILURE); return CSR_RESULT_FAILURE; } @@ -781,7 +738,6 @@ static CsrResult card_hw_init(card_t *card) if ((card->sdio_io_block_size % cfg_data->sig_frag_size) != 0) { unifi_error(card->ospriv, "Configuration error: Can not pad to-host signals.\n"); - func_exit_r(CSR_WIFI_HIP_RESULT_INVALID_VALUE); return CSR_WIFI_HIP_RESULT_INVALID_VALUE; } cfg_data->tohost_signal_padding = (u16) (card->sdio_io_block_size / cfg_data->sig_frag_size); @@ -795,7 +751,6 @@ static CsrResult card_hw_init(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to write To-Host Signal Padding Fragments\n"); - func_exit_r(r); return r; } } @@ -818,7 +773,6 @@ static CsrResult card_hw_init(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to read build id\n"); - func_exit_r(r); return r; } card->build_id = n; @@ -835,7 +789,6 @@ static CsrResult card_hw_init(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to read build string\n"); - func_exit_r(r); return r; } break; @@ -853,7 +806,6 @@ static CsrResult card_hw_init(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to write loader load image command\n"); - func_exit_r(r); return r; } @@ -871,7 +823,6 @@ static CsrResult card_hw_init(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to patch firmware\n"); - func_exit_r(r); return r; } } @@ -882,7 +833,6 @@ static CsrResult card_hw_init(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to write loader restart command\n"); - func_exit_r(r); return r; } @@ -913,7 +863,6 @@ static CsrResult card_hw_init(card_t *card) if (cfg_data == NULL) { unifi_error(card->ospriv, "Failed to find SDIO_SLOT_CONFIG Symbol\n"); - func_exit_r(CSR_RESULT_FAILURE); return CSR_RESULT_FAILURE; } @@ -930,12 +879,10 @@ static CsrResult card_hw_init(card_t *card) { unifi_error(card->ospriv, "Failed to read init flag at %08lx\n", card->init_flag_addr); - func_exit_r(r); return r; } if (initialised != 0) { - func_exit_r(CSR_RESULT_FAILURE); return CSR_RESULT_FAILURE; } @@ -957,7 +904,6 @@ static CsrResult card_hw_init(card_t *card) unifi_error(card->ospriv, "UniFi f/w protocol major version (%d) is different from driver (v%d.%d)\n", major, UNIFI_HIP_MAJOR_VERSION, UNIFI_HIP_MINOR_VERSION); #ifndef CSR_WIFI_DISABLE_HIP_VERSION_CHECK - func_exit_r(CSR_RESULT_FAILURE); return CSR_RESULT_FAILURE; #endif } @@ -967,7 +913,6 @@ static CsrResult card_hw_init(card_t *card) major, minor, UNIFI_HIP_MAJOR_VERSION, UNIFI_HIP_MINOR_VERSION); #ifndef CSR_WIFI_DISABLE_HIP_VERSION_CHECK - func_exit_r(CSR_RESULT_FAILURE); return CSR_RESULT_FAILURE; #endif } @@ -978,7 +923,6 @@ static CsrResult card_hw_init(card_t *card) */ unifi_read_panic(card); - func_exit(); return CSR_RESULT_SUCCESS; } /* card_hw_init() */ @@ -1004,8 +948,6 @@ static CsrResult card_wait_for_unifi_to_reset(card_t *card) u8 io_enable; CsrResult csrResult; - func_enter(); - r = CSR_RESULT_SUCCESS; for (i = 0; i < MAILBOX2_ATTEMPTS; i++) { @@ -1107,7 +1049,6 @@ static CsrResult card_wait_for_unifi_to_reset(card_t *card) r = CSR_RESULT_FAILURE; } - func_exit(); return r; } /* card_wait_for_unifi_to_reset() */ @@ -1136,14 +1077,11 @@ static CsrResult card_wait_for_unifi_to_disable(card_t *card) u8 io_enable; CsrResult csrResult; - func_enter(); - if (card->chip_id <= SDIO_CARD_ID_UNIFI_2) { unifi_error(card->ospriv, "Function reset method not supported for chip_id=%d\n", card->chip_id); - func_exit(); return CSR_RESULT_FAILURE; } @@ -1210,7 +1148,6 @@ static CsrResult card_wait_for_unifi_to_disable(card_t *card) r = CSR_RESULT_FAILURE; } - func_exit(); return r; } /* card_wait_for_unifi_to_reset() */ @@ -1238,8 +1175,6 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr) u16 mbox0, mbox1; CsrResult r; - func_enter(); - /* * Wait for UniFi to initialise its data structures by polling * the SHARED_MAILBOX1 register. @@ -1277,7 +1212,6 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to read UniFi Mailbox1 register for second time\n"); - func_exit_r(r); return r; } unifi_trace(card->ospriv, UDBG1, "MAILBOX1 value=0x%04X\n", mbox1); @@ -1296,7 +1230,6 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr) { unifi_trace(card->ospriv, UDBG1, "Timeout waiting for firmware to start, Mailbox1 still 0 after %d ms\n", MAILBOX1_ATTEMPTS * MAILBOX1_TIMEOUT); - func_exit_r(CSR_RESULT_FAILURE); return CSR_RESULT_FAILURE; } @@ -1312,7 +1245,6 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to write f/w startup handshake to MAILBOX2\n"); - func_exit_r(r); return r; } @@ -1330,13 +1262,11 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to read UniFi Mailbox0 register\n"); - func_exit_r(r); return r; } *paddr = (((u32)mbox1 << 16) | mbox0); - func_exit(); return CSR_RESULT_SUCCESS; } /* card_wait_for_firmware_to_start() */ @@ -1358,14 +1288,12 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr) */ CsrResult unifi_capture_panic(card_t *card) { - func_enter(); /* The firmware must have previously initialised to read the panic addresses * from the SLUT */ if (!card->panic_data_phy_addr || !card->panic_data_mac_addr) { - func_exit(); return CSR_RESULT_SUCCESS; } @@ -1380,7 +1308,6 @@ CsrResult unifi_capture_panic(card_t *card) unifi_info(card->ospriv, "Unable to read panic codes"); } - func_exit(); return CSR_RESULT_SUCCESS; } @@ -1405,8 +1332,6 @@ static CsrResult card_access_panic(card_t *card) s32 i; CsrResult r, sr; - func_enter(); - /* A chip version of zero means that the version never got succesfully read * during reset. In this case give up because it will not be possible to * verify the chip version. @@ -1513,7 +1438,6 @@ static CsrResult card_access_panic(card_t *card) } r = ConvertCsrSdioToCsrHipResult(card, sr); - func_exit_r(r); return r; } @@ -1536,8 +1460,6 @@ void unifi_read_panic(card_t *card) CsrResult r; u16 p_code, p_arg; - func_enter(); - /* The firmware must have previously initialised to read the panic addresses * from the SLUT */ @@ -1584,7 +1506,6 @@ void unifi_read_panic(card_t *card) card->last_mac_panic_arg = p_arg; } - func_exit(); } @@ -1607,8 +1528,6 @@ static CsrResult card_allocate_memory_resources(card_t *card) s16 n, i, k, r; sdio_config_data_t *cfg_data; - func_enter(); - /* Reset any state carried forward from a previous life */ card->fh_command_queue.q_rd_ptr = 0; card->fh_command_queue.q_wr_ptr = 0; @@ -1634,7 +1553,6 @@ static CsrResult card_allocate_memory_resources(card_t *card) if (card->fh_buffer.buf == NULL) { unifi_error(card->ospriv, "Failed to allocate memory for F-H signals\n"); - func_exit_r(CSR_WIFI_HIP_RESULT_NO_MEMORY); return CSR_WIFI_HIP_RESULT_NO_MEMORY; } card->fh_buffer.bufsize = UNIFI_FH_BUF_SIZE; @@ -1645,7 +1563,6 @@ static CsrResult card_allocate_memory_resources(card_t *card) if (card->th_buffer.buf == NULL) { unifi_error(card->ospriv, "Failed to allocate memory for T-H signals\n"); - func_exit_r(CSR_WIFI_HIP_RESULT_NO_MEMORY); return CSR_WIFI_HIP_RESULT_NO_MEMORY; } card->th_buffer.bufsize = UNIFI_FH_BUF_SIZE; @@ -1667,7 +1584,6 @@ static CsrResult card_allocate_memory_resources(card_t *card) if (card->from_host_data == NULL) { unifi_error(card->ospriv, "Failed to allocate memory for F-H bulk data array\n"); - func_exit_r(CSR_WIFI_HIP_RESULT_NO_MEMORY); return CSR_WIFI_HIP_RESULT_NO_MEMORY; } @@ -1683,7 +1599,6 @@ static CsrResult card_allocate_memory_resources(card_t *card) if (card->fh_slot_host_tag_record == NULL) { unifi_error(card->ospriv, "Failed to allocate memory for F-H slot host tag mapping array\n"); - func_exit_r(CSR_WIFI_HIP_RESULT_NO_MEMORY); return CSR_WIFI_HIP_RESULT_NO_MEMORY; } @@ -1702,7 +1617,6 @@ static CsrResult card_allocate_memory_resources(card_t *card) if (card->to_host_data == NULL) { unifi_error(card->ospriv, "Failed to allocate memory for T-H bulk data array\n"); - func_exit_r(CSR_WIFI_HIP_RESULT_NO_MEMORY); return CSR_WIFI_HIP_RESULT_NO_MEMORY; } @@ -1736,7 +1650,6 @@ static CsrResult card_allocate_memory_resources(card_t *card) card->memory_resources_allocated = 1; - func_exit(); return CSR_RESULT_SUCCESS; } /* card_allocate_memory_resources() */ @@ -1781,7 +1694,6 @@ static void unifi_free_bulk_data(card_t *card, bulk_data_desc_t *bulk_data_slot) */ static void card_free_memory_resources(card_t *card) { - func_enter(); unifi_trace(card->ospriv, UDBG1, "Freeing card memory resources.\n"); @@ -1812,7 +1724,6 @@ static void card_free_memory_resources(card_t *card) card->memory_resources_allocated = 0; - func_exit(); } /* card_free_memory_resources() */ @@ -1820,8 +1731,6 @@ static void card_init_soft_queues(card_t *card) { s16 i; - func_enter(); - unifi_trace(card->ospriv, UDBG1, "Initialising internal signal queues.\n"); /* Reset any state carried forward from a previous life */ card->fh_command_queue.q_rd_ptr = 0; @@ -1838,7 +1747,6 @@ static void card_init_soft_queues(card_t *card) #ifndef CSR_WIFI_HIP_TA_DISABLE unifi_ta_sampling_init(card); #endif - func_exit(); } @@ -1858,7 +1766,6 @@ static void card_init_soft_queues(card_t *card) void unifi_cancel_pending_signals(card_t *card) { s16 i, n, r; - func_enter(); unifi_trace(card->ospriv, UDBG1, "Canceling pending signals.\n"); @@ -1927,7 +1834,6 @@ void unifi_cancel_pending_signals(card_t *card) card_init_soft_queues(card); - func_exit(); } /* unifi_cancel_pending_signals() */ @@ -1951,7 +1857,6 @@ void unifi_cancel_pending_signals(card_t *card) */ void unifi_free_card(card_t *card) { - func_enter(); #ifdef CSR_PRE_ALLOC_NET_DATA prealloc_netdata_free(card); #endif @@ -1967,7 +1872,6 @@ void unifi_free_card(card_t *card) kfree(card); - func_exit(); } /* unifi_free_card() */ @@ -1989,8 +1893,6 @@ static CsrResult card_init_slots(card_t *card) CsrResult r; u8 i; - func_enter(); - /* Allocate the buffers we need, only once. */ if (card->memory_resources_allocated == 1) { @@ -2007,14 +1909,12 @@ static CsrResult card_init_slots(card_t *card) { unifi_error(card->ospriv, "Failed to allocate card memory resources.\n"); card_free_memory_resources(card); - func_exit_r(r); return r; } if (card->sdio_ctrl_addr == 0) { unifi_error(card->ospriv, "Failed to find config struct!\n"); - func_exit_r(CSR_WIFI_HIP_RESULT_INVALID_VALUE); return CSR_WIFI_HIP_RESULT_INVALID_VALUE; } @@ -2037,7 +1937,6 @@ static CsrResult card_init_slots(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to read from-host sig written count\n"); - func_exit_r(r); return r; } card->from_host_signals_w = (s16)s; @@ -2051,7 +1950,6 @@ static CsrResult card_init_slots(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to read to-host sig read count\n"); - func_exit_r(r); return r; } card->to_host_signals_r = (s16)s; @@ -2066,7 +1964,6 @@ static CsrResult card_init_slots(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to write initialised flag\n"); - func_exit_r(r); return r; } @@ -2082,7 +1979,6 @@ static CsrResult card_init_slots(card_t *card) card->dynamic_slot_data.packets_interval = UNIFI_PACKETS_INTERVAL; - func_exit(); return CSR_RESULT_SUCCESS; } /* card_init_slots() */ @@ -2153,8 +2049,6 @@ static void CardReassignDynamicReservation(card_t *card) { u8 i; - func_enter(); - unifi_trace(card->ospriv, UDBG5, "Packets Txed %d %d %d %d\n", card->dynamic_slot_data.packets_txed[0], card->dynamic_slot_data.packets_txed[1], @@ -2176,7 +2070,6 @@ static void CardReassignDynamicReservation(card_t *card) } card->dynamic_slot_data.total_packets_txed = 0; - func_exit(); } @@ -2206,8 +2099,6 @@ static void CardCheckDynamicReservation(card_t *card, unifi_TrafficQueue queue) q_t *sigq; u16 num_data_slots = card->config_data.num_fromhost_data_slots - UNIFI_RESERVED_COMMAND_SLOTS; - func_enter(); - /* Calculate the pending queue length */ sigq = &card->fh_traffic_queue[queue]; q_len = CSR_WIFI_HIP_Q_SLOTS_USED(sigq); @@ -2215,7 +2106,6 @@ static void CardCheckDynamicReservation(card_t *card, unifi_TrafficQueue queue) if (q_len <= card->dynamic_slot_data.from_host_reserved_slots[queue]) { unifi_trace(card->ospriv, UDBG5, "queue %d q_len %d already has that many reserved slots, exiting\n", queue, q_len); - func_exit(); return; } @@ -2313,7 +2203,6 @@ static void CardCheckDynamicReservation(card_t *card, unifi_TrafficQueue queue) card->dynamic_slot_data.from_host_max_slots[i]); } - func_exit(); } @@ -2336,14 +2225,11 @@ void CardClearFromHostDataSlot(card_t *card, const s16 slot) u8 queue = card->from_host_data[slot].queue; const void *os_data_ptr = card->from_host_data[slot].bd.os_data_ptr; - func_enter(); - if (card->from_host_data[slot].bd.data_length == 0) { unifi_warning(card->ospriv, "Surprise: request to clear an already free FH data slot: %d\n", slot); - func_exit(); return; } @@ -2379,7 +2265,6 @@ void CardClearFromHostDataSlot(card_t *card, const s16 slot) unifi_trace(card->ospriv, UDBG4, "CardClearFromHostDataSlot: slot %d recycled %p\n", slot, os_data_ptr); - func_exit(); } /* CardClearFromHostDataSlot() */ @@ -2457,8 +2342,6 @@ u16 CardGetFreeFromHostDataSlots(card_t *card) { u16 i, n = 0; - func_enter(); - /* First two slots reserved for MLME */ for (i = 0; i < card->config_data.num_fromhost_data_slots; i++) { @@ -2469,7 +2352,6 @@ u16 CardGetFreeFromHostDataSlots(card_t *card) } } - func_exit(); return n; } /* CardGetFreeFromHostDataSlots() */ @@ -2506,7 +2388,6 @@ u16 CardAreAllFromHostDataSlotsEmpty(card_t *card) static CsrResult unifi_identify_hw(card_t *card) { - func_enter(); card->chip_id = card->sdio_if->sdioId.cardId; card->function = card->sdio_if->sdioId.sdioFunction; @@ -2530,7 +2411,6 @@ static CsrResult unifi_identify_hw(card_t *card) ChipHelper_MarketingName(card->helper), ChipHelper_FriendlyName(card->helper)); - func_exit(); return CSR_RESULT_SUCCESS; } /* unifi_identify_hw() */ @@ -2541,8 +2421,6 @@ static CsrResult unifi_prepare_hw(card_t *card) CsrResult csrResult; enum unifi_host_state old_state = card->host_state; - func_enter(); - r = unifi_identify_hw(card); if (r == CSR_WIFI_HIP_RESULT_NO_DEVICE) { @@ -2551,7 +2429,6 @@ static CsrResult unifi_prepare_hw(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to identify hw\n"); - func_exit_r(r); return r; } @@ -2576,7 +2453,6 @@ static CsrResult unifi_prepare_hw(card_t *card) if (csrResult != CSR_RESULT_SUCCESS) { r = ConvertCsrSdioToCsrHipResult(card, csrResult); - func_exit_r(r); return r; } card->sdio_clock_speed = UNIFI_SDIO_CLOCK_INIT_HZ; @@ -2596,7 +2472,6 @@ static CsrResult unifi_prepare_hw(card_t *card) r = ConvertCsrSdioToCsrHipResult(card, csrResult); /* Can't enable WLAN function. Try resetting the SDIO block. */ unifi_error(card->ospriv, "Failed to re-enable function %d.\n", card->function); - func_exit_r(r); return r; } @@ -2610,11 +2485,9 @@ static CsrResult unifi_prepare_hw(card_t *card) r = unifi_read_chip_version(card); if (r != CSR_RESULT_SUCCESS) { - func_exit_r(r); return r; } - func_exit(); return CSR_RESULT_SUCCESS; } /* unifi_prepare_hw() */ @@ -2625,8 +2498,6 @@ static CsrResult unifi_read_chip_version(card_t *card) CsrResult r; u16 ver; - func_enter(); - gbl_chip_version = ChipHelper_GBL_CHIP_VERSION(card->helper); /* Try to read the chip version from register. */ @@ -2640,7 +2511,6 @@ static CsrResult unifi_read_chip_version(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to read GBL_CHIP_VERSION\n"); - func_exit_r(r); return r; } card->chip_version = ver; @@ -2653,7 +2523,6 @@ static CsrResult unifi_read_chip_version(card_t *card) unifi_info(card->ospriv, "Chip Version 0x%04X\n", card->chip_version); - func_exit_r(r); return r; } /* unifi_read_chip_version() */ @@ -2684,8 +2553,6 @@ static CsrResult unifi_reset_hardware(card_t *card) u16 new_block_size = UNIFI_IO_BLOCK_SIZE; CsrResult csrResult; - func_enter(); - /* Errors returned by unifi_prepare_hw() are not critical at this point */ r = unifi_prepare_hw(card); if (r == CSR_WIFI_HIP_RESULT_NO_DEVICE) @@ -2709,7 +2576,6 @@ static CsrResult unifi_reset_hardware(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "unifi_prepare_hw failed after hard reset\n"); - func_exit_r(r); return r; } } @@ -2729,7 +2595,6 @@ static CsrResult unifi_reset_hardware(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "software hard reset failed\n"); - func_exit_r(r); return r; } @@ -2742,7 +2607,6 @@ static CsrResult unifi_reset_hardware(card_t *card) r = unifi_read_chip_version(card); if (r != CSR_RESULT_SUCCESS) { - func_exit_r(r); return r; } } @@ -2792,7 +2656,6 @@ static CsrResult unifi_reset_hardware(card_t *card) } - func_exit_r(r); return r; } /* unifi_reset_hardware() */ @@ -2818,8 +2681,6 @@ static CsrResult card_reset_method_io_enable(card_t *card) CsrResult r; CsrResult csrResult; - func_enter(); - /* * This resets only function 1, so should be used in * preference to the method below (CSR_FUNC_EN) @@ -2869,7 +2730,6 @@ static CsrResult card_reset_method_io_enable(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_warning(card->ospriv, "SDIO error writing SDIO_CSR_FUNC_EN: %d\n", r); - func_exit_r(r); return r; } else @@ -2890,7 +2750,6 @@ static CsrResult card_reset_method_io_enable(card_t *card) unifi_warning(card->ospriv, "card_reset_method_io_enable failed to reset UniFi\n"); } - func_exit(); return r; } /* card_reset_method_io_enable() */ @@ -2915,8 +2774,6 @@ static CsrResult card_reset_method_dbg_reset(card_t *card) { CsrResult r; - func_enter(); - /* * Prepare UniFi for h/w reset */ @@ -2930,7 +2787,6 @@ static CsrResult card_reset_method_dbg_reset(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to set UNIFI_HOST_STATE_DROWSY\n"); - func_exit_r(r); return r; } CsrThreadSleep(5); @@ -2944,7 +2800,6 @@ static CsrResult card_reset_method_dbg_reset(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Can't stop processors\n"); - func_exit(); return r; } @@ -2963,7 +2818,6 @@ static CsrResult card_reset_method_dbg_reset(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_warning(card->ospriv, "SDIO error writing DBG_RESET: %d\n", r); - func_exit_r(r); return r; } @@ -2980,7 +2834,6 @@ static CsrResult card_reset_method_dbg_reset(card_t *card) unifi_warning(card->ospriv, "card_reset_method_dbg_reset failed to reset UniFi\n"); } - func_exit(); return r; } /* card_reset_method_dbg_reset() */ @@ -3008,8 +2861,6 @@ CsrResult unifi_card_hard_reset(card_t *card) const struct chip_helper_reset_values *init_data; u32 chunks; - func_enter(); - /* Clear cache of page registers */ card->proc_select = (u32)(-1); card->dmem_page = (u32)(-1); @@ -3028,7 +2879,6 @@ CsrResult unifi_card_hard_reset(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "unifi_card_hard_reset failed to identify h/w\n"); - func_exit(); return r; } @@ -3039,7 +2889,6 @@ CsrResult unifi_card_hard_reset(card_t *card) unifi_error(card->ospriv, "Hard reset (Code download) is unsupported\n"); - func_exit_r(CSR_RESULT_FAILURE); return CSR_RESULT_FAILURE; } @@ -3058,7 +2907,6 @@ CsrResult unifi_card_hard_reset(card_t *card) } if (r == CSR_RESULT_SUCCESS) { - func_exit(); return r; } } @@ -3066,7 +2914,6 @@ CsrResult unifi_card_hard_reset(card_t *card) /* Software hard reset */ r = card_reset_method_dbg_reset(card); - func_exit_r(r); return r; } /* unifi_card_hard_reset() */ @@ -3097,8 +2944,6 @@ CsrResult CardGenInt(card_t *card) { CsrResult r; - func_enter(); - if (card->chip_id > SDIO_CARD_ID_UNIFI_2) { r = sdio_write_f0(card, SDIO_CSR_FROM_HOST_SCRATCH0, @@ -3117,13 +2962,11 @@ CsrResult CardGenInt(card_t *card) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "SDIO error writing UNIFI_SHARED_IO_INTERRUPT: %d\n", r); - func_exit_r(r); return r; } card->unifi_interrupt_seq++; - func_exit(); return CSR_RESULT_SUCCESS; } /* CardGenInt() */ @@ -3388,8 +3231,6 @@ CsrResult CardWriteBulkData(card_t *card, card_signal_t *csptr, unifi_TrafficQue bulk_data_desc_t *bulkdata = csptr->bulkdata; s16 h, nslots; - func_enter(); - /* Count the number of slots required */ for (i = 0; i < UNIFI_MAX_DATA_REFERENCES; i++) { @@ -3470,7 +3311,6 @@ CsrResult CardWriteBulkData(card_t *card, card_signal_t *csptr, unifi_TrafficQue { unifi_trace(card->ospriv, UDBG5, "fh data slot %d: %d\n", i, card->from_host_data[i].bd.data_length); } - func_exit(); return CSR_RESULT_FAILURE; } } @@ -3523,8 +3363,6 @@ CsrResult CardWriteBulkData(card_t *card, card_signal_t *csptr, unifi_TrafficQue } } - func_exit(); - return CSR_RESULT_SUCCESS; } /* CardWriteBulkData() */ diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio.h b/drivers/staging/csr/csr_wifi_hip_card_sdio.h index dc2ed70f7edd..a9b9ec427320 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio.h +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio.h @@ -20,10 +20,6 @@ #ifndef __CARD_SDIO_H__ #define __CARD_SDIO_H__ -#ifdef __cplusplus -extern "C" { -#endif - #include "csr_wifi_hip_unifi.h" #include "csr_wifi_hip_unifi_udi.h" #include "csr_wifi_hip_unifihw.h" @@ -695,8 +691,4 @@ CsrResult prealloc_netdata_alloc(card_t *card); void dump(void *mem, u16 len); void dump16(void *mem, u16 len); -#ifdef __cplusplus -} -#endif - #endif /* __CARD_SDIO_H__ */ diff --git a/drivers/staging/csr/csr_wifi_hip_chiphelper.h b/drivers/staging/csr/csr_wifi_hip_chiphelper.h index 24737ae8a2de..b6b67ee11db8 100644 --- a/drivers/staging/csr/csr_wifi_hip_chiphelper.h +++ b/drivers/staging/csr/csr_wifi_hip_chiphelper.h @@ -14,10 +14,6 @@ #include <linux/types.h> -#ifdef __cplusplus -extern "C" { -#endif - /* The age of the BlueCore chip. This is probably not useful, if you know the age then you can probably work out the version directly. */ enum chip_helper_bluecore_age @@ -408,64 +404,4 @@ s32 ChipHelper_DecodeWindow(ChipDescript *chip_help, u32 offset, u16 *page, u16 *addr, u32 *len); -#ifdef __cplusplus -/* Close the extern "C" */ -} - -/* - * This is the C++ API. - */ - -class ChipHelper -{ -public: - /* If this constructor is used then a GetVersionXXX function - should be called next. */ - ChipHelper(); - - /* copy constructor */ - ChipHelper(ChipDescript * desc); - - /* The default constructor assume a BC7 / UF105x series chip - and that the number given is the value of UNIFI_GBL_CHIP_VERSION - (0xFE81) */ - ChipHelper(u16 version); - - /* This returns the C interface magic token from a C++ instance. */ - ChipDescript* GetDescript() const - { - return m_desc; - } - - - /* Clear out theis class (set it to the null token). */ - void ClearVersion(); - - /* Load this class with data for a specific chip. */ - 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. */ -#define CHIP_HELPER_DEF0_CPP_DEC(ret_type, name, info) \ - ret_type name() const; -#define CHIP_HELPER_DEF1_CPP_DEC(ret_type, name, type1, name1) \ - ret_type name(type1 name1) const; - - CHIP_HELPER_LIST(CPP_DEC) - - - /* The DecodeWindow function, see the description of the C version. */ - s32 DecodeWindow(chip_helper_window_index window, - chip_helper_window_type type, - u32 offset, - u16 &page, u16 &addr, u32 &len) const; - -private: - ChipDescript *m_desc; -}; - -#endif /* __cplusplus */ - #endif diff --git a/drivers/staging/csr/csr_wifi_hip_chiphelper_private.h b/drivers/staging/csr/csr_wifi_hip_chiphelper_private.h index cb0ea4b63e65..e5e579912550 100644 --- a/drivers/staging/csr/csr_wifi_hip_chiphelper_private.h +++ b/drivers/staging/csr/csr_wifi_hip_chiphelper_private.h @@ -14,10 +14,6 @@ #include "csr_wifi_hip_chiphelper.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - /* This GP stuff should be somewhere else? */ /* Memory spaces encoded in top byte of Generic Pointer type */ @@ -201,8 +197,4 @@ struct chip_device_desc_t const struct window_info_t *windows[CHIP_HELPER_WINDOW_COUNT]; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - #endif /* CSR_WIFI_HIP_CHIPHELPER_PRIVATE_H__ */ diff --git a/drivers/staging/csr/csr_wifi_hip_conversions.h b/drivers/staging/csr/csr_wifi_hip_conversions.h index 7d045c069362..bf7a52e82995 100644 --- a/drivers/staging/csr/csr_wifi_hip_conversions.h +++ b/drivers/staging/csr/csr_wifi_hip_conversions.h @@ -23,10 +23,6 @@ #ifndef __CSR_WIFI_HIP_CONVERSIONS_H__ #define __CSR_WIFI_HIP_CONVERSIONS_H__ -#ifdef __cplusplus -extern "C" { -#endif - #define SIZEOF_UINT16 2 #define SIZEOF_UINT32 4 #define SIZEOF_UINT64 8 @@ -73,9 +69,5 @@ s32 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, u16 *sig_len); -#ifdef __cplusplus -} -#endif - #endif /* __CSR_WIFI_HIP_CONVERSIONS_H__ */ diff --git a/drivers/staging/csr/csr_wifi_hip_download.c b/drivers/staging/csr/csr_wifi_hip_download.c index 6db672caaa02..2f44a383d2cf 100644 --- a/drivers/staging/csr/csr_wifi_hip_download.c +++ b/drivers/staging/csr/csr_wifi_hip_download.c @@ -68,7 +68,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Firmware hasn't started\n"); - func_exit_r(r); return r; } *pslut = slut_address; @@ -81,7 +80,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut) if (csrResult != CSR_RESULT_SUCCESS) { r = ConvertCsrSdioToCsrHipResult(card, csrResult); - func_exit_r(r); return r; } card->sdio_clock_speed = UNIFI_SDIO_CLOCK_INIT_HZ; @@ -106,14 +104,12 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut) if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Failed to read SLUT finger print\n"); - func_exit_r(r); return r; } if (finger_print != SLUT_FINGERPRINT) { unifi_error(card->ospriv, "Failed to find SLUT fingerprint\n"); - func_exit_r(CSR_RESULT_FAILURE); return CSR_RESULT_FAILURE; } @@ -128,7 +124,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut) r = unifi_card_read16(card, slut_address, &id); if (r != CSR_RESULT_SUCCESS) { - func_exit_r(r); return r; } slut_address += 2; @@ -143,7 +138,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut) r = unifi_read32(card, slut_address, &obj); if (r != CSR_RESULT_SUCCESS) { - func_exit_r(r); return r; } slut_address += 4; @@ -161,7 +155,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut) } } - func_exit_r(r); return r; } @@ -279,7 +272,6 @@ static CsrResult do_patch_convert_download(card_t *card, void *dlpriv, xbv1_t *p if (r != CSR_RESULT_SUCCESS) { unifi_error(card->ospriv, "Converted patch download failed\n"); - func_exit_r(r); return r; } else @@ -294,7 +286,6 @@ static CsrResult do_patch_convert_download(card_t *card, void *dlpriv, xbv1_t *p unifi_error(card->ospriv, "Failed to write loader restart cmd\n"); } - func_exit_r(r); return r; } } @@ -327,8 +318,6 @@ CsrResult unifi_dl_firmware(card_t *card, void *dlpriv) xbv1_t *fwinfo; CsrResult r; - func_enter(); - fwinfo = kmalloc(sizeof(xbv1_t), GFP_KERNEL); if (fwinfo == NULL) { @@ -376,7 +365,6 @@ CsrResult unifi_dl_firmware(card_t *card, void *dlpriv) } kfree(fwinfo); - func_exit_r(r); return r; } /* unifi_dl_firmware() */ @@ -407,15 +395,12 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, u32 boot_ctrl) xbv1_t *fwinfo; CsrResult r; - func_enter(); - unifi_info(card->ospriv, "unifi_dl_patch %p %08x\n", dlpriv, boot_ctrl); fwinfo = kmalloc(sizeof(xbv1_t), GFP_KERNEL); if (fwinfo == NULL) { unifi_error(card->ospriv, "Failed to allocate memory for patches\n"); - func_exit(); return CSR_WIFI_HIP_RESULT_NO_MEMORY; } @@ -431,7 +416,6 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, u32 boot_ctrl) { kfree(fwinfo); unifi_error(card->ospriv, "Failed to read in patch file\n"); - func_exit(); return CSR_WIFI_HIP_RESULT_INVALID_VALUE; } @@ -446,7 +430,6 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, u32 boot_ctrl) card->build_id, fwinfo->build_id); kfree(fwinfo); #ifndef CSR_WIFI_IGNORE_PATCH_VERSION_MISMATCH - func_exit(); return CSR_WIFI_HIP_RESULT_INVALID_VALUE; #else fwinfo = NULL; @@ -463,7 +446,6 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, u32 boot_ctrl) kfree(fwinfo); - func_exit_r(r); return r; } /* unifi_dl_patch() */ diff --git a/drivers/staging/csr/csr_wifi_hip_dump.c b/drivers/staging/csr/csr_wifi_hip_dump.c index d67b460e7a85..7b7eec49d028 100644 --- a/drivers/staging/csr/csr_wifi_hip_dump.c +++ b/drivers/staging/csr/csr_wifi_hip_dump.c @@ -40,7 +40,7 @@ typedef struct coredump_buf { u16 count; /* serial number of dump */ - CsrTime timestamp; /* host's system time at capture */ + u32 timestamp; /* host's system time at capture */ s16 requestor; /* request: 0=auto dump, 1=manual */ u16 chip_ver; u32 fw_ver; @@ -104,8 +104,6 @@ CsrResult unifi_coredump_request_at_next_reset(card_t *card, s8 enable) { CsrResult r; - func_enter(); - if (enable) { unifi_trace(card->ospriv, UDBG2, "Mini-coredump requested after reset\n"); @@ -121,7 +119,6 @@ CsrResult unifi_coredump_request_at_next_reset(card_t *card, s8 enable) r = CSR_RESULT_SUCCESS; } - func_exit_r(r); return r; } @@ -145,8 +142,6 @@ CsrResult unifi_coredump_handle_request(card_t *card) { CsrResult r = CSR_RESULT_SUCCESS; - func_enter(); - if (card == NULL) { r = CSR_WIFI_HIP_RESULT_INVALID_VALUE; @@ -160,7 +155,6 @@ CsrResult unifi_coredump_handle_request(card_t *card) } } - func_exit_r(r); return r; } @@ -192,9 +186,7 @@ CsrResult unifi_coredump_capture(card_t *card, struct unifi_coredump_req *req) { CsrResult r = CSR_RESULT_SUCCESS; static u16 dump_seq_no = 1; - CsrTime time_of_capture; - - func_enter(); + u32 time_of_capture; if (card->dump_next_write == NULL) { @@ -269,7 +261,6 @@ CsrResult unifi_coredump_capture(card_t *card, struct unifi_coredump_req *req) } done: - func_exit_r(r); return r; } /* unifi_coredump_capture() */ @@ -358,8 +349,6 @@ CsrResult unifi_coredump_get_value(card_t *card, struct unifi_coredump_req *req) s32 i = 0; coredump_buffer *find_dump = NULL; - func_enter(); - if (req == NULL || card == NULL) { r = CSR_WIFI_HIP_RESULT_INVALID_VALUE; @@ -452,7 +441,6 @@ CsrResult unifi_coredump_get_value(card_t *card, struct unifi_coredump_req *req) req->serial = find_dump->count; done: - func_exit_r(r); return r; } /* unifi_coredump_get_value() */ @@ -481,8 +469,6 @@ static CsrResult unifi_coredump_read_zone(card_t *card, u16 *zonebuf, const stru { CsrResult r; - func_enter(); - if (zonebuf == NULL || def == NULL) { r = CSR_WIFI_HIP_RESULT_INVALID_VALUE; @@ -521,7 +507,6 @@ static CsrResult unifi_coredump_read_zone(card_t *card, u16 *zonebuf, const stru } done: - func_exit_r(r); return r; } @@ -551,8 +536,6 @@ static CsrResult unifi_coredump_read_zones(card_t *card, coredump_buffer *dump_b CsrResult r = CSR_RESULT_SUCCESS; s32 i; - func_enter(); - /* Walk the table of coredump zone definitions and read them from the chip */ for (i = 0; (i < HIP_CDUMP_NUM_ZONES) && (r == 0); @@ -561,7 +544,6 @@ static CsrResult unifi_coredump_read_zones(card_t *card, coredump_buffer *dump_b r = unifi_coredump_read_zone(card, dump_buf->zone[i], &zonedef_table[i]); } - func_exit_r(r); return r; } @@ -590,8 +572,6 @@ static CsrResult unifi_coredump_from_sdio(card_t *card, coredump_buffer *dump_bu CsrResult r; u32 sdio_addr; - func_enter(); - if (dump_buf == NULL) { r = CSR_WIFI_HIP_RESULT_INVALID_VALUE; @@ -634,7 +614,6 @@ static CsrResult unifi_coredump_from_sdio(card_t *card, coredump_buffer *dump_bu } done: - func_exit_r(r); return r; } /* unifi_coredump_from_sdio() */ @@ -743,8 +722,6 @@ CsrResult unifi_coredump_init(card_t *card, u16 num_dump_buffers) u32 i = 0; #endif - func_enter(); - card->request_coredump_on_reset = 0; card->dump_next_write = NULL; card->dump_cur_read = NULL; @@ -790,7 +767,6 @@ CsrResult unifi_coredump_init(card_t *card, u16 num_dump_buffers) done: #endif - func_exit(); return CSR_RESULT_SUCCESS; #ifndef UNIFI_DISABLE_COREDUMP @@ -798,7 +774,6 @@ fail: /* Unwind what we allocated so far */ unifi_error(ospriv, "Out of memory allocating core dump node %d\n", i); unifi_coredump_free(card); - func_exit(); return CSR_WIFI_HIP_RESULT_NO_MEMORY; #endif } /* unifi_coreump_init() */ @@ -826,7 +801,6 @@ void unifi_coredump_free(card_t *card) s16 i = 0; s16 j; - func_enter(); unifi_trace(ospriv, UDBG2, "Core dump de-configured\n"); if (card->dump_buf == NULL) @@ -858,8 +832,6 @@ void unifi_coredump_free(card_t *card) card->dump_buf = NULL; card->dump_next_write = NULL; card->dump_cur_read = NULL; - - func_exit(); } /* unifi_coredump_free() */ diff --git a/drivers/staging/csr/csr_wifi_hip_send.c b/drivers/staging/csr/csr_wifi_hip_send.c index 86aa23cefe30..76429e5e77cf 100644 --- a/drivers/staging/csr/csr_wifi_hip_send.c +++ b/drivers/staging/csr/csr_wifi_hip_send.c @@ -270,8 +270,6 @@ static CsrResult send_signal(card_t *card, const u8 *sigptr, u32 siglen, } } - func_exit(); - return CSR_RESULT_SUCCESS; } /* send_signal() */ diff --git a/drivers/staging/csr/csr_wifi_hip_signals.h b/drivers/staging/csr/csr_wifi_hip_signals.h index 5f841556bbef..ca4d0774195c 100644 --- a/drivers/staging/csr/csr_wifi_hip_signals.h +++ b/drivers/staging/csr/csr_wifi_hip_signals.h @@ -1,10 +1,10 @@ /***************************************************************************** - (c) Cambridge Silicon Radio Limited 2011 - All rights reserved and confidential information of CSR + (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. + Refer to LICENSE.txt included with this source for details + on the license terms. *****************************************************************************/ @@ -101,10 +101,6 @@ /* FUNCTION DECLARATIONS */ /******************************************************************************/ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - /****************************************************************************** * SigGetNumDataRefs - Retrieve pointers to data-refs from a signal. * @@ -129,9 +125,4 @@ s32 SigGetDataRefs(CSR_SIGNAL *aSignal, CSR_DATAREF **aDataRef); */ s32 SigGetSize(const CSR_SIGNAL *aSignal); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - #endif /* __CSR_WIFI_HIP_SIGNALS_H__ */ diff --git a/drivers/staging/csr/csr_wifi_hip_sigs.h b/drivers/staging/csr/csr_wifi_hip_sigs.h index 2b9f51d7f296..6112cc3e87fa 100644 --- a/drivers/staging/csr/csr_wifi_hip_sigs.h +++ b/drivers/staging/csr/csr_wifi_hip_sigs.h @@ -16,10 +16,6 @@ #ifndef CSR_WIFI_HIP_SIGS_H #define CSR_WIFI_HIP_SIGS_H -#ifdef __cplusplus -extern "C" { -#endif - typedef s16 csr_place_holding_type; typedef u16 CSR_ASSOCIATION_ID; @@ -1418,8 +1414,4 @@ typedef struct CSR_SIGNAL_PRIMITIVE u32 SigGetFilterPos(u16 aSigID); -#ifdef __cplusplus -} -#endif - #endif diff --git a/drivers/staging/csr/csr_wifi_hip_ta_sampling.h b/drivers/staging/csr/csr_wifi_hip_ta_sampling.h index 46c630b4beea..aa684c654d06 100644 --- a/drivers/staging/csr/csr_wifi_hip_ta_sampling.h +++ b/drivers/staging/csr/csr_wifi_hip_ta_sampling.h @@ -21,10 +21,6 @@ #ifndef __TA_SAMPLING_H__ #define __TA_SAMPLING_H__ -#ifdef __cplusplus -extern "C" { -#endif - #include "csr_wifi_hip_unifi.h" typedef struct ta_l4stats @@ -67,9 +63,4 @@ typedef struct ta_data void unifi_ta_sampling_init(card_t *card); - -#ifdef __cplusplus -} -#endif - #endif /* __TA_SAMPLING_H__ */ diff --git a/drivers/staging/csr/csr_wifi_hip_unifi.h b/drivers/staging/csr/csr_wifi_hip_unifi.h index 2923e2ef12f2..c2a2231680f5 100644 --- a/drivers/staging/csr/csr_wifi_hip_unifi.h +++ b/drivers/staging/csr/csr_wifi_hip_unifi.h @@ -20,10 +20,6 @@ #ifndef __CSR_WIFI_HIP_UNIFI_H__ #define __CSR_WIFI_HIP_UNIFI_H__ 1 -#ifdef __cplusplus -extern "C" { -#endif - #ifndef CSR_WIFI_HIP_TA_DISABLE #include "csr_wifi_router_ctrl_prim.h" #include "csr_wifi_router_prim.h" @@ -228,7 +224,7 @@ typedef struct unifi_coredump_req u32 chip_ver; /* Chip version */ u32 fw_ver; /* Firmware version */ s32 requestor; /* Requestor: 0=auto dump, 1=manual */ - CsrTime timestamp; /* time of capture by driver */ + u32 timestamp; /* time of capture by driver */ u32 serial; /* capture serial number */ s32 value; /* register value */ } unifi_coredump_req_t; /* mini-coredumped reg value request */ @@ -872,8 +868,4 @@ CsrResult unifi_coredump_request_at_next_reset(card_t *card, s8 enable); CsrResult unifi_coredump_init(card_t *card, u16 num_dump_buffers); void unifi_coredump_free(card_t *card); -#ifdef __cplusplus -} -#endif - #endif /* __CSR_WIFI_HIP_UNIFI_H__ */ 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 7c13df295c11..9a3528599f3c 100644 --- a/drivers/staging/csr/csr_wifi_hip_unifi_signal_names.c +++ b/drivers/staging/csr/csr_wifi_hip_unifi_signal_names.c @@ -10,37 +10,32 @@ #include "csr_wifi_hip_unifi.h" -struct sig_name -{ - s16 id; - const char *name; +struct sig_name { + s16 id; + const char *name; }; static const struct sig_name Unifi_bulkcmd_names[] = { - { 0, "SignalCmd" }, - { 1, "CopyToHost" }, - { 2, "CopyToHostAck" }, - { 3, "CopyFromHost" }, - { 4, "CopyFromHostAck" }, - { 5, "ClearSlot" }, - { 6, "CopyOverlay" }, - { 7, "CopyOverlayAck" }, - { 8, "CopyFromHostAndClearSlot" }, - { 15, "Padding" } + { 0, "SignalCmd" }, + { 1, "CopyToHost" }, + { 2, "CopyToHostAck" }, + { 3, "CopyFromHost" }, + { 4, "CopyFromHostAck" }, + { 5, "ClearSlot" }, + { 6, "CopyOverlay" }, + { 7, "CopyOverlayAck" }, + { 8, "CopyFromHostAndClearSlot" }, + { 15, "Padding" } }; -const char* lookup_bulkcmd_name(u16 id) +const char *lookup_bulkcmd_name(u16 id) { - if (id < 9) - { - return Unifi_bulkcmd_names[id].name; - } - if (id == 15) - { - return "Padding"; - } - - return "UNKNOWN"; + if (id < 9) + return Unifi_bulkcmd_names[id].name; + if (id == 15) + return "Padding"; + + return "UNKNOWN"; } diff --git a/drivers/staging/csr/csr_wifi_hip_unifi_udi.h b/drivers/staging/csr/csr_wifi_hip_unifi_udi.h index 83032d0b4ec9..9d85cfd57616 100644 --- a/drivers/staging/csr/csr_wifi_hip_unifi_udi.h +++ b/drivers/staging/csr/csr_wifi_hip_unifi_udi.h @@ -20,10 +20,6 @@ #ifndef __CSR_WIFI_HIP_UNIFI_UDI_H__ #define __CSR_WIFI_HIP_UNIFI_UDI_H__ -#ifdef __cplusplus -extern "C" { -#endif - #include "csr_wifi_hip_unifi.h" #include "csr_wifi_hip_signals.h" @@ -68,9 +64,4 @@ s32 unifi_print_status(card_t *card, char *str, s32 *remain); } \ } while (0) - -#ifdef __cplusplus -} -#endif - #endif /* __CSR_WIFI_HIP_UNIFI_UDI_H__ */ diff --git a/drivers/staging/csr/csr_wifi_hip_unifihw.h b/drivers/staging/csr/csr_wifi_hip_unifihw.h index 5ffd6ba38d3b..3f9fcbd55b55 100644 --- a/drivers/staging/csr/csr_wifi_hip_unifihw.h +++ b/drivers/staging/csr/csr_wifi_hip_unifihw.h @@ -20,10 +20,6 @@ #ifndef __UNIFIHW_H__ #define __UNIFIHW_H__ 1 -#ifdef __cplusplus -extern "C" { -#endif - /* Symbol Look Up Table fingerprint. IDs are in sigs.h */ #define SLUT_FINGERPRINT 0xD397 @@ -60,8 +56,4 @@ extern "C" { #define UNIFI_GP_OFFSET(GP) ((GP) & 0xFFFFFF) #define UNIFI_GP_SPACE(GP) (((GP) >> 24) & 0xFF) -#ifdef __cplusplus -} -#endif - #endif /* __UNIFIHW_H__ */ diff --git a/drivers/staging/csr/csr_wifi_hip_unifiversion.h b/drivers/staging/csr/csr_wifi_hip_unifiversion.h index e1fdbb27a463..d1c66783f32c 100644 --- a/drivers/staging/csr/csr_wifi_hip_unifiversion.h +++ b/drivers/staging/csr/csr_wifi_hip_unifiversion.h @@ -21,18 +21,10 @@ #ifndef __UNIFIVERSION_H__ #define __UNIFIVERSION_H__ -#ifdef __cplusplus -extern "C" { -#endif - /* * The minimum version of Host Interface Protocol required by the driver. */ #define UNIFI_HIP_MAJOR_VERSION 9 #define UNIFI_HIP_MINOR_VERSION 1 -#ifdef __cplusplus -} -#endif - #endif /* __UNIFIVERSION_H__ */ diff --git a/drivers/staging/csr/csr_wifi_hip_xbv.c b/drivers/staging/csr/csr_wifi_hip_xbv.c index 071f80a49f19..050a15fbadf9 100644 --- a/drivers/staging/csr/csr_wifi_hip_xbv.c +++ b/drivers/staging/csr/csr_wifi_hip_xbv.c @@ -758,7 +758,7 @@ static u32 write_fwdl_to_ptdl(void *buf, const u32 offset, fwreadfn_t readfn, while (left) { /* Calculate amount to be transferred */ - sec_data_len = CSRMIN(left, PTDL_MAX_SIZE - PTDL_HDR_SIZE); + sec_data_len = min_t(u32, left, PTDL_MAX_SIZE - PTDL_HDR_SIZE); sec_len = sec_data_len + PTDL_HDR_SIZE; /* Write PTDL header + entire PTDL size */ diff --git a/drivers/staging/csr/csr_wifi_hip_xbv.h b/drivers/staging/csr/csr_wifi_hip_xbv.h index 9b60a7e2dc78..3c507235323d 100644 --- a/drivers/staging/csr/csr_wifi_hip_xbv.h +++ b/drivers/staging/csr/csr_wifi_hip_xbv.h @@ -21,10 +21,6 @@ #ifndef __XBV_H__ #define __XBV_H__ -#ifdef __cplusplus -extern "C" { -#endif - #ifndef CSR_WIFI_XBV_TEST /* Driver includes */ #include "csr_wifi_hip_unifi.h" @@ -120,8 +116,4 @@ s32 xbv1_read_slut(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwinfo void* xbv_to_patch(card_t *card, fwreadfn_t readfn, const void *fw_buf, const xbv1_t *fwinfo, u32 *size); -#ifdef __cplusplus -} -#endif - #endif /* __XBV_H__ */ diff --git a/drivers/staging/csr/csr_wifi_hostio_prim.h b/drivers/staging/csr/csr_wifi_hostio_prim.h index bf7c55c6e84b..cfb3e272e359 100644 --- a/drivers/staging/csr/csr_wifi_hostio_prim.h +++ b/drivers/staging/csr/csr_wifi_hostio_prim.h @@ -12,16 +12,7 @@ #ifndef CSR_WIFI_HOSTIO_H #define CSR_WIFI_HOSTIO_H -#ifdef __cplusplus -extern "C" { -#endif - - #define CSR_WIFI_HOSTIO_PRIM 0x0453 -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_HOSTIO_H */ diff --git a/drivers/staging/csr/csr_wifi_lib.h b/drivers/staging/csr/csr_wifi_lib.h index eb56f6208871..5fde0efb5dca 100644 --- a/drivers/staging/csr/csr_wifi_lib.h +++ b/drivers/staging/csr/csr_wifi_lib.h @@ -12,11 +12,6 @@ #include "csr_wifi_fsm_event.h" - -#ifdef __cplusplus -extern "C" { -#endif - /*----------------------------------------------------------------------------* * CsrWifiFsmEventInit * @@ -105,8 +100,4 @@ typedef struct *----------------------------------------------------------------------------*/ CsrWifiEventCsrUint16CsrUint8* CsrWifiEventCsrUint16CsrUint8_struct(u16 primtype, u16 msgtype, CsrSchedQid dst, CsrSchedQid src, u16 value16, u8 value8); -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_LIB_H__ */ diff --git a/drivers/staging/csr/csr_wifi_msgconv.h b/drivers/staging/csr/csr_wifi_msgconv.h index 7ec35d70e14a..f8b402947a09 100644 --- a/drivers/staging/csr/csr_wifi_msgconv.h +++ b/drivers/staging/csr/csr_wifi_msgconv.h @@ -14,11 +14,6 @@ #include "csr_prim_defs.h" #include "csr_sched.h" -#ifdef __cplusplus -extern "C" { -#endif - - void CsrUint16SerBigEndian(u8 *ptr, size_t *len, u16 v); void CsrUint24SerBigEndian(u8 *ptr, size_t *len, u32 v); void CsrUint32SerBigEndian(u8 *ptr, size_t *len, u32 v); @@ -51,8 +46,4 @@ size_t CsrWifiEventCsrUint16CsrUint8Sizeof(void *msg); u8* CsrWifiEventCsrUint16CsrUint8Ser(u8 *ptr, size_t *len, void *msg); void* CsrWifiEventCsrUint16CsrUint8Des(u8 *buffer, size_t length); -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_MSGCONV_H__ */ diff --git a/drivers/staging/csr/csr_wifi_nme_ap_converter_init.h b/drivers/staging/csr/csr_wifi_nme_ap_converter_init.h index 4072c06a152d..b89d7c7f8e21 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_converter_init.h +++ b/drivers/staging/csr/csr_wifi_nme_ap_converter_init.h @@ -13,10 +13,6 @@ #ifndef CSR_WIFI_NME_AP_CONVERTER_INIT_H__ #define CSR_WIFI_NME_AP_CONVERTER_INIT_H__ -#ifdef __cplusplus -extern "C" { -#endif - #ifndef CSR_WIFI_NME_ENABLE #error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_ap_converter_init.h #endif @@ -42,8 +38,4 @@ extern void CsrWifiNmeApConverterInit(void); #endif /* EXCLUDE_CSR_WIFI_NME_AP_MODULE */ -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_NME_AP_CONVERTER_INIT_H__ */ diff --git a/drivers/staging/csr/csr_wifi_nme_ap_lib.h b/drivers/staging/csr/csr_wifi_nme_ap_lib.h index d4014709112b..6d8df8366817 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_lib.h +++ b/drivers/staging/csr/csr_wifi_nme_ap_lib.h @@ -22,11 +22,6 @@ #include "csr_wifi_nme_ap_prim.h" #include "csr_wifi_nme_task.h" - -#ifdef __cplusplus -extern "C" { -#endif - #ifndef CSR_WIFI_NME_ENABLE #error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_ap_lib.h #endif @@ -58,24 +53,6 @@ void CsrWifiNmeApFreeUpstreamMessageContents(u16 eventClass, void *message); *----------------------------------------------------------------------------*/ void CsrWifiNmeApFreeDownstreamMessageContents(u16 eventClass, void *message); -/*----------------------------------------------------------------------------* - * Enum to string functions - *----------------------------------------------------------------------------*/ -const char* CsrWifiNmeApPersCredentialTypeToString(CsrWifiNmeApPersCredentialType value); - - -/*----------------------------------------------------------------------------* - * CsrPrim Type toString function. - * Converts a message type to the String name of the Message - *----------------------------------------------------------------------------*/ -const char* CsrWifiNmeApPrimTypeToString(CsrPrim msgType); - -/*----------------------------------------------------------------------------* - * Lookup arrays for PrimType name Strings - *----------------------------------------------------------------------------*/ -extern const char *CsrWifiNmeApUpstreamPrimNames[CSR_WIFI_NME_AP_PRIM_UPSTREAM_COUNT]; -extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTREAM_COUNT]; - /******************************************************************************* NAME @@ -515,9 +492,4 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE #define CsrWifiNmeApWpsRegisterCfmSend(dst__, interfaceTag__, status__) \ CsrWifiNmeApWpsRegisterCfmSendTo(dst__, CSR_WIFI_NME_IFACEQUEUE, interfaceTag__, status__) - -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_NME_AP_LIB_H__ */ diff --git a/drivers/staging/csr/csr_wifi_nme_ap_prim.h b/drivers/staging/csr/csr_wifi_nme_ap_prim.h index fc44560b28b8..b32bdbc7e22f 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_prim.h +++ b/drivers/staging/csr/csr_wifi_nme_ap_prim.h @@ -22,10 +22,6 @@ #include "csr_wifi_sme_ap_prim.h" #include "csr_wifi_nme_prim.h" -#ifdef __cplusplus -extern "C" { -#endif - #ifndef CSR_WIFI_NME_ENABLE #error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_ap_prim.h #endif @@ -494,10 +490,5 @@ typedef struct CsrWifiMacAddress peerDeviceAddress; } CsrWifiNmeApStationInd; - -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_NME_AP_PRIM_H__ */ diff --git a/drivers/staging/csr/csr_wifi_nme_ap_sef.h b/drivers/staging/csr/csr_wifi_nme_ap_sef.h index 3f353633fa5e..3daaa0944dba 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_sef.h +++ b/drivers/staging/csr/csr_wifi_nme_ap_sef.h @@ -11,11 +11,6 @@ #include "csr_wifi_nme_prim.h" - -#ifdef __cplusplus -extern "C" { -#endif - void CsrWifiNmeApUpstreamStateHandlers(void* drvpriv, CsrWifiFsmEvent* msg); @@ -23,9 +18,4 @@ extern void CsrWifiNmeApConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg) extern void CsrWifiNmeApStartCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); extern void CsrWifiNmeApStopCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); - -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_ROUTER_SEF_CSR_WIFI_NME_H__ */ diff --git a/drivers/staging/csr/csr_wifi_nme_ap_serialize.h b/drivers/staging/csr/csr_wifi_nme_ap_serialize.h index 0f5782947223..c04585e72460 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_serialize.h +++ b/drivers/staging/csr/csr_wifi_nme_ap_serialize.h @@ -17,10 +17,6 @@ #include "csr_wifi_nme_ap_prim.h" -#ifdef __cplusplus -extern "C" { -#endif - #ifndef CSR_WIFI_NME_ENABLE #error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_ap_serialize.h #endif @@ -95,9 +91,4 @@ extern void* CsrWifiNmeApStationIndDes(u8 *buffer, size_t len); extern size_t CsrWifiNmeApStationIndSizeof(void *msg); #define CsrWifiNmeApStationIndSerFree CsrWifiNmeApPfree - -#ifdef __cplusplus -} -#endif #endif /* CSR_WIFI_NME_AP_SERIALIZE_H__ */ - diff --git a/drivers/staging/csr/csr_wifi_nme_converter_init.h b/drivers/staging/csr/csr_wifi_nme_converter_init.h index 6661914fb403..85e6f5f57130 100644 --- a/drivers/staging/csr/csr_wifi_nme_converter_init.h +++ b/drivers/staging/csr/csr_wifi_nme_converter_init.h @@ -13,10 +13,6 @@ #ifndef CSR_WIFI_NME_CONVERTER_INIT_H__ #define CSR_WIFI_NME_CONVERTER_INIT_H__ -#ifdef __cplusplus -extern "C" { -#endif - #ifndef CSR_WIFI_NME_ENABLE #error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_converter_init.h #endif @@ -39,8 +35,4 @@ extern void CsrWifiNmeConverterInit(void); #endif /* EXCLUDE_CSR_WIFI_NME_MODULE */ -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_NME_CONVERTER_INIT_H__ */ diff --git a/drivers/staging/csr/csr_wifi_nme_lib.h b/drivers/staging/csr/csr_wifi_nme_lib.h index 709ece464977..5a1f132009bf 100644 --- a/drivers/staging/csr/csr_wifi_nme_lib.h +++ b/drivers/staging/csr/csr_wifi_nme_lib.h @@ -23,68 +23,10 @@ #include "csr_wifi_nme_task.h" -#ifdef __cplusplus -extern "C" { -#endif - #ifndef CSR_WIFI_NME_ENABLE #error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_lib.h #endif -/*----------------------------------------------------------------------------* - * CsrWifiNmeFreeUpstreamMessageContents - * - * DESCRIPTION - * Free the allocated memory in a CSR_WIFI_NME upstream message. Does not - * free the message itself, and can only be used for upstream messages. - * - * PARAMETERS - * Deallocates the resources in a CSR_WIFI_NME upstream message - *----------------------------------------------------------------------------*/ -void CsrWifiNmeFreeUpstreamMessageContents(u16 eventClass, void *message); - -/*----------------------------------------------------------------------------* - * CsrWifiNmeFreeDownstreamMessageContents - * - * DESCRIPTION - * Free the allocated memory in a CSR_WIFI_NME downstream message. Does not - * free the message itself, and can only be used for downstream messages. - * - * PARAMETERS - * Deallocates the resources in a CSR_WIFI_NME downstream message - *----------------------------------------------------------------------------*/ -void CsrWifiNmeFreeDownstreamMessageContents(u16 eventClass, void *message); - -/*----------------------------------------------------------------------------* - * Enum to string functions - *----------------------------------------------------------------------------*/ -const char* CsrWifiNmeAuthModeToString(CsrWifiNmeAuthMode value); -const char* CsrWifiNmeBssTypeToString(CsrWifiNmeBssType value); -const char* CsrWifiNmeCcxOptionsMaskToString(CsrWifiNmeCcxOptionsMask value); -const char* CsrWifiNmeConfigActionToString(CsrWifiNmeConfigAction value); -const char* CsrWifiNmeConnectionStatusToString(CsrWifiNmeConnectionStatus value); -const char* CsrWifiNmeCredentialTypeToString(CsrWifiNmeCredentialType value); -const char* CsrWifiNmeEapMethodToString(CsrWifiNmeEapMethod value); -const char* CsrWifiNmeEncryptionToString(CsrWifiNmeEncryption value); -const char* CsrWifiNmeIndicationsToString(CsrWifiNmeIndications value); -const char* CsrWifiNmeSecErrorToString(CsrWifiNmeSecError value); -const char* CsrWifiNmeSimCardTypeToString(CsrWifiNmeSimCardType value); -const char* CsrWifiNmeUmtsAuthResultToString(CsrWifiNmeUmtsAuthResult value); -const char* CsrWifiNmeWmmQosInfoToString(CsrWifiNmeWmmQosInfo value); - - -/*----------------------------------------------------------------------------* - * CsrPrim Type toString function. - * Converts a message type to the String name of the Message - *----------------------------------------------------------------------------*/ -const char* CsrWifiNmePrimTypeToString(CsrPrim msgType); - -/*----------------------------------------------------------------------------* - * Lookup arrays for PrimType name Strings - *----------------------------------------------------------------------------*/ -extern const char *CsrWifiNmeUpstreamPrimNames[CSR_WIFI_NME_PRIM_UPSTREAM_COUNT]; -extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_COUNT]; - /******************************************************************************* NAME @@ -1046,9 +988,4 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO #define CsrWifiNmeWpsReqSend(src__, interfaceTag__, pin__, ssid__, bssid__) \ CsrWifiNmeWpsReqSendTo(CSR_WIFI_NME_IFACEQUEUE, src__, interfaceTag__, pin__, ssid__, bssid__) - -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_NME_LIB_H__ */ diff --git a/drivers/staging/csr/csr_wifi_nme_prim.h b/drivers/staging/csr/csr_wifi_nme_prim.h index 20dc77971f94..9a7927a117ea 100644 --- a/drivers/staging/csr/csr_wifi_nme_prim.h +++ b/drivers/staging/csr/csr_wifi_nme_prim.h @@ -21,10 +21,6 @@ #include "csr_wifi_fsm_event.h" #include "csr_wifi_sme_prim.h" -#ifdef __cplusplus -extern "C" { -#endif - #ifndef CSR_WIFI_NME_ENABLE #error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_prim.h #endif @@ -1657,10 +1653,5 @@ typedef struct CsrResult status; } CsrWifiNmeEventMaskSetCfm; - -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_NME_PRIM_H__ */ diff --git a/drivers/staging/csr/csr_wifi_nme_serialize.h b/drivers/staging/csr/csr_wifi_nme_serialize.h index c6b163660a3e..ebac484419cf 100644 --- a/drivers/staging/csr/csr_wifi_nme_serialize.h +++ b/drivers/staging/csr/csr_wifi_nme_serialize.h @@ -16,10 +16,6 @@ #include "csr_wifi_msgconv.h" #include "csr_wifi_nme_prim.h" -#ifdef __cplusplus -extern "C" { -#endif - #ifndef CSR_WIFI_NME_ENABLE #error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_serialize.h #endif @@ -166,9 +162,5 @@ extern size_t CsrWifiNmeSimUmtsAuthIndSizeof(void *msg); #define CsrWifiNmeEventMaskSetCfmSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiNmeEventMaskSetCfmSerFree CsrWifiNmePfree - -#ifdef __cplusplus -} -#endif #endif /* CSR_WIFI_NME_SERIALIZE_H__ */ diff --git a/drivers/staging/csr/csr_wifi_nme_task.h b/drivers/staging/csr/csr_wifi_nme_task.h index 76f44dbe26a9..84e973a59bb2 100644 --- a/drivers/staging/csr/csr_wifi_nme_task.h +++ b/drivers/staging/csr/csr_wifi_nme_task.h @@ -16,23 +16,12 @@ #include <linux/types.h> #include "csr_sched.h" -#ifdef __cplusplus -extern "C" { -#endif - #ifndef CSR_WIFI_NME_ENABLE #error CSR_WIFI_NME_ENABLE MUST be defined inorder to use csr_wifi_nme_task.h #endif #define CSR_WIFI_NME_LOG_ID 0x1203FFFF extern CsrSchedQid CSR_WIFI_NME_IFACEQUEUE; -void CsrWifiNmeInit(void **gash); -void CsrWifiNmeDeinit(void **gash); -void CsrWifiNmeHandler(void **gash); - -#ifdef __cplusplus -} -#endif #endif /* CSR_WIFI_NME_TASK_H__ */ diff --git a/drivers/staging/csr/csr_wifi_private_common.h b/drivers/staging/csr/csr_wifi_private_common.h index 47309984e2a7..ee3bd51b934a 100644 --- a/drivers/staging/csr/csr_wifi_private_common.h +++ b/drivers/staging/csr/csr_wifi_private_common.h @@ -11,10 +11,6 @@ #ifndef CSR_WIFI_PRIVATE_COMMON_H__ #define CSR_WIFI_PRIVATE_COMMON_H__ -#ifdef __cplusplus -extern "C" { -#endif - /** * @brief maximum number of STAs allowed to be connected * @@ -81,9 +77,5 @@ typedef u8 CsrWifiInterfaceMode; #define CSR_WIFI_MODE_WPS_ENROLLEE ((CsrWifiInterfaceMode) 0x06) #define CSR_WIFI_MODE_IBSS ((CsrWifiInterfaceMode) 0x07) -#ifdef __cplusplus -} -#endif - #endif diff --git a/drivers/staging/csr/csr_wifi_result.h b/drivers/staging/csr/csr_wifi_result.h index 2f87cda9003e..3c394c7e5fa9 100644 --- a/drivers/staging/csr/csr_wifi_result.h +++ b/drivers/staging/csr/csr_wifi_result.h @@ -13,10 +13,6 @@ #include "csr_result.h" -#ifdef __cplusplus -extern "C" { -#endif - /* THIS FILE SHOULD CONTAIN ONLY RESULT CODES */ /* Result Codes */ @@ -27,9 +23,5 @@ extern "C" { #define CSR_WIFI_HIP_RESULT_RANGE ((CsrResult) 5) /* Request exceeds the range of a file or a buffer */ #define CSR_WIFI_HIP_RESULT_NOT_FOUND ((CsrResult) 6) /* A file (typically a f/w patch) is not found */ -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_RESULT_H__ */ diff --git a/drivers/staging/csr/csr_wifi_router_converter_init.h b/drivers/staging/csr/csr_wifi_router_converter_init.h index 2a293e457ffb..478327b75c18 100644 --- a/drivers/staging/csr/csr_wifi_router_converter_init.h +++ b/drivers/staging/csr/csr_wifi_router_converter_init.h @@ -13,10 +13,6 @@ #ifndef CSR_WIFI_ROUTER_CONVERTER_INIT_H__ #define CSR_WIFI_ROUTER_CONVERTER_INIT_H__ -#ifdef __cplusplus -extern "C" { -#endif - #ifndef EXCLUDE_CSR_WIFI_ROUTER_MODULE #include "csr_msgconv.h" @@ -35,8 +31,4 @@ extern void CsrWifiRouterConverterInit(void); #endif /* EXCLUDE_CSR_WIFI_ROUTER_MODULE */ -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_ROUTER_CONVERTER_INIT_H__ */ diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.h b/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.h index 0c9d26b7a0b4..c98458912825 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.h +++ b/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.h @@ -13,10 +13,6 @@ #ifndef CSR_WIFI_ROUTER_CTRL_CONVERTER_INIT_H__ #define CSR_WIFI_ROUTER_CTRL_CONVERTER_INIT_H__ -#ifdef __cplusplus -extern "C" { -#endif - #ifndef EXCLUDE_CSR_WIFI_ROUTER_CTRL_MODULE #include "csr_msgconv.h" @@ -35,8 +31,4 @@ extern void CsrWifiRouterCtrlConverterInit(void); #endif /* EXCLUDE_CSR_WIFI_ROUTER_CTRL_MODULE */ -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_ROUTER_CTRL_CONVERTER_INIT_H__ */ diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h index 93d0fadf5e6f..f235153c42af 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h +++ b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h @@ -22,11 +22,6 @@ #include "csr_wifi_router_ctrl_prim.h" #include "csr_wifi_router_task.h" - -#ifdef __cplusplus -extern "C" { -#endif - /*----------------------------------------------------------------------------* * CsrWifiRouterCtrlFreeUpstreamMessageContents * @@ -2084,9 +2079,4 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI #define CsrWifiRouterCtrlWifiOnCfmSend(dst__, clientData__, status__) \ CsrWifiRouterCtrlWifiOnCfmSendTo(dst__, CSR_WIFI_ROUTER_IFACEQUEUE, clientData__, status__) - -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_ROUTER_CTRL_LIB_H__ */ diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_prim.h b/drivers/staging/csr/csr_wifi_router_ctrl_prim.h index ec972ac0b5aa..1312a335dd76 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_prim.h +++ b/drivers/staging/csr/csr_wifi_router_ctrl_prim.h @@ -20,10 +20,6 @@ #include "csr_result.h" #include "csr_wifi_fsm_event.h" -#ifdef __cplusplus -extern "C" { -#endif - #define CSR_WIFI_ROUTER_CTRL_PRIM (0x0401) typedef CsrPrim CsrWifiRouterCtrlPrim; @@ -2113,10 +2109,5 @@ typedef struct u8 *data; } CsrWifiRouterCtrlWapiUnicastTxEncryptInd; - -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_ROUTER_CTRL_PRIM_H__ */ diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_sef.c b/drivers/staging/csr/csr_wifi_router_ctrl_sef.c index 33d92b698c59..99cf93061d1b 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_sef.c +++ b/drivers/staging/csr/csr_wifi_router_ctrl_sef.c @@ -9,37 +9,38 @@ *****************************************************************************/ #include "csr_wifi_router_ctrl_sef.h" -const CsrWifiRouterCtrlStateHandlerType CsrWifiRouterCtrlDownstreamStateHandlers[CSR_WIFI_ROUTER_CTRL_PRIM_DOWNSTREAM_COUNT] = -{ - /* 0x0000 */ CsrWifiRouterCtrlConfigurePowerModeReqHandler, - /* 0x0001 */ CsrWifiRouterCtrlHipReqHandler, - /* 0x0002 */ CsrWifiRouterCtrlMediaStatusReqHandler, - /* 0x0003 */ CsrWifiRouterCtrlMulticastAddressResHandler, - /* 0x0004 */ CsrWifiRouterCtrlPortConfigureReqHandler, - /* 0x0005 */ CsrWifiRouterCtrlQosControlReqHandler, - /* 0x0006 */ CsrWifiRouterCtrlSuspendResHandler, - /* 0x0007 */ CsrWifiRouterCtrlTclasAddReqHandler, - /* 0x0008 */ CsrWifiRouterCtrlResumeResHandler, - /* 0x0009 */ CsrWifiRouterCtrlRawSdioDeinitialiseReqHandler, - /* 0x000A */ CsrWifiRouterCtrlRawSdioInitialiseReqHandler, - /* 0x000B */ CsrWifiRouterCtrlTclasDelReqHandler, - /* 0x000C */ CsrWifiRouterCtrlTrafficClassificationReqHandler, - /* 0x000D */ CsrWifiRouterCtrlTrafficConfigReqHandler, - /* 0x000E */ CsrWifiRouterCtrlWifiOffReqHandler, - /* 0x000F */ CsrWifiRouterCtrlWifiOffResHandler, - /* 0x0010 */ CsrWifiRouterCtrlWifiOnReqHandler, - /* 0x0011 */ CsrWifiRouterCtrlWifiOnResHandler, - /* 0x0012 */ CsrWifiRouterCtrlM4TransmitReqHandler, - /* 0x0013 */ CsrWifiRouterCtrlModeSetReqHandler, - /* 0x0014 */ CsrWifiRouterCtrlPeerAddReqHandler, - /* 0x0015 */ CsrWifiRouterCtrlPeerDelReqHandler, - /* 0x0016 */ CsrWifiRouterCtrlPeerUpdateReqHandler, - /* 0x0017 */ CsrWifiRouterCtrlCapabilitiesReqHandler, - /* 0x0018 */ CsrWifiRouterCtrlBlockAckEnableReqHandler, - /* 0x0019 */ CsrWifiRouterCtrlBlockAckDisableReqHandler, - /* 0x001A */ CsrWifiRouterCtrlWapiRxPktReqHandler, - /* 0x001B */ CsrWifiRouterCtrlWapiMulticastFilterReqHandler, - /* 0x001C */ CsrWifiRouterCtrlWapiUnicastFilterReqHandler, - /* 0x001D */ CsrWifiRouterCtrlWapiUnicastTxPktReqHandler, - /* 0x001E */ CsrWifiRouterCtrlWapiFilterReqHandler, +const CsrWifiRouterCtrlStateHandlerType + CsrWifiRouterCtrlDownstreamStateHandlers + [CSR_WIFI_ROUTER_CTRL_PRIM_DOWNSTREAM_COUNT] = { + /* 0x0000 */ CsrWifiRouterCtrlConfigurePowerModeReqHandler, + /* 0x0001 */ CsrWifiRouterCtrlHipReqHandler, + /* 0x0002 */ CsrWifiRouterCtrlMediaStatusReqHandler, + /* 0x0003 */ CsrWifiRouterCtrlMulticastAddressResHandler, + /* 0x0004 */ CsrWifiRouterCtrlPortConfigureReqHandler, + /* 0x0005 */ CsrWifiRouterCtrlQosControlReqHandler, + /* 0x0006 */ CsrWifiRouterCtrlSuspendResHandler, + /* 0x0007 */ CsrWifiRouterCtrlTclasAddReqHandler, + /* 0x0008 */ CsrWifiRouterCtrlResumeResHandler, + /* 0x0009 */ CsrWifiRouterCtrlRawSdioDeinitialiseReqHandler, + /* 0x000A */ CsrWifiRouterCtrlRawSdioInitialiseReqHandler, + /* 0x000B */ CsrWifiRouterCtrlTclasDelReqHandler, + /* 0x000C */ CsrWifiRouterCtrlTrafficClassificationReqHandler, + /* 0x000D */ CsrWifiRouterCtrlTrafficConfigReqHandler, + /* 0x000E */ CsrWifiRouterCtrlWifiOffReqHandler, + /* 0x000F */ CsrWifiRouterCtrlWifiOffResHandler, + /* 0x0010 */ CsrWifiRouterCtrlWifiOnReqHandler, + /* 0x0011 */ CsrWifiRouterCtrlWifiOnResHandler, + /* 0x0012 */ CsrWifiRouterCtrlM4TransmitReqHandler, + /* 0x0013 */ CsrWifiRouterCtrlModeSetReqHandler, + /* 0x0014 */ CsrWifiRouterCtrlPeerAddReqHandler, + /* 0x0015 */ CsrWifiRouterCtrlPeerDelReqHandler, + /* 0x0016 */ CsrWifiRouterCtrlPeerUpdateReqHandler, + /* 0x0017 */ CsrWifiRouterCtrlCapabilitiesReqHandler, + /* 0x0018 */ CsrWifiRouterCtrlBlockAckEnableReqHandler, + /* 0x0019 */ CsrWifiRouterCtrlBlockAckDisableReqHandler, + /* 0x001A */ CsrWifiRouterCtrlWapiRxPktReqHandler, + /* 0x001B */ CsrWifiRouterCtrlWapiMulticastFilterReqHandler, + /* 0x001C */ CsrWifiRouterCtrlWapiUnicastFilterReqHandler, + /* 0x001D */ CsrWifiRouterCtrlWapiUnicastTxPktReqHandler, + /* 0x001E */ CsrWifiRouterCtrlWapiFilterReqHandler, }; diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_sef.h b/drivers/staging/csr/csr_wifi_router_ctrl_sef.h index e0ee5cf45f9e..2fb4937bc909 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_sef.h +++ b/drivers/staging/csr/csr_wifi_router_ctrl_sef.h @@ -12,10 +12,6 @@ #include "csr_wifi_router_ctrl_prim.h" -#ifdef __cplusplus -extern "C" { -#endif - typedef void (*CsrWifiRouterCtrlStateHandlerType)(void* drvpriv, CsrWifiFsmEvent* msg); extern const CsrWifiRouterCtrlStateHandlerType CsrWifiRouterCtrlDownstreamStateHandlers[CSR_WIFI_ROUTER_CTRL_PRIM_DOWNSTREAM_COUNT]; @@ -51,8 +47,5 @@ extern "C" { extern void CsrWifiRouterCtrlWapiUnicastTxPktReqHandler(void* drvpriv, CsrWifiFsmEvent* msg); extern void CsrWifiRouterCtrlWapiUnicastFilterReqHandler(void* drvpriv, CsrWifiFsmEvent* msg); extern void CsrWifiRouterCtrlWapiFilterReqHandler(void* drvpriv, CsrWifiFsmEvent* msg); -#ifdef __cplusplus -} -#endif #endif /* CSR_WIFI_ROUTER_SEF_CSR_WIFI_ROUTER_CTRL_H__ */ diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h index 2c2a229f4bf1..c9048386cfcb 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h +++ b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h @@ -17,10 +17,6 @@ #include "csr_wifi_router_ctrl_prim.h" -#ifdef __cplusplus -extern "C" { -#endif - extern void CsrWifiRouterCtrlPfree(void *ptr); extern u8* CsrWifiRouterCtrlConfigurePowerModeReqSer(u8 *ptr, size_t *len, void *msg); @@ -333,9 +329,5 @@ extern void* CsrWifiRouterCtrlWapiUnicastTxEncryptIndDes(u8 *buffer, size_t len) extern size_t CsrWifiRouterCtrlWapiUnicastTxEncryptIndSizeof(void *msg); extern void CsrWifiRouterCtrlWapiUnicastTxEncryptIndSerFree(void *msg); - -#ifdef __cplusplus -} -#endif #endif /* CSR_WIFI_ROUTER_CTRL_SERIALIZE_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 de1086d7158d..4cd126338e27 100644 --- a/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c +++ b/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c @@ -1,10 +1,10 @@ /***************************************************************************** - (c) Cambridge Silicon Radio Limited 2011 - All rights reserved and confidential information of CSR + (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. + Refer to LICENSE.txt included with this source for details + on the license terms. *****************************************************************************/ @@ -26,28 +26,22 @@ *----------------------------------------------------------------------------*/ void CsrWifiRouterFreeUpstreamMessageContents(u16 eventClass, void *message) { - if (eventClass != CSR_WIFI_ROUTER_PRIM) - { - return; - } - if (NULL == message) - { - return; - } - - switch (*((CsrWifiRouterPrim *) message)) - { - case CSR_WIFI_ROUTER_MA_PACKET_IND: - { - CsrWifiRouterMaPacketInd *p = (CsrWifiRouterMaPacketInd *)message; - kfree(p->frame); - p->frame = NULL; - break; - } - - default: - break; - } + if (eventClass != CSR_WIFI_ROUTER_PRIM) + return; + if (NULL == message) + return; + switch (*((CsrWifiRouterPrim *) message)) { + case CSR_WIFI_ROUTER_MA_PACKET_IND: + { + CsrWifiRouterMaPacketInd *p = + (CsrWifiRouterMaPacketInd *) message; + kfree(p->frame); + p->frame = NULL; + break; + } + default: + break; + } } diff --git a/drivers/staging/csr/csr_wifi_router_lib.h b/drivers/staging/csr/csr_wifi_router_lib.h index 06a2214714b7..b0477c413aae 100644 --- a/drivers/staging/csr/csr_wifi_router_lib.h +++ b/drivers/staging/csr/csr_wifi_router_lib.h @@ -22,11 +22,6 @@ #include "csr_wifi_router_prim.h" #include "csr_wifi_router_task.h" - -#ifdef __cplusplus -extern "C" { -#endif - /*----------------------------------------------------------------------------* * CsrWifiRouterFreeUpstreamMessageContents * @@ -419,9 +414,4 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR #define CsrWifiRouterMaPacketUnsubscribeCfmSend(dst__, interfaceTag__, status__) \ CsrWifiRouterMaPacketUnsubscribeCfmSendTo(dst__, CSR_WIFI_ROUTER_IFACEQUEUE, interfaceTag__, status__) - -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_ROUTER_LIB_H__ */ diff --git a/drivers/staging/csr/csr_wifi_router_prim.h b/drivers/staging/csr/csr_wifi_router_prim.h index c61486fbb6d6..c52344b51f2f 100644 --- a/drivers/staging/csr/csr_wifi_router_prim.h +++ b/drivers/staging/csr/csr_wifi_router_prim.h @@ -20,10 +20,6 @@ #include "csr_result.h" #include "csr_wifi_fsm_event.h" -#ifdef __cplusplus -extern "C" { -#endif - #define CSR_WIFI_ROUTER_PRIM (0x0400) typedef CsrPrim CsrWifiRouterPrim; @@ -421,10 +417,5 @@ typedef struct u16 rate; } CsrWifiRouterMaPacketInd; - -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_ROUTER_PRIM_H__ */ diff --git a/drivers/staging/csr/csr_wifi_router_sef.h b/drivers/staging/csr/csr_wifi_router_sef.h index 49dd158fa98d..86692c7780c9 100644 --- a/drivers/staging/csr/csr_wifi_router_sef.h +++ b/drivers/staging/csr/csr_wifi_router_sef.h @@ -12,10 +12,6 @@ #include "csr_wifi_router_prim.h" -#ifdef __cplusplus -extern "C" { -#endif - typedef void (*CsrWifiRouterStateHandlerType)(void* drvpriv, CsrWifiFsmEvent* msg); extern const CsrWifiRouterStateHandlerType CsrWifiRouterDownstreamStateHandlers[CSR_WIFI_ROUTER_PRIM_DOWNSTREAM_COUNT]; @@ -26,8 +22,4 @@ extern "C" { extern void CsrWifiRouterMaPacketResHandler(void* drvpriv, CsrWifiFsmEvent* msg); extern void CsrWifiRouterMaPacketCancelReqHandler(void* drvpriv, CsrWifiFsmEvent* msg); -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_ROUTER_SEF_CSR_WIFI_ROUTER_H__ */ diff --git a/drivers/staging/csr/csr_wifi_router_serialize.h b/drivers/staging/csr/csr_wifi_router_serialize.h index 07e21b2b4363..94ccdac5606f 100644 --- a/drivers/staging/csr/csr_wifi_router_serialize.h +++ b/drivers/staging/csr/csr_wifi_router_serialize.h @@ -16,10 +16,6 @@ #include "csr_wifi_msgconv.h" #include "csr_wifi_router_prim.h" -#ifdef __cplusplus -extern "C" { -#endif - extern void CsrWifiRouterPfree(void *ptr); extern u8* CsrWifiRouterMaPacketSubscribeReqSer(u8 *ptr, size_t *len, void *msg); @@ -67,9 +63,5 @@ extern void* CsrWifiRouterMaPacketIndDes(u8 *buffer, size_t len); extern size_t CsrWifiRouterMaPacketIndSizeof(void *msg); extern void CsrWifiRouterMaPacketIndSerFree(void *msg); - -#ifdef __cplusplus -} -#endif #endif /* CSR_WIFI_ROUTER_SERIALIZE_H__ */ diff --git a/drivers/staging/csr/csr_wifi_router_task.h b/drivers/staging/csr/csr_wifi_router_task.h index 4e51fae4cda0..9ba892f34e6d 100644 --- a/drivers/staging/csr/csr_wifi_router_task.h +++ b/drivers/staging/csr/csr_wifi_router_task.h @@ -15,19 +15,11 @@ #include "csr_sched.h" -#ifdef __cplusplus -extern "C" { -#endif - #define CSR_WIFI_ROUTER_LOG_ID 0x1201FFFF extern CsrSchedQid CSR_WIFI_ROUTER_IFACEQUEUE; void CsrWifiRouterInit(void **gash); void CsrWifiRouterDeinit(void **gash); void CsrWifiRouterHandler(void **gash); -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_ROUTER_TASK_H__ */ diff --git a/drivers/staging/csr/csr_wifi_sme_ap_lib.h b/drivers/staging/csr/csr_wifi_sme_ap_lib.h index 350cb9ec3012..48ea9143f591 100644 --- a/drivers/staging/csr/csr_wifi_sme_ap_lib.h +++ b/drivers/staging/csr/csr_wifi_sme_ap_lib.h @@ -22,11 +22,6 @@ #include "csr_wifi_sme_ap_prim.h" #include "csr_wifi_sme_task.h" - -#ifdef __cplusplus -extern "C" { -#endif - #ifndef CSR_WIFI_AP_ENABLE #error CSR_WIFI_AP_ENABLE MUST be defined inorder to use csr_wifi_sme_ap_lib.h #endif @@ -776,8 +771,4 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE CsrWifiSmeApWpsRegistrationStartedCfmSendTo(dst__, CSR_WIFI_SME_IFACEQUEUE, interfaceTag__, status__) -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_SME_AP_LIB_H__ */ diff --git a/drivers/staging/csr/csr_wifi_sme_ap_prim.h b/drivers/staging/csr/csr_wifi_sme_ap_prim.h index 93b64e9154c8..3c4bcbc16126 100644 --- a/drivers/staging/csr/csr_wifi_sme_ap_prim.h +++ b/drivers/staging/csr/csr_wifi_sme_ap_prim.h @@ -20,10 +20,6 @@ #include "csr_wifi_fsm_event.h" #include "csr_wifi_sme_prim.h" -#ifdef __cplusplus -extern "C" { -#endif - #ifndef CSR_WIFI_AP_ENABLE #error CSR_WIFI_AP_ENABLE MUST be defined inorder to use csr_wifi_sme_ap_prim.h #endif @@ -1030,9 +1026,5 @@ typedef struct } CsrWifiSmeApBaDeleteCfm; -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_SME_AP_PRIM_H__ */ diff --git a/drivers/staging/csr/csr_wifi_sme_converter_init.h b/drivers/staging/csr/csr_wifi_sme_converter_init.h index fb895dec7688..ba5e4b44bb6b 100644 --- a/drivers/staging/csr/csr_wifi_sme_converter_init.h +++ b/drivers/staging/csr/csr_wifi_sme_converter_init.h @@ -13,10 +13,6 @@ #ifndef CSR_WIFI_SME_CONVERTER_INIT_H__ #define CSR_WIFI_SME_CONVERTER_INIT_H__ -#ifdef __cplusplus -extern "C" { -#endif - #ifndef EXCLUDE_CSR_WIFI_SME_MODULE #include "csr_msgconv.h" @@ -35,8 +31,4 @@ extern void CsrWifiSmeConverterInit(void); #endif /* EXCLUDE_CSR_WIFI_SME_MODULE */ -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_SME_CONVERTER_INIT_H__ */ diff --git a/drivers/staging/csr/csr_wifi_sme_lib.h b/drivers/staging/csr/csr_wifi_sme_lib.h index 3ca745608252..53cf1268286e 100644 --- a/drivers/staging/csr/csr_wifi_sme_lib.h +++ b/drivers/staging/csr/csr_wifi_sme_lib.h @@ -32,11 +32,6 @@ # endif #endif - -#ifdef __cplusplus -extern "C" { -#endif - /*----------------------------------------------------------------------------* * CsrWifiSmeFreeUpstreamMessageContents * @@ -4305,9 +4300,4 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO #define CsrWifiSmeWpsConfigurationCfmSend(dst__, status__) \ CsrWifiSmeWpsConfigurationCfmSendTo(dst__, CSR_WIFI_SME_IFACEQUEUE, status__) - -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_SME_LIB_H__ */ diff --git a/drivers/staging/csr/csr_wifi_sme_prim.h b/drivers/staging/csr/csr_wifi_sme_prim.h index 55cac5059bf7..17ec79c77e54 100644 --- a/drivers/staging/csr/csr_wifi_sme_prim.h +++ b/drivers/staging/csr/csr_wifi_sme_prim.h @@ -20,10 +20,6 @@ #include "csr_result.h" #include "csr_wifi_fsm_event.h" -#ifdef __cplusplus -extern "C" { -#endif - #define CSR_WIFI_SME_PRIM (0x0404) typedef CsrPrim CsrWifiSmePrim; @@ -6510,10 +6506,5 @@ typedef struct CsrResult status; } CsrWifiSmeWpsConfigurationCfm; - -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_SME_PRIM_H__ */ diff --git a/drivers/staging/csr/csr_wifi_sme_sef.h b/drivers/staging/csr/csr_wifi_sme_sef.h index c8741811b2e4..78b88c067236 100644 --- a/drivers/staging/csr/csr_wifi_sme_sef.h +++ b/drivers/staging/csr/csr_wifi_sme_sef.h @@ -1,10 +1,10 @@ /***************************************************************************** - (c) Cambridge Silicon Radio Limited 2010 - Confidential information of CSR + (c) Cambridge Silicon Radio Limited 2010 + Confidential information of CSR - Refer to LICENSE.txt included with this source for details - on the license terms. + Refer to LICENSE.txt included with this source for details + on the license terms. *****************************************************************************/ #ifndef CSR_WIFI_ROUTER_SEF_CSR_WIFI_SME_H__ @@ -12,90 +12,131 @@ #include "csr_wifi_sme_prim.h" +typedef void (*CsrWifiSmeStateHandlerType)(void *drvpriv, CsrWifiFsmEvent *msg); -#ifdef __cplusplus -extern "C" { -#endif +extern const CsrWifiSmeStateHandlerType + CsrWifiSmeUpstreamStateHandlers[CSR_WIFI_SME_PRIM_UPSTREAM_COUNT]; -typedef void (*CsrWifiSmeStateHandlerType)(void* drvpriv, CsrWifiFsmEvent* msg); -extern const CsrWifiSmeStateHandlerType CsrWifiSmeUpstreamStateHandlers[CSR_WIFI_SME_PRIM_UPSTREAM_COUNT]; - - -extern void CsrWifiSmeActivateCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeAdhocConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeAdhocConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeAssociationCompleteIndHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeAssociationStartIndHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeBlacklistCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeCalibrationDataGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeCalibrationDataSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeCcxConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeCcxConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeCoexConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeCoexConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeCoexInfoGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeConnectCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeConnectionConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeConnectionInfoGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeConnectionQualityIndHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeConnectionStatsGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeDeactivateCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeDisconnectCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeEventMaskSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeHostConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeHostConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeIbssStationIndHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeKeyCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeLinkQualityGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeMediaStatusIndHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeMibConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeMibConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeMibGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeMibGetNextCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeMibSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeMicFailureIndHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeMulticastAddressCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmePacketFilterSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmePermanentMacAddressGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmePmkidCandidateListIndHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmePmkidCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmePowerConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmePowerConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeRegulatoryDomainInfoGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeRoamCompleteIndHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeRoamStartIndHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeRoamingConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeRoamingConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeScanConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeScanConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeScanFullCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeScanResultIndHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeScanResultsFlushCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeScanResultsGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeSmeStaConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeSmeStaConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeStationMacAddressGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeTspecIndHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeTspecCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeVersionsGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeWifiFlightmodeCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeWifiOffIndHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeWifiOffCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeWifiOnCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeCloakedSsidsSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeCloakedSsidsGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeWifiOnIndHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeSmeCommonConfigGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeSmeCommonConfigSetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeGetInterfaceCapabilityCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeErrorIndHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeInfoIndHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeCoreDumpIndHandler(void* drvpriv, CsrWifiFsmEvent* msg); -extern void CsrWifiSmeAmpStatusChangeIndHandler(void* drvpriv, CsrWifiFsmEvent* msg); - -#ifdef __cplusplus -} -#endif +extern void CsrWifiSmeActivateCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeAdhocConfigGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeAdhocConfigSetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeAssociationCompleteIndHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeAssociationStartIndHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeBlacklistCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeCalibrationDataGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeCalibrationDataSetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeCcxConfigGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeCcxConfigSetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeCoexConfigGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeCoexConfigSetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeCoexInfoGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeConnectCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeConnectionConfigGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeConnectionInfoGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeConnectionQualityIndHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeConnectionStatsGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeDeactivateCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeDisconnectCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeEventMaskSetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeHostConfigGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeHostConfigSetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeIbssStationIndHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeKeyCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeLinkQualityGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeMediaStatusIndHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeMibConfigGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeMibConfigSetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeMibGetCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeMibGetNextCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeMibSetCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeMicFailureIndHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeMulticastAddressCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmePacketFilterSetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmePermanentMacAddressGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmePmkidCandidateListIndHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmePmkidCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmePowerConfigGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmePowerConfigSetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeRegulatoryDomainInfoGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeRoamCompleteIndHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeRoamStartIndHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeRoamingConfigGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeRoamingConfigSetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeScanConfigGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeScanConfigSetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeScanFullCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeScanResultIndHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeScanResultsFlushCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeScanResultsGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeSmeStaConfigGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeSmeStaConfigSetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeStationMacAddressGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeTspecIndHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeTspecCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeVersionsGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeWifiFlightmodeCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeWifiOffIndHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeWifiOffCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeWifiOnCfmHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeCloakedSsidsSetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeCloakedSsidsGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeWifiOnIndHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeSmeCommonConfigGetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeSmeCommonConfigSetCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeGetInterfaceCapabilityCfmHandler(void *drvpriv, + CsrWifiFsmEvent *msg); +extern void CsrWifiSmeErrorIndHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeInfoIndHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeCoreDumpIndHandler(void *drvpriv, CsrWifiFsmEvent *msg); +extern void CsrWifiSmeAmpStatusChangeIndHandler(void *drvpriv, + CsrWifiFsmEvent *msg); #endif /* CSR_WIFI_ROUTER_SEF_CSR_WIFI_SME_H__ */ diff --git a/drivers/staging/csr/csr_wifi_sme_serialize.h b/drivers/staging/csr/csr_wifi_sme_serialize.h index 4f3af0a6be7c..f8526269b203 100644 --- a/drivers/staging/csr/csr_wifi_sme_serialize.h +++ b/drivers/staging/csr/csr_wifi_sme_serialize.h @@ -1,10 +1,10 @@ /***************************************************************************** - (c) Cambridge Silicon Radio Limited 2012 - All rights reserved and confidential information of CSR + (c) Cambridge Silicon Radio Limited 2012 + All rights reserved and confidential information of CSR - Refer to LICENSE.txt included with this source for details - on the license terms. + Refer to LICENSE.txt included with this source for details + on the license terms. *****************************************************************************/ @@ -16,10 +16,6 @@ #include "csr_wifi_msgconv.h" #include "csr_wifi_sme_prim.h" -#ifdef __cplusplus -extern "C" { -#endif - extern void CsrWifiSmePfree(void *ptr); #define CsrWifiSmeActivateReqSer CsrWifiEventSer @@ -32,13 +28,13 @@ extern void CsrWifiSmePfree(void *ptr); #define CsrWifiSmeAdhocConfigGetReqSizeof CsrWifiEventSizeof #define CsrWifiSmeAdhocConfigGetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeAdhocConfigSetReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeAdhocConfigSetReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeAdhocConfigSetReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeAdhocConfigSetReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeAdhocConfigSetReqSizeof(void *msg); #define CsrWifiSmeAdhocConfigSetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeBlacklistReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeBlacklistReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeBlacklistReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeBlacklistReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeBlacklistReqSizeof(void *msg); extern void CsrWifiSmeBlacklistReqSerFree(void *msg); @@ -47,8 +43,8 @@ extern void CsrWifiSmeBlacklistReqSerFree(void *msg); #define CsrWifiSmeCalibrationDataGetReqSizeof CsrWifiEventSizeof #define CsrWifiSmeCalibrationDataGetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeCalibrationDataSetReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeCalibrationDataSetReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeCalibrationDataSetReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeCalibrationDataSetReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeCalibrationDataSetReqSizeof(void *msg); extern void CsrWifiSmeCalibrationDataSetReqSerFree(void *msg); @@ -57,8 +53,8 @@ extern void CsrWifiSmeCalibrationDataSetReqSerFree(void *msg); #define CsrWifiSmeCcxConfigGetReqSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiSmeCcxConfigGetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeCcxConfigSetReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeCcxConfigSetReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeCcxConfigSetReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeCcxConfigSetReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeCcxConfigSetReqSizeof(void *msg); #define CsrWifiSmeCcxConfigSetReqSerFree CsrWifiSmePfree @@ -67,8 +63,8 @@ extern size_t CsrWifiSmeCcxConfigSetReqSizeof(void *msg); #define CsrWifiSmeCoexConfigGetReqSizeof CsrWifiEventSizeof #define CsrWifiSmeCoexConfigGetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeCoexConfigSetReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeCoexConfigSetReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeCoexConfigSetReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeCoexConfigSetReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeCoexConfigSetReqSizeof(void *msg); #define CsrWifiSmeCoexConfigSetReqSerFree CsrWifiSmePfree @@ -77,8 +73,8 @@ extern size_t CsrWifiSmeCoexConfigSetReqSizeof(void *msg); #define CsrWifiSmeCoexInfoGetReqSizeof CsrWifiEventSizeof #define CsrWifiSmeCoexInfoGetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeConnectReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeConnectReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeConnectReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeConnectReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeConnectReqSizeof(void *msg); extern void CsrWifiSmeConnectReqSerFree(void *msg); @@ -117,13 +113,13 @@ extern void CsrWifiSmeConnectReqSerFree(void *msg); #define CsrWifiSmeHostConfigGetReqSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiSmeHostConfigGetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeHostConfigSetReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeHostConfigSetReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeHostConfigSetReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeHostConfigSetReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeHostConfigSetReqSizeof(void *msg); #define CsrWifiSmeHostConfigSetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeKeyReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeKeyReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeKeyReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeKeyReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeKeyReqSizeof(void *msg); #define CsrWifiSmeKeyReqSerFree CsrWifiSmePfree @@ -137,33 +133,33 @@ extern size_t CsrWifiSmeKeyReqSizeof(void *msg); #define CsrWifiSmeMibConfigGetReqSizeof CsrWifiEventSizeof #define CsrWifiSmeMibConfigGetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeMibConfigSetReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeMibConfigSetReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeMibConfigSetReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeMibConfigSetReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeMibConfigSetReqSizeof(void *msg); #define CsrWifiSmeMibConfigSetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeMibGetNextReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeMibGetNextReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeMibGetNextReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeMibGetNextReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeMibGetNextReqSizeof(void *msg); extern void CsrWifiSmeMibGetNextReqSerFree(void *msg); -extern u8* CsrWifiSmeMibGetReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeMibGetReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeMibGetReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeMibGetReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeMibGetReqSizeof(void *msg); extern void CsrWifiSmeMibGetReqSerFree(void *msg); -extern u8* CsrWifiSmeMibSetReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeMibSetReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeMibSetReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeMibSetReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeMibSetReqSizeof(void *msg); extern void CsrWifiSmeMibSetReqSerFree(void *msg); -extern u8* CsrWifiSmeMulticastAddressReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeMulticastAddressReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeMulticastAddressReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeMulticastAddressReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeMulticastAddressReqSizeof(void *msg); extern void CsrWifiSmeMulticastAddressReqSerFree(void *msg); -extern u8* CsrWifiSmePacketFilterSetReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmePacketFilterSetReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmePacketFilterSetReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmePacketFilterSetReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmePacketFilterSetReqSizeof(void *msg); extern void CsrWifiSmePacketFilterSetReqSerFree(void *msg); @@ -172,8 +168,8 @@ extern void CsrWifiSmePacketFilterSetReqSerFree(void *msg); #define CsrWifiSmePermanentMacAddressGetReqSizeof CsrWifiEventSizeof #define CsrWifiSmePermanentMacAddressGetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmePmkidReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmePmkidReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmePmkidReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmePmkidReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmePmkidReqSizeof(void *msg); extern void CsrWifiSmePmkidReqSerFree(void *msg); @@ -182,8 +178,8 @@ extern void CsrWifiSmePmkidReqSerFree(void *msg); #define CsrWifiSmePowerConfigGetReqSizeof CsrWifiEventSizeof #define CsrWifiSmePowerConfigGetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmePowerConfigSetReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmePowerConfigSetReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmePowerConfigSetReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmePowerConfigSetReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmePowerConfigSetReqSizeof(void *msg); #define CsrWifiSmePowerConfigSetReqSerFree CsrWifiSmePfree @@ -197,8 +193,8 @@ extern size_t CsrWifiSmePowerConfigSetReqSizeof(void *msg); #define CsrWifiSmeRoamingConfigGetReqSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiSmeRoamingConfigGetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeRoamingConfigSetReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeRoamingConfigSetReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeRoamingConfigSetReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeRoamingConfigSetReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeRoamingConfigSetReqSizeof(void *msg); #define CsrWifiSmeRoamingConfigSetReqSerFree CsrWifiSmePfree @@ -207,13 +203,13 @@ extern size_t CsrWifiSmeRoamingConfigSetReqSizeof(void *msg); #define CsrWifiSmeScanConfigGetReqSizeof CsrWifiEventSizeof #define CsrWifiSmeScanConfigGetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeScanConfigSetReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeScanConfigSetReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeScanConfigSetReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeScanConfigSetReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeScanConfigSetReqSizeof(void *msg); extern void CsrWifiSmeScanConfigSetReqSerFree(void *msg); -extern u8* CsrWifiSmeScanFullReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeScanFullReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeScanFullReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeScanFullReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeScanFullReqSizeof(void *msg); extern void CsrWifiSmeScanFullReqSerFree(void *msg); @@ -232,8 +228,8 @@ extern void CsrWifiSmeScanFullReqSerFree(void *msg); #define CsrWifiSmeSmeStaConfigGetReqSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiSmeSmeStaConfigGetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeSmeStaConfigSetReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeSmeStaConfigSetReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeSmeStaConfigSetReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeSmeStaConfigSetReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeSmeStaConfigSetReqSizeof(void *msg); #define CsrWifiSmeSmeStaConfigSetReqSerFree CsrWifiSmePfree @@ -242,8 +238,8 @@ extern size_t CsrWifiSmeSmeStaConfigSetReqSizeof(void *msg); #define CsrWifiSmeStationMacAddressGetReqSizeof CsrWifiEventSizeof #define CsrWifiSmeStationMacAddressGetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeTspecReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeTspecReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeTspecReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeTspecReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeTspecReqSizeof(void *msg); extern void CsrWifiSmeTspecReqSerFree(void *msg); @@ -252,8 +248,8 @@ extern void CsrWifiSmeTspecReqSerFree(void *msg); #define CsrWifiSmeVersionsGetReqSizeof CsrWifiEventSizeof #define CsrWifiSmeVersionsGetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeWifiFlightmodeReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeWifiFlightmodeReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeWifiFlightmodeReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeWifiFlightmodeReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeWifiFlightmodeReqSizeof(void *msg); extern void CsrWifiSmeWifiFlightmodeReqSerFree(void *msg); @@ -262,13 +258,13 @@ extern void CsrWifiSmeWifiFlightmodeReqSerFree(void *msg); #define CsrWifiSmeWifiOffReqSizeof CsrWifiEventSizeof #define CsrWifiSmeWifiOffReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeWifiOnReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeWifiOnReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeWifiOnReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeWifiOnReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeWifiOnReqSizeof(void *msg); extern void CsrWifiSmeWifiOnReqSerFree(void *msg); -extern u8* CsrWifiSmeCloakedSsidsSetReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeCloakedSsidsSetReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeCloakedSsidsSetReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeCloakedSsidsSetReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeCloakedSsidsSetReqSizeof(void *msg); extern void CsrWifiSmeCloakedSsidsSetReqSerFree(void *msg); @@ -282,8 +278,8 @@ extern void CsrWifiSmeCloakedSsidsSetReqSerFree(void *msg); #define CsrWifiSmeSmeCommonConfigGetReqSizeof CsrWifiEventSizeof #define CsrWifiSmeSmeCommonConfigGetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeSmeCommonConfigSetReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeSmeCommonConfigSetReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeSmeCommonConfigSetReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeSmeCommonConfigSetReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeSmeCommonConfigSetReqSizeof(void *msg); #define CsrWifiSmeSmeCommonConfigSetReqSerFree CsrWifiSmePfree @@ -292,13 +288,13 @@ extern size_t CsrWifiSmeSmeCommonConfigSetReqSizeof(void *msg); #define CsrWifiSmeInterfaceCapabilityGetReqSizeof CsrWifiEventSizeof #define CsrWifiSmeInterfaceCapabilityGetReqSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeWpsConfigurationReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeWpsConfigurationReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeWpsConfigurationReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeWpsConfigurationReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeWpsConfigurationReqSizeof(void *msg); extern void CsrWifiSmeWpsConfigurationReqSerFree(void *msg); -extern u8* CsrWifiSmeSetReqSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeSetReqDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeSetReqSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeSetReqDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeSetReqSizeof(void *msg); extern void CsrWifiSmeSetReqSerFree(void *msg); @@ -307,8 +303,8 @@ extern void CsrWifiSmeSetReqSerFree(void *msg); #define CsrWifiSmeActivateCfmSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiSmeActivateCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeAdhocConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeAdhocConfigGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeAdhocConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeAdhocConfigGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeAdhocConfigGetCfmSizeof(void *msg); #define CsrWifiSmeAdhocConfigGetCfmSerFree CsrWifiSmePfree @@ -317,23 +313,23 @@ extern size_t CsrWifiSmeAdhocConfigGetCfmSizeof(void *msg); #define CsrWifiSmeAdhocConfigSetCfmSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiSmeAdhocConfigSetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeAssociationCompleteIndSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeAssociationCompleteIndSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeAssociationCompleteIndSizeof(void *msg); extern void CsrWifiSmeAssociationCompleteIndSerFree(void *msg); -extern u8* CsrWifiSmeAssociationStartIndSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeAssociationStartIndDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeAssociationStartIndSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeAssociationStartIndDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeAssociationStartIndSizeof(void *msg); #define CsrWifiSmeAssociationStartIndSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeBlacklistCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeBlacklistCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeBlacklistCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeBlacklistCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeBlacklistCfmSizeof(void *msg); extern void CsrWifiSmeBlacklistCfmSerFree(void *msg); -extern u8* CsrWifiSmeCalibrationDataGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeCalibrationDataGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeCalibrationDataGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeCalibrationDataGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeCalibrationDataGetCfmSizeof(void *msg); extern void CsrWifiSmeCalibrationDataGetCfmSerFree(void *msg); @@ -342,18 +338,18 @@ extern void CsrWifiSmeCalibrationDataGetCfmSerFree(void *msg); #define CsrWifiSmeCalibrationDataSetCfmSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiSmeCalibrationDataSetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeCcxConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeCcxConfigGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeCcxConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeCcxConfigGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeCcxConfigGetCfmSizeof(void *msg); #define CsrWifiSmeCcxConfigGetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeCcxConfigSetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeCcxConfigSetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeCcxConfigSetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeCcxConfigSetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeCcxConfigSetCfmSizeof(void *msg); #define CsrWifiSmeCcxConfigSetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeCoexConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeCoexConfigGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeCoexConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeCoexConfigGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeCoexConfigGetCfmSizeof(void *msg); #define CsrWifiSmeCoexConfigGetCfmSerFree CsrWifiSmePfree @@ -362,33 +358,33 @@ extern size_t CsrWifiSmeCoexConfigGetCfmSizeof(void *msg); #define CsrWifiSmeCoexConfigSetCfmSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiSmeCoexConfigSetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeCoexInfoGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeCoexInfoGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeCoexInfoGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeCoexInfoGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeCoexInfoGetCfmSizeof(void *msg); #define CsrWifiSmeCoexInfoGetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeConnectCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeConnectCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeConnectCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeConnectCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeConnectCfmSizeof(void *msg); #define CsrWifiSmeConnectCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeConnectionConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeConnectionConfigGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeConnectionConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeConnectionConfigGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeConnectionConfigGetCfmSizeof(void *msg); extern void CsrWifiSmeConnectionConfigGetCfmSerFree(void *msg); -extern u8* CsrWifiSmeConnectionInfoGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeConnectionInfoGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeConnectionInfoGetCfmSizeof(void *msg); extern void CsrWifiSmeConnectionInfoGetCfmSerFree(void *msg); -extern u8* CsrWifiSmeConnectionQualityIndSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeConnectionQualityIndDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeConnectionQualityIndSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeConnectionQualityIndDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeConnectionQualityIndSizeof(void *msg); #define CsrWifiSmeConnectionQualityIndSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeConnectionStatsGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeConnectionStatsGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeConnectionStatsGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeConnectionStatsGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeConnectionStatsGetCfmSizeof(void *msg); #define CsrWifiSmeConnectionStatsGetCfmSerFree CsrWifiSmePfree @@ -397,8 +393,8 @@ extern size_t CsrWifiSmeConnectionStatsGetCfmSizeof(void *msg); #define CsrWifiSmeDeactivateCfmSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiSmeDeactivateCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeDisconnectCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeDisconnectCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeDisconnectCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeDisconnectCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeDisconnectCfmSizeof(void *msg); #define CsrWifiSmeDisconnectCfmSerFree CsrWifiSmePfree @@ -407,38 +403,38 @@ extern size_t CsrWifiSmeDisconnectCfmSizeof(void *msg); #define CsrWifiSmeEventMaskSetCfmSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiSmeEventMaskSetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeHostConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeHostConfigGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeHostConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeHostConfigGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeHostConfigGetCfmSizeof(void *msg); #define CsrWifiSmeHostConfigGetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeHostConfigSetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeHostConfigSetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeHostConfigSetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeHostConfigSetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeHostConfigSetCfmSizeof(void *msg); #define CsrWifiSmeHostConfigSetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeIbssStationIndSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeIbssStationIndDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeIbssStationIndSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeIbssStationIndDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeIbssStationIndSizeof(void *msg); #define CsrWifiSmeIbssStationIndSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeKeyCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeKeyCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeKeyCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeKeyCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeKeyCfmSizeof(void *msg); #define CsrWifiSmeKeyCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeLinkQualityGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeLinkQualityGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeLinkQualityGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeLinkQualityGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeLinkQualityGetCfmSizeof(void *msg); #define CsrWifiSmeLinkQualityGetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeMediaStatusIndSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeMediaStatusIndSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeMediaStatusIndSizeof(void *msg); extern void CsrWifiSmeMediaStatusIndSerFree(void *msg); -extern u8* CsrWifiSmeMibConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeMibConfigGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeMibConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeMibConfigGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeMibConfigGetCfmSizeof(void *msg); #define CsrWifiSmeMibConfigGetCfmSerFree CsrWifiSmePfree @@ -447,13 +443,13 @@ extern size_t CsrWifiSmeMibConfigGetCfmSizeof(void *msg); #define CsrWifiSmeMibConfigSetCfmSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiSmeMibConfigSetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeMibGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeMibGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeMibGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeMibGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeMibGetCfmSizeof(void *msg); extern void CsrWifiSmeMibGetCfmSerFree(void *msg); -extern u8* CsrWifiSmeMibGetNextCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeMibGetNextCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeMibGetNextCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeMibGetNextCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeMibGetNextCfmSizeof(void *msg); extern void CsrWifiSmeMibGetNextCfmSerFree(void *msg); @@ -462,38 +458,39 @@ extern void CsrWifiSmeMibGetNextCfmSerFree(void *msg); #define CsrWifiSmeMibSetCfmSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiSmeMibSetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeMicFailureIndSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeMicFailureIndDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeMicFailureIndSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeMicFailureIndDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeMicFailureIndSizeof(void *msg); #define CsrWifiSmeMicFailureIndSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeMulticastAddressCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeMulticastAddressCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeMulticastAddressCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeMulticastAddressCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeMulticastAddressCfmSizeof(void *msg); extern void CsrWifiSmeMulticastAddressCfmSerFree(void *msg); -extern u8* CsrWifiSmePacketFilterSetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmePacketFilterSetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmePacketFilterSetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmePacketFilterSetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmePacketFilterSetCfmSizeof(void *msg); #define CsrWifiSmePacketFilterSetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmePermanentMacAddressGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmePermanentMacAddressGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmePermanentMacAddressGetCfmSer(u8 *ptr, size_t *len, + void *msg); +extern void *CsrWifiSmePermanentMacAddressGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmePermanentMacAddressGetCfmSizeof(void *msg); #define CsrWifiSmePermanentMacAddressGetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmePmkidCandidateListIndSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmePmkidCandidateListIndDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmePmkidCandidateListIndSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmePmkidCandidateListIndDes(u8 *buffer, size_t len); extern size_t CsrWifiSmePmkidCandidateListIndSizeof(void *msg); extern void CsrWifiSmePmkidCandidateListIndSerFree(void *msg); -extern u8* CsrWifiSmePmkidCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmePmkidCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmePmkidCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmePmkidCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmePmkidCfmSizeof(void *msg); extern void CsrWifiSmePmkidCfmSerFree(void *msg); -extern u8* CsrWifiSmePowerConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmePowerConfigGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmePowerConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmePowerConfigGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmePowerConfigGetCfmSizeof(void *msg); #define CsrWifiSmePowerConfigGetCfmSerFree CsrWifiSmePfree @@ -502,33 +499,34 @@ extern size_t CsrWifiSmePowerConfigGetCfmSizeof(void *msg); #define CsrWifiSmePowerConfigSetCfmSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiSmePowerConfigSetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeRegulatoryDomainInfoGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeRegulatoryDomainInfoGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeRegulatoryDomainInfoGetCfmSer(u8 *ptr, size_t *len, + void *msg); +extern void *CsrWifiSmeRegulatoryDomainInfoGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeRegulatoryDomainInfoGetCfmSizeof(void *msg); #define CsrWifiSmeRegulatoryDomainInfoGetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeRoamCompleteIndSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeRoamCompleteIndDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeRoamCompleteIndSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeRoamCompleteIndDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeRoamCompleteIndSizeof(void *msg); #define CsrWifiSmeRoamCompleteIndSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeRoamStartIndSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeRoamStartIndDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeRoamStartIndSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeRoamStartIndDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeRoamStartIndSizeof(void *msg); #define CsrWifiSmeRoamStartIndSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeRoamingConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeRoamingConfigGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeRoamingConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeRoamingConfigGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeRoamingConfigGetCfmSizeof(void *msg); #define CsrWifiSmeRoamingConfigGetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeRoamingConfigSetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeRoamingConfigSetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeRoamingConfigSetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeRoamingConfigSetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeRoamingConfigSetCfmSizeof(void *msg); #define CsrWifiSmeRoamingConfigSetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeScanConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeScanConfigGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeScanConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeScanConfigGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeScanConfigGetCfmSizeof(void *msg); extern void CsrWifiSmeScanConfigGetCfmSerFree(void *msg); @@ -542,8 +540,8 @@ extern void CsrWifiSmeScanConfigGetCfmSerFree(void *msg); #define CsrWifiSmeScanFullCfmSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiSmeScanFullCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeScanResultIndSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeScanResultIndDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeScanResultIndSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeScanResultIndDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeScanResultIndSizeof(void *msg); extern void CsrWifiSmeScanResultIndSerFree(void *msg); @@ -552,38 +550,39 @@ extern void CsrWifiSmeScanResultIndSerFree(void *msg); #define CsrWifiSmeScanResultsFlushCfmSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiSmeScanResultsFlushCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeScanResultsGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeScanResultsGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeScanResultsGetCfmSizeof(void *msg); extern void CsrWifiSmeScanResultsGetCfmSerFree(void *msg); -extern u8* CsrWifiSmeSmeStaConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeSmeStaConfigGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeSmeStaConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeSmeStaConfigGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeSmeStaConfigGetCfmSizeof(void *msg); #define CsrWifiSmeSmeStaConfigGetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeSmeStaConfigSetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeSmeStaConfigSetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeSmeStaConfigSetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeSmeStaConfigSetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeSmeStaConfigSetCfmSizeof(void *msg); #define CsrWifiSmeSmeStaConfigSetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeStationMacAddressGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeStationMacAddressGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeStationMacAddressGetCfmSer(u8 *ptr, size_t *len, + void *msg); +extern void *CsrWifiSmeStationMacAddressGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeStationMacAddressGetCfmSizeof(void *msg); #define CsrWifiSmeStationMacAddressGetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeTspecIndSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeTspecIndDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeTspecIndSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeTspecIndDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeTspecIndSizeof(void *msg); extern void CsrWifiSmeTspecIndSerFree(void *msg); -extern u8* CsrWifiSmeTspecCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeTspecCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeTspecCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeTspecCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeTspecCfmSizeof(void *msg); extern void CsrWifiSmeTspecCfmSerFree(void *msg); -extern u8* CsrWifiSmeVersionsGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeVersionsGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeVersionsGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeVersionsGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeVersionsGetCfmSizeof(void *msg); extern void CsrWifiSmeVersionsGetCfmSerFree(void *msg); @@ -612,18 +611,18 @@ extern void CsrWifiSmeVersionsGetCfmSerFree(void *msg); #define CsrWifiSmeCloakedSsidsSetCfmSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiSmeCloakedSsidsSetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeCloakedSsidsGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeCloakedSsidsGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeCloakedSsidsGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeCloakedSsidsGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeCloakedSsidsGetCfmSizeof(void *msg); extern void CsrWifiSmeCloakedSsidsGetCfmSerFree(void *msg); -extern u8* CsrWifiSmeWifiOnIndSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeWifiOnIndDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeWifiOnIndSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeWifiOnIndDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeWifiOnIndSizeof(void *msg); #define CsrWifiSmeWifiOnIndSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeSmeCommonConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeSmeCommonConfigGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeSmeCommonConfigGetCfmSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeSmeCommonConfigGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeSmeCommonConfigGetCfmSizeof(void *msg); #define CsrWifiSmeSmeCommonConfigGetCfmSerFree CsrWifiSmePfree @@ -632,23 +631,24 @@ extern size_t CsrWifiSmeSmeCommonConfigGetCfmSizeof(void *msg); #define CsrWifiSmeSmeCommonConfigSetCfmSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiSmeSmeCommonConfigSetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeInterfaceCapabilityGetCfmSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeInterfaceCapabilityGetCfmDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeInterfaceCapabilityGetCfmSer(u8 *ptr, size_t *len, + void *msg); +extern void *CsrWifiSmeInterfaceCapabilityGetCfmDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeInterfaceCapabilityGetCfmSizeof(void *msg); #define CsrWifiSmeInterfaceCapabilityGetCfmSerFree CsrWifiSmePfree -extern u8* CsrWifiSmeErrorIndSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeErrorIndDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeErrorIndSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeErrorIndDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeErrorIndSizeof(void *msg); extern void CsrWifiSmeErrorIndSerFree(void *msg); -extern u8* CsrWifiSmeInfoIndSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeInfoIndDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeInfoIndSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeInfoIndDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeInfoIndSizeof(void *msg); extern void CsrWifiSmeInfoIndSerFree(void *msg); -extern u8* CsrWifiSmeCoreDumpIndSer(u8 *ptr, size_t *len, void *msg); -extern void* CsrWifiSmeCoreDumpIndDes(u8 *buffer, size_t len); +extern u8 *CsrWifiSmeCoreDumpIndSer(u8 *ptr, size_t *len, void *msg); +extern void *CsrWifiSmeCoreDumpIndDes(u8 *buffer, size_t len); extern size_t CsrWifiSmeCoreDumpIndSizeof(void *msg); extern void CsrWifiSmeCoreDumpIndSerFree(void *msg); @@ -662,9 +662,5 @@ extern void CsrWifiSmeCoreDumpIndSerFree(void *msg); #define CsrWifiSmeWpsConfigurationCfmSizeof CsrWifiEventCsrUint16Sizeof #define CsrWifiSmeWpsConfigurationCfmSerFree CsrWifiSmePfree - -#ifdef __cplusplus -} -#endif #endif /* CSR_WIFI_SME_SERIALIZE_H__ */ diff --git a/drivers/staging/csr/csr_wifi_sme_task.h b/drivers/staging/csr/csr_wifi_sme_task.h index 0f725e454939..1e938c1fa964 100644 --- a/drivers/staging/csr/csr_wifi_sme_task.h +++ b/drivers/staging/csr/csr_wifi_sme_task.h @@ -1,10 +1,10 @@ /***************************************************************************** - (c) Cambridge Silicon Radio Limited 2011 - All rights reserved and confidential information of CSR + (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. + Refer to LICENSE.txt included with this source for details + on the license terms. *****************************************************************************/ @@ -15,19 +15,11 @@ #include "csr_sched.h" -#ifdef __cplusplus -extern "C" { -#endif - #define CSR_WIFI_SME_LOG_ID 0x1202FFFF extern CsrSchedQid CSR_WIFI_SME_IFACEQUEUE; void CsrWifiSmeInit(void **gash); void CsrWifiSmeDeinit(void **gash); void CsrWifiSmeHandler(void **gash); -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_SME_TASK_H__ */ diff --git a/drivers/staging/csr/csr_wifi_vif_utils.h b/drivers/staging/csr/csr_wifi_vif_utils.h index 523172d1ac92..8ff97888996d 100644 --- a/drivers/staging/csr/csr_wifi_vif_utils.h +++ b/drivers/staging/csr/csr_wifi_vif_utils.h @@ -11,10 +11,6 @@ #ifndef CSR_WIFI_VIF_UTILS_H #define CSR_WIFI_VIF_UTILS_H -#ifdef __cplusplus -extern "C" { -#endif - /* STANDARD INCLUDES ********************************************************/ /* PROJECT INCLUDES *********************************************************/ @@ -27,82 +23,5 @@ extern "C" { #define CSR_WIFI_NUM_INTERFACES (u8)0x1 #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 -#define CSR_WIFI_INTERFACE_STA 0 -#define CSR_WIFI_INTERFACE_AMP 0 - - -#define CSR_WIFI_VIF_UTILS_UNDEFINED_TAG 0xFFFF - -/* Extract the Interface Id from the event */ -#define CsrWifiVifUtilsGetVifTagFromEvent(msg) \ - ((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) \ - ((u16)((interfaceId) | ((type) << 8))) - - -/* TYPES DEFINITIONS ********************************************************/ - -/* GLOBAL VARIABLE DECLARATIONS *********************************************/ - -/* PUBLIC FUNCTION PROTOTYPES ***********************************************/ - -/** - * @brief - * First checks if the mode is supported capability bitmap of the interface. - * If this succeeds, then checks if running this mode on this interface is allowed. - * - * @param[in] u8 : interface capability bitmap - * @param[in] u8* : pointer to the array of current interface modes - * @param[in] u16 : interfaceTag - * @param[in] CsrWifiInterfaceMode : mode - * - * @return - * u8 : returns true if the interface is allowed to operate in the mode otherwise false. - */ -extern u8 CsrWifiVifUtilsCheckCompatibility(u8 interfaceCapability, - u8 *currentInterfaceModes, - u16 interfaceTag, - CsrWifiInterfaceMode mode); - -/** - * @brief - * Checks if the specified interface is supported. - * NOTE: Only checks that the interface is supported, no checks are made to - * determine whether a supported interface may be made active. - * - * @param[in] u16 : interfaceTag - * - * @return - * u8 : returns true if the interface is supported, otherwise false. - */ -extern u8 CsrWifiVifUtilsIsSupported(u16 interfaceTag); - -#ifdef CSR_LOG_ENABLE -/** - * @brief - * Registers the virtual interface utils logging details. - * Should only be called once at initialisation. - * - * @param[in/out] None - * - * @return - * None - */ -void CsrWifiVifUtilsLogTextRegister(void); -#else -#define CsrWifiVifUtilsLogTextRegister() -#endif - -#ifdef __cplusplus -} -#endif - #endif /* CSR_WIFI_VIF_UTILS_H */ diff --git a/drivers/staging/csr/data_tx.c b/drivers/staging/csr/data_tx.c index 8ed7a7845cc6..9e3d8b8ab02c 100644 --- a/drivers/staging/csr/data_tx.c +++ b/drivers/staging/csr/data_tx.c @@ -18,33 +18,30 @@ int uf_verify_m4(unifi_priv_t *priv, const unsigned char *packet, unsigned int length) { - const unsigned char *p = packet; - u16 keyinfo; + const unsigned char *p = packet; + u16 keyinfo; - if (length < (4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1 + 8)) { - return 1; - } + if (length < (4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1 + 8)) + return 1; - p += 8; - keyinfo = p[5] << 8 | p[6]; /* big-endian */ - if ( - (p[0] == 1 || p[0] == 2) /* protocol version 802.1X-2001 (WPA) or -2004 (WPA2) */ && - p[1] == 3 /* EAPOL-Key */ && - /* don't bother checking p[2] p[3] (hh ll, packet body length) */ - (p[4] == 254 || p[4] == 2) /* descriptor type P802.1i-D3.0 (WPA) or 802.11i-2004 (WPA2) */ && - ((keyinfo & 0x0007) == 1 || (keyinfo & 0x0007) == 2) /* key descriptor version */ && - (keyinfo & ~0x0207U) == 0x0108 && /* key info for 4/4 or 4/2 -- ignore key desc version and sec bit (since varies in WPA 4/4) */ - (p[4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 0] == 0 && /* key data length (2 octets) 0 for 4/4 only */ - p[4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1] == 0) - ) { - unifi_trace(priv, UDBG1, "uf_verify_m4: M4 detected \n"); - return 0; - } - else - { - return 1; - } + p += 8; + keyinfo = p[5] << 8 | p[6]; /* big-endian */ + if ( + (p[0] == 1 || p[0] == 2) /* protocol version 802.1X-2001 (WPA) or -2004 (WPA2) */ && + p[1] == 3 /* EAPOL-Key */ && + /* don't bother checking p[2] p[3] (hh ll, packet body length) */ + (p[4] == 254 || p[4] == 2) /* descriptor type P802.1i-D3.0 (WPA) or 802.11i-2004 (WPA2) */ && + ((keyinfo & 0x0007) == 1 || (keyinfo & 0x0007) == 2) /* key descriptor version */ && + (keyinfo & ~0x0207U) == 0x0108 && /* key info for 4/4 or 4/2 -- ignore key desc version and sec bit (since varies in WPA 4/4) */ + (p[4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 0] == 0 && /* key data length (2 octets) 0 for 4/4 only */ + p[4 + 5 + 8 + 32 + 16 + 8 + 8 + 16 + 1] == 0) + ) { + unifi_trace(priv, UDBG1, "uf_verify_m4: M4 detected\n"); + return 0; + } else { + return 1; + } } /* diff --git a/drivers/staging/csr/drv.c b/drivers/staging/csr/drv.c index 249758076a75..4780c32c2fe3 100644 --- a/drivers/staging/csr/drv.c +++ b/drivers/staging/csr/drv.c @@ -166,33 +166,32 @@ s32 CsrHipResultToStatus(CsrResult csrResult) static const char* trace_putest_cmdid(unifi_putest_command_t putest_cmd) { - switch (putest_cmd) - { - case UNIFI_PUTEST_START: - return "START"; - case UNIFI_PUTEST_STOP: - return "STOP"; - case UNIFI_PUTEST_SET_SDIO_CLOCK: - return "SET CLOCK"; - case UNIFI_PUTEST_CMD52_READ: - return "CMD52R"; - case UNIFI_PUTEST_CMD52_BLOCK_READ: - return "CMD52BR"; - case UNIFI_PUTEST_CMD52_WRITE: - return "CMD52W"; - case UNIFI_PUTEST_DL_FW: - return "D/L FW"; - case UNIFI_PUTEST_DL_FW_BUFF: - return "D/L FW BUFFER"; - case UNIFI_PUTEST_COREDUMP_PREPARE: - return "PREPARE COREDUMP"; - case UNIFI_PUTEST_GP_READ16: - return "GP16R"; - case UNIFI_PUTEST_GP_WRITE16: - return "GP16W"; - default: - return "ERROR: unrecognised command"; - } + switch (putest_cmd) { + case UNIFI_PUTEST_START: + return "START"; + case UNIFI_PUTEST_STOP: + return "STOP"; + case UNIFI_PUTEST_SET_SDIO_CLOCK: + return "SET CLOCK"; + case UNIFI_PUTEST_CMD52_READ: + return "CMD52R"; + case UNIFI_PUTEST_CMD52_BLOCK_READ: + return "CMD52BR"; + case UNIFI_PUTEST_CMD52_WRITE: + return "CMD52W"; + case UNIFI_PUTEST_DL_FW: + return "D/L FW"; + case UNIFI_PUTEST_DL_FW_BUFF: + return "D/L FW BUFFER"; + case UNIFI_PUTEST_COREDUMP_PREPARE: + return "PREPARE COREDUMP"; + case UNIFI_PUTEST_GP_READ16: + return "GP16R"; + case UNIFI_PUTEST_GP_WRITE16: + return "GP16W"; + default: + return "ERROR: unrecognised command"; + } } #ifdef CSR_WIFI_HIP_DEBUG_OFFLINE @@ -266,8 +265,6 @@ unifi_open(struct inode *inode, struct file *file) unifi_priv_t *priv; ul_client_t *udi_cli; - func_enter(); - devno = MINOR(inode->i_rdev) >> 1; /* @@ -278,7 +275,6 @@ unifi_open(struct inode *inode, struct file *file) priv = uf_get_instance(devno); if (priv == NULL) { unifi_error(NULL, "unifi_open: No device present\n"); - func_exit(); return -ENODEV; } @@ -290,7 +286,6 @@ unifi_open(struct inode *inode, struct file *file) /* Too many clients already using this device */ unifi_error(priv, "Too many clients already open\n"); uf_put_instance(devno); - func_exit(); return -ENOSPC; } unifi_trace(priv, UDBG1, "Client is registered to /dev/unifiudi%d\n", devno); @@ -310,7 +305,6 @@ unifi_open(struct inode *inode, struct file *file) uf_put_instance(devno); unifi_info(priv, "There is already a configuration client using the character device\n"); - func_exit(); return -EBUSY; } #endif /* CSR_SME_USERSPACE */ @@ -331,7 +325,6 @@ unifi_open(struct inode *inode, struct file *file) uf_put_instance(devno); unifi_error(priv, "Too many clients already open\n"); - func_exit(); return -ENOSPC; } @@ -357,7 +350,6 @@ unifi_open(struct inode *inode, struct file *file) */ file->private_data = udi_cli; - func_exit(); return 0; } /* unifi_open() */ @@ -369,8 +361,6 @@ unifi_release(struct inode *inode, struct file *filp) int devno; unifi_priv_t *priv; - func_enter(); - priv = uf_find_instance(udi_cli->instance); if (!priv) { unifi_error(priv, "unifi_close: instance for device not found\n"); @@ -465,8 +455,6 @@ unifi_read(struct file *filp, char *p, size_t len, loff_t *poff) struct list_head *l; int msglen; - func_enter(); - priv = uf_find_instance(pcli->instance); if (!priv) { unifi_error(priv, "invalid priv\n"); @@ -527,7 +515,6 @@ unifi_read(struct file *filp, char *p, size_t len, loff_t *poff) /* It is our resposibility to free the message buffer. */ kfree(logptr); - func_exit_r(msglen); return msglen; } /* unifi_read() */ @@ -615,7 +602,6 @@ udi_send_signal_unpacked(unifi_priv_t *priv, unsigned char* data, uint data_len) unifi_net_data_free(priv, &bulk_data.d[i]); } } - func_exit(); return -EIO; } @@ -654,8 +640,6 @@ udi_send_signal_raw(unifi_priv_t *priv, unsigned char *buf, int buflen) int bytecount; CsrResult csrResult; - func_enter(); - /* * The signal is the first thing in buf, the signal id is the * first 16 bits of the signal. @@ -668,7 +652,6 @@ udi_send_signal_raw(unifi_priv_t *priv, unsigned char *buf, int buflen) if ((signal_size <= 0) || (signal_size > buflen)) { unifi_error(priv, "udi_send_signal_raw - Couldn't find length of signal 0x%x\n", sig_id); - func_exit(); return -EINVAL; } unifi_trace(priv, UDBG2, "udi_send_signal_raw: signal 0x%.4X len:%d\n", @@ -713,7 +696,6 @@ udi_send_signal_raw(unifi_priv_t *priv, unsigned char *buf, int buflen) if (bytecount > buflen) { unifi_error(priv, "udi_send_signal_raw: Not enough data (%d instead of %d)\n", buflen, bytecount); - func_exit(); return -EINVAL; } @@ -721,7 +703,6 @@ udi_send_signal_raw(unifi_priv_t *priv, unsigned char *buf, int buflen) r = ul_send_signal_raw(priv, buf, signal_size, &data_ptrs); if (r < 0) { unifi_error(priv, "udi_send_signal_raw: send failed (%d)\n", r); - func_exit(); return -EIO; } @@ -746,8 +727,6 @@ udi_send_signal_raw(unifi_priv_t *priv, unsigned char *buf, int buflen) } #endif - func_exit_r(bytecount); - return bytecount; } /* udi_send_signal_raw */ @@ -784,8 +763,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff) bulk_data_param_t bulkdata; CsrResult csrResult; - func_enter(); - priv = uf_find_instance(pcli->instance); if (!priv) { unifi_error(priv, "invalid priv\n"); @@ -812,7 +789,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff) csrResult = unifi_net_data_malloc(priv, &bulkdata.d[0], len); if (csrResult != CSR_RESULT_SUCCESS) { unifi_error(priv, "unifi_write: failed to allocate request_data.\n"); - func_exit(); return -ENOMEM; } @@ -822,7 +798,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff) if (copy_from_user((void*)user_data_buf, p, len)) { unifi_error(priv, "unifi_write: copy from user failed\n"); unifi_net_data_free(priv, &bulkdata.d[0]); - func_exit(); return -EFAULT; } @@ -838,7 +813,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff) unifi_error(priv, "unifi_write - Couldn't find length of signal 0x%x\n", sig_id); unifi_net_data_free(priv, &bulkdata.d[0]); - func_exit(); return -EINVAL; } @@ -849,7 +823,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff) signal_buf = kmalloc(signal_size, GFP_KERNEL); if (!signal_buf) { unifi_net_data_free(priv, &bulkdata.d[0]); - func_exit(); return -ENOMEM; } @@ -948,8 +921,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff) kfree(buf); - func_exit_r(bytes_written); - return bytes_written; } /* unifi_write() */ @@ -1657,8 +1628,6 @@ unifi_poll(struct file *filp, poll_table *wait) unsigned int mask = 0; int ready; - func_enter(); - ready = !list_empty(&pcli->udi_log); poll_wait(filp, &pcli->udi_wq, wait); @@ -1667,8 +1636,6 @@ unifi_poll(struct file *filp, poll_table *wait) mask |= POLLIN | POLLRDNORM; /* readable */ } - func_exit(); - return mask; } /* unifi_poll() */ @@ -1784,8 +1751,6 @@ udi_log_event(ul_client_t *pcli, unsigned long n_1000; #endif - func_enter(); - /* Just a sanity check */ if ((signal == NULL) || (signal_len <= 0)) { return; @@ -1901,7 +1866,6 @@ udi_log_event(ul_client_t *pcli, if (down_interruptible(&pcli->udi_sem)) { printk(KERN_WARNING "udi_log_event_q: Failed to get udi sem\n"); kfree(logptr); - func_exit(); return; } list_add_tail(&logptr->q, &pcli->udi_log); @@ -1910,7 +1874,6 @@ udi_log_event(ul_client_t *pcli, /* Wake any waiting user process */ wake_up_interruptible(&pcli->udi_wq); - func_exit(); } /* udi_log_event() */ #ifdef CSR_SME_USERSPACE @@ -1921,8 +1884,6 @@ uf_sme_queue_message(unifi_priv_t *priv, u8 *buffer, int length) udi_msg_t *msgptr; u8 *p; - func_enter(); - /* Just a sanity check */ if ((buffer == NULL) || (length <= 0)) { return -EINVAL; @@ -1968,8 +1929,6 @@ uf_sme_queue_message(unifi_priv_t *priv, u8 *buffer, int length) /* It is our responsibility to free the buffer allocated in build_packed_*() */ kfree(buffer); - func_exit(); - return 0; } /* uf_sme_queue_message() */ @@ -2059,10 +2018,10 @@ int uf_create_device_nodes(unifi_priv_t *priv, int bus_id) void uf_destroy_device_nodes(unifi_priv_t *priv) { - device_destroy(unifi_class, priv->unifiudi_cdev.dev); - device_destroy(unifi_class, priv->unifi_cdev.dev); - cdev_del(&priv->unifiudi_cdev); - cdev_del(&priv->unifi_cdev); + device_destroy(unifi_class, priv->unifiudi_cdev.dev); + device_destroy(unifi_class, priv->unifi_cdev.dev); + cdev_del(&priv->unifiudi_cdev); + cdev_del(&priv->unifi_cdev); } diff --git a/drivers/staging/csr/firmware.c b/drivers/staging/csr/firmware.c index b6d8a6e52915..b42a4d6a0c36 100644 --- a/drivers/staging/csr/firmware.c +++ b/drivers/staging/csr/firmware.c @@ -62,8 +62,6 @@ unifi_fw_read_start(void *ospriv, s8 is_fw, const card_info_t *info) unifi_priv_t *priv = (unifi_priv_t*)ospriv; CSR_UNUSED(info); - func_enter(); - if (is_fw == UNIFI_FW_STA) { /* F/w may have been released after a previous successful download. */ if (priv->fw_sta.dl_data == NULL) { @@ -72,7 +70,6 @@ unifi_fw_read_start(void *ospriv, s8 is_fw, const card_info_t *info) } /* Set up callback struct for readfunc() */ if (priv->fw_sta.dl_data != NULL) { - func_exit(); return &priv->fw_sta; } @@ -80,7 +77,6 @@ unifi_fw_read_start(void *ospriv, s8 is_fw, const card_info_t *info) unifi_error(priv, "downloading firmware... unknown request: %d\n", is_fw); } - func_exit(); return NULL; } /* unifi_fw_read_start() */ @@ -105,7 +101,6 @@ unifi_fw_read_stop(void *ospriv, void *dlpriv) { unifi_priv_t *priv = (unifi_priv_t*)ospriv; struct dlpriv *dl_struct = (struct dlpriv *)dlpriv; - func_enter(); if (dl_struct != NULL) { if (dl_struct->dl_data != NULL) { @@ -115,7 +110,6 @@ unifi_fw_read_stop(void *ospriv, void *dlpriv) uf_release_firmware(priv, dl_struct); } - func_exit(); } /* unifi_fw_read_stop() */ @@ -143,17 +137,14 @@ void * unifi_fw_open_buffer(void *ospriv, void *fwbuf, u32 len) { unifi_priv_t *priv = (unifi_priv_t*)ospriv; - func_enter(); if (fwbuf == NULL) { - func_exit(); return NULL; } priv->fw_conv.dl_data = fwbuf; priv->fw_conv.dl_len = len; priv->fw_conv.fw_desc = NULL; /* No OS f/w resource is associated */ - func_exit(); return &priv->fw_conv; } @@ -242,8 +233,6 @@ unifi_fw_read(void *ospriv, void *arg, u32 offset, void *buf, u32 len) int uf_run_unifihelper(unifi_priv_t *priv) { -#ifdef CONFIG_HOTPLUG - #ifdef ANDROID_BUILD char *prog = "/system/bin/unififw"; #else @@ -289,10 +278,6 @@ uf_run_unifihelper(unifi_priv_t *priv) r = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_EXEC); return r; -#else - unifi_trace(priv, UDBG1, "Can't automatically download firmware because kernel does not have HOTPLUG\n"); - return -1; -#endif } /* uf_run_unifihelper() */ #ifdef CSR_WIFI_SPLIT_PATCH diff --git a/drivers/staging/csr/inet.c b/drivers/staging/csr/inet.c index b4acb54ecc62..b3ef818fef35 100644 --- a/drivers/staging/csr/inet.c +++ b/drivers/staging/csr/inet.c @@ -93,14 +93,12 @@ static struct notifier_block uf_inetaddr_notifier = { void uf_register_inet_notifier(void) { - if (atomic_inc_return(&inet_notif_refs) == 1) { - register_inetaddr_notifier(&uf_inetaddr_notifier); - } + if (atomic_inc_return(&inet_notif_refs) == 1) + register_inetaddr_notifier(&uf_inetaddr_notifier); } void uf_unregister_inet_notifier(void) { - if (atomic_dec_return(&inet_notif_refs) == 0) { - unregister_inetaddr_notifier(&uf_inetaddr_notifier); - } + if (atomic_dec_return(&inet_notif_refs) == 0) + unregister_inetaddr_notifier(&uf_inetaddr_notifier); } diff --git a/drivers/staging/csr/io.c b/drivers/staging/csr/io.c index caf48e3120ca..af9c28f073b9 100644 --- a/drivers/staging/csr/io.c +++ b/drivers/staging/csr/io.c @@ -31,7 +31,6 @@ * --------------------------------------------------------------------------- */ #include <linux/proc_fs.h> -#include <linux/version.h> #include "csr_wifi_hip_unifi.h" #include "csr_wifi_hip_unifiversion.h" @@ -86,7 +85,6 @@ static int uf_read_proc(char *page, char **start, off_t offset, int count, static CsrResult signal_buffer_init(unifi_priv_t * priv, int size) { int i; - func_enter(); priv->rxSignalBuffer.writePointer = priv->rxSignalBuffer.readPointer = 0; @@ -106,11 +104,9 @@ static CsrResult signal_buffer_init(unifi_priv_t * priv, int size) kfree(priv->rxSignalBuffer.rx_buff[j].bufptr); priv->rxSignalBuffer.rx_buff[j].bufptr = NULL; } - func_exit(); return -1; } } - func_exit(); return 0; } @@ -265,8 +261,6 @@ register_unifi_sdio(CsrSdioFunction *sdio_dev, int bus_id, struct device *dev) int r = -1; CsrResult csrResult; - func_enter(); - if ((bus_id < 0) || (bus_id >= MAX_UNIFI_DEVS)) { unifi_error(priv, "register_unifi_sdio: invalid device %d\n", bus_id); @@ -415,7 +409,6 @@ register_unifi_sdio(CsrSdioFunction *sdio_dev, int bus_id, struct device *dev) up(&Unifi_instance_mutex); - func_exit(); return priv; failed4: @@ -449,7 +442,6 @@ failed0: up(&Unifi_instance_mutex); - func_exit(); return NULL; } /* register_unifi_sdio() */ @@ -473,7 +465,6 @@ failed0: static void ask_unifi_sdio_cleanup(unifi_priv_t *priv) { - func_enter(); /* * Now clear the flag that says the old instance is in use. @@ -486,8 +477,6 @@ ask_unifi_sdio_cleanup(unifi_priv_t *priv) unifi_trace(NULL, UDBG5, "ask_unifi_sdio_cleanup: wake up cleanup workqueue.\n"); wake_up(&Unifi_cleanup_wq); - func_exit(); - } /* ask_unifi_sdio_cleanup() */ @@ -511,8 +500,6 @@ cleanup_unifi_sdio(unifi_priv_t *priv) int i; static const CsrWifiMacAddress broadcast_address = {{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}}; - func_enter(); - /* Remove the device nodes */ uf_destroy_device_nodes(priv); @@ -604,8 +591,6 @@ cleanup_unifi_sdio(unifi_priv_t *priv) unifi_trace(NULL, UDBG5, "cleanup_unifi_sdio: DONE.\n"); - func_exit(); - } /* cleanup_unifi_sdio() */ @@ -639,7 +624,6 @@ unregister_unifi_sdio(int bus_id) if (priv == NULL) { unifi_error(priv, "unregister_unifi_sdio: device %d is not registered\n", bus_id); - func_exit(); return; } @@ -1016,37 +1000,37 @@ uf_remove_os_device(int bus_id) static void uf_sdio_inserted(CsrSdioFunction *sdio_ctx) { - unifi_priv_t *priv; + unifi_priv_t *priv; - unifi_trace(NULL, UDBG5, "uf_sdio_inserted(0x%p), slot_id=%d, dev=%p\n", - sdio_ctx, active_slot, os_devices[active_slot]); + unifi_trace(NULL, UDBG5, "uf_sdio_inserted(0x%p), slot_id=%d, dev=%p\n", + sdio_ctx, active_slot, os_devices[active_slot]); - priv = register_unifi_sdio(sdio_ctx, active_slot, os_devices[active_slot]); - if (priv == NULL) { - CsrSdioInsertedAcknowledge(sdio_ctx, CSR_RESULT_FAILURE); - return; - } + priv = register_unifi_sdio(sdio_ctx, active_slot, os_devices[active_slot]); + if (priv == NULL) { + CsrSdioInsertedAcknowledge(sdio_ctx, CSR_RESULT_FAILURE); + return; + } - sdio_ctx->driverData = priv; + sdio_ctx->driverData = priv; - CsrSdioInsertedAcknowledge(sdio_ctx, CSR_RESULT_SUCCESS); + CsrSdioInsertedAcknowledge(sdio_ctx, CSR_RESULT_SUCCESS); } /* uf_sdio_inserted() */ static void uf_sdio_removed(CsrSdioFunction *sdio_ctx) { - unregister_unifi_sdio(active_slot); - CsrSdioRemovedAcknowledge(sdio_ctx); + unregister_unifi_sdio(active_slot); + CsrSdioRemovedAcknowledge(sdio_ctx); } /* uf_sdio_removed() */ static void uf_sdio_dsr_handler(CsrSdioFunction *sdio_ctx) { - unifi_priv_t *priv = sdio_ctx->driverData; + unifi_priv_t *priv = sdio_ctx->driverData; - unifi_sdio_interrupt_handler(priv->card); + unifi_sdio_interrupt_handler(priv->card); } /* uf_sdio_dsr_handler() */ /* @@ -1068,7 +1052,7 @@ uf_sdio_dsr_handler(CsrSdioFunction *sdio_ctx) static CsrSdioInterruptDsrCallback uf_sdio_int_handler(CsrSdioFunction *sdio_ctx) { - return uf_sdio_dsr_handler; + return uf_sdio_dsr_handler; } /* uf_sdio_int_handler() */ @@ -1076,18 +1060,18 @@ uf_sdio_int_handler(CsrSdioFunction *sdio_ctx) static CsrSdioFunctionId unifi_ids[] = { - { - .manfId = SDIO_MANF_ID_CSR, - .cardId = SDIO_CARD_ID_UNIFI_3, - .sdioFunction = SDIO_WLAN_FUNC_ID_UNIFI_3, - .sdioInterface = CSR_SDIO_ANY_SDIO_INTERFACE, - }, - { - .manfId = SDIO_MANF_ID_CSR, - .cardId = SDIO_CARD_ID_UNIFI_4, - .sdioFunction = SDIO_WLAN_FUNC_ID_UNIFI_4, - .sdioInterface = CSR_SDIO_ANY_SDIO_INTERFACE, - } + { + .manfId = SDIO_MANF_ID_CSR, + .cardId = SDIO_CARD_ID_UNIFI_3, + .sdioFunction = SDIO_WLAN_FUNC_ID_UNIFI_3, + .sdioInterface = CSR_SDIO_ANY_SDIO_INTERFACE, + }, + { + .manfId = SDIO_MANF_ID_CSR, + .cardId = SDIO_CARD_ID_UNIFI_4, + .sdioFunction = SDIO_WLAN_FUNC_ID_UNIFI_4, + .sdioInterface = CSR_SDIO_ANY_SDIO_INTERFACE, + } }; @@ -1096,14 +1080,14 @@ static CsrSdioFunctionId unifi_ids[] = */ static CsrSdioFunctionDriver unifi_sdioFunction_drv = { - .inserted = uf_sdio_inserted, - .removed = uf_sdio_removed, - .intr = uf_sdio_int_handler, - .suspend = uf_lx_suspend, - .resume = uf_lx_resume, - - .ids = unifi_ids, - .idsCount = sizeof(unifi_ids) / sizeof(unifi_ids[0]) + .inserted = uf_sdio_inserted, + .removed = uf_sdio_removed, + .intr = uf_sdio_int_handler, + .suspend = uf_lx_suspend, + .resume = uf_lx_resume, + + .ids = unifi_ids, + .idsCount = sizeof(unifi_ids) / sizeof(unifi_ids[0]) }; @@ -1126,15 +1110,15 @@ static CsrSdioFunctionDriver unifi_sdioFunction_drv = int __init uf_sdio_load(void) { - CsrResult csrResult; + CsrResult csrResult; - csrResult = CsrSdioFunctionDriverRegister(&unifi_sdioFunction_drv); - if (csrResult != CSR_RESULT_SUCCESS) { - unifi_error(NULL, "Failed to register UniFi SDIO driver: csrResult=%d\n", csrResult); - return -EIO; - } + csrResult = CsrSdioFunctionDriverRegister(&unifi_sdioFunction_drv); + if (csrResult != CSR_RESULT_SUCCESS) { + unifi_error(NULL, "Failed to register UniFi SDIO driver: csrResult=%d\n", csrResult); + return -EIO; + } - return 0; + return 0; } /* uf_sdio_load() */ @@ -1142,6 +1126,6 @@ uf_sdio_load(void) void __exit uf_sdio_unload(void) { - CsrSdioFunctionDriverUnregister(&unifi_sdioFunction_drv); + CsrSdioFunctionDriverUnregister(&unifi_sdioFunction_drv); } /* uf_sdio_unload() */ diff --git a/drivers/staging/csr/mlme.c b/drivers/staging/csr/mlme.c index ed767eccbb32..861d6b7687c7 100644 --- a/drivers/staging/csr/mlme.c +++ b/drivers/staging/csr/mlme.c @@ -154,8 +154,6 @@ unifi_mlme_blocking_request(unifi_priv_t *priv, ul_client_t *pcli, { int r; - func_enter(); - if (sig->SignalPrimitiveHeader.SignalId == 0) { unifi_error(priv, "unifi_mlme_blocking_request: Invalid Signal Id (0x%x)\n", sig->SignalPrimitiveHeader.SignalId); @@ -199,7 +197,6 @@ unifi_mlme_blocking_request(unifi_priv_t *priv, ul_client_t *pcli, return r; } - func_exit(); return 0; } /* unifi_mlme_blocking_request() */ diff --git a/drivers/staging/csr/monitor.c b/drivers/staging/csr/monitor.c index 7c524a18958e..c8e20e4c6111 100644 --- a/drivers/staging/csr/monitor.c +++ b/drivers/staging/csr/monitor.c @@ -10,7 +10,6 @@ * --------------------------------------------------------------------------- */ -#include <linux/version.h> #include "unifi_priv.h" #ifdef UNIFI_SNIFF_ARPHRD @@ -122,8 +121,6 @@ netrx_radiotap(unifi_priv_t *priv, struct unifi_rx_radiotap_header *unifi_rt; int signal, noise, snr; - func_enter(); - if (ind_data_len <= 0) { unifi_error(priv, "Invalid length in CSR_MA_SNIFFDATA_INDICATION.\n"); return; @@ -205,7 +202,6 @@ netrx_radiotap(unifi_priv_t *priv, priv->stats.rx_packets++; priv->stats.rx_bytes += ind_data_len; - func_exit(); } /* netrx_radiotap() */ #endif /* RADIOTAP */ @@ -256,8 +252,6 @@ netrx_prism(unifi_priv_t *priv, } *avs; int signal, noise, snr; - func_enter(); - if (ind_data_len <= 0) { unifi_error(priv, "Invalid length in CSR_MA_SNIFFDATA_INDICATION.\n"); return; @@ -319,7 +313,6 @@ netrx_prism(unifi_priv_t *priv, priv->stats.rx_packets++; priv->stats.rx_bytes += ind_data_len; - func_exit(); } /* netrx_prism() */ #endif /* PRISM */ @@ -351,11 +344,8 @@ ma_sniffdata_ind(void *ospriv, struct net_device *dev = priv->netdev; struct sk_buff *skb = (struct sk_buff*)bulkdata->d[0].os_net_buf_ptr; - func_enter(); - if (bulkdata->d[0].data_length == 0) { unifi_warning(priv, "rx: MA-SNIFFDATA indication with zero bulk data\n"); - func_exit(); return; } diff --git a/drivers/staging/csr/netdev.c b/drivers/staging/csr/netdev.c index 9a52ab408e1a..7dad26f70175 100644 --- a/drivers/staging/csr/netdev.c +++ b/drivers/staging/csr/netdev.c @@ -47,7 +47,6 @@ #include <linux/etherdevice.h> #include <linux/mutex.h> #include <linux/semaphore.h> -#include <linux/version.h> #include <linux/vmalloc.h> #include "csr_wifi_hip_unifi.h" #include "csr_wifi_hip_conversions.h" @@ -55,7 +54,7 @@ #include <net/pkt_sched.h> -/* Wext handler is suported only if CSR_SUPPORT_WEXT is defined */ +/* Wext handler is supported only if CSR_SUPPORT_WEXT is defined */ #ifdef CSR_SUPPORT_WEXT extern struct iw_handler_def unifi_iw_handler_def; #endif /* CSR_SUPPORT_WEXT */ @@ -89,7 +88,7 @@ typedef int (*tx_signal_handler)(unifi_priv_t *priv, struct sk_buff *skb, const /* * The driver uses the qdisc interface to buffer and control all * outgoing traffic. We create a root qdisc, register our qdisc operations - * and later we create two subsiduary pfifo queues for the uncontrolled + * and later we create two subsidiary pfifo queues for the uncontrolled * and controlled ports. * * The network stack delivers all outgoing packets in our enqueue handler. @@ -478,8 +477,6 @@ uf_free_netdevice(unifi_priv_t *priv) int i; unsigned long flags; - func_enter(); - unifi_trace(priv, UDBG1, "uf_free_netdevice\n"); if (!priv) { @@ -554,7 +551,6 @@ uf_free_netdevice(unifi_priv_t *priv) } } - func_exit(); return 0; } /* uf_free_netdevice() */ @@ -578,8 +574,6 @@ uf_net_open(struct net_device *dev) netInterface_priv_t *interfacePriv = (netInterface_priv_t *)netdev_priv(dev); unifi_priv_t *priv = interfacePriv->privPtr; - func_enter(); - /* If we haven't finished UniFi initialisation, we can't start */ if (priv->init_progress != UNIFI_INIT_COMPLETED) { unifi_warning(priv, "%s: unifi not ready, failing net_open\n", __FUNCTION__); @@ -615,7 +609,6 @@ uf_net_open(struct net_device *dev) netif_tx_start_all_queues(dev); - func_exit(); return 0; } /* uf_net_open() */ @@ -627,8 +620,6 @@ uf_net_stop(struct net_device *dev) netInterface_priv_t *interfacePriv = (netInterface_priv_t*)netdev_priv(dev); unifi_priv_t *priv = interfacePriv->privPtr; - func_enter(); - /* Stop sniffing if in Monitor mode */ if (priv->wext_conf.mode == IW_MODE_MONITOR) { if (priv->card) { @@ -639,13 +630,10 @@ uf_net_stop(struct net_device *dev) } } } -#else - func_enter(); #endif netif_tx_stop_all_queues(dev); - func_exit(); return 0; } /* uf_net_stop() */ @@ -675,7 +663,6 @@ static CSR_PRIORITY uf_get_packet_priority(unifi_priv_t *priv, netInterface_priv { CSR_PRIORITY priority = CSR_CONTENTION; - func_enter(); priority = (CSR_PRIORITY) (skb->priority >> 5); if (priority == CSR_QOS_UP0) { /* 0 */ @@ -721,7 +708,6 @@ static CSR_PRIORITY uf_get_packet_priority(unifi_priv_t *priv, netInterface_priv unifi_trace(priv, UDBG5, "Packet priority = %d\n", priority); - func_exit(); return priority; } @@ -750,8 +736,6 @@ get_packet_priority(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr u8 interfaceMode = interfacePriv->interfaceMode; - func_enter(); - /* Priority Mapping for all the Modes */ switch(interfaceMode) { @@ -788,7 +772,6 @@ get_packet_priority(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr } unifi_trace(priv, UDBG5, "priority = %x\n", priority); - func_exit(); return priority; } @@ -816,8 +799,6 @@ uf_net_select_queue(struct net_device *dev, struct sk_buff *skb) int proto; CSR_PRIORITY priority; - func_enter(); - memcpy(&ehdr, skb->data, ETH_HLEN); proto = ntohs(ehdr.h_proto); @@ -836,7 +817,6 @@ uf_net_select_queue(struct net_device *dev, struct sk_buff *skb) } - func_exit(); return (u16)queue; } /* uf_net_select_queue() */ @@ -1582,7 +1562,7 @@ send_ma_pkt_request(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr return -1; } - /* RA adrress must contain the immediate destination MAC address that is similiar to + /* RA address must contain the immediate destination MAC address that is similar to * the Address 1 field of 802.11 Mac header here 4 is: (sizeof(framecontrol) + sizeof (durationID)) * which is address 1 field */ @@ -1760,8 +1740,6 @@ uf_net_xmit(struct sk_buff *skb, struct net_device *dev) CSR_PRIORITY priority; CsrWifiRouterCtrlPortAction port_action; - func_enter(); - unifi_trace(priv, UDBG5, "unifi_net_xmit: skb = %x\n", skb); memcpy(&ehdr, skb->data, ETH_HLEN); @@ -1805,7 +1783,6 @@ uf_net_xmit(struct sk_buff *skb, struct net_device *dev) interfacePriv->stats.tx_dropped++; kfree_skb(skb); - func_exit(); return NETDEV_TX_OK; } @@ -1848,7 +1825,6 @@ uf_net_xmit(struct sk_buff *skb, struct net_device *dev) /* The skb will have been freed by send_XXX_request() */ - func_exit(); return result; } /* uf_net_xmit() */ @@ -1877,7 +1853,6 @@ unifi_pause_xmit(void *ospriv, unifi_TrafficQueue queue) unifi_priv_t *priv = ospriv; int i; /* used as a loop counter */ - func_enter(); unifi_trace(priv, UDBG2, "Stopping queue %d\n", queue); for(i=0;i<CSR_WIFI_NUM_INTERFACES;i++) @@ -1897,7 +1872,6 @@ unifi_pause_xmit(void *ospriv, unifi_TrafficQueue queue) unifi_error(priv, "Start buffering %d defaulting to 0\n", queue); } #endif - func_exit(); } /* unifi_pause_xmit() */ @@ -1907,7 +1881,6 @@ unifi_restart_xmit(void *ospriv, unifi_TrafficQueue queue) unifi_priv_t *priv = ospriv; int i=0; /* used as a loop counter */ - func_enter(); unifi_trace(priv, UDBG2, "Waking queue %d\n", queue); for(i=0;i<CSR_WIFI_NUM_INTERFACES;i++) @@ -1927,7 +1900,6 @@ unifi_restart_xmit(void *ospriv, unifi_TrafficQueue queue) uf_send_buffered_frames(priv,0); } #endif - func_exit(); } /* unifi_restart_xmit() */ @@ -1963,7 +1935,6 @@ indicate_rx_skb(unifi_priv_t *priv, u16 ifTag, u8* dst_a, u8* src_a, struct sk_b priv->interfacePriv[ifTag]->stats.rx_frame_errors++; unifi_net_data_free(priv, &bulkdata->d[0]); unifi_notice(priv, "indicate_rx_skb: Discard unknown frame.\n"); - func_exit(); return; } @@ -1975,7 +1946,6 @@ indicate_rx_skb(unifi_priv_t *priv, u16 ifTag, u8* dst_a, u8* src_a, struct sk_b unifi_net_data_free(priv, &bulkdata->d[0]); unifi_trace(priv, UDBG5, "indicate_rx_skb: Data given to subscription" "API, not being given to kernel\n"); - func_exit(); return; } @@ -1998,7 +1968,6 @@ indicate_rx_skb(unifi_priv_t *priv, u16 ifTag, u8* dst_a, u8* src_a, struct sk_b priv->interfacePriv[ifTag]->stats.rx_errors++; priv->interfacePriv[ifTag]->stats.rx_length_errors++; unifi_net_data_free(priv, &bulkdata->d[0]); - func_exit(); return; } @@ -2025,7 +1994,6 @@ indicate_rx_skb(unifi_priv_t *priv, u16 ifTag, u8* dst_a, u8* src_a, struct sk_b priv->interfacePriv[ifTag]->stats.rx_packets++; priv->interfacePriv[ifTag]->stats.rx_bytes += bulkdata->d[0].data_length; - func_exit(); return; } @@ -2178,8 +2146,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) netInterface_priv_t *interfacePriv; struct ethhdr ehdr; - func_enter(); - interfaceTag = (pkt_ind->VirtualInterfaceIdentifier & 0xff); interfacePriv = priv->interfacePriv[interfaceTag]; @@ -2188,7 +2154,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) { unifi_error(priv, "%s: MA-PACKET indication with bad interfaceTag %d\n", __FUNCTION__, interfaceTag); unifi_net_data_free(priv,&bulkdata->d[0]); - func_exit(); return; } @@ -2197,14 +2162,12 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) { unifi_error(priv, "%s: MA-PACKET indication with unallocated interfaceTag %d\n", __FUNCTION__, interfaceTag); unifi_net_data_free(priv, &bulkdata->d[0]); - func_exit(); return; } if (bulkdata->d[0].data_length == 0) { unifi_warning(priv, "%s: MA-PACKET indication with zero bulk data\n", __FUNCTION__); unifi_net_data_free(priv,&bulkdata->d[0]); - func_exit(); return; } @@ -2326,7 +2289,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) sa[0], sa[1],sa[2], sa[3], sa[4],sa[5]); CsrWifiRouterCtrlUnexpectedFrameIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0,interfaceTag,peerMacAddress); unifi_net_data_free(priv, &bulkdata->d[0]); - func_exit(); return; } @@ -2343,7 +2305,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) unifi_net_data_free(priv, &bulkdata->d[0]); unifi_notice(priv, "%s: Dropping packet, proto=0x%04x, %s port\n", __FUNCTION__, proto, queue ? "Controlled" : "Un-controlled"); - func_exit(); return; } @@ -2351,7 +2312,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) if((dataFrameType == QOS_DATA_NULL) || (dataFrameType == DATA_NULL)){ unifi_trace(priv, UDBG5, "%s: Null Frame Received and Freed\n", __FUNCTION__); unifi_net_data_free(priv, &bulkdata->d[0]); - func_exit(); return; } @@ -2366,7 +2326,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) bulkdata, macHeaderLengthInBytes))) { - func_exit(); return; } unifi_trace(priv, UDBG5, "unifi_rx: no specific AP handling process as normal frame, MAC Header len %d\n",macHeaderLengthInBytes); @@ -2389,7 +2348,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) unifi_trace(priv, UDBG1, "Zero length frame, but not null-data %04x\n", frameControl); } unifi_net_data_free(priv, &bulkdata->d[0]); - func_exit(); return; } @@ -2399,7 +2357,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) unifi_net_data_free(priv, &bulkdata->d[0]); unifi_notice(priv, "%s: Dropping packet, proto=0x%04x, %s port\n", __FUNCTION__, proto, queue ? "controlled" : "uncontrolled"); - func_exit(); return; } else if ( (port_action == CSR_WIFI_ROUTER_CTRL_PORT_ACTION_8021X_PORT_CLOSED_BLOCK) || (interfacePriv->connected != UnifiConnected) ) { @@ -2415,7 +2372,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) __FUNCTION__, sizeof(rx_buffered_packets_t)); interfacePriv->stats.rx_dropped++; unifi_net_data_free(priv, &bulkdata->d[0]); - func_exit(); return; } @@ -2439,15 +2395,12 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) list_add_tail(&rx_q_item->q, rx_list); up(&priv->rx_q_sem); - func_exit(); return; } indicate_rx_skb(priv, interfaceTag, da, sa, skb, signal, bulkdata); - func_exit(); - } /* unifi_rx() */ static void process_ma_packet_cfm(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) @@ -2456,7 +2409,6 @@ static void process_ma_packet_cfm(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d const CSR_MA_PACKET_CONFIRM *pkt_cfm = &signal->u.MaPacketConfirm; netInterface_priv_t *interfacePriv; - func_enter(); interfaceTag = (pkt_cfm->VirtualInterfaceIdentifier & 0xff); interfacePriv = priv->interfacePriv[interfaceTag]; @@ -2464,7 +2416,6 @@ static void process_ma_packet_cfm(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d if (interfaceTag >= CSR_WIFI_NUM_INTERFACES) { unifi_error(priv, "%s: MA-PACKET confirm with bad interfaceTag %d\n", __FUNCTION__, interfaceTag); - func_exit(); return; } #ifdef CSR_SUPPORT_SME @@ -2487,7 +2438,6 @@ static void process_ma_packet_cfm(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d interfacePriv->m4_hostTag = 0xffffffff; } #endif - func_exit(); return; } @@ -2528,8 +2478,6 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d #endif - func_enter(); - interfaceTag = (pkt_ind->VirtualInterfaceIdentifier & 0xff); interfacePriv = priv->interfacePriv[interfaceTag]; @@ -2539,7 +2487,6 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d { unifi_error(priv, "%s: MA-PACKET indication with bad interfaceTag %d\n", __FUNCTION__, interfaceTag); unifi_net_data_free(priv,&bulkdata->d[0]); - func_exit(); return; } @@ -2548,24 +2495,21 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d { unifi_error(priv, "%s: MA-PACKET indication with unallocated interfaceTag %d\n", __FUNCTION__, interfaceTag); unifi_net_data_free(priv, &bulkdata->d[0]); - func_exit(); return; } if (bulkdata->d[0].data_length == 0) { unifi_warning(priv, "%s: MA-PACKET indication with zero bulk data\n", __FUNCTION__); unifi_net_data_free(priv,&bulkdata->d[0]); - func_exit(); return; } /* For monitor mode we need to pass this indication to the registered application - handle this seperately*/ + handle this separately*/ /* MIC failure is already taken care of so no need to send the PDUs which are not successfully received in non-monitor mode*/ if(pkt_ind->ReceptionStatus != CSR_RX_SUCCESS) { unifi_warning(priv, "%s: MA-PACKET indication with status = %d\n",__FUNCTION__, pkt_ind->ReceptionStatus); unifi_net_data_free(priv,&bulkdata->d[0]); - func_exit(); return; } @@ -2613,13 +2557,11 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d } #endif unifi_net_data_free(priv,&bulkdata->d[0]); - func_exit(); return; } if(frameType != IEEE802_11_FRAMETYPE_DATA) { unifi_warning(priv, "%s: Non control Non Data frame is received\n",__FUNCTION__); unifi_net_data_free(priv,&bulkdata->d[0]); - func_exit(); return; } @@ -2637,7 +2579,6 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d sa[0], sa[1],sa[2], sa[3], sa[4],sa[5]); CsrWifiRouterCtrlUnexpectedFrameIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0,interfaceTag,peerMacAddress); unifi_net_data_free(priv, &bulkdata->d[0]); - func_exit(); return; } @@ -2743,7 +2684,6 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d up(&priv->ba_mutex); process_ba_complete(priv, interfacePriv); - func_exit(); } /* * --------------------------------------------------------------------------- @@ -2836,8 +2776,6 @@ netdev_mlme_event_handler(ul_client_t *pcli, const u8 *sig_packed, int sig_len, int id, r; bulk_data_param_t bulkdata; - func_enter(); - /* Just a sanity check */ if (sig_packed == NULL) { return; @@ -2902,7 +2840,6 @@ netdev_mlme_event_handler(ul_client_t *pcli, const u8 *sig_packed, int sig_len, break; } - func_exit(); } /* netdev_mlme_event_handler() */ @@ -3100,13 +3037,13 @@ static void update_expected_sn(unifi_priv_t *priv, 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); + unifi_trace(priv, UDBG6, "%s: process the frames up to new_expected_sn = %d gap = %d\n", __FUNCTION__, sn, gap); for(j = 0; j < gap && j < ba_session->wind_size; j++) { i = SN_TO_INDEX(ba_session, ba_session->expected_sn); - unifi_trace(priv, UDBG6, "%s: proccess the slot index = %d\n", __FUNCTION__, i); + unifi_trace(priv, UDBG6, "%s: process the slot index = %d\n", __FUNCTION__, i); if(ba_session->buffer[i].active) { add_frame_to_ba_complete(priv, interfacePriv, &ba_session->buffer[i]); - unifi_trace(priv, UDBG6, "%s: proccess the frame at index = %d expected_sn = %d\n", __FUNCTION__, i, ba_session->expected_sn); + unifi_trace(priv, UDBG6, "%s: process the frame at index = %d expected_sn = %d\n", __FUNCTION__, i, ba_session->expected_sn); FREE_BUFFER_SLOT(ba_session, i); } else { unifi_trace(priv, UDBG6, "%s: empty slot at index = %d\n", __FUNCTION__, i); @@ -3247,8 +3184,8 @@ static void check_ba_frame_age_timeout( unifi_priv_t *priv, netInterface_priv_t *interfacePriv, ba_session_rx_struct *ba_session) { - CsrTime now; - CsrTime age; + u32 now; + u32 age; u8 i, j; u16 sn_temp; @@ -3283,11 +3220,11 @@ static void check_ba_frame_age_timeout( unifi_priv_t *priv, if (ba_session->buffer[i].recv_time > now) { /* timer wrap */ - age = CsrTimeAdd((CsrTime)CsrTimeSub(CSR_SCHED_TIME_MAX, ba_session->buffer[i].recv_time), now); + age = CsrTimeAdd((u32)CsrTimeSub(CSR_SCHED_TIME_MAX, ba_session->buffer[i].recv_time), now); } else { - age = (CsrTime)CsrTimeSub(now, ba_session->buffer[i].recv_time); + age = (u32)CsrTimeSub(now, ba_session->buffer[i].recv_time); } if (age >= CSR_WIFI_BA_MPDU_FRAME_AGE_TIMEOUT) @@ -3331,8 +3268,6 @@ static void process_ma_packet_error_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, CSR_PRIORITY UserPriority; CSR_SEQUENCE_NUMBER sn; - func_enter(); - interfaceTag = (pkt_err_ind->VirtualInterfaceIdentifier & 0xff); @@ -3340,7 +3275,6 @@ static void process_ma_packet_error_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, if (interfaceTag >= CSR_WIFI_NUM_INTERFACES) { unifi_error(priv, "%s: MaPacketErrorIndication indication with bad interfaceTag %d\n", __FUNCTION__, interfaceTag); - func_exit(); return; } @@ -3348,7 +3282,6 @@ static void process_ma_packet_error_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, UserPriority = pkt_err_ind->UserPriority; if(UserPriority > 15) { unifi_error(priv, "%s: MaPacketErrorIndication indication with bad UserPriority=%d\n", __FUNCTION__, UserPriority); - func_exit(); } sn = pkt_err_ind->SequenceNumber; @@ -3369,7 +3302,6 @@ static void process_ma_packet_error_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, up(&priv->ba_mutex); process_ba_complete(priv, interfacePriv); - func_exit(); } diff --git a/drivers/staging/csr/os.c b/drivers/staging/csr/os.c index 35dc9087d79f..37ec59df3581 100644 --- a/drivers/staging/csr/os.c +++ b/drivers/staging/csr/os.c @@ -412,9 +412,8 @@ dump(void *mem, u16 len) return; } for (i = 0; i < len; i++) { - if (col == 0) { + if (col == 0) printk("0x%02X: ", i); - } printk(" %02X", pdata[i]); @@ -423,9 +422,8 @@ dump(void *mem, u16 len) col = 0; } } - if (col) { + if (col) printk("\n"); - } } /* dump() */ @@ -438,9 +436,8 @@ dump16(void *mem, u16 len) printk("timestamp %s \n", print_time()); #endif /* ANDROID_TIMESTAMP */ for (i = 0; i < len; i+=2) { - if (col == 0) { + if (col == 0) printk("0x%02X: ", i); - } printk(" %04X", *p++); @@ -449,9 +446,8 @@ dump16(void *mem, u16 len) col = 0; } } - if (col) { + if (col) printk("\n"); - } } @@ -459,7 +455,7 @@ dump16(void *mem, u16 len) void dump_str(void *mem, u16 len) { - int i, col = 0; + int i; unsigned char *pdata = (unsigned char *)mem; #ifdef ANDROID_TIMESTAMP printk("timestamp %s \n", print_time()); @@ -467,9 +463,7 @@ dump_str(void *mem, u16 len) for (i = 0; i < len; i++) { printk("%c", pdata[i]); } - if (col) { - printk("\n"); - } + printk("\n"); } /* dump_str() */ #endif /* CSR_ONLY_NOTES */ diff --git a/drivers/staging/csr/sdio_mmc.c b/drivers/staging/csr/sdio_mmc.c index af3e40bb5010..b6a16de08f4e 100644 --- a/drivers/staging/csr/sdio_mmc.c +++ b/drivers/staging/csr/sdio_mmc.c @@ -14,7 +14,6 @@ #include <linux/kernel.h> #include <linux/mutex.h> #include <linux/gfp.h> -#include <linux/version.h> #include <linux/mmc/core.h> #include <linux/mmc/card.h> #include <linux/mmc/host.h> @@ -152,7 +151,6 @@ CsrSdioRead8(CsrSdioFunction *function, u32 address, u8 *data) _sdio_release_host(func); if (err) { - func_exit_r(err); return ConvertSdioToCsrSdioResult(err); } @@ -170,7 +168,6 @@ CsrSdioWrite8(CsrSdioFunction *function, u32 address, u8 data) _sdio_release_host(func); if (err) { - func_exit_r(err); return ConvertSdioToCsrSdioResult(err); } @@ -246,7 +243,6 @@ CsrSdioF0Read8(CsrSdioFunction *function, u32 address, u8 *data) _sdio_release_host(func); if (err) { - func_exit_r(err); return ConvertSdioToCsrSdioResult(err); } @@ -268,7 +264,6 @@ CsrSdioF0Write8(CsrSdioFunction *function, u32 address, u8 data) _sdio_release_host(func); if (err) { - func_exit_r(err); return ConvertSdioToCsrSdioResult(err); } @@ -287,7 +282,6 @@ CsrSdioRead(CsrSdioFunction *function, u32 address, void *data, u32 length) _sdio_release_host(func); if (err) { - func_exit_r(err); return ConvertSdioToCsrSdioResult(err); } @@ -305,7 +299,6 @@ CsrSdioWrite(CsrSdioFunction *function, u32 address, const void *data, u32 lengt _sdio_release_host(func); if (err) { - func_exit_r(err); return ConvertSdioToCsrSdioResult(err); } @@ -480,7 +473,6 @@ CsrSdioInterruptEnable(CsrSdioFunction *function) #endif _sdio_release_host(func); - func_exit(); if (err) { printk(KERN_ERR "unifi: %s: error %d writing IENx\n", __FUNCTION__, err); return ConvertSdioToCsrSdioResult(err); @@ -507,7 +499,6 @@ CsrSdioInterruptDisable(CsrSdioFunction *function) #endif _sdio_release_host(func); - func_exit(); if (err) { printk(KERN_ERR "unifi: %s: error %d writing IENx\n", __FUNCTION__, err); return ConvertSdioToCsrSdioResult(err); @@ -541,8 +532,6 @@ CsrSdioFunctionEnable(CsrSdioFunction *function) struct sdio_func *func = (struct sdio_func *)function->priv; int err; - func_enter(); - /* Enable UniFi function 1 (the 802.11 part). */ _sdio_claim_host(func); err = sdio_enable_func(func); @@ -551,7 +540,6 @@ CsrSdioFunctionEnable(CsrSdioFunction *function) unifi_error(NULL, "Failed to enable SDIO function %d\n", func->num); } - func_exit(); return ConvertSdioToCsrSdioResult(err); } /* CsrSdioFunctionEnable() */ @@ -575,8 +563,6 @@ CsrSdioFunctionDisable(CsrSdioFunction *function) struct sdio_func *func = (struct sdio_func *)function->priv; int err; - func_enter(); - /* Disable UniFi function 1 (the 802.11 part). */ _sdio_claim_host(func); err = sdio_disable_func(func); @@ -585,7 +571,6 @@ CsrSdioFunctionDisable(CsrSdioFunction *function) unifi_error(NULL, "Failed to disable SDIO function %d\n", func->num); } - func_exit(); return ConvertSdioToCsrSdioResult(err); } /* CsrSdioFunctionDisable() */ @@ -1034,8 +1019,6 @@ uf_glue_sdio_probe(struct sdio_func *func, int instance; CsrSdioFunction *sdio_ctx; - func_enter(); - /* First of all claim the SDIO driver */ sdio_claim_host(func); @@ -1103,7 +1086,6 @@ uf_glue_sdio_probe(struct sdio_func *func, wake_lock(&unifi_sdio_wake_lock); #endif - func_exit(); return 0; } /* uf_glue_sdio_probe() */ @@ -1131,8 +1113,6 @@ uf_glue_sdio_remove(struct sdio_func *func) return; } - func_enter(); - unifi_info(NULL, "UniFi card removed\n"); /* Clean up the SDIO function driver */ @@ -1148,8 +1128,6 @@ uf_glue_sdio_remove(struct sdio_func *func) kfree(sdio_ctx); - func_exit(); - } /* uf_glue_sdio_remove */ @@ -1183,11 +1161,8 @@ MODULE_DEVICE_TABLE(sdio, unifi_ids); static int uf_glue_sdio_suspend(struct device *dev) { - func_enter(); - unifi_trace(NULL, UDBG1, "uf_glue_sdio_suspend"); - func_exit(); return 0; } /* uf_glue_sdio_suspend */ @@ -1208,8 +1183,6 @@ uf_glue_sdio_suspend(struct device *dev) static int uf_glue_sdio_resume(struct device *dev) { - func_enter(); - unifi_trace(NULL, UDBG1, "uf_glue_sdio_resume"); #ifdef ANDROID_BUILD @@ -1217,7 +1190,6 @@ uf_glue_sdio_resume(struct device *dev) wake_lock(&unifi_sdio_wake_lock); #endif - func_exit(); return 0; } /* uf_glue_sdio_resume */ diff --git a/drivers/staging/csr/sme_blocking.c b/drivers/staging/csr/sme_blocking.c index 543e8f2c407a..d88ccd5bd428 100644 --- a/drivers/staging/csr/sme_blocking.c +++ b/drivers/staging/csr/sme_blocking.c @@ -270,17 +270,15 @@ int sme_mgt_wifi_off(unifi_priv_t *priv) } r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } /* Stop the SME */ CsrWifiSmeWifiOffReqSend(0); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_LONG_TIMEOUT); - if (r) { + if (r) return r; - } unifi_trace(priv, UDBG4, "sme_mgt_wifi_off: unifi_mgt_wifi_off_req <-- (r=%d, status=%d)\n", @@ -300,16 +298,14 @@ int sme_mgt_key(unifi_priv_t *priv, CsrWifiSmeKey *sme_key, } r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeKeyReqSend(0, CSR_WIFI_INTERFACE_IN_USE, action, *sme_key); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } return convert_sme_error(priv->sme_reply.reply_status); } @@ -332,9 +328,8 @@ int sme_mgt_scan_full(unifi_priv_t *priv, unifi_trace(priv, UDBG4, "sme_mgt_scan_full: -->\n"); r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } /* If a channel list is provided, do an active scan */ if (is_active) { @@ -354,16 +349,14 @@ int sme_mgt_scan_full(unifi_priv_t *priv, 0, NULL); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_LONG_TIMEOUT); - if (r) { + if (r) return r; - } unifi_trace(priv, UDBG4, "sme_mgt_scan_full: <-- (status=%d)\n", priv->sme_reply.reply_status); - if (priv->sme_reply.reply_status == CSR_WIFI_RESULT_UNAVAILABLE) { + if (priv->sme_reply.reply_status == CSR_WIFI_RESULT_UNAVAILABLE) return 0; /* initial scan already underway */ - } else { + else return convert_sme_error(priv->sme_reply.reply_status); - } } @@ -385,15 +378,13 @@ int sme_mgt_scan_results_get_async(unifi_priv_t *priv, } r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeScanResultsGetReqSend(0); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_LONG_TIMEOUT); - if (r) { + if (r) return r; - } scan_result_list_count = priv->sme_reply.reply_scan_results_count; scan_result_list = priv->sme_reply.reply_scan_results; @@ -454,20 +445,17 @@ int sme_mgt_connect(unifi_priv_t *priv) priv->connection_config.ssid.ssid); r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeConnectReqSend(0, CSR_WIFI_INTERFACE_IN_USE, priv->connection_config); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } - if (priv->sme_reply.reply_status) { + if (priv->sme_reply.reply_status) unifi_trace(priv, UDBG1, "sme_mgt_connect: failed with SME status %d\n", priv->sme_reply.reply_status); - } return convert_sme_error(priv->sme_reply.reply_status); } @@ -483,15 +471,13 @@ int sme_mgt_disconnect(unifi_priv_t *priv) } r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeDisconnectReqSend(0, CSR_WIFI_INTERFACE_IN_USE); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } unifi_trace(priv, UDBG4, "sme_mgt_disconnect: <-- (status=%d)\n", priv->sme_reply.reply_status); return convert_sme_error(priv->sme_reply.reply_status); @@ -510,16 +496,14 @@ int sme_mgt_pmkid(unifi_priv_t *priv, } r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmePmkidReqSend(0, CSR_WIFI_INTERFACE_IN_USE, action, pmkid_list->pmkidsCount, pmkid_list->pmkids); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } unifi_trace(priv, UDBG4, "sme_mgt_pmkid: <-- (status=%d)\n", priv->sme_reply.reply_status); return convert_sme_error(priv->sme_reply.reply_status); @@ -537,9 +521,8 @@ int sme_mgt_mib_get(unifi_priv_t *priv, } r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } priv->mib_cfm_buffer = varbind; priv->mib_cfm_buffer_length = MAX_VARBIND_LENGTH; @@ -571,15 +554,13 @@ int sme_mgt_mib_set(unifi_priv_t *priv, } r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeMibSetReqSend(0, length, varbind); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } unifi_trace(priv, UDBG4, "sme_mgt_mib_set: <-- (status=%d)\n", priv->sme_reply.reply_status); return convert_sme_error(priv->sme_reply.reply_status); @@ -598,16 +579,14 @@ int sme_mgt_power_config_set(unifi_priv_t *priv, CsrWifiSmePowerConfig *powerCon } r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmePowerConfigSetReqSend(0, *powerConfig); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } unifi_trace(priv, UDBG4, "sme_mgt_set_value_async: unifi_mgt_set_value_req <-- (r=%d status=%d)\n", @@ -637,29 +616,26 @@ int sme_mgt_sme_config_set(unifi_priv_t *priv, CsrWifiSmeStaConfig *staConfig, C } r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeSmeStaConfigSetReqSend(0, CSR_WIFI_INTERFACE_IN_USE, *staConfig); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } + unifi_trace(priv, UDBG4, "sme_mgt_sme_config_set: CsrWifiSmeSmeStaConfigSetReq <-- (r=%d status=%d)\n", r, priv->sme_reply.reply_status); r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeSmeCommonConfigSetReqSend(0, *deviceConfig); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } unifi_trace(priv, UDBG4, "sme_mgt_sme_config_set: CsrWifiSmeSmeCommonConfigSetReq <-- (r=%d status=%d)\n", @@ -693,16 +669,14 @@ int sme_mgt_mib_config_set(unifi_priv_t *priv, CsrWifiSmeMibConfig *mibConfig) } r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeMibConfigSetReqSend(0, *mibConfig); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } unifi_trace(priv, UDBG4, "sme_mgt_mib_config_set: unifi_mgt_set_mib_config_req <-- (r=%d status=%d)\n", @@ -732,16 +706,14 @@ int sme_mgt_coex_config_set(unifi_priv_t *priv, CsrWifiSmeCoexConfig *coexConfig } r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeCoexConfigSetReqSend(0, *coexConfig); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } unifi_trace(priv, UDBG4, "sme_mgt_coex_config_set: unifi_mgt_set_mib_config_req <-- (r=%d status=%d)\n", @@ -773,16 +745,14 @@ int sme_mgt_host_config_set(unifi_priv_t *priv, CsrWifiSmeHostConfig *hostConfig } r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeHostConfigSetReqSend(0, CSR_WIFI_INTERFACE_IN_USE, *hostConfig); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } unifi_trace(priv, UDBG4, "sme_mgt_host_config_set: unifi_mgt_set_host_config_req <-- (r=%d status=%d)\n", @@ -815,16 +785,14 @@ int sme_mgt_versions_get(unifi_priv_t *priv, CsrWifiSmeVersions *versions) unifi_trace(priv, UDBG4, "sme_mgt_versions_get: unifi_mgt_versions_get_req -->\n"); r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeVersionsGetReqSend(0); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } /* store the reply */ if (versions != NULL) { @@ -861,16 +829,14 @@ int sme_mgt_power_config_get(unifi_priv_t *priv, CsrWifiSmePowerConfig *powerCon unifi_trace(priv, UDBG4, "sme_mgt_power_config_get: unifi_mgt_power_config_req -->\n"); r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmePowerConfigGetReqSend(0); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } /* store the reply */ if (powerConfig != NULL) { @@ -905,23 +871,20 @@ int sme_mgt_host_config_get(unifi_priv_t *priv, CsrWifiSmeHostConfig *hostConfig unifi_trace(priv, UDBG4, "sme_mgt_host_config_get: unifi_mgt_host_config_get_req -->\n"); r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeHostConfigGetReqSend(0, CSR_WIFI_INTERFACE_IN_USE); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } /* store the reply */ - if (hostConfig != NULL) { + if (hostConfig != NULL) memcpy((unsigned char*)hostConfig, (unsigned char*)&priv->sme_reply.hostConfig, sizeof(CsrWifiSmeHostConfig)); - } unifi_trace(priv, UDBG4, "sme_mgt_host_config_get: unifi_mgt_host_config_get_req <-- (r=%d status=%d)\n", @@ -951,41 +914,35 @@ int sme_mgt_sme_config_get(unifi_priv_t *priv, CsrWifiSmeStaConfig *staConfig, C /* Common device config */ r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeSmeCommonConfigGetReqSend(0); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } /* store the reply */ - if (deviceConfig != NULL) { + if (deviceConfig != NULL) memcpy((unsigned char*)deviceConfig, (unsigned char*)&priv->sme_reply.deviceConfig, sizeof(CsrWifiSmeDeviceConfig)); - } /* STA config */ r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeSmeStaConfigGetReqSend(0, CSR_WIFI_INTERFACE_IN_USE); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } /* store the reply */ - if (staConfig != NULL) { + if (staConfig != NULL) memcpy((unsigned char*)staConfig, (unsigned char*)&priv->sme_reply.staConfig, sizeof(CsrWifiSmeStaConfig)); - } unifi_trace(priv, UDBG4, "sme_mgt_sme_config_get: unifi_mgt_sme_config_get_req <-- (r=%d status=%d)\n", @@ -1014,23 +971,20 @@ int sme_mgt_coex_info_get(unifi_priv_t *priv, CsrWifiSmeCoexInfo *coexInfo) unifi_trace(priv, UDBG4, "sme_mgt_coex_info_get: unifi_mgt_coex_info_get_req -->\n"); r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeCoexInfoGetReqSend(0); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } /* store the reply */ - if (coexInfo != NULL) { + if (coexInfo != NULL) memcpy((unsigned char*)coexInfo, (unsigned char*)&priv->sme_reply.coexInfo, sizeof(CsrWifiSmeCoexInfo)); - } unifi_trace(priv, UDBG4, "sme_mgt_coex_info_get: unifi_mgt_coex_info_get_req <-- (r=%d status=%d)\n", @@ -1060,23 +1014,20 @@ int sme_mgt_coex_config_get(unifi_priv_t *priv, CsrWifiSmeCoexConfig *coexConfig unifi_trace(priv, UDBG4, "sme_mgt_coex_config_get: unifi_mgt_coex_config_get_req -->\n"); r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeCoexConfigGetReqSend(0); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } /* store the reply */ - if (coexConfig != NULL) { + if (coexConfig != NULL) memcpy((unsigned char*)coexConfig, (unsigned char*)&priv->sme_reply.coexConfig, sizeof(CsrWifiSmeCoexConfig)); - } unifi_trace(priv, UDBG4, "sme_mgt_coex_config_get: unifi_mgt_coex_config_get_req <-- (r=%d status=%d)\n", @@ -1104,23 +1055,20 @@ int sme_mgt_mib_config_get(unifi_priv_t *priv, CsrWifiSmeMibConfig *mibConfig) unifi_trace(priv, UDBG4, "sme_mgt_mib_config_get: unifi_mgt_mib_config_get_req -->\n"); r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeMibConfigGetReqSend(0); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } /* store the reply */ - if (mibConfig != NULL) { + if (mibConfig != NULL) memcpy((unsigned char*)mibConfig, (unsigned char*)&priv->sme_reply.mibConfig, sizeof(CsrWifiSmeMibConfig)); - } unifi_trace(priv, UDBG4, "sme_mgt_mib_config_get: unifi_mgt_mib_config_get_req <-- (r=%d status=%d)\n", @@ -1148,23 +1096,20 @@ int sme_mgt_connection_info_get(unifi_priv_t *priv, CsrWifiSmeConnectionInfo *co unifi_trace(priv, UDBG4, "sme_mgt_connection_info_get: unifi_mgt_connection_info_get_req -->\n"); r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeConnectionInfoGetReqSend(0, CSR_WIFI_INTERFACE_IN_USE); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } /* store the reply */ - if (connectionInfo != NULL) { + if (connectionInfo != NULL) memcpy((unsigned char*)connectionInfo, (unsigned char*)&priv->sme_reply.connectionInfo, sizeof(CsrWifiSmeConnectionInfo)); - } unifi_trace(priv, UDBG4, "sme_mgt_connection_info_get: unifi_mgt_connection_info_get_req <-- (r=%d status=%d)\n", @@ -1192,23 +1137,20 @@ int sme_mgt_connection_config_get(unifi_priv_t *priv, CsrWifiSmeConnectionConfig unifi_trace(priv, UDBG4, "sme_mgt_connection_config_get: unifi_mgt_connection_config_get_req -->\n"); r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeConnectionConfigGetReqSend(0, CSR_WIFI_INTERFACE_IN_USE); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } /* store the reply */ - if (connectionConfig != NULL) { + if (connectionConfig != NULL) memcpy((unsigned char*)connectionConfig, (unsigned char*)&priv->sme_reply.connectionConfig, sizeof(CsrWifiSmeConnectionConfig)); - } unifi_trace(priv, UDBG4, "sme_mgt_connection_config_get: unifi_mgt_connection_config_get_req <-- (r=%d status=%d)\n", @@ -1236,23 +1178,20 @@ int sme_mgt_connection_stats_get(unifi_priv_t *priv, CsrWifiSmeConnectionStats * unifi_trace(priv, UDBG4, "sme_mgt_connection_stats_get: unifi_mgt_connection_stats_get_req -->\n"); r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiSmeConnectionStatsGetReqSend(0, CSR_WIFI_INTERFACE_IN_USE); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } /* store the reply */ - if (connectionStats != NULL) { + if (connectionStats != NULL) memcpy((unsigned char*)connectionStats, (unsigned char*)&priv->sme_reply.connectionStats, sizeof(CsrWifiSmeConnectionStats)); - } unifi_trace(priv, UDBG4, "sme_mgt_connection_stats_get: unifi_mgt_connection_stats_get_req <-- (r=%d status=%d)\n", @@ -1272,58 +1211,56 @@ int sme_mgt_connection_stats_get(unifi_priv_t *priv, CsrWifiSmeConnectionStats * int sme_mgt_packet_filter_set(unifi_priv_t *priv) { - CsrWifiIp4Address ipAddress = {{0xFF, 0xFF, 0xFF, 0xFF }}; - if (priv->smepriv == NULL) { - unifi_error(priv, "sme_mgt_packet_filter_set: invalid smepriv\n"); - return -EIO; - } - if (priv->packet_filters.arp_filter) { - ipAddress.a[0] = (priv->sta_ip_address ) & 0xFF; - ipAddress.a[1] = (priv->sta_ip_address >> 8) & 0xFF; - ipAddress.a[2] = (priv->sta_ip_address >> 16) & 0xFF; - ipAddress.a[3] = (priv->sta_ip_address >> 24) & 0xFF; - } - - unifi_trace(priv, UDBG5, - "sme_mgt_packet_filter_set: IP address %d.%d.%d.%d\n", - ipAddress.a[0], ipAddress.a[1], - ipAddress.a[2], ipAddress.a[3]); - - /* Doesn't block for a confirm */ - CsrWifiSmePacketFilterSetReqSend(0, CSR_WIFI_INTERFACE_IN_USE, - priv->packet_filters.tclas_ies_length, - priv->filter_tclas_ies, - priv->packet_filters.filter_mode, - ipAddress); - return 0; + CsrWifiIp4Address ipAddress = {{0xFF, 0xFF, 0xFF, 0xFF }}; + if (priv->smepriv == NULL) { + unifi_error(priv, "sme_mgt_packet_filter_set: invalid smepriv\n"); + return -EIO; + } + if (priv->packet_filters.arp_filter) { + ipAddress.a[0] = (priv->sta_ip_address ) & 0xFF; + ipAddress.a[1] = (priv->sta_ip_address >> 8) & 0xFF; + ipAddress.a[2] = (priv->sta_ip_address >> 16) & 0xFF; + ipAddress.a[3] = (priv->sta_ip_address >> 24) & 0xFF; + } + + unifi_trace(priv, UDBG5, + "sme_mgt_packet_filter_set: IP address %d.%d.%d.%d\n", + ipAddress.a[0], ipAddress.a[1], + ipAddress.a[2], ipAddress.a[3]); + + /* Doesn't block for a confirm */ + CsrWifiSmePacketFilterSetReqSend(0, CSR_WIFI_INTERFACE_IN_USE, + priv->packet_filters.tclas_ies_length, + priv->filter_tclas_ies, + priv->packet_filters.filter_mode, + ipAddress); + return 0; } int sme_mgt_tspec(unifi_priv_t *priv, CsrWifiSmeListAction action, u32 tid, CsrWifiSmeDataBlock *tspec, CsrWifiSmeDataBlock *tclas) { - int r; - - if (priv->smepriv == NULL) { - unifi_error(priv, "sme_mgt_tspec: invalid smepriv\n"); - return -EIO; - } - - r = sme_init_request(priv); - if (r) { - return -EIO; - } - - CsrWifiSmeTspecReqSend(0, CSR_WIFI_INTERFACE_IN_USE, - action, tid, TRUE, 0, - tspec->length, tspec->data, - tclas->length, tclas->data); - r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { - return r; - } - - unifi_trace(priv, UDBG4, "sme_mgt_tspec: <-- (status=%d)\n", priv->sme_reply.reply_status); - return convert_sme_error(priv->sme_reply.reply_status); + int r; + + if (priv->smepriv == NULL) { + unifi_error(priv, "sme_mgt_tspec: invalid smepriv\n"); + return -EIO; + } + + r = sme_init_request(priv); + if (r) + return -EIO; + + CsrWifiSmeTspecReqSend(0, CSR_WIFI_INTERFACE_IN_USE, + action, tid, TRUE, 0, + tspec->length, tspec->data, + tclas->length, tclas->data); + r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); + if (r) + return r; + + unifi_trace(priv, UDBG4, "sme_mgt_tspec: <-- (status=%d)\n", priv->sme_reply.reply_status); + return convert_sme_error(priv->sme_reply.reply_status); } @@ -1339,9 +1276,8 @@ int sme_sys_suspend(unifi_priv_t *priv) } r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } /* Suspend the SME, which MAY cause it to power down UniFi */ CsrWifiRouterCtrlSuspendIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0, 0, priv->wol_suspend); @@ -1427,17 +1363,15 @@ int sme_sys_resume(unifi_priv_t *priv) } r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiRouterCtrlResumeIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0, priv->wol_suspend); r = sme_wait_for_reply(priv, UNIFI_SME_SYS_LONG_TIMEOUT); - if (r) { + if (r) unifi_notice(priv, "resume: SME did not reply, return success anyway\n"); - } return 0; } @@ -1453,16 +1387,14 @@ int sme_ap_stop(unifi_priv_t *priv,u16 interface_tag) } r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiNmeApStopReqSend(0,interface_tag); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } unifi_trace(priv, UDBG4, "sme_ap_stop <-- (r=%d status=%d)\n", @@ -1484,9 +1416,8 @@ int sme_ap_start(unifi_priv_t *priv,u16 interface_tag, } r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiNmeApStartReqSend(0,interface_tag,CSR_WIFI_AP_TYPE_LEGACY,FALSE, ap_config->ssid,1,ap_config->channel, @@ -1494,9 +1425,8 @@ int sme_ap_start(unifi_priv_t *priv,u16 interface_tag, p2p_go_param,FALSE); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); - if (r) { + if (r) return r; - } unifi_trace(priv, UDBG4, "sme_ap_start <-- (r=%d status=%d)\n", @@ -1518,14 +1448,15 @@ int sme_ap_config(unifi_priv_t *priv, } r = sme_init_request(priv); - if (r) { + if (r) return -EIO; - } CsrWifiNmeApConfigSetReqSend(0,*group_security_config, *ap_mac_config); r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT); + if (r) + return r; unifi_trace(priv, UDBG4, "sme_ap_config <-- (r=%d status=%d)\n", diff --git a/drivers/staging/csr/sme_native.c b/drivers/staging/csr/sme_native.c index d7a5125d9a8e..525fe1bce0e6 100644 --- a/drivers/staging/csr/sme_native.c +++ b/drivers/staging/csr/sme_native.c @@ -12,7 +12,6 @@ */ #include <linux/netdevice.h> -#include <linux/version.h> #include "unifi_priv.h" #include "csr_wifi_hip_unifi.h" #include "csr_wifi_hip_conversions.h" @@ -22,23 +21,17 @@ static const unsigned char wildcard_address[ETH_ALEN] = {0x00, 0x00, 0x00, 0x00, int uf_sme_init(unifi_priv_t *priv) { - func_enter(); - sema_init(&priv->mlme_blocking_mutex, 1); #ifdef CSR_SUPPORT_WEXT { int r = uf_init_wext_interface(priv); if (r != 0) { - func_exit(); return r; } } #endif - - - func_exit(); return 0; } /* uf_sme_init() */ @@ -47,8 +40,6 @@ void uf_sme_deinit(unifi_priv_t *priv) { - func_enter(); - /* Free memory allocated for the scan table */ /* unifi_clear_scan_table(priv); */ @@ -59,8 +50,6 @@ uf_sme_deinit(unifi_priv_t *priv) uf_deinit_wext_interface(priv); #endif - - func_exit(); } /* uf_sme_deinit() */ @@ -222,8 +211,6 @@ sme_native_log_event(ul_client_t *pcli, CSR_SIGNAL signal; ul_client_t *client = pcli; - func_enter(); - if (client == NULL) { unifi_error(NULL, "sme_native_log_event: client has exited\n"); return; @@ -334,8 +321,6 @@ sme_native_log_event(ul_client_t *pcli, /* Wake any waiting user process */ wake_up_interruptible(&client->udi_wq); - func_exit(); - } /* sme_native_log_event() */ @@ -461,8 +446,6 @@ sme_native_mlme_event_handler(ul_client_t *pcli, unifi_priv_t *priv = uf_find_instance(pcli->instance); int id, r; - func_enter(); - /* Just a sanity check */ if ((sig_packed == NULL) || (sig_len <= 0)) { return; @@ -542,7 +525,6 @@ sme_native_mlme_event_handler(ul_client_t *pcli, break; } - func_exit(); } /* sme_native_mlme_event_handler() */ @@ -574,14 +556,11 @@ unifi_reset_state(unifi_priv_t *priv, unsigned char *macaddr, { int r = 0; - func_enter(); - #ifdef CSR_SUPPORT_WEXT /* The reset clears any 802.11 association. */ priv->wext_conf.flag_associated = 0; #endif - func_exit(); return r; } /* unifi_reset_state() */ diff --git a/drivers/staging/csr/sme_sys.c b/drivers/staging/csr/sme_sys.c index 5b26c41c01f6..2b068197ed44 100644 --- a/drivers/staging/csr/sme_sys.c +++ b/drivers/staging/csr/sme_sys.c @@ -14,7 +14,6 @@ * --------------------------------------------------------------------------- */ -#include <linux/version.h> #include "csr_wifi_hip_unifiversion.h" #include "unifi_priv.h" #include "csr_wifi_hip_conversions.h" @@ -413,8 +412,6 @@ uf_send_gratuitous_arp(unifi_priv_t *priv, u16 interfaceTag) 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0xa8, 0x00, 0x02}; - func_enter(); - csrResult = unifi_net_data_malloc(priv, &bulkdata.d[0], sizeof(arp_req)); if (csrResult != CSR_RESULT_SUCCESS) { @@ -480,8 +477,6 @@ uf_send_gratuitous_arp(unifi_priv_t *priv, u16 interfaceTag) return; } - func_exit(); - } #endif /* CSR_WIFI_SEND_GRATUITOUS_ARP */ @@ -2102,7 +2097,7 @@ static int peer_add_new_record(unifi_priv_t *priv,CsrWifiRouterCtrlPeerAddReq *r u8 freeSlotFound = FALSE; CsrWifiRouterCtrlStaInfo_t *newRecord = NULL; netInterface_priv_t *interfacePriv = priv->interfacePriv[req->interfaceTag]; - CsrTime currentTime, currentTimeHi; + u32 currentTime, currentTimeHi; unsigned long lock_flags; if (req->interfaceTag >= CSR_WIFI_NUM_INTERFACES) { @@ -2296,8 +2291,8 @@ static void check_inactivity_timer_expire_func(unsigned long data) struct unifi_priv *priv; CsrWifiRouterCtrlStaInfo_t *sta_record = NULL; u8 i = 0; - CsrTime now; - CsrTime inactive_time; + u32 now; + u32 inactive_time; netInterface_priv_t *interfacePriv = (netInterface_priv_t *) data; if (!interfacePriv) @@ -2329,11 +2324,11 @@ static void check_inactivity_timer_expire_func(unsigned long data) if (sta_record->lastActivity > now) { /* simple timer wrap (for 1 wrap) */ - inactive_time = CsrTimeAdd((CsrTime)CsrTimeSub(CSR_SCHED_TIME_MAX, sta_record->lastActivity), now); + inactive_time = CsrTimeAdd((u32)CsrTimeSub(CSR_SCHED_TIME_MAX, sta_record->lastActivity), now); } else { - inactive_time = (CsrTime)CsrTimeSub(now, sta_record->lastActivity); + inactive_time = (u32)CsrTimeSub(now, sta_record->lastActivity); } if (inactive_time >= STA_INACTIVE_TIMEOUT_VAL) @@ -2411,8 +2406,6 @@ void uf_send_disconnected_ind_wq(struct work_struct *work) struct list_head send_cfm_list; u8 j; - func_enter(); - if(!staInfo) { return; } diff --git a/drivers/staging/csr/sme_userspace.h b/drivers/staging/csr/sme_userspace.h index 7816b15b4b5d..ebe371c732b2 100644 --- a/drivers/staging/csr/sme_userspace.h +++ b/drivers/staging/csr/sme_userspace.h @@ -32,7 +32,7 @@ int uf_sme_queue_message(unifi_priv_t *priv, u8 *buffer, int length); #include "csr_wifi_sme_lib.h" void CsrWifiRouterTransportInit(unifi_priv_t *priv); -void CsrWifiRouterTransportRecv(unifi_priv_t *priv, u8* buffer, size_t bufferLength); +void CsrWifiRouterTransportRecv(unifi_priv_t *priv, u8 *buffer, size_t bufferLength); void CsrWifiRouterTransportDeInit(unifi_priv_t *priv); #endif /* __LINUX_SME_USERSPACE_H__ */ diff --git a/drivers/staging/csr/sme_wext.c b/drivers/staging/csr/sme_wext.c index b58c0c6b171c..5e06a380b40a 100644 --- a/drivers/staging/csr/sme_wext.c +++ b/drivers/staging/csr/sme_wext.c @@ -800,7 +800,6 @@ iwprivsconfwapi(struct net_device *dev, struct iw_request_info *info, u8 enable; netInterface_priv_t *interfacePriv = (netInterface_priv_t *)netdev_priv(dev); unifi_priv_t *priv = interfacePriv->privPtr; - func_enter(); unifi_trace(priv, UDBG1, "iwprivsconfwapi\n" ); @@ -824,7 +823,6 @@ iwprivsconfwapi(struct net_device *dev, struct iw_request_info *info, ~(CSR_WIFI_SME_ENCRYPTION_CIPHER_PAIRWISE_SMS4 | CSR_WIFI_SME_ENCRYPTION_CIPHER_GROUP_SMS4); } - func_exit(); return 0; } @@ -837,7 +835,6 @@ iwprivswpikey(struct net_device *dev, struct iw_request_info *info, unifiio_wapi_key_t inKey; netInterface_priv_t *interfacePriv = (netInterface_priv_t *)netdev_priv(dev); unifi_priv_t *priv = interfacePriv->privPtr; - func_enter(); unifi_trace(priv, UDBG1, "iwprivswpikey\n" ); @@ -882,7 +879,6 @@ iwprivswpikey(struct net_device *dev, struct iw_request_info *info, return convert_sme_error(r); } - func_exit(); return r; } #endif @@ -914,7 +910,6 @@ unifi_siwfreq(struct net_device *dev, struct iw_request_info *info, unifi_priv_t *priv = interfacePriv->privPtr; struct iw_freq *freq = (struct iw_freq *)wrqu; - func_enter(); unifi_trace(priv, UDBG2, "unifi_siwfreq\n"); if(interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP || @@ -935,7 +930,6 @@ unifi_siwfreq(struct net_device *dev, struct iw_request_info *info, priv->connection_config.adhocChannel = wext_freq_to_channel(freq->m, freq->e); } - func_exit(); return 0; } /* unifi_siwfreq() */ @@ -950,7 +944,6 @@ unifi_giwfreq(struct net_device *dev, struct iw_request_info *info, int err = 0; CsrWifiSmeConnectionInfo connectionInfo; - func_enter(); unifi_trace(priv, UDBG2, "unifi_giwfreq\n"); CHECK_INITED(priv); @@ -970,7 +963,6 @@ unifi_giwfreq(struct net_device *dev, struct iw_request_info *info, (connectionInfo.networkType80211 == CSR_WIFI_SME_RADIO_IF_GHZ_5_0)); freq->e = 6; - func_exit(); return convert_sme_error(err); } /* unifi_giwfreq() */ @@ -982,7 +974,6 @@ unifi_siwmode(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; - func_enter(); unifi_trace(priv, UDBG2, "unifi_siwmode\n"); if(interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP || @@ -1011,7 +1002,6 @@ unifi_siwmode(struct net_device *dev, struct iw_request_info *info, priv->connection_config.ssid.length = 0; memset(priv->connection_config.bssid.a, 0xFF, ETH_ALEN); - func_exit(); return 0; } /* unifi_siwmode() */ @@ -1026,7 +1016,6 @@ unifi_giwmode(struct net_device *dev, struct iw_request_info *info, unifi_priv_t *priv = interfacePriv->privPtr; CsrWifiSmeConnectionConfig connectionConfig; - func_enter(); unifi_trace(priv, UDBG2, "unifi_giwmode\n"); CHECK_INITED(priv); @@ -1069,7 +1058,6 @@ unifi_giwmode(struct net_device *dev, struct iw_request_info *info, } unifi_trace(priv, UDBG4, "unifi_giwmode: mode = 0x%x\n", wrqu->mode); - func_exit(); return r; } /* unifi_giwmode() */ @@ -1192,8 +1180,6 @@ unifi_siwap(struct net_device *dev, struct iw_request_info *info, unifi_priv_t *priv = interfacePriv->privPtr; int err = 0; - func_enter(); - CHECK_INITED(priv); if(interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP || @@ -1235,11 +1221,9 @@ unifi_siwap(struct net_device *dev, struct iw_request_info *info, err = sme_mgt_connect(priv); if (err) { unifi_error(priv, "unifi_siwap: Join failed, status %d\n", err); - func_exit(); return convert_sme_error(err); } } - func_exit(); return 0; } /* unifi_siwap() */ @@ -1255,8 +1239,6 @@ unifi_giwap(struct net_device *dev, struct iw_request_info *info, int r = 0; u8 *bssid; - func_enter(); - CHECK_INITED(priv); unifi_trace(priv, UDBG2, "unifi_giwap\n"); @@ -1281,7 +1263,6 @@ unifi_giwap(struct net_device *dev, struct iw_request_info *info, memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN); } - func_exit(); return 0; } /* unifi_giwap() */ @@ -1302,8 +1283,6 @@ unifi_siwscan(struct net_device *dev, struct iw_request_info *info, struct iw_scan_req *req = (struct iw_scan_req *) extra; #endif - func_enter(); - CHECK_INITED(priv); if(interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP || @@ -1366,7 +1345,6 @@ unifi_siwscan(struct net_device *dev, struct iw_request_info *info, kfree(channel_list); } - func_exit(); return r; } /* unifi_siwscan() */ @@ -1707,7 +1685,6 @@ unifi_siwessid(struct net_device *dev, struct iw_request_info *info, int len; int err = 0; - func_enter(); CHECK_INITED(priv); if(interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP || @@ -1760,11 +1737,9 @@ unifi_siwessid(struct net_device *dev, struct iw_request_info *info, UF_RTNL_LOCK(); if (err) { unifi_error(priv, "unifi_siwessid: Join failed, status %d\n", err); - func_exit(); return convert_sme_error(err); } - func_exit(); return 0; } /* unifi_siwessid() */ @@ -1779,7 +1754,6 @@ unifi_giwessid(struct net_device *dev, struct iw_request_info *info, CsrWifiSmeConnectionInfo connectionInfo; int r = 0; - func_enter(); unifi_trace(priv, UDBG2, "unifi_giwessid\n"); CHECK_INITED(priv); @@ -1805,7 +1779,6 @@ unifi_giwessid(struct net_device *dev, struct iw_request_info *info, data->length, essid); } - func_exit(); return 0; } /* unifi_giwessid() */ @@ -1821,8 +1794,6 @@ unifi_siwrate(struct net_device *dev, struct iw_request_info *info, CsrWifiSmeMibConfig mibConfig; int r; - func_enter(); - CHECK_INITED(priv); unifi_trace(priv, UDBG2, "unifi_siwrate\n"); @@ -1863,7 +1834,6 @@ unifi_siwrate(struct net_device *dev, struct iw_request_info *info, return r; } - func_exit(); return 0; } /* unifi_siwrate() */ @@ -1882,7 +1852,6 @@ unifi_giwrate(struct net_device *dev, struct iw_request_info *info, CsrWifiSmeMibConfig mibConfig; CsrWifiSmeConnectionStats connectionStats; - func_enter(); unifi_trace(priv, UDBG2, "unifi_giwrate\n"); CHECK_INITED(priv); @@ -1913,8 +1882,6 @@ unifi_giwrate(struct net_device *dev, struct iw_request_info *info, args->value = bitrate * 500000; args->fixed = !flag; - func_exit(); - return 0; } /* unifi_giwrate() */ @@ -2081,7 +2048,6 @@ unifi_siwencode(struct net_device *dev, struct iw_request_info *info, int privacy = -1; CsrWifiSmeKey sme_key; - func_enter(); unifi_trace(priv, UDBG2, "unifi_siwencode\n"); CHECK_INITED(priv); @@ -2236,7 +2202,6 @@ unifi_siwencode(struct net_device *dev, struct iw_request_info *info, CSR_WIFI_SME_ENCRYPTION_CIPHER_NONE; } - func_exit_r(rc); return convert_sme_error(rc); } /* unifi_siwencode() */ @@ -2467,7 +2432,6 @@ unifi_siwmlme(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; struct iw_mlme *mlme = (struct iw_mlme *)extra; - func_enter(); unifi_trace(priv, UDBG2, "unifi_siwmlme\n"); CHECK_INITED(priv); @@ -2488,11 +2452,9 @@ unifi_siwmlme(struct net_device *dev, struct iw_request_info *info, UF_RTNL_LOCK(); break; default: - func_exit_r(-EOPNOTSUPP); return -EOPNOTSUPP; } - func_exit(); return 0; } /* unifi_siwmlme() */ @@ -2529,7 +2491,6 @@ unifi_siwgenie(struct net_device *dev, struct iw_request_info *info, unifi_priv_t *priv = interfacePriv->privPtr; int len; - func_enter(); unifi_trace(priv, UDBG2, "unifi_siwgenie\n"); if(interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP || @@ -2548,20 +2509,17 @@ unifi_siwgenie(struct net_device *dev, struct iw_request_info *info, len = wrqu->data.length; if (len == 0) { - func_exit(); return 0; } priv->connection_config.mlmeAssociateReqInformationElements = kmalloc(len, GFP_KERNEL); if (priv->connection_config.mlmeAssociateReqInformationElements == NULL) { - func_exit(); return -ENOMEM; } priv->connection_config.mlmeAssociateReqInformationElementsLength = len; memcpy( priv->connection_config.mlmeAssociateReqInformationElements, extra, len); - func_exit(); return 0; } /* unifi_siwgenie() */ @@ -2574,7 +2532,6 @@ unifi_giwgenie(struct net_device *dev, struct iw_request_info *info, unifi_priv_t *priv = interfacePriv->privPtr; int len; - func_enter(); unifi_trace(priv, UDBG2, "unifi_giwgenie\n"); if(interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP || @@ -2599,7 +2556,6 @@ unifi_giwgenie(struct net_device *dev, struct iw_request_info *info, wrqu->data.length = len; memcpy(extra, priv->connection_config.mlmeAssociateReqInformationElements, len); - func_exit(); return 0; } /* unifi_giwgenie() */ @@ -2627,7 +2583,6 @@ _unifi_siwauth(struct net_device *dev, struct iw_request_info *info, unifi_priv_t *priv = interfacePriv->privPtr; CsrWifiSmeAuthModeMask new_auth; - func_enter(); unifi_trace(priv, UDBG2, "unifi_siwauth\n"); if(interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP || @@ -2848,7 +2803,6 @@ _unifi_siwauth(struct net_device *dev, struct iw_request_info *info, } unifi_trace(priv, UDBG2, "authModeMask = %d", priv->connection_config.authModeMask); - func_exit(); return 0; } /* _unifi_siwauth() */ @@ -2911,8 +2865,6 @@ _unifi_siwencodeext(struct net_device *dev, struct iw_request_info *info, CsrWifiSmeKey sme_key; CsrWifiSmeKeyType key_type; - func_enter(); - CHECK_INITED(priv); if(interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP || @@ -3061,7 +3013,6 @@ _unifi_siwencodeext(struct net_device *dev, struct iw_request_info *info, return convert_sme_error(r); } - func_exit(); return r; } /* _unifi_siwencodeext() */ diff --git a/drivers/staging/csr/ul_int.c b/drivers/staging/csr/ul_int.c index 4013d021ebbf..0fae6f48f79b 100644 --- a/drivers/staging/csr/ul_int.c +++ b/drivers/staging/csr/ul_int.c @@ -12,7 +12,6 @@ * * *************************************************************************** */ -#include <linux/version.h> #include "csr_wifi_hip_unifi.h" #include "csr_wifi_hip_conversions.h" #include "unifi_priv.h" diff --git a/drivers/staging/csr/unifi_event.c b/drivers/staging/csr/unifi_event.c index c27b23daf399..e81a99878272 100644 --- a/drivers/staging/csr/unifi_event.c +++ b/drivers/staging/csr/unifi_event.c @@ -376,8 +376,6 @@ unifi_process_receive_event(void *ospriv, s16 signal_id; u8 pktIndToSme = FALSE, freeBulkData = FALSE; - func_enter(); - unifi_trace(priv, UDBG5, "unifi_process_receive_event: " "%04x %04x %04x %04x %04x %04x %04x %04x (%d)\n", CSR_GET_UINT16_FROM_LITTLE_ENDIAN((sigdata) + sizeof(s16)*0) & 0xFFFF, @@ -523,7 +521,6 @@ unifi_process_receive_event(void *ospriv, unifi_net_data_free(priv, (void *)&bulkdata->d[i]); } } - func_exit(); return; } } /* CSR_MA_PACKET_INDICATION_ID */ @@ -573,7 +570,6 @@ unifi_process_receive_event(void *ospriv, } } - func_exit(); } /* unifi_process_receive_event() */ @@ -587,7 +583,6 @@ void unifi_rx_queue_flush(void *ospriv) { unifi_priv_t *priv = (unifi_priv_t*)ospriv; - func_enter(); unifi_trace(priv, UDBG4, "rx_wq_handler: RdPtr = %d WritePtr = %d\n", priv->rxSignalBuffer.readPointer,priv->rxSignalBuffer.writePointer); if(priv != NULL) { @@ -605,7 +600,6 @@ void unifi_rx_queue_flush(void *ospriv) } priv->rxSignalBuffer.readPointer = readPointer; } - func_exit(); } void rx_wq_handler(struct work_struct *work) @@ -655,7 +649,6 @@ unifi_receive_event(void *ospriv, u8 writePointer; int i; rx_buff_struct_t * rx_buff; - func_enter(); unifi_trace(priv, UDBG5, "unifi_receive_event: " "%04x %04x %04x %04x %04x %04x %04x %04x (%d)\n", @@ -695,6 +688,5 @@ unifi_receive_event(void *ospriv, #else unifi_process_receive_event(ospriv, sigdata, siglen, bulkdata); #endif - func_exit(); } /* unifi_receive_event() */ diff --git a/drivers/staging/csr/unifi_os.h b/drivers/staging/csr/unifi_os.h index 4e63a942f1a2..56a26982070e 100644 --- a/drivers/staging/csr/unifi_os.h +++ b/drivers/staging/csr/unifi_os.h @@ -61,26 +61,6 @@ extern int unifi_debug; * etc. */ -#define func_enter() \ - do { \ - if (unifi_debug >= 5) { \ - printk("unifi: => %s\n", __FUNCTION__); \ - } \ - } while (0) -#define func_exit() \ - do { \ - if (unifi_debug >= 5) { \ - printk("unifi: <= %s\n", __FUNCTION__); \ - } \ - } while (0) -#define func_exit_r(_rc) \ - do { \ - if (unifi_debug >= 5) { \ - printk("unifi: <= %s %d\n", __FUNCTION__, (int)(_rc)); \ - } \ - } while (0) - - #define ASSERT(cond) \ do { \ if (!(cond)) { \ @@ -107,9 +87,6 @@ void unifi_trace(void* ospriv, int level, const char *fmt, ...); #else /* Stubs */ -#define func_enter() -#define func_exit() -#define func_exit_r(_rc) #define ASSERT(cond) diff --git a/drivers/staging/csr/unifi_pdu_processing.c b/drivers/staging/csr/unifi_pdu_processing.c index ae7c8fc94092..95efc360cc2d 100644 --- a/drivers/staging/csr/unifi_pdu_processing.c +++ b/drivers/staging/csr/unifi_pdu_processing.c @@ -14,7 +14,6 @@ * --------------------------------------------------------------------------- */ -#include <linux/version.h> #include <linux/types.h> #include <linux/etherdevice.h> #include <linux/vmalloc.h> @@ -409,7 +408,6 @@ CsrResult enque_tx_data_pdu(unifi_priv_t *priv, bulk_data_param_t *bulkdata, unifi_error(priv, "Failed to allocate %d bytes for tx packet record\n", sizeof(tx_buffered_packets_t)); - func_exit(); return CSR_RESULT_FAILURE; } @@ -1117,8 +1115,8 @@ void uf_process_ma_pkt_cfm_for_ap(unifi_priv_t *priv,u16 interfaceTag, const CSR staRecord->nullDataHostTag = INVALID_HOST_TAG; if(pkt_cfm->TransmissionStatus == CSR_TX_RETRY_LIMIT){ - CsrTime now; - CsrTime inactive_time; + u32 now; + u32 inactive_time; unifi_trace(priv, UDBG1, "Nulldata to probe STA ALIVE Failed with retry limit\n"); /* Recheck if there is some activity after null data is sent. @@ -1134,12 +1132,12 @@ void uf_process_ma_pkt_cfm_for_ap(unifi_priv_t *priv,u16 interfaceTag, const CSR if (staRecord->lastActivity > now) { /* simple timer wrap (for 1 wrap) */ - inactive_time = CsrTimeAdd((CsrTime)CsrTimeSub(CSR_SCHED_TIME_MAX, staRecord->lastActivity), + inactive_time = CsrTimeAdd((u32)CsrTimeSub(CSR_SCHED_TIME_MAX, staRecord->lastActivity), now); } else { - inactive_time = (CsrTime)CsrTimeSub(now, staRecord->lastActivity); + inactive_time = (u32)CsrTimeSub(now, staRecord->lastActivity); } if (inactive_time >= STA_INACTIVE_TIMEOUT_VAL) @@ -2024,7 +2022,6 @@ u8 send_multicast_frames(unifi_priv_t *priv, u16 interfaceTag) netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; u32 hostTag = 0xffffffff; - func_enter(); if(!isRouterBufferEnabled(priv,UNIFI_TRAFFIC_Q_VO)) { while((interfacePriv->dtimActive)&& (buffered_pkt=dequeue_tx_data_pdu(priv,&interfacePriv->genericMulticastOrBroadCastMgtFrames))) { buffered_pkt->transmissionControl |= (TRANSMISSION_CONTROL_TRIGGER_MASK); @@ -2124,7 +2121,6 @@ void uf_process_ma_vif_availibility_ind(unifi_priv_t *priv,u8 *sigdata, CSR_RESULT_CODE resultCode = CSR_RC_SUCCESS; netInterface_priv_t *interfacePriv; - func_enter(); unifi_trace(priv, UDBG3, "uf_process_ma_vif_availibility_ind: Process signal 0x%.4X\n", *((u16*)sigdata)); @@ -2134,7 +2130,6 @@ void uf_process_ma_vif_availibility_ind(unifi_priv_t *priv,u8 *sigdata, unifi_error(priv, "uf_process_ma_vif_availibility_ind: Received unknown signal 0x%.4X.\n", CSR_GET_UINT16_FROM_LITTLE_ENDIAN(sigdata)); - func_exit(); return; } ind = &signal.u.MaVifAvailabilityIndication; @@ -2369,8 +2364,6 @@ void uf_send_buffered_data_from_ac(unifi_priv_t *priv, u8 moreData = FALSE; s8 r =0; - func_enter(); - unifi_trace(priv,UDBG2,"uf_send_buffered_data_from_ac :\n"); while(!isRouterBufferEnabled(priv,queue) && @@ -2399,8 +2392,6 @@ void uf_send_buffered_data_from_ac(unifi_priv_t *priv, } } - func_exit(); - } void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q) @@ -2416,7 +2407,6 @@ void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q) if(!((interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_AP) || (interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_P2PGO))) return; - func_enter(); queue = (q<=3)?q:0; @@ -2451,7 +2441,6 @@ void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q) interfacePriv->dtimActive = FALSE; } } - func_exit(); return; } if(priv->pausedStaHandle[queue] > 7) { @@ -2542,7 +2531,6 @@ void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q) */ unifi_trace(priv, UDBG4, "csrWifiHipSendBufferedFrames: UAPSD Resume Q=%x\n", queue); resume_suspended_uapsd(priv, interfaceTag); - func_exit(); } @@ -2770,7 +2758,6 @@ void uf_send_qos_null(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI CSR_RATE transmitRate = 0; - func_enter(); /* Send a Null Frame to Peer, * 32= size of mac header */ csrResult = unifi_net_data_malloc(priv, &bulkdata.d[0], MAC_HEADER_SIZE + QOS_CONTROL_HEADER_SIZE); @@ -2823,7 +2810,6 @@ void uf_send_qos_null(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI unifi_net_data_free(priv, &bulkdata.d[0]); } - func_exit(); return; } @@ -2842,7 +2828,6 @@ void uf_send_nulldata(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI CSR_MA_PACKET_REQUEST *req = &signal.u.MaPacketRequest; unsigned long lock_flags; - func_enter(); /* Send a Null Frame to Peer, size = 24 for MAC header */ csrResult = unifi_net_data_malloc(priv, &bulkdata.d[0], MAC_HEADER_SIZE); @@ -2909,7 +2894,6 @@ void uf_send_nulldata(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI srcStaInfo->nullDataHostTag = INVALID_HOST_TAG; } - func_exit(); return; } @@ -3327,8 +3311,6 @@ void uf_prepare_send_cfm_list_for_queued_pkts(unifi_priv_t * priv, struct list_head *placeHolder; unsigned long lock_flags; - func_enter(); - spin_lock_irqsave(&priv->tx_q_lock,lock_flags); /* Search through the list and if confirmation required for any frames, @@ -3357,7 +3339,6 @@ void uf_prepare_send_cfm_list_for_queued_pkts(unifi_priv_t * priv, spin_unlock_irqrestore(&priv->tx_q_lock,lock_flags); - func_exit(); } @@ -3492,11 +3473,11 @@ CsrWifiRouterCtrlStaInfo_t * CsrWifiRouterCtrlGetStationRecordFromHandle(unifi_p } /* Function to do inactivity */ -void uf_check_inactivity(unifi_priv_t *priv, u16 interfaceTag, CsrTime currentTime) +void uf_check_inactivity(unifi_priv_t *priv, u16 interfaceTag, u32 currentTime) { u32 i; CsrWifiRouterCtrlStaInfo_t *staInfo; - CsrTime elapsedTime; /* Time in microseconds */ + u32 elapsedTime; /* Time in microseconds */ netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; CsrWifiMacAddress peerMacAddress; unsigned long lock_flags; @@ -3543,8 +3524,8 @@ void uf_check_inactivity(unifi_priv_t *priv, u16 interfaceTag, CsrTime currentTi /* Function to update activity of a station */ 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 */ + u32 elapsedTime, currentTime; /* Time in microseconds */ + u32 timeHi; /* Not used - Time in microseconds */ CsrWifiRouterCtrlStaInfo_t *staInfo; netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; unsigned long lock_flags; @@ -3595,7 +3576,6 @@ void resume_unicast_buffered_frames(unifi_priv_t *priv, u16 interfaceTag) int r; unsigned long lock_flags; - func_enter(); while(!isRouterBufferEnabled(priv,3) && ((buffered_pkt=dequeue_tx_data_pdu(priv,&interfacePriv->genericMgtFrames))!=NULL)) { buffered_pkt->transmissionControl &= @@ -3672,7 +3652,6 @@ void resume_unicast_buffered_frames(unifi_priv_t *priv, u16 interfaceTag) } } } - func_exit(); } void update_eosp_to_head_of_broadcast_list_head(unifi_priv_t *priv,u16 interfaceTag) { @@ -3683,7 +3662,6 @@ void update_eosp_to_head_of_broadcast_list_head(unifi_priv_t *priv,u16 interface struct list_head *placeHolder; tx_buffered_packets_t *tx_q_item; - func_enter(); if (interfacePriv->noOfbroadcastPktQueued) { /* Update the EOSP to the HEAD of b/c list @@ -3700,7 +3678,6 @@ void update_eosp_to_head_of_broadcast_list_head(unifi_priv_t *priv,u16 interface } spin_unlock_irqrestore(&priv->tx_q_lock,lock_flags); } - func_exit(); } /* diff --git a/drivers/staging/csr/unifi_priv.h b/drivers/staging/csr/unifi_priv.h index aec8e28fb60d..d20d74ce56cb 100644 --- a/drivers/staging/csr/unifi_priv.h +++ b/drivers/staging/csr/unifi_priv.h @@ -17,7 +17,6 @@ #ifndef __LINUX_UNIFI_PRIV_H__ #define __LINUX_UNIFI_PRIV_H__ 1 -#include <linux/version.h> #include <linux/module.h> #include <linux/string.h> #include <linux/errno.h> @@ -313,7 +312,7 @@ typedef struct CsrWifiRouterCtrlStaInfo_t { CSR_CLIENT_TAG nullDataHostTag; /* Activity timestamps for the station */ - CsrTime lastActivity; + u32 lastActivity; /* during m/c transmission sp suspended */ u8 uspSuspend; @@ -653,7 +652,7 @@ typedef struct { bulk_data_param_t bulkdata; CSR_SIGNAL signal; u16 sn; - CsrTime recv_time; + u32 recv_time; } frame_desc_struct; typedef struct { @@ -736,7 +735,7 @@ typedef struct netInterface_priv u8 sta_activity_check_enabled; /* Timestamp when the last inactivity check was done */ - CsrTime last_inactivity_check; + u32 last_inactivity_check; /*number of multicast or borad cast packets queued*/ u16 noOfbroadcastPktQueued; diff --git a/drivers/staging/csr/unifi_sme.c b/drivers/staging/csr/unifi_sme.c index ff639d47d07b..7c6c4138fc76 100644 --- a/drivers/staging/csr/unifi_sme.c +++ b/drivers/staging/csr/unifi_sme.c @@ -78,23 +78,19 @@ sme_log_event(ul_client_t *pcli, CsrResult result = CSR_RESULT_SUCCESS; int r; - func_enter(); /* Just a sanity check */ if ((signal == NULL) || (signal_len <= 0)) { - func_exit(); return; } priv = uf_find_instance(pcli->instance); if (!priv) { unifi_error(priv, "sme_log_event: invalid priv\n"); - func_exit(); return; } if (priv->smepriv == NULL) { unifi_error(priv, "sme_log_event: invalid smepriv\n"); - func_exit(); return; } @@ -109,7 +105,6 @@ sme_log_event(ul_client_t *pcli, if ((unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_DEBUG_STRING_INDICATION_ID) || (unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_DEBUG_WORD16_INDICATION_ID)) { - func_exit(); return; } if (unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_MA_PACKET_INDICATION_ID) @@ -171,7 +166,6 @@ sme_log_event(ul_client_t *pcli, if (interfaceTag >= CSR_WIFI_NUM_INTERFACES) { unifi_error(priv, "Bad MA_PACKET_CONFIRM interfaceTag %d\n", interfaceTag); - func_exit(); return; } @@ -219,7 +213,6 @@ sme_log_event(ul_client_t *pcli, } else { unifi_trace(priv, UDBG1, "%s: M4 received from netdevice\n", __FUNCTION__); } - func_exit(); return; } } @@ -248,7 +241,6 @@ sme_log_event(ul_client_t *pcli, dataref1.length, dataref1.data, dataref2.length, dataref2.data); - func_exit(); } /* sme_log_event() */ @@ -1158,8 +1150,6 @@ uf_send_m4_ready_wq(struct work_struct *work) CsrWifiMacAddress peer; unsigned long flags; - func_enter(); - /* The peer address was stored in the signal */ spin_lock_irqsave(&priv->m4_lock, flags); memcpy(peer.a, req->Ra.x, sizeof(peer.a)); @@ -1171,8 +1161,6 @@ uf_send_m4_ready_wq(struct work_struct *work) unifi_trace(priv, UDBG1, "M4ReadyToSendInd sent for peer %pMF\n", peer.a); - func_exit(); - } /* uf_send_m4_ready_wq() */ #if (defined(CSR_WIFI_SECURITY_WAPI_ENABLE) && defined(CSR_WIFI_SECURITY_WAPI_SW_ENCRYPTION)) @@ -1204,8 +1192,6 @@ void uf_send_pkt_to_encrypt(struct work_struct *work) if (interfacePriv->interfaceMode == CSR_WIFI_ROUTER_CTRL_MODE_STA) { - func_enter(); - pktBulkDataLength = interfacePriv->wapi_unicast_bulk_data.data_length; if (pktBulkDataLength > 0) { @@ -1231,7 +1217,6 @@ void uf_send_pkt_to_encrypt(struct work_struct *work) kfree(pktBulkData); /* Would have been copied over by the SME Handler */ - func_exit(); } else { unifi_warning(priv, "uf_send_pkt_to_encrypt() is NOT applicable for interface mode - %d\n",interfacePriv->interfaceMode); } diff --git a/drivers/staging/csr/unifi_wext.h b/drivers/staging/csr/unifi_wext.h index 6834c43abfbb..beba089e2e35 100644 --- a/drivers/staging/csr/unifi_wext.h +++ b/drivers/staging/csr/unifi_wext.h @@ -16,7 +16,6 @@ #define __LINUX_UNIFI_WEXT_H__ 1 #include <linux/kernel.h> -#include <linux/version.h> #include <net/iw_handler.h> #include "csr_wifi_sme_prim.h" |