Skip to content

L
linux
Commit 5379b13d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

staging: csr: remove CsrBool typedef 

Use u8 instead.

Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c781b96b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 264 additions and 267 deletions
drivers/staging/csr/csr_log.h
View file @ 5379b13d
...@@ -71,9 +71,9 @@ typedef u32 CsrLogLevelTask; ...@@ -71,9 +71,9 @@ typedef u32 CsrLogLevelTask;
/* The bit masks between here are reserved for future usage */ /* The bit masks between here are reserved for future usage */
#define CSR_LOG_LEVEL_TASK_ALL ((CsrLogLevelTask) 0xFFFFFFFF & ~(CSR_LOG_LEVEL_TASK_PRIM_ONLY_TYPE | CSR_LOG_LEVEL_TASK_PRIM_APPLY_LIMIT)) /* All info possible to log for a task are logged. WARNING: By using this define the application also accepts future possible task data/events in the logs */ #define CSR_LOG_LEVEL_TASK_ALL ((CsrLogLevelTask) 0xFFFFFFFF & ~(CSR_LOG_LEVEL_TASK_PRIM_ONLY_TYPE | CSR_LOG_LEVEL_TASK_PRIM_APPLY_LIMIT)) /* All info possible to log for a task are logged. WARNING: By using this define the application also accepts future possible task data/events in the logs */
CsrBool CsrLogEnvironmentIsFiltered(CsrLogLevelEnvironment level); u8 CsrLogEnvironmentIsFiltered(CsrLogLevelEnvironment level);
CsrLogLevelTask CsrLogTaskFilterGet(CsrSchedQid taskId); CsrLogLevelTask CsrLogTaskFilterGet(CsrSchedQid taskId);
CsrBool CsrLogTaskIsFiltered(CsrSchedQid taskId, CsrLogLevelTask level); u8 CsrLogTaskIsFiltered(CsrSchedQid taskId, CsrLogLevelTask level);
/* /*
* Logging stuff * Logging stuff
...@@ -193,7 +193,7 @@ void CsrLogMessagePut(u32 line, ...@@ -193,7 +193,7 @@ void CsrLogMessagePut(u32 line,
void CsrLogMessageGet(CsrSchedQid src_task_id, void CsrLogMessageGet(CsrSchedQid src_task_id,
CsrSchedQid dst_taskid, CsrSchedQid dst_taskid,
CsrBool get_res, u8 get_res,
CsrSchedMsgId msg_id, CsrSchedMsgId msg_id,
u16 prim_type, u16 prim_type,
const void *msg); const void *msg);
...@@ -216,7 +216,7 @@ void CsrLogTimedEventCancel(u32 line, ...@@ -216,7 +216,7 @@ void CsrLogTimedEventCancel(u32 line,
const char *file, const char *file,
CsrSchedQid task_id, CsrSchedQid task_id,
CsrSchedTid tid, CsrSchedTid tid,
CsrBool cancel_res); u8 cancel_res);
void CsrLogBgintRegister(u8 thread_id, void CsrLogBgintRegister(u8 thread_id,
CsrSchedBgint irq, CsrSchedBgint irq,
......
drivers/staging/csr/csr_macro.h
View file @ 5379b13d
...@@ -23,7 +23,7 @@ extern "C" { ...@@ -23,7 +23,7 @@ extern "C" {
#define CSR_MASK_IS_UNSET(val, mask) ((((val) & (mask)) ^ mask) == (mask)) #define CSR_MASK_IS_UNSET(val, mask) ((((val) & (mask)) ^ mask) == (mask))
#define CSR_MASK_SET(val, mask) ((val) |= (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_MASK_UNSET(val, mask) ((val) = ((val) ^ (mask)) & (val)) /* Unsets the bits in val that are set in mask */
#define CSR_BIT_IS_SET(val, bit) ((CsrBool) ((((val) & (1UL << (bit))) != 0))) #define CSR_BIT_IS_SET(val, bit) ((u8) ((((val) & (1UL << (bit))) != 0)))
#define CSR_BIT_SET(val, bit) ((val) |= (1UL << (bit))) #define CSR_BIT_SET(val, bit) ((val) |= (1UL << (bit)))
#define CSR_BIT_UNSET(val, bit) ((val) &= ~(1UL << (bit))) #define CSR_BIT_UNSET(val, bit) ((val) &= ~(1UL << (bit)))
#define CSR_BIT_TOGGLE(val, bit) ((val) ^= (1UL << (bit))) #define CSR_BIT_TOGGLE(val, bit) ((val) ^= (1UL << (bit)))
......
drivers/staging/csr/csr_msgconv.c
View file @ 5379b13d
...@@ -133,10 +133,10 @@ static CsrSize sizeof_message(u16 primType, void *msg) ...@@ -133,10 +133,10 @@ static CsrSize sizeof_message(u16 primType, void *msg)
return ret; return ret;
} }
static CsrBool free_message(u16 primType, u8 *data) static u8 free_message(u16 primType, u8 *data)
{ {
CsrMsgConvPrimEntry *ptr; CsrMsgConvPrimEntry *ptr;
CsrBool ret; u8 ret;
ptr = CsrMsgConvFind(primType); ptr = CsrMsgConvFind(primType);
......
drivers/staging/csr/csr_msgconv.h
View file @ 5379b13d
...@@ -51,7 +51,7 @@ typedef struct ...@@ -51,7 +51,7 @@ typedef struct
{ {
CsrMsgConvPrimEntry *profile_converters; CsrMsgConvPrimEntry *profile_converters;
void *(*deserialize_data)(u16 primType, CsrSize length, u8 * data); void *(*deserialize_data)(u16 primType, CsrSize length, u8 * data);
CsrBool (*free_message)(u16 primType, u8 *data); u8 (*free_message)(u16 primType, u8 *data);
CsrSize (*sizeof_message)(u16 primType, void *msg); CsrSize (*sizeof_message)(u16 primType, void *msg);
u8 *(*serialize_message)(u16 primType, void *msg, u8 *(*serialize_message)(u16 primType, void *msg,
CsrSize * length, CsrSize * length,
......
drivers/staging/csr/csr_sched.h
View file @ 5379b13d
...@@ -185,7 +185,7 @@ void CsrSchedMessageBroadcast(u16 mi, ...@@ -185,7 +185,7 @@ void CsrSchedMessageBroadcast(u16 mi,
* The message consists of one or both of a u16 and a void *. * The message consists of one or both of a u16 and a void *.
* *
* RETURNS * RETURNS
* CsrBool - TRUE if a message has been obtained from the queue, else FALSE. * u8 - TRUE if a message has been obtained from the queue, else FALSE.
* If a message is taken from the queue, then "*pmi" and "*pmv" are set to * If a message is taken from the queue, then "*pmi" and "*pmv" are set to
* the "mi" and "mv" passed to CsrSchedMessagePut() respectively. * the "mi" and "mv" passed to CsrSchedMessagePut() respectively.
* *
...@@ -193,7 +193,7 @@ void CsrSchedMessageBroadcast(u16 mi, ...@@ -193,7 +193,7 @@ void CsrSchedMessageBroadcast(u16 mi,
* them message is discarded. * them message is discarded.
* *
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
CsrBool CsrSchedMessageGet(u16 *pmi, void **pmv); u8 CsrSchedMessageGet(u16 *pmi, void **pmv);
/*----------------------------------------------------------------------------* /*----------------------------------------------------------------------------*
* NAME * NAME
...@@ -241,18 +241,18 @@ CsrSchedTid CsrSchedTimerSet(CsrTime delay, ...@@ -241,18 +241,18 @@ CsrSchedTid CsrSchedTimerSet(CsrTime delay,
* occurring. * occurring.
* *
* RETURNS * RETURNS
* CsrBool - TRUE if cancelled, FALSE if the event has already occurred. * u8 - TRUE if cancelled, FALSE if the event has already occurred.
* *
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER) #if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER)
CsrBool CsrSchedTimerCancelStringLog(CsrSchedTid eventid, u8 CsrSchedTimerCancelStringLog(CsrSchedTid eventid,
u16 *pmi, u16 *pmi,
void **pmv, void **pmv,
u32 line, u32 line,
const char *file); const char *file);
#define CsrSchedTimerCancel(e, pmi, pmv) CsrSchedTimerCancelStringLog((e), (pmi), (pmv), __LINE__, __FILE__) #define CsrSchedTimerCancel(e, pmi, pmv) CsrSchedTimerCancelStringLog((e), (pmi), (pmv), __LINE__, __FILE__)
#else #else
CsrBool CsrSchedTimerCancel(CsrSchedTid eventid, u8 CsrSchedTimerCancel(CsrSchedTid eventid,
u16 *pmi, u16 *pmi,
void **pmv); void **pmv);
#endif #endif
......
drivers/staging/csr/csr_types.h
View file @ 5379b13d
...@@ -32,9 +32,6 @@ typedef ptrdiff_t CsrPtrdiff; /* Type of the result of subtracting two pointer ...@@ -32,9 +32,6 @@ typedef ptrdiff_t CsrPtrdiff; /* Type of the result of subtracting two pointer
typedef uintptr_t CsrUintptr; /* Unsigned integer large enough to hold any pointer (ISO/IEC 9899:1999 7.18.1.4) */ typedef uintptr_t CsrUintptr; /* Unsigned integer large enough to hold any pointer (ISO/IEC 9899:1999 7.18.1.4) */
typedef ptrdiff_t CsrIntptr; /* intptr_t is not defined in kernel. Use the equivalent ptrdiff_t. */ typedef ptrdiff_t CsrIntptr; /* intptr_t is not defined in kernel. Use the equivalent ptrdiff_t. */
/* Boolean */
typedef u8 CsrBool;
/* /*
* 64-bit integers * 64-bit integers
* *
......
drivers/staging/csr/csr_utf16.c
View file @ 5379b13d
...@@ -261,7 +261,7 @@ u8 *CsrUtf16String2Utf8(const u16 *source) ...@@ -261,7 +261,7 @@ u8 *CsrUtf16String2Utf8(const u16 *source)
u32 length; u32 length;
u32 sourceLength; u32 sourceLength;
u8 bytes; u8 bytes;
CsrBool appendNull = FALSE; u8 appendNull = FALSE;
u8 firstByteMark[5] = {0x00, 0x00, 0xC0, 0xE0, 0xF0}; u8 firstByteMark[5] = {0x00, 0x00, 0xC0, 0xE0, 0xF0};
...@@ -463,7 +463,7 @@ u8 *CsrUtf16String2Utf8(const u16 *source) ...@@ -463,7 +463,7 @@ u8 *CsrUtf16String2Utf8(const u16 *source)
TRUE if the given code unit is legal. TRUE if the given code unit is legal.
*****************************************************************************/ *****************************************************************************/
static CsrBool isLegalUtf8(const u8 *codeUnit, u32 length) static u8 isLegalUtf8(const u8 *codeUnit, u32 length)
{ {
const u8 *srcPtr = codeUnit + length; const u8 *srcPtr = codeUnit + length;
u8 byte; u8 byte;
...@@ -815,7 +815,7 @@ u16 *CsrUtf16String2XML(u16 *str) ...@@ -815,7 +815,7 @@ u16 *CsrUtf16String2XML(u16 *str)
u16 *outputString = NULL; u16 *outputString = NULL;
u16 *resultString = str; u16 *resultString = str;
u32 stringLength = 0; u32 stringLength = 0;
CsrBool encodeChars = FALSE; u8 encodeChars = FALSE;
scanString = str; scanString = str;
if (scanString) if (scanString)
...@@ -908,7 +908,7 @@ u16 *CsrXML2Utf16String(u16 *str) ...@@ -908,7 +908,7 @@ u16 *CsrXML2Utf16String(u16 *str)
u16 *outputString = NULL; u16 *outputString = NULL;
u16 *resultString = str; u16 *resultString = str;
u32 stringLength = 0; u32 stringLength = 0;
CsrBool encodeChars = FALSE; u8 encodeChars = FALSE;
scanString = str; scanString = str;
if (scanString) if (scanString)
......
drivers/staging/csr/csr_util.c
View file @ 5379b13d
...@@ -53,7 +53,7 @@ u8 CsrBitCountDense(u32 n) ...@@ -53,7 +53,7 @@ u8 CsrBitCountDense(u32 n)
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* Base conversion */ /* Base conversion */
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
CsrBool CsrHexStrToUint8(const char *string, u8 *returnValue) u8 CsrHexStrToUint8(const char *string, u8 *returnValue)
{ {
u16 currentIndex = 0; u16 currentIndex = 0;
*returnValue = 0; *returnValue = 0;
...@@ -77,7 +77,7 @@ CsrBool CsrHexStrToUint8(const char *string, u8 *returnValue) ...@@ -77,7 +77,7 @@ CsrBool CsrHexStrToUint8(const char *string, u8 *returnValue)
return FALSE; return FALSE;
} }
CsrBool CsrHexStrToUint16(const char *string, u16 *returnValue) u8 CsrHexStrToUint16(const char *string, u16 *returnValue)
{ {
u16 currentIndex = 0; u16 currentIndex = 0;
*returnValue = 0; *returnValue = 0;
...@@ -101,7 +101,7 @@ CsrBool CsrHexStrToUint16(const char *string, u16 *returnValue) ...@@ -101,7 +101,7 @@ CsrBool CsrHexStrToUint16(const char *string, u16 *returnValue)
return FALSE; return FALSE;
} }
CsrBool CsrHexStrToUint32(const char *string, u32 *returnValue) u8 CsrHexStrToUint32(const char *string, u32 *returnValue)
{ {
u16 currentIndex = 0; u16 currentIndex = 0;
*returnValue = 0; *returnValue = 0;
...@@ -150,7 +150,7 @@ void CsrIntToBase10(s32 number, char *str) ...@@ -150,7 +150,7 @@ void CsrIntToBase10(s32 number, char *str)
s32 digit; s32 digit;
u8 index; u8 index;
char res[I2B10_MAX]; char res[I2B10_MAX];
CsrBool foundDigit = FALSE; u8 foundDigit = FALSE;
for (digit = 0; digit < I2B10_MAX; digit++) for (digit = 0; digit < I2B10_MAX; digit++)
{ {
...@@ -423,7 +423,7 @@ const char *CsrGetBaseName(const char *file) ...@@ -423,7 +423,7 @@ const char *CsrGetBaseName(const char *file)
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* Misc */ /* Misc */
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
CsrBool CsrIsSpace(u8 c) u8 CsrIsSpace(u8 c)
{ {
switch (c) switch (c)
{ {
......
drivers/staging/csr/csr_util.h
View file @ 5379b13d
...@@ -26,9 +26,9 @@ u8 CsrBitCountDense(u32 n); ...@@ -26,9 +26,9 @@ u8 CsrBitCountDense(u32 n);
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* Base conversion */ /* Base conversion */
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
CsrBool CsrHexStrToUint8(const char *string, u8 *returnValue); u8 CsrHexStrToUint8(const char *string, u8 *returnValue);
CsrBool CsrHexStrToUint16(const char *string, u16 *returnValue); u8 CsrHexStrToUint16(const char *string, u16 *returnValue);
CsrBool CsrHexStrToUint32(const char *string, u32 *returnValue); u8 CsrHexStrToUint32(const char *string, u32 *returnValue);
u32 CsrPow(u32 base, u32 exponent); u32 CsrPow(u32 base, u32 exponent);
void CsrIntToBase10(s32 number, char *str); void CsrIntToBase10(s32 number, char *str);
void CsrUInt16ToHex(u16 number, char *str); void CsrUInt16ToHex(u16 number, char *str);
...@@ -85,7 +85,7 @@ const char *CsrGetBaseName(const char *file); ...@@ -85,7 +85,7 @@ const char *CsrGetBaseName(const char *file);
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* Misc */ /* Misc */
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
CsrBool CsrIsSpace(u8 c); u8 CsrIsSpace(u8 c);
#define CsrOffsetOf(st, m) ((CsrSize) & ((st *) 0)->m) #define CsrOffsetOf(st, m) ((CsrSize) & ((st *) 0)->m)
#ifdef __cplusplus #ifdef __cplusplus
......
drivers/staging/csr/csr_wifi_fsm.h
View file @ 5379b13d
...@@ -226,9 +226,9 @@ extern void CsrWifiFsmTestAdvanceTime(CsrWifiFsmContext *context, u32 ms); ...@@ -226,9 +226,9 @@ extern void CsrWifiFsmTestAdvanceTime(CsrWifiFsmContext *context, u32 ms);
* @param[in] context : FSM context * @param[in] context : FSM context
* *
* @return * @return
* CsrBool returns TRUE if there are events for the FSM to process * u8 returns TRUE if there are events for the FSM to process
*/ */
extern CsrBool CsrWifiFsmHasEvents(CsrWifiFsmContext *context); extern u8 CsrWifiFsmHasEvents(CsrWifiFsmContext *context);
/** /**
* @brief * @brief
......
drivers/staging/csr/csr_wifi_fsm_types.h
View file @ 5379b13d
...@@ -220,7 +220,7 @@ typedef struct ...@@ -220,7 +220,7 @@ typedef struct
typedef struct typedef struct
{ {
const u8 numEntries; const u8 numEntries;
const CsrBool saveAll; const u8 saveAll;
const CsrWifiFsmEventEntry *eventEntryArray; /* array of transition function pointers for state */ const CsrWifiFsmEventEntry *eventEntryArray; /* array of transition function pointers for state */
#ifdef CSR_LOG_ENABLE #ifdef CSR_LOG_ENABLE
u16 stateNumber; u16 stateNumber;
...@@ -391,7 +391,7 @@ struct CsrWifiFsmContext ...@@ -391,7 +391,7 @@ struct CsrWifiFsmContext
#endif #endif
u32 timeOffset; /* Amount to adjust the TimeOfDayMs by */ u32 timeOffset; /* Amount to adjust the TimeOfDayMs by */
CsrWifiFsmTimerList timerQueue; /* The internal timer queue */ CsrWifiFsmTimerList timerQueue; /* The internal timer queue */
CsrBool useTempSaveList; /* Should the temp save list be used */ u8 useTempSaveList; /* Should the temp save list be used */
CsrWifiFsmEventList tempSaveList; /* The temp save event queue */ CsrWifiFsmEventList tempSaveList; /* The temp save event queue */
CsrWifiFsmEvent *eventForwardedOrSaved; /* The event that was forwarded or Saved */ CsrWifiFsmEvent *eventForwardedOrSaved; /* The event that was forwarded or Saved */
u16 maxProcesses; /* Size of instanceArray */ u16 maxProcesses; /* Size of instanceArray */
......
drivers/staging/csr/csr_wifi_hip_card.h
View file @ 5379b13d
...@@ -43,7 +43,7 @@ CsrResult CardGenInt(card_t *card); ...@@ -43,7 +43,7 @@ CsrResult CardGenInt(card_t *card);
/***************************************************************************** /*****************************************************************************
* CardPendingInt - * CardPendingInt -
*/ */
CsrResult CardPendingInt(card_t *card, CsrBool *pintr); CsrResult CardPendingInt(card_t *card, u8 *pintr);
/***************************************************************************** /*****************************************************************************
* CardDisableInt - * CardDisableInt -
...@@ -63,7 +63,7 @@ void CardDisable(card_t *card); ...@@ -63,7 +63,7 @@ void CardDisable(card_t *card);
/***************************************************************************** /*****************************************************************************
* CardIntEnabled - * CardIntEnabled -
*/ */
CsrResult CardIntEnabled(card_t *card, CsrBool *enabled); CsrResult CardIntEnabled(card_t *card, u8 *enabled);
/***************************************************************************** /*****************************************************************************
* CardGetDataSlotSize * CardGetDataSlotSize
......
drivers/staging/csr/csr_wifi_hip_card_sdio.c
View file @ 5379b13d
...@@ -3261,7 +3261,7 @@ CsrResult CardDisableInt(card_t *card) ...@@ -3261,7 +3261,7 @@ CsrResult CardDisableInt(card_t *card)
* CSR_RESULT_FAILURE if an SDIO error occurred, * CSR_RESULT_FAILURE if an SDIO error occurred,
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------
*/ */
CsrResult CardPendingInt(card_t *card, CsrBool *pintr) CsrResult CardPendingInt(card_t *card, u8 *pintr)
{ {
CsrResult r; CsrResult r;
u8 pending; u8 pending;
...@@ -3303,7 +3303,7 @@ CsrResult CardPendingInt(card_t *card, CsrBool *pintr) ...@@ -3303,7 +3303,7 @@ CsrResult CardPendingInt(card_t *card, CsrBool *pintr)
CsrResult CardClearInt(card_t *card) CsrResult CardClearInt(card_t *card)
{ {
CsrResult r; CsrResult r;
CsrBool intr; u8 intr;
if (card->chip_id > SDIO_CARD_ID_UNIFI_2) if (card->chip_id > SDIO_CARD_ID_UNIFI_2)
{ {
...@@ -3361,7 +3361,7 @@ CsrResult CardClearInt(card_t *card) ...@@ -3361,7 +3361,7 @@ CsrResult CardClearInt(card_t *card)
* CSR_RESULT_FAILURE if an SDIO error occurred, * CSR_RESULT_FAILURE if an SDIO error occurred,
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------
*/ */
CsrResult CardIntEnabled(card_t *card, CsrBool *enabled) CsrResult CardIntEnabled(card_t *card, u8 *enabled)
{ {
CsrResult r; CsrResult r;
u8 int_enable; u8 int_enable;
...@@ -4036,7 +4036,7 @@ CsrResult unifi_check_io_status(card_t *card, s32 *status) ...@@ -4036,7 +4036,7 @@ CsrResult unifi_check_io_status(card_t *card, s32 *status)
{ {
u8 io_en; u8 io_en;
CsrResult r; CsrResult r;
CsrBool pending; u8 pending;
*status = 0; *status = 0;
......
drivers/staging/csr/csr_wifi_hip_card_sdio.h
View file @ 5379b13d
...@@ -300,7 +300,7 @@ typedef struct ...@@ -300,7 +300,7 @@ typedef struct
u16 packets_interval; u16 packets_interval;
/* Once a queue reaches a stable state, avoid processing */ /* Once a queue reaches a stable state, avoid processing */
CsrBool queue_stable[UNIFI_NO_OF_TX_QS]; u8 queue_stable[UNIFI_NO_OF_TX_QS];
} card_dynamic_slot_t; } card_dynamic_slot_t;
...@@ -566,7 +566,7 @@ struct card ...@@ -566,7 +566,7 @@ struct card
u16 sdio_io_block_size; u16 sdio_io_block_size;
/* Pad transfer sizes to SDIO block boundaries */ /* Pad transfer sizes to SDIO block boundaries */
CsrBool sdio_io_block_pad; u8 sdio_io_block_pad;
/* Read from the XBV */ /* Read from the XBV */
struct FWOV fwov; struct FWOV fwov;
......
drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c
View file @ 5379b13d
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
static CsrResult process_bh(card_t *card); static CsrResult process_bh(card_t *card);
static CsrResult handle_host_protocol(card_t *card, CsrBool *processed_something); static CsrResult handle_host_protocol(card_t *card, u8 *processed_something);
static CsrResult flush_fh_buffer(card_t *card); static CsrResult flush_fh_buffer(card_t *card);
...@@ -358,7 +358,7 @@ CsrResult unifi_bh(card_t *card, u32 *remaining) ...@@ -358,7 +358,7 @@ CsrResult unifi_bh(card_t *card, u32 *remaining)
{ {
CsrResult r; CsrResult r;
CsrResult csrResult; CsrResult csrResult;
CsrBool pending; u8 pending;
s32 iostate, j; s32 iostate, j;
const enum unifi_low_power_mode low_power_mode = card->low_power_mode; const enum unifi_low_power_mode low_power_mode = card->low_power_mode;
u16 data_slots_used = 0; u16 data_slots_used = 0;
...@@ -700,7 +700,7 @@ static CsrResult process_clock_request(card_t *card) ...@@ -700,7 +700,7 @@ static CsrResult process_clock_request(card_t *card)
static CsrResult process_bh(card_t *card) static CsrResult process_bh(card_t *card)
{ {
CsrResult r; CsrResult r;
CsrBool more; u8 more;
more = FALSE; more = FALSE;
/* Process the reasons (interrupt, signals) */ /* Process the reasons (interrupt, signals) */
...@@ -842,7 +842,7 @@ static CsrResult process_bh(card_t *card) ...@@ -842,7 +842,7 @@ static CsrResult process_bh(card_t *card)
* CSR_RESULT_SUCCESS on success or CSR error code. * CSR_RESULT_SUCCESS on success or CSR error code.
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------
*/ */
static CsrResult handle_host_protocol(card_t *card, CsrBool *processed_something) static CsrResult handle_host_protocol(card_t *card, u8 *processed_something)
{ {
CsrResult r; CsrResult r;
s32 done; s32 done;
......
drivers/staging/csr/csr_wifi_nme_ap_prim.h
View file @ 5379b13d
...@@ -78,7 +78,7 @@ typedef u8 CsrWifiNmeApPersCredentialType; ...@@ -78,7 +78,7 @@ typedef u8 CsrWifiNmeApPersCredentialType;
typedef struct typedef struct
{ {
u16 apGroupkeyTimeout; u16 apGroupkeyTimeout;
CsrBool apStrictGtkRekey; u8 apStrictGtkRekey;
u16 apGmkTimeout; u16 apGmkTimeout;
u16 apResponseTimeout; u16 apResponseTimeout;
u8 apRetransLimit; u8 apRetransLimit;
...@@ -256,14 +256,14 @@ typedef struct ...@@ -256,14 +256,14 @@ typedef struct
CsrWifiFsmEvent common; CsrWifiFsmEvent common;
u16 interfaceTag; u16 interfaceTag;
CsrWifiSmeApType apType; CsrWifiSmeApType apType;
CsrBool cloakSsid; u8 cloakSsid;
CsrWifiSsid ssid; CsrWifiSsid ssid;
CsrWifiSmeRadioIF ifIndex; CsrWifiSmeRadioIF ifIndex;
u8 channel; u8 channel;
CsrWifiNmeApCredentials apCredentials; CsrWifiNmeApCredentials apCredentials;
u8 maxConnections; u8 maxConnections;
CsrWifiSmeApP2pGoConfig p2pGoParam; CsrWifiSmeApP2pGoConfig p2pGoParam;
CsrBool wpsEnabled; u8 wpsEnabled;
} CsrWifiNmeApStartReq; } CsrWifiNmeApStartReq;
/******************************************************************************* /*******************************************************************************
...@@ -334,7 +334,7 @@ typedef struct ...@@ -334,7 +334,7 @@ typedef struct
CsrWifiFsmEvent common; CsrWifiFsmEvent common;
u16 interfaceTag; u16 interfaceTag;
CsrWifiMacAddress staMacAddress; CsrWifiMacAddress staMacAddress;
CsrBool keepBlocking; u8 keepBlocking;
} CsrWifiNmeApStaRemoveReq; } CsrWifiNmeApStaRemoveReq;
/******************************************************************************* /*******************************************************************************
......
drivers/staging/csr/csr_wifi_nme_ap_serialize.c
View file @ 5379b13d
...@@ -33,7 +33,7 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg) ...@@ -33,7 +33,7 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg)
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 104) */ /* Calculate the Size of the Serialised Data. Could be more efficient (Try 104) */
bufferSize += 2; /* u16 primitive->apConfig.apGroupkeyTimeout */ bufferSize += 2; /* u16 primitive->apConfig.apGroupkeyTimeout */
bufferSize += 1; /* CsrBool primitive->apConfig.apStrictGtkRekey */ bufferSize += 1; /* u8 primitive->apConfig.apStrictGtkRekey */
bufferSize += 2; /* u16 primitive->apConfig.apGmkTimeout */ bufferSize += 2; /* u16 primitive->apConfig.apGmkTimeout */
bufferSize += 2; /* u16 primitive->apConfig.apResponseTimeout */ bufferSize += 2; /* u16 primitive->apConfig.apResponseTimeout */
bufferSize += 1; /* u8 primitive->apConfig.apRetransLimit */ bufferSize += 1; /* u8 primitive->apConfig.apRetransLimit */
...@@ -44,9 +44,9 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg) ...@@ -44,9 +44,9 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg)
bufferSize += 1; /* u8 primitive->apMacConfig.supportedRatesCount */ bufferSize += 1; /* u8 primitive->apMacConfig.supportedRatesCount */
bufferSize += 20; /* u8 primitive->apMacConfig.supportedRates[20] */ bufferSize += 20; /* u8 primitive->apMacConfig.supportedRates[20] */
bufferSize += 1; /* CsrWifiSmePreambleType primitive->apMacConfig.preamble */ bufferSize += 1; /* CsrWifiSmePreambleType primitive->apMacConfig.preamble */
bufferSize += 1; /* CsrBool primitive->apMacConfig.shortSlotTimeEnabled */ bufferSize += 1; /* u8 primitive->apMacConfig.shortSlotTimeEnabled */
bufferSize += 1; /* CsrWifiSmeCtsProtectionType primitive->apMacConfig.ctsProtectionType */ bufferSize += 1; /* CsrWifiSmeCtsProtectionType primitive->apMacConfig.ctsProtectionType */
bufferSize += 1; /* CsrBool primitive->apMacConfig.wmmEnabled */ bufferSize += 1; /* u8 primitive->apMacConfig.wmmEnabled */
{ {
u16 i2; u16 i2;
for (i2 = 0; i2 < 4; i2++) for (i2 = 0; i2 < 4; i2++)
...@@ -55,7 +55,7 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg) ...@@ -55,7 +55,7 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg)
bufferSize += 1; /* u8 primitive->apMacConfig.wmmApParams[i2].cwMax */ bufferSize += 1; /* u8 primitive->apMacConfig.wmmApParams[i2].cwMax */
bufferSize += 1; /* u8 primitive->apMacConfig.wmmApParams[i2].aifs */ bufferSize += 1; /* u8 primitive->apMacConfig.wmmApParams[i2].aifs */
bufferSize += 2; /* u16 primitive->apMacConfig.wmmApParams[i2].txopLimit */ bufferSize += 2; /* u16 primitive->apMacConfig.wmmApParams[i2].txopLimit */
bufferSize += 1; /* CsrBool primitive->apMacConfig.wmmApParams[i2].admissionControlMandatory */ bufferSize += 1; /* u8 primitive->apMacConfig.wmmApParams[i2].admissionControlMandatory */
} }
} }
{ {
...@@ -66,7 +66,7 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg) ...@@ -66,7 +66,7 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg)
bufferSize += 1; /* u8 primitive->apMacConfig.wmmApBcParams[i2].cwMax */ bufferSize += 1; /* u8 primitive->apMacConfig.wmmApBcParams[i2].cwMax */
bufferSize += 1; /* u8 primitive->apMacConfig.wmmApBcParams[i2].aifs */ bufferSize += 1; /* u8 primitive->apMacConfig.wmmApBcParams[i2].aifs */
bufferSize += 2; /* u16 primitive->apMacConfig.wmmApBcParams[i2].txopLimit */ bufferSize += 2; /* u16 primitive->apMacConfig.wmmApBcParams[i2].txopLimit */
bufferSize += 1; /* CsrBool primitive->apMacConfig.wmmApBcParams[i2].admissionControlMandatory */ bufferSize += 1; /* u8 primitive->apMacConfig.wmmApBcParams[i2].admissionControlMandatory */
} }
} }
bufferSize += 1; /* CsrWifiSmeApAccessType primitive->apMacConfig.accessType */ bufferSize += 1; /* CsrWifiSmeApAccessType primitive->apMacConfig.accessType */
...@@ -78,12 +78,12 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg) ...@@ -78,12 +78,12 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg)
bufferSize += 6; /* u8 primitive->apMacConfig.macAddressList[i2].a[6] */ bufferSize += 6; /* u8 primitive->apMacConfig.macAddressList[i2].a[6] */
} }
} }
bufferSize += 1; /* CsrBool primitive->apMacConfig.apHtParams.greenfieldSupported */ bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.greenfieldSupported */
bufferSize += 1; /* CsrBool primitive->apMacConfig.apHtParams.shortGi20MHz */ bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.shortGi20MHz */
bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.rxStbc */ bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.rxStbc */
bufferSize += 1; /* CsrBool primitive->apMacConfig.apHtParams.rifsModeAllowed */ bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.rifsModeAllowed */
bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.htProtection */ bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.htProtection */
bufferSize += 1; /* CsrBool primitive->apMacConfig.apHtParams.dualCtsProtection */ bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.dualCtsProtection */
return bufferSize; return bufferSize;
} }
...@@ -276,7 +276,7 @@ CsrSize CsrWifiNmeApStartReqSizeof(void *msg) ...@@ -276,7 +276,7 @@ CsrSize CsrWifiNmeApStartReqSizeof(void *msg)
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 112) */ /* Calculate the Size of the Serialised Data. Could be more efficient (Try 112) */
bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* u16 primitive->interfaceTag */
bufferSize += 1; /* CsrWifiSmeApType primitive->apType */ bufferSize += 1; /* CsrWifiSmeApType primitive->apType */
bufferSize += 1; /* CsrBool primitive->cloakSsid */ bufferSize += 1; /* u8 primitive->cloakSsid */
bufferSize += 32; /* u8 primitive->ssid.ssid[32] */ bufferSize += 32; /* u8 primitive->ssid.ssid[32] */
bufferSize += 1; /* u8 primitive->ssid.length */ bufferSize += 1; /* u8 primitive->ssid.length */
bufferSize += 1; /* CsrWifiSmeRadioIF primitive->ifIndex */ bufferSize += 1; /* CsrWifiSmeRadioIF primitive->ifIndex */
...@@ -346,11 +346,11 @@ CsrSize CsrWifiNmeApStartReqSizeof(void *msg) ...@@ -346,11 +346,11 @@ CsrSize CsrWifiNmeApStartReqSizeof(void *msg)
bufferSize += primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount; /* u8 primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel */ bufferSize += primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount; /* u8 primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel */
} }
} }
bufferSize += 1; /* CsrBool primitive->p2pGoParam.opPsEnabled */ bufferSize += 1; /* u8 primitive->p2pGoParam.opPsEnabled */
bufferSize += 1; /* u8 primitive->p2pGoParam.ctWindow */ bufferSize += 1; /* u8 primitive->p2pGoParam.ctWindow */
bufferSize += 1; /* CsrWifiSmeP2pNoaConfigMethod primitive->p2pGoParam.noaConfigMethod */ bufferSize += 1; /* CsrWifiSmeP2pNoaConfigMethod primitive->p2pGoParam.noaConfigMethod */
bufferSize += 1; /* CsrBool primitive->p2pGoParam.allowNoaWithNonP2pDevices */ bufferSize += 1; /* u8 primitive->p2pGoParam.allowNoaWithNonP2pDevices */
bufferSize += 1; /* CsrBool primitive->wpsEnabled */ bufferSize += 1; /* u8 primitive->wpsEnabled */
return bufferSize; return bufferSize;
} }
...@@ -589,7 +589,7 @@ CsrSize CsrWifiNmeApWmmParamUpdateReqSizeof(void *msg) ...@@ -589,7 +589,7 @@ CsrSize CsrWifiNmeApWmmParamUpdateReqSizeof(void *msg)
bufferSize += 1; /* u8 primitive->wmmApParams[i1].cwMax */ bufferSize += 1; /* u8 primitive->wmmApParams[i1].cwMax */
bufferSize += 1; /* u8 primitive->wmmApParams[i1].aifs */ bufferSize += 1; /* u8 primitive->wmmApParams[i1].aifs */
bufferSize += 2; /* u16 primitive->wmmApParams[i1].txopLimit */ bufferSize += 2; /* u16 primitive->wmmApParams[i1].txopLimit */
bufferSize += 1; /* CsrBool primitive->wmmApParams[i1].admissionControlMandatory */ bufferSize += 1; /* u8 primitive->wmmApParams[i1].admissionControlMandatory */
} }
} }
{ {
...@@ -600,7 +600,7 @@ CsrSize CsrWifiNmeApWmmParamUpdateReqSizeof(void *msg) ...@@ -600,7 +600,7 @@ CsrSize CsrWifiNmeApWmmParamUpdateReqSizeof(void *msg)
bufferSize += 1; /* u8 primitive->wmmApBcParams[i1].cwMax */ bufferSize += 1; /* u8 primitive->wmmApBcParams[i1].cwMax */
bufferSize += 1; /* u8 primitive->wmmApBcParams[i1].aifs */ bufferSize += 1; /* u8 primitive->wmmApBcParams[i1].aifs */
bufferSize += 2; /* u16 primitive->wmmApBcParams[i1].txopLimit */ bufferSize += 2; /* u16 primitive->wmmApBcParams[i1].txopLimit */
bufferSize += 1; /* CsrBool primitive->wmmApBcParams[i1].admissionControlMandatory */ bufferSize += 1; /* u8 primitive->wmmApBcParams[i1].admissionControlMandatory */
} }
} }
return bufferSize; return bufferSize;
...@@ -679,7 +679,7 @@ CsrSize CsrWifiNmeApStaRemoveReqSizeof(void *msg) ...@@ -679,7 +679,7 @@ CsrSize CsrWifiNmeApStaRemoveReqSizeof(void *msg)
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 12) */ /* Calculate the Size of the Serialised Data. Could be more efficient (Try 12) */
bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* u16 primitive->interfaceTag */
bufferSize += 6; /* u8 primitive->staMacAddress.a[6] */ bufferSize += 6; /* u8 primitive->staMacAddress.a[6] */
bufferSize += 1; /* CsrBool primitive->keepBlocking */ bufferSize += 1; /* u8 primitive->keepBlocking */
return bufferSize; return bufferSize;
} }
......
drivers/staging/csr/csr_wifi_nme_prim.h
View file @ 5379b13d
...@@ -720,7 +720,7 @@ typedef struct ...@@ -720,7 +720,7 @@ typedef struct
char *privateKeyPassword; char *privateKeyPassword;
u32 sessionLength; u32 sessionLength;
u8 *session; u8 *session;
CsrBool allowPacProvisioning; u8 allowPacProvisioning;
u32 pacLength; u32 pacLength;
u8 *pac; u8 *pac;
char *pacPassword; char *pacPassword;
...@@ -896,7 +896,7 @@ typedef struct ...@@ -896,7 +896,7 @@ typedef struct
CsrWifiNmeBssType bssType; CsrWifiNmeBssType bssType;
u8 channelNo; u8 channelNo;
u8 ccxOptionsMask; u8 ccxOptionsMask;
CsrBool cloakedSsid; u8 cloakedSsid;
CsrWifiNmeCredentials credentials; CsrWifiNmeCredentials credentials;
} CsrWifiNmeProfile; } CsrWifiNmeProfile;
......
drivers/staging/csr/csr_wifi_router_ctrl_prim.h
View file @ 5379b13d
...@@ -32,7 +32,7 @@ typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteWrite)(u8 func, u32 address, u8 ...@@ -32,7 +32,7 @@ typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteWrite)(u8 func, u32 address, u8
typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteRead)(u8 func, u32 address, u8 *pdata); typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteRead)(u8 func, u32 address, u8 *pdata);
typedef CsrResult (*CsrWifiRouterCtrlRawSdioFirmwareDownload)(u32 length, const u8 *pdata); typedef CsrResult (*CsrWifiRouterCtrlRawSdioFirmwareDownload)(u32 length, const u8 *pdata);
typedef CsrResult (*CsrWifiRouterCtrlRawSdioReset)(void); typedef CsrResult (*CsrWifiRouterCtrlRawSdioReset)(void);
typedef CsrResult (*CsrWifiRouterCtrlRawSdioCoreDumpPrepare)(CsrBool suspendSme); typedef CsrResult (*CsrWifiRouterCtrlRawSdioCoreDumpPrepare)(u8 suspendSme);
typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteBlockRead)(u8 func, u32 address, u8 *pdata, u32 length); typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteBlockRead)(u8 func, u32 address, u8 *pdata, u32 length);
typedef CsrResult (*CsrWifiRouterCtrlRawSdioGpRead16)(u8 func, u32 address, u16 *pdata); typedef CsrResult (*CsrWifiRouterCtrlRawSdioGpRead16)(u8 func, u32 address, u16 *pdata);
typedef CsrResult (*CsrWifiRouterCtrlRawSdioGpWrite16)(u8 func, u32 address, u16 data); typedef CsrResult (*CsrWifiRouterCtrlRawSdioGpWrite16)(u8 func, u32 address, u16 data);
...@@ -488,7 +488,7 @@ typedef struct ...@@ -488,7 +488,7 @@ typedef struct
*******************************************************************************/ *******************************************************************************/
typedef struct typedef struct
{ {
CsrBool wmmOrQosEnabled; u8 wmmOrQosEnabled;
CsrWifiRouterCtrlPowersaveTypeMask powersaveMode; CsrWifiRouterCtrlPowersaveTypeMask powersaveMode;
u8 maxSpLength; u8 maxSpLength;
u16 listenIntervalInTus; u16 listenIntervalInTus;
...@@ -684,7 +684,7 @@ typedef struct ...@@ -684,7 +684,7 @@ typedef struct
CsrWifiFsmEvent common; CsrWifiFsmEvent common;
CsrWifiRouterCtrlRequestorInfo clientData; CsrWifiRouterCtrlRequestorInfo clientData;
CsrWifiRouterCtrlLowPowerMode mode; CsrWifiRouterCtrlLowPowerMode mode;
CsrBool wakeHost; u8 wakeHost;
} CsrWifiRouterCtrlConfigurePowerModeReq; } CsrWifiRouterCtrlConfigurePowerModeReq;
/******************************************************************************* /*******************************************************************************
...@@ -791,7 +791,7 @@ typedef struct ...@@ -791,7 +791,7 @@ typedef struct
CsrWifiRouterCtrlPortAction uncontrolledPortAction; CsrWifiRouterCtrlPortAction uncontrolledPortAction;
CsrWifiRouterCtrlPortAction controlledPortAction; CsrWifiRouterCtrlPortAction controlledPortAction;
CsrWifiMacAddress macAddress; CsrWifiMacAddress macAddress;
CsrBool setProtection; u8 setProtection;
} CsrWifiRouterCtrlPortConfigureReq; } CsrWifiRouterCtrlPortConfigureReq;
/******************************************************************************* /*******************************************************************************
...@@ -1073,7 +1073,7 @@ typedef struct ...@@ -1073,7 +1073,7 @@ typedef struct
u16 numInterfaceAddress; u16 numInterfaceAddress;
CsrWifiMacAddress stationMacAddress[2]; CsrWifiMacAddress stationMacAddress[2];
CsrWifiRouterCtrlSmeVersions smeVersions; CsrWifiRouterCtrlSmeVersions smeVersions;
CsrBool scheduledInterrupt; u8 scheduledInterrupt;
} CsrWifiRouterCtrlWifiOnRes; } CsrWifiRouterCtrlWifiOnRes;
/******************************************************************************* /*******************************************************************************
...@@ -1126,8 +1126,8 @@ typedef struct ...@@ -1126,8 +1126,8 @@ typedef struct
CsrWifiRouterCtrlRequestorInfo clientData; CsrWifiRouterCtrlRequestorInfo clientData;
CsrWifiRouterCtrlMode mode; CsrWifiRouterCtrlMode mode;
CsrWifiMacAddress bssid; CsrWifiMacAddress bssid;
CsrBool protection; u8 protection;
CsrBool intraBssDistEnabled; u8 intraBssDistEnabled;
} CsrWifiRouterCtrlModeSetReq; } CsrWifiRouterCtrlModeSetReq;
/******************************************************************************* /*******************************************************************************
...@@ -1383,7 +1383,7 @@ typedef struct ...@@ -1383,7 +1383,7 @@ typedef struct
{ {
CsrWifiFsmEvent common; CsrWifiFsmEvent common;
u16 interfaceTag; u16 interfaceTag;
CsrBool isWapiConnected; u8 isWapiConnected;
} CsrWifiRouterCtrlWapiFilterReq; } CsrWifiRouterCtrlWapiFilterReq;
/******************************************************************************* /*******************************************************************************
...@@ -1482,7 +1482,7 @@ typedef struct ...@@ -1482,7 +1482,7 @@ typedef struct
{ {
CsrWifiFsmEvent common; CsrWifiFsmEvent common;
CsrWifiRouterCtrlRequestorInfo clientData; CsrWifiRouterCtrlRequestorInfo clientData;
CsrBool powerMaintained; u8 powerMaintained;
} CsrWifiRouterCtrlResumeInd; } CsrWifiRouterCtrlResumeInd;
/******************************************************************************* /*******************************************************************************
...@@ -1503,8 +1503,8 @@ typedef struct ...@@ -1503,8 +1503,8 @@ typedef struct
{ {
CsrWifiFsmEvent common; CsrWifiFsmEvent common;
CsrWifiRouterCtrlRequestorInfo clientData; CsrWifiRouterCtrlRequestorInfo clientData;
CsrBool hardSuspend; u8 hardSuspend;
CsrBool d3Suspend; u8 d3Suspend;
} CsrWifiRouterCtrlSuspendInd; } CsrWifiRouterCtrlSuspendInd;
/******************************************************************************* /*******************************************************************************
...@@ -1802,7 +1802,7 @@ typedef struct ...@@ -1802,7 +1802,7 @@ typedef struct
CsrWifiRouterCtrlRequestorInfo clientData; CsrWifiRouterCtrlRequestorInfo clientData;
u16 interfaceTag; u16 interfaceTag;
CsrWifiMacAddress peerMacAddress; CsrWifiMacAddress peerMacAddress;
CsrBool unicastPdu; u8 unicastPdu;
} CsrWifiRouterCtrlMicFailureInd; } CsrWifiRouterCtrlMicFailureInd;
/******************************************************************************* /*******************************************************************************
......
drivers/staging/csr/csr_wifi_router_ctrl_serialize.c
View file @ 5379b13d
...@@ -31,7 +31,7 @@ CsrSize CsrWifiRouterCtrlConfigurePowerModeReqSizeof(void *msg) ...@@ -31,7 +31,7 @@ CsrSize CsrWifiRouterCtrlConfigurePowerModeReqSizeof(void *msg)
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 8) */ /* Calculate the Size of the Serialised Data. Could be more efficient (Try 8) */
bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */
bufferSize += 2; /* CsrWifiRouterCtrlLowPowerMode primitive->mode */ bufferSize += 2; /* CsrWifiRouterCtrlLowPowerMode primitive->mode */
bufferSize += 1; /* CsrBool primitive->wakeHost */ bufferSize += 1; /* u8 primitive->wakeHost */
return bufferSize; return bufferSize;
} }
...@@ -284,7 +284,7 @@ CsrSize CsrWifiRouterCtrlPortConfigureReqSizeof(void *msg) ...@@ -284,7 +284,7 @@ CsrSize CsrWifiRouterCtrlPortConfigureReqSizeof(void *msg)
bufferSize += 2; /* CsrWifiRouterCtrlPortAction primitive->uncontrolledPortAction */ bufferSize += 2; /* CsrWifiRouterCtrlPortAction primitive->uncontrolledPortAction */
bufferSize += 2; /* CsrWifiRouterCtrlPortAction primitive->controlledPortAction */ bufferSize += 2; /* CsrWifiRouterCtrlPortAction primitive->controlledPortAction */
bufferSize += 6; /* u8 primitive->macAddress.a[6] */ bufferSize += 6; /* u8 primitive->macAddress.a[6] */
bufferSize += 1; /* CsrBool primitive->setProtection */ bufferSize += 1; /* u8 primitive->setProtection */
return bufferSize; return bufferSize;
} }
...@@ -734,7 +734,7 @@ CsrSize CsrWifiRouterCtrlWifiOnResSizeof(void *msg) ...@@ -734,7 +734,7 @@ CsrSize CsrWifiRouterCtrlWifiOnResSizeof(void *msg)
bufferSize += 4; /* u32 primitive->smeVersions.firmwarePatch */ bufferSize += 4; /* u32 primitive->smeVersions.firmwarePatch */
bufferSize += (primitive->smeVersions.smeBuild?CsrStrLen(primitive->smeVersions.smeBuild) : 0) + 1; /* char* primitive->smeVersions.smeBuild (0 byte len + 1 for NULL Term) */ bufferSize += (primitive->smeVersions.smeBuild?CsrStrLen(primitive->smeVersions.smeBuild) : 0) + 1; /* char* primitive->smeVersions.smeBuild (0 byte len + 1 for NULL Term) */
bufferSize += 4; /* u32 primitive->smeVersions.smeHip */ bufferSize += 4; /* u32 primitive->smeVersions.smeHip */
bufferSize += 1; /* CsrBool primitive->scheduledInterrupt */ bufferSize += 1; /* u8 primitive->scheduledInterrupt */
return bufferSize; return bufferSize;
} }
...@@ -841,8 +841,8 @@ CsrSize CsrWifiRouterCtrlModeSetReqSizeof(void *msg) ...@@ -841,8 +841,8 @@ CsrSize CsrWifiRouterCtrlModeSetReqSizeof(void *msg)
bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */
bufferSize += 1; /* CsrWifiRouterCtrlMode primitive->mode */ bufferSize += 1; /* CsrWifiRouterCtrlMode primitive->mode */
bufferSize += 6; /* u8 primitive->bssid.a[6] */ bufferSize += 6; /* u8 primitive->bssid.a[6] */
bufferSize += 1; /* CsrBool primitive->protection */ bufferSize += 1; /* u8 primitive->protection */
bufferSize += 1; /* CsrBool primitive->intraBssDistEnabled */ bufferSize += 1; /* u8 primitive->intraBssDistEnabled */
return bufferSize; return bufferSize;
} }
...@@ -889,7 +889,7 @@ CsrSize CsrWifiRouterCtrlPeerAddReqSizeof(void *msg) ...@@ -889,7 +889,7 @@ CsrSize CsrWifiRouterCtrlPeerAddReqSizeof(void *msg)
bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */
bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */ bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */
bufferSize += 2; /* u16 primitive->associationId */ bufferSize += 2; /* u16 primitive->associationId */
bufferSize += 1; /* CsrBool primitive->staInfo.wmmOrQosEnabled */ bufferSize += 1; /* u8 primitive->staInfo.wmmOrQosEnabled */
bufferSize += 2; /* CsrWifiRouterCtrlPowersaveTypeMask primitive->staInfo.powersaveMode */ bufferSize += 2; /* CsrWifiRouterCtrlPowersaveTypeMask primitive->staInfo.powersaveMode */
bufferSize += 1; /* u8 primitive->staInfo.maxSpLength */ bufferSize += 1; /* u8 primitive->staInfo.maxSpLength */
bufferSize += 2; /* u16 primitive->staInfo.listenIntervalInTus */ bufferSize += 2; /* u16 primitive->staInfo.listenIntervalInTus */
...@@ -1467,8 +1467,8 @@ CsrSize CsrWifiRouterCtrlSuspendIndSizeof(void *msg) ...@@ -1467,8 +1467,8 @@ CsrSize CsrWifiRouterCtrlSuspendIndSizeof(void *msg)
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 7) */ /* Calculate the Size of the Serialised Data. Could be more efficient (Try 7) */
bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */
bufferSize += 1; /* CsrBool primitive->hardSuspend */ bufferSize += 1; /* u8 primitive->hardSuspend */
bufferSize += 1; /* CsrBool primitive->d3Suspend */ bufferSize += 1; /* u8 primitive->d3Suspend */
return bufferSize; return bufferSize;
} }
...@@ -1969,7 +1969,7 @@ CsrSize CsrWifiRouterCtrlMicFailureIndSizeof(void *msg) ...@@ -1969,7 +1969,7 @@ CsrSize CsrWifiRouterCtrlMicFailureIndSizeof(void *msg)
bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */ bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */
bufferSize += 2; /* u16 primitive->interfaceTag */ bufferSize += 2; /* u16 primitive->interfaceTag */
bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */ bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */
bufferSize += 1; /* CsrBool primitive->unicastPdu */ bufferSize += 1; /* u8 primitive->unicastPdu */
return bufferSize; return bufferSize;
} }
......
drivers/staging/csr/csr_wifi_router_prim.h
View file @ 5379b13d
...@@ -249,7 +249,7 @@ typedef struct ...@@ -249,7 +249,7 @@ typedef struct
CsrWifiRouterFrameFreeFunction freeFunction; CsrWifiRouterFrameFreeFunction freeFunction;
CsrWifiRouterPriority priority; CsrWifiRouterPriority priority;
u32 hostTag; u32 hostTag;
CsrBool cfmRequested; u8 cfmRequested;
} CsrWifiRouterMaPacketReq; } CsrWifiRouterMaPacketReq;
/******************************************************************************* /*******************************************************************************
......
drivers/staging/csr/csr_wifi_router_serialize.c
View file @ 5379b13d
...@@ -79,7 +79,7 @@ CsrSize CsrWifiRouterMaPacketReqSizeof(void *msg) ...@@ -79,7 +79,7 @@ CsrSize CsrWifiRouterMaPacketReqSizeof(void *msg)
bufferSize += 4; /* CsrWifiRouterFrameFreeFunction primitive->freeFunction */ bufferSize += 4; /* CsrWifiRouterFrameFreeFunction primitive->freeFunction */
bufferSize += 2; /* CsrWifiRouterPriority primitive->priority */ bufferSize += 2; /* CsrWifiRouterPriority primitive->priority */
bufferSize += 4; /* u32 primitive->hostTag */ bufferSize += 4; /* u32 primitive->hostTag */
bufferSize += 1; /* CsrBool primitive->cfmRequested */ bufferSize += 1; /* u8 primitive->cfmRequested */
return bufferSize; return bufferSize;
} }
......
drivers/staging/csr/csr_wifi_sme_ap_prim.h
View file @ 5379b13d
...@@ -248,12 +248,12 @@ typedef u16 CsrWifiSmeApWapiCapabilitiesMask; ...@@ -248,12 +248,12 @@ typedef u16 CsrWifiSmeApWapiCapabilitiesMask;
*******************************************************************************/ *******************************************************************************/
typedef struct typedef struct
{ {
CsrBool greenfieldSupported; u8 greenfieldSupported;
CsrBool shortGi20MHz; u8 shortGi20MHz;
u8 rxStbc; u8 rxStbc;
CsrBool rifsModeAllowed; u8 rifsModeAllowed;
u8 htProtection; u8 htProtection;
CsrBool dualCtsProtection; u8 dualCtsProtection;
} CsrWifiSmeApHtParams; } CsrWifiSmeApHtParams;
/******************************************************************************* /*******************************************************************************
...@@ -389,9 +389,9 @@ typedef struct ...@@ -389,9 +389,9 @@ typedef struct
u8 supportedRatesCount; u8 supportedRatesCount;
u8 supportedRates[20]; u8 supportedRates[20];
CsrWifiSmePreambleType preamble; CsrWifiSmePreambleType preamble;
CsrBool shortSlotTimeEnabled; u8 shortSlotTimeEnabled;
CsrWifiSmeCtsProtectionType ctsProtectionType; CsrWifiSmeCtsProtectionType ctsProtectionType;
CsrBool wmmEnabled; u8 wmmEnabled;
CsrWifiSmeWmmAcParams wmmApParams[4]; CsrWifiSmeWmmAcParams wmmApParams[4];
CsrWifiSmeWmmAcParams wmmApBcParams[4]; CsrWifiSmeWmmAcParams wmmApBcParams[4];
CsrWifiSmeApAccessType accessType; CsrWifiSmeApAccessType accessType;
...@@ -435,10 +435,10 @@ typedef struct ...@@ -435,10 +435,10 @@ typedef struct
{ {
CsrWifiSmeP2pGroupCapabilityMask groupCapability; CsrWifiSmeP2pGroupCapabilityMask groupCapability;
CsrWifiSmeApP2pOperatingChanList operatingChanList; CsrWifiSmeApP2pOperatingChanList operatingChanList;
CsrBool opPsEnabled; u8 opPsEnabled;
u8 ctWindow; u8 ctWindow;
CsrWifiSmeP2pNoaConfigMethod noaConfigMethod; CsrWifiSmeP2pNoaConfigMethod noaConfigMethod;
CsrBool allowNoaWithNonP2pDevices; u8 allowNoaWithNonP2pDevices;
} CsrWifiSmeApP2pGoConfig; } CsrWifiSmeApP2pGoConfig;
/******************************************************************************* /*******************************************************************************
...@@ -481,7 +481,7 @@ typedef struct ...@@ -481,7 +481,7 @@ typedef struct
typedef struct typedef struct
{ {
CsrWifiSmeApCredentials apCredentials; CsrWifiSmeApCredentials apCredentials;
CsrBool wpsEnabled; u8 wpsEnabled;
} CsrWifiSmeApSecConfig; } CsrWifiSmeApSecConfig;
...@@ -553,7 +553,7 @@ typedef struct ...@@ -553,7 +553,7 @@ typedef struct
u16 interfaceTag; u16 interfaceTag;
u8 initialPresence; u8 initialPresence;
CsrWifiSmeApType apType; CsrWifiSmeApType apType;
CsrBool cloakSsid; u8 cloakSsid;
CsrWifiSsid ssid; CsrWifiSsid ssid;
CsrWifiSmeRadioIF ifIndex; CsrWifiSmeRadioIF ifIndex;
u8 channel; u8 channel;
...@@ -675,7 +675,7 @@ typedef struct ...@@ -675,7 +675,7 @@ typedef struct
CsrWifiSmeIEEE80211Reason deauthReason; CsrWifiSmeIEEE80211Reason deauthReason;
CsrWifiSmeIEEE80211Reason disassocReason; CsrWifiSmeIEEE80211Reason disassocReason;
CsrWifiMacAddress peerMacaddress; CsrWifiMacAddress peerMacaddress;
CsrBool keepBlocking; u8 keepBlocking;
} CsrWifiSmeApStaDisconnectReq; } CsrWifiSmeApStaDisconnectReq;
/******************************************************************************* /*******************************************************************************
......
drivers/staging/csr/csr_wifi_sme_prim.h
View file @ 5379b13d
...@@ -1988,9 +1988,9 @@ typedef struct ...@@ -1988,9 +1988,9 @@ typedef struct
typedef struct typedef struct
{ {
u8 keepAliveTimeMs; u8 keepAliveTimeMs;
CsrBool apRoamingEnabled; u8 apRoamingEnabled;
u8 measurementsMask; u8 measurementsMask;
CsrBool ccxRadioMgtEnabled; u8 ccxRadioMgtEnabled;
} CsrWifiSmeCcxConfig; } CsrWifiSmeCcxConfig;
/******************************************************************************* /*******************************************************************************
...@@ -2037,8 +2037,8 @@ typedef struct ...@@ -2037,8 +2037,8 @@ typedef struct
*******************************************************************************/ *******************************************************************************/
typedef struct typedef struct
{ {
CsrBool coexEnableSchemeManagement; u8 coexEnableSchemeManagement;
CsrBool coexPeriodicWakeHost; u8 coexPeriodicWakeHost;
u16 coexTrafficBurstyLatencyMs; u16 coexTrafficBurstyLatencyMs;
u16 coexTrafficContinuousLatencyMs; u16 coexTrafficContinuousLatencyMs;
u16 coexObexBlackoutDurationMs; u16 coexObexBlackoutDurationMs;
...@@ -2231,7 +2231,7 @@ typedef struct ...@@ -2231,7 +2231,7 @@ typedef struct
*******************************************************************************/ *******************************************************************************/
typedef struct typedef struct
{ {
CsrBool unifiFixMaxTxDataRate; u8 unifiFixMaxTxDataRate;
u8 unifiFixTxDataRate; u8 unifiFixTxDataRate;
u16 dot11RtsThreshold; u16 dot11RtsThreshold;
u16 dot11FragmentationThreshold; u16 dot11FragmentationThreshold;
...@@ -2294,7 +2294,7 @@ typedef struct ...@@ -2294,7 +2294,7 @@ typedef struct
typedef struct typedef struct
{ {
CsrWifiMacAddress bssid; CsrWifiMacAddress bssid;
CsrBool preAuthAllowed; u8 preAuthAllowed;
} CsrWifiSmePmkidCandidate; } CsrWifiSmePmkidCandidate;
/******************************************************************************* /*******************************************************************************
...@@ -2339,8 +2339,8 @@ typedef struct ...@@ -2339,8 +2339,8 @@ typedef struct
*******************************************************************************/ *******************************************************************************/
typedef struct typedef struct
{ {
CsrBool dot11MultiDomainCapabilityImplemented; u8 dot11MultiDomainCapabilityImplemented;
CsrBool dot11MultiDomainCapabilityEnabled; u8 dot11MultiDomainCapabilityEnabled;
CsrWifiSmeRegulatoryDomain currentRegulatoryDomain; CsrWifiSmeRegulatoryDomain currentRegulatoryDomain;
u8 currentCountryCode[2]; u8 currentCountryCode[2];
} CsrWifiSmeRegulatoryDomainInfo; } CsrWifiSmeRegulatoryDomainInfo;
...@@ -2489,7 +2489,7 @@ typedef struct ...@@ -2489,7 +2489,7 @@ typedef struct
u8 cwMax; u8 cwMax;
u8 aifs; u8 aifs;
u16 txopLimit; u16 txopLimit;
CsrBool admissionControlMandatory; u8 admissionControlMandatory;
} CsrWifiSmeWmmAcParams; } CsrWifiSmeWmmAcParams;
/******************************************************************************* /*******************************************************************************
...@@ -2523,7 +2523,7 @@ typedef struct ...@@ -2523,7 +2523,7 @@ typedef struct
*******************************************************************************/ *******************************************************************************/
typedef struct typedef struct
{ {
CsrBool spportWps; u8 spportWps;
u8 deviceType; u8 deviceType;
} CsrWifiSmeWpsDeviceTypeCommon; } CsrWifiSmeWpsDeviceTypeCommon;
...@@ -2596,13 +2596,13 @@ typedef struct ...@@ -2596,13 +2596,13 @@ typedef struct
*******************************************************************************/ *******************************************************************************/
typedef struct typedef struct
{ {
CsrBool hasTrafficData; u8 hasTrafficData;
CsrWifiSmeTrafficType currentTrafficType; CsrWifiSmeTrafficType currentTrafficType;
u16 currentPeriodMs; u16 currentPeriodMs;
CsrWifiSmePowerSaveLevel currentPowerSave; CsrWifiSmePowerSaveLevel currentPowerSave;
u16 currentCoexPeriodMs; u16 currentCoexPeriodMs;
u16 currentCoexLatencyMs; u16 currentCoexLatencyMs;
CsrBool hasBtDevice; u8 hasBtDevice;
u32 currentBlackoutDurationUs; u32 currentBlackoutDurationUs;
u32 currentBlackoutPeriodUs; u32 currentBlackoutPeriodUs;
CsrWifiSmeCoexScheme currentCoexScheme; CsrWifiSmeCoexScheme currentCoexScheme;
...@@ -2677,7 +2677,7 @@ typedef struct ...@@ -2677,7 +2677,7 @@ typedef struct
u16 mlmeAssociateReqInformationElementsLength; u16 mlmeAssociateReqInformationElementsLength;
u8 *mlmeAssociateReqInformationElements; u8 *mlmeAssociateReqInformationElements;
CsrWifiSmeWmmQosInfoMask wmmQosInfo; CsrWifiSmeWmmQosInfoMask wmmQosInfo;
CsrBool adhocJoinOnly; u8 adhocJoinOnly;
u8 adhocChannel; u8 adhocChannel;
} CsrWifiSmeConnectionConfig; } CsrWifiSmeConnectionConfig;
...@@ -2756,7 +2756,7 @@ typedef struct ...@@ -2756,7 +2756,7 @@ typedef struct
CsrWifiSmeRadioIF ifIndex; CsrWifiSmeRadioIF ifIndex;
u16 atimWindowTu; u16 atimWindowTu;
u16 beaconPeriodTu; u16 beaconPeriodTu;
CsrBool reassociation; u8 reassociation;
u16 beaconFrameLength; u16 beaconFrameLength;
u8 *beaconFrame; u8 *beaconFrame;
u16 associationReqFrameLength; u16 associationReqFrameLength;
...@@ -2800,7 +2800,7 @@ typedef struct ...@@ -2800,7 +2800,7 @@ typedef struct
CsrWifiSme80211dTrustLevel trustLevel; CsrWifiSme80211dTrustLevel trustLevel;
u8 countryCode[2]; u8 countryCode[2];
CsrWifiSmeFirmwareDriverInterface firmwareDriverInterface; CsrWifiSmeFirmwareDriverInterface firmwareDriverInterface;
CsrBool enableStrictDraftN; u8 enableStrictDraftN;
} CsrWifiSmeDeviceConfig; } CsrWifiSmeDeviceConfig;
/******************************************************************************* /*******************************************************************************
...@@ -2925,9 +2925,9 @@ typedef struct ...@@ -2925,9 +2925,9 @@ typedef struct
{ {
CsrWifiSmeKeyType keyType; CsrWifiSmeKeyType keyType;
u8 keyIndex; u8 keyIndex;
CsrBool wepTxKey; u8 wepTxKey;
u16 keyRsc[8]; u16 keyRsc[8];
CsrBool authenticator; u8 authenticator;
CsrWifiMacAddress address; CsrWifiMacAddress address;
u8 keyLength; u8 keyLength;
u8 key[32]; u8 key[32];
...@@ -3001,11 +3001,11 @@ typedef struct ...@@ -3001,11 +3001,11 @@ typedef struct
{ {
CsrWifiSmePowerSaveLevel powerSaveLevel; CsrWifiSmePowerSaveLevel powerSaveLevel;
u16 listenIntervalTu; u16 listenIntervalTu;
CsrBool rxDtims; u8 rxDtims;
CsrWifiSmeD3AutoScanMode d3AutoScanMode; CsrWifiSmeD3AutoScanMode d3AutoScanMode;
u8 clientTrafficWindow; u8 clientTrafficWindow;
CsrBool opportunisticPowerSave; u8 opportunisticPowerSave;
CsrBool noticeOfAbsence; u8 noticeOfAbsence;
} CsrWifiSmePowerConfig; } CsrWifiSmePowerConfig;
/******************************************************************************* /*******************************************************************************
...@@ -3039,8 +3039,8 @@ typedef struct ...@@ -3039,8 +3039,8 @@ typedef struct
typedef struct typedef struct
{ {
CsrWifiSmeRoamingBandData roamingBands[3]; CsrWifiSmeRoamingBandData roamingBands[3];
CsrBool disableSmoothRoaming; u8 disableSmoothRoaming;
CsrBool disableRoamScans; u8 disableRoamScans;
u8 reconnectLimit; u8 reconnectLimit;
u16 reconnectLimitIntervalMs; u16 reconnectLimitIntervalMs;
CsrWifiSmeScanConfigData roamScanCfg[3]; CsrWifiSmeScanConfigData roamScanCfg[3];
...@@ -3085,7 +3085,7 @@ typedef struct ...@@ -3085,7 +3085,7 @@ typedef struct
typedef struct typedef struct
{ {
CsrWifiSmeScanConfigData scanCfg[4]; CsrWifiSmeScanConfigData scanCfg[4];
CsrBool disableAutonomousScans; u8 disableAutonomousScans;
u16 maxResults; u16 maxResults;
s8 highRssiThreshold; s8 highRssiThreshold;
s8 lowRssiThreshold; s8 lowRssiThreshold;
...@@ -3193,8 +3193,8 @@ typedef struct ...@@ -3193,8 +3193,8 @@ typedef struct
u8 connectionQualitySnrChangeTrigger; u8 connectionQualitySnrChangeTrigger;
CsrWifiSmeWmmModeMask wmmModeMask; CsrWifiSmeWmmModeMask wmmModeMask;
CsrWifiSmeRadioIF ifIndex; CsrWifiSmeRadioIF ifIndex;
CsrBool allowUnicastUseGroupCipher; u8 allowUnicastUseGroupCipher;
CsrBool enableOpportunisticKeyCaching; u8 enableOpportunisticKeyCaching;
} CsrWifiSmeStaConfig; } CsrWifiSmeStaConfig;
/******************************************************************************* /*******************************************************************************
...@@ -4401,7 +4401,7 @@ typedef struct ...@@ -4401,7 +4401,7 @@ typedef struct
u8 ssidCount; u8 ssidCount;
CsrWifiSsid *ssid; CsrWifiSsid *ssid;
CsrWifiMacAddress bssid; CsrWifiMacAddress bssid;
CsrBool forceScan; u8 forceScan;
CsrWifiSmeBssType bssType; CsrWifiSmeBssType bssType;
CsrWifiSmeScanType scanType; CsrWifiSmeScanType scanType;
u16 channelListCount; u16 channelListCount;
...@@ -4561,7 +4561,7 @@ typedef struct ...@@ -4561,7 +4561,7 @@ typedef struct
u16 interfaceTag; u16 interfaceTag;
CsrWifiSmeListAction action; CsrWifiSmeListAction action;
u32 transactionId; u32 transactionId;
CsrBool strict; u8 strict;
CsrWifiSmeTspecCtrlMask ctrlMask; CsrWifiSmeTspecCtrlMask ctrlMask;
u16 tspecLength; u16 tspecLength;
u8 *tspec; u8 *tspec;
...@@ -5383,7 +5383,7 @@ typedef struct ...@@ -5383,7 +5383,7 @@ typedef struct
{ {
CsrWifiFsmEvent common; CsrWifiFsmEvent common;
CsrWifiMacAddress address; CsrWifiMacAddress address;
CsrBool isconnected; u8 isconnected;
} CsrWifiSmeIbssStationInd; } CsrWifiSmeIbssStationInd;
/******************************************************************************* /*******************************************************************************
...@@ -5608,7 +5608,7 @@ typedef struct ...@@ -5608,7 +5608,7 @@ typedef struct
{ {
CsrWifiFsmEvent common; CsrWifiFsmEvent common;
u16 interfaceTag; u16 interfaceTag;
CsrBool secondFailure; u8 secondFailure;
u16 count; u16 count;
CsrWifiMacAddress address; CsrWifiMacAddress address;
CsrWifiSmeKeyType keyType; CsrWifiSmeKeyType keyType;
......
drivers/staging/csr/csr_wifi_vif_utils.h
View file @ 5379b13d
...@@ -64,9 +64,9 @@ extern "C" { ...@@ -64,9 +64,9 @@ extern "C" {
* @param[in] CsrWifiInterfaceMode : mode * @param[in] CsrWifiInterfaceMode : mode
* *
* @return * @return
* CsrBool : returns true if the interface is allowed to operate in the mode otherwise false. * u8 : returns true if the interface is allowed to operate in the mode otherwise false.
*/ */
extern CsrBool CsrWifiVifUtilsCheckCompatibility(u8 interfaceCapability, extern u8 CsrWifiVifUtilsCheckCompatibility(u8 interfaceCapability,
u8 *currentInterfaceModes, u8 *currentInterfaceModes,
u16 interfaceTag, u16 interfaceTag,
CsrWifiInterfaceMode mode); CsrWifiInterfaceMode mode);
...@@ -80,9 +80,9 @@ extern CsrBool CsrWifiVifUtilsCheckCompatibility(u8 interfaceCapabil ...@@ -80,9 +80,9 @@ extern CsrBool CsrWifiVifUtilsCheckCompatibility(u8 interfaceCapabil
* @param[in] u16 : interfaceTag * @param[in] u16 : interfaceTag
* *
* @return * @return
* CsrBool : returns true if the interface is supported, otherwise false. * u8 : returns true if the interface is supported, otherwise false.
*/ */
extern CsrBool CsrWifiVifUtilsIsSupported(u16 interfaceTag); extern u8 CsrWifiVifUtilsIsSupported(u16 interfaceTag);
#ifdef CSR_LOG_ENABLE #ifdef CSR_LOG_ENABLE
/** /**
......
drivers/staging/csr/firmware.c
View file @ 5379b13d
...@@ -296,7 +296,7 @@ uf_run_unifihelper(unifi_priv_t *priv) ...@@ -296,7 +296,7 @@ uf_run_unifihelper(unifi_priv_t *priv)
} /* uf_run_unifihelper() */ } /* uf_run_unifihelper() */
#ifdef CSR_WIFI_SPLIT_PATCH #ifdef CSR_WIFI_SPLIT_PATCH
static CsrBool is_ap_mode(unifi_priv_t *priv) static u8 is_ap_mode(unifi_priv_t *priv)
{ {
if (priv == NULL || priv->interfacePriv[0] == NULL) if (priv == NULL || priv->interfacePriv[0] == NULL)
{ {
......
drivers/staging/csr/netdev.c
View file @ 5379b13d
...@@ -552,7 +552,7 @@ uf_alloc_netdevice(CsrSdioFunction *sdio_dev, int bus_id) ...@@ -552,7 +552,7 @@ uf_alloc_netdevice(CsrSdioFunction *sdio_dev, int bus_id)
* and should be freed by freeing the net_device pointer. * and should be freed by freeing the net_device pointer.
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------
*/ */
CsrBool u8
uf_alloc_netdevice_for_other_interfaces(unifi_priv_t *priv, u16 interfaceTag) uf_alloc_netdevice_for_other_interfaces(unifi_priv_t *priv, u16 interfaceTag)
{ {
struct net_device *dev; struct net_device *dev;
...@@ -1371,7 +1371,7 @@ int prepare_and_add_macheader(unifi_priv_t *priv, struct sk_buff *skb, struct sk ...@@ -1371,7 +1371,7 @@ int prepare_and_add_macheader(unifi_priv_t *priv, struct sk_buff *skb, struct sk
u16 interfaceTag, u16 interfaceTag,
const u8 *daddr, const u8 *daddr,
const u8 *saddr, const u8 *saddr,
CsrBool protection) u8 protection)
{ {
u16 fc = 0; u16 fc = 0;
u8 qc = 0; u8 qc = 0;
...@@ -1382,7 +1382,7 @@ int prepare_and_add_macheader(unifi_priv_t *priv, struct sk_buff *skb, struct sk ...@@ -1382,7 +1382,7 @@ int prepare_and_add_macheader(unifi_priv_t *priv, struct sk_buff *skb, struct sk
u8 direction = 0; u8 direction = 0;
netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
u8 *addressOne; u8 *addressOne;
CsrBool bQosNull = false; u8 bQosNull = false;
if (skb == NULL) { if (skb == NULL) {
unifi_error(priv,"prepare_and_add_macheader: Invalid SKB reference\n"); unifi_error(priv,"prepare_and_add_macheader: Invalid SKB reference\n");
...@@ -1650,7 +1650,7 @@ send_ma_pkt_request(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr ...@@ -1650,7 +1650,7 @@ send_ma_pkt_request(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr
{ {
int r; int r;
u16 i; u16 i;
CsrBool eapolStore = FALSE; u8 eapolStore = FALSE;
struct sk_buff *newSkb = NULL; struct sk_buff *newSkb = NULL;
bulk_data_param_t bulkdata; bulk_data_param_t bulkdata;
const int proto = ntohs(ehdr->h_proto); const int proto = ntohs(ehdr->h_proto);
...@@ -2745,7 +2745,7 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d ...@@ -2745,7 +2745,7 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d
#ifdef CSR_SUPPORT_SME #ifdef CSR_SUPPORT_SME
u8 dataFrameType = 0; u8 dataFrameType = 0;
CsrBool powerSaveChanged = FALSE; u8 powerSaveChanged = FALSE;
u8 pmBit = 0; u8 pmBit = 0;
CsrWifiRouterCtrlStaInfo_t *srcStaInfo = NULL; CsrWifiRouterCtrlStaInfo_t *srcStaInfo = NULL;
u16 qosControl; u16 qosControl;
......
drivers/staging/csr/sme_blocking.c
View file @ 5379b13d
...@@ -321,7 +321,7 @@ int sme_mgt_scan_full(unifi_priv_t *priv, ...@@ -321,7 +321,7 @@ int sme_mgt_scan_full(unifi_priv_t *priv,
unsigned char *channel_list) unsigned char *channel_list)
{ {
CsrWifiMacAddress bcastAddress = {{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }}; CsrWifiMacAddress bcastAddress = {{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }};
CsrBool is_active = (num_channels > 0) ? TRUE : FALSE; u8 is_active = (num_channels > 0) ? TRUE : FALSE;
int r; int r;
if (priv->smepriv == NULL) { if (priv->smepriv == NULL) {
......
drivers/staging/csr/sme_sys.c
View file @ 5379b13d
...@@ -1095,7 +1095,7 @@ void CsrWifiRouterCtrlWifiOnResHandler(void* drvpriv, CsrWifiFsmEvent* msg) ...@@ -1095,7 +1095,7 @@ void CsrWifiRouterCtrlWifiOnResHandler(void* drvpriv, CsrWifiFsmEvent* msg)
int i; /* used as a loop counter */ int i; /* used as a loop counter */
u32 intmode = CSR_WIFI_INTMODE_DEFAULT; u32 intmode = CSR_WIFI_INTMODE_DEFAULT;
#ifdef CSR_WIFI_SPLIT_PATCH #ifdef CSR_WIFI_SPLIT_PATCH
CsrBool switching_ap_fw = FALSE; u8 switching_ap_fw = FALSE;
#endif #endif
/* Register the UniFi device with the OS network manager */ /* Register the UniFi device with the OS network manager */
unifi_trace(priv, UDBG3, "Card Init Completed Successfully\n"); unifi_trace(priv, UDBG3, "Card Init Completed Successfully\n");
...@@ -1365,7 +1365,7 @@ _sys_packet_req(unifi_priv_t *priv, const CSR_SIGNAL *signal, ...@@ -1365,7 +1365,7 @@ _sys_packet_req(unifi_priv_t *priv, const CSR_SIGNAL *signal,
CsrWifiMacAddress peerMacAddress; CsrWifiMacAddress peerMacAddress;
CsrResult csrResult; CsrResult csrResult;
u16 interfaceTag = req.VirtualInterfaceIdentifier & 0xff; u16 interfaceTag = req.VirtualInterfaceIdentifier & 0xff;
CsrBool eapolStore = FALSE; u8 eapolStore = FALSE;
s8 protection = 0; s8 protection = 0;
netInterface_priv_t *interfacePriv; netInterface_priv_t *interfacePriv;
unsigned long flags; unsigned long flags;
...@@ -2101,7 +2101,7 @@ void CsrWifiRouterCtrlPeerDelReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) ...@@ -2101,7 +2101,7 @@ void CsrWifiRouterCtrlPeerDelReqHandler(void* drvpriv, CsrWifiFsmEvent* msg)
static int peer_add_new_record(unifi_priv_t *priv,CsrWifiRouterCtrlPeerAddReq *req,u32 *handle) static int peer_add_new_record(unifi_priv_t *priv,CsrWifiRouterCtrlPeerAddReq *req,u32 *handle)
{ {
u8 i, powerModeTemp = 0; u8 i, powerModeTemp = 0;
CsrBool freeSlotFound = FALSE; u8 freeSlotFound = FALSE;
CsrWifiRouterCtrlStaInfo_t *newRecord = NULL; CsrWifiRouterCtrlStaInfo_t *newRecord = NULL;
netInterface_priv_t *interfacePriv = priv->interfacePriv[req->interfaceTag]; netInterface_priv_t *interfacePriv = priv->interfacePriv[req->interfaceTag];
CsrTime currentTime, currentTimeHi; CsrTime currentTime, currentTimeHi;
...@@ -2610,7 +2610,7 @@ static void ba_session_terminate_timer_func(unsigned long data) ...@@ -2610,7 +2610,7 @@ static void ba_session_terminate_timer_func(unsigned long data)
} }
CsrBool blockack_session_stop(unifi_priv_t *priv, u8 blockack_session_stop(unifi_priv_t *priv,
u16 interfaceTag, u16 interfaceTag,
CsrWifiRouterCtrlBlockAckRole role, CsrWifiRouterCtrlBlockAckRole role,
u16 tID, u16 tID,
...@@ -2708,7 +2708,7 @@ CsrBool blockack_session_stop(unifi_priv_t *priv, ...@@ -2708,7 +2708,7 @@ CsrBool blockack_session_stop(unifi_priv_t *priv,
void CsrWifiRouterCtrlBlockAckDisableReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) void CsrWifiRouterCtrlBlockAckDisableReqHandler(void* drvpriv, CsrWifiFsmEvent* msg)
{ {
CsrWifiRouterCtrlBlockAckDisableReq* req = (CsrWifiRouterCtrlBlockAckDisableReq*)msg; CsrWifiRouterCtrlBlockAckDisableReq* req = (CsrWifiRouterCtrlBlockAckDisableReq*)msg;
CsrBool r; u8 r;
unifi_priv_t *priv = (unifi_priv_t*)drvpriv; unifi_priv_t *priv = (unifi_priv_t*)drvpriv;
unifi_trace(priv, UDBG6, "%s: in ok\n", __FUNCTION__); unifi_trace(priv, UDBG6, "%s: in ok\n", __FUNCTION__);
...@@ -2730,7 +2730,7 @@ void CsrWifiRouterCtrlBlockAckDisableReqHandler(void* drvpriv, CsrWifiFsmEvent* ...@@ -2730,7 +2730,7 @@ void CsrWifiRouterCtrlBlockAckDisableReqHandler(void* drvpriv, CsrWifiFsmEvent*
} }
CsrBool blockack_session_start(unifi_priv_t *priv, u8 blockack_session_start(unifi_priv_t *priv,
u16 interfaceTag, u16 interfaceTag,
u16 tID, u16 tID,
u16 timeout, u16 timeout,
...@@ -2946,7 +2946,7 @@ CsrBool blockack_session_start(unifi_priv_t *priv, ...@@ -2946,7 +2946,7 @@ CsrBool blockack_session_start(unifi_priv_t *priv,
void CsrWifiRouterCtrlBlockAckEnableReqHandler(void* drvpriv, CsrWifiFsmEvent* msg) void CsrWifiRouterCtrlBlockAckEnableReqHandler(void* drvpriv, CsrWifiFsmEvent* msg)
{ {
CsrWifiRouterCtrlBlockAckEnableReq* req = (CsrWifiRouterCtrlBlockAckEnableReq*)msg; CsrWifiRouterCtrlBlockAckEnableReq* req = (CsrWifiRouterCtrlBlockAckEnableReq*)msg;
CsrBool r; u8 r;
unifi_priv_t *priv = (unifi_priv_t*)drvpriv; unifi_priv_t *priv = (unifi_priv_t*)drvpriv;
unifi_trace(priv, UDBG6, ">>%s\n", __FUNCTION__); unifi_trace(priv, UDBG6, ">>%s\n", __FUNCTION__);
......
drivers/staging/csr/unifi_event.c
View file @ 5379b13d
...@@ -91,25 +91,25 @@ static void send_to_client(unifi_priv_t *priv, ul_client_t *client, ...@@ -91,25 +91,25 @@ static void send_to_client(unifi_priv_t *priv, ul_client_t *client,
* FALSE if the packet is for the driver or network stack * FALSE if the packet is for the driver or network stack
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------
*/ */
static CsrBool check_routing_pkt_data_ind(unifi_priv_t *priv, static u8 check_routing_pkt_data_ind(unifi_priv_t *priv,
u8 *sigdata, u8 *sigdata,
const bulk_data_param_t* bulkdata, const bulk_data_param_t* bulkdata,
CsrBool *freeBulkData, u8 *freeBulkData,
netInterface_priv_t *interfacePriv) netInterface_priv_t *interfacePriv)
{ {
u16 frmCtrl, receptionStatus, frmCtrlSubType; u16 frmCtrl, receptionStatus, frmCtrlSubType;
u8 *macHdrLocation; u8 *macHdrLocation;
u8 interfaceTag; u8 interfaceTag;
CsrBool isDataFrame; u8 isDataFrame;
CsrBool isProtocolVerInvalid = FALSE; u8 isProtocolVerInvalid = FALSE;
CsrBool isDataFrameSubTypeNoData = FALSE; u8 isDataFrameSubTypeNoData = FALSE;
#ifdef CSR_WIFI_SECURITY_WAPI_ENABLE #ifdef CSR_WIFI_SECURITY_WAPI_ENABLE
static const u8 wapiProtocolIdSNAPHeader[] = {0x88,0xb4}; static const u8 wapiProtocolIdSNAPHeader[] = {0x88,0xb4};
static const u8 wapiProtocolIdSNAPHeaderOffset = 6; static const u8 wapiProtocolIdSNAPHeaderOffset = 6;
u8 *destAddr; u8 *destAddr;
u8 *srcAddr; u8 *srcAddr;
CsrBool isWapiUnicastPkt = FALSE; u8 isWapiUnicastPkt = FALSE;
#ifdef CSR_WIFI_SECURITY_WAPI_QOSCTRL_MIC_WORKAROUND #ifdef CSR_WIFI_SECURITY_WAPI_QOSCTRL_MIC_WORKAROUND
u16 qosControl; u16 qosControl;
...@@ -374,7 +374,7 @@ unifi_process_receive_event(void *ospriv, ...@@ -374,7 +374,7 @@ unifi_process_receive_event(void *ospriv,
int i, receiver_id; int i, receiver_id;
int client_id; int client_id;
s16 signal_id; s16 signal_id;
CsrBool pktIndToSme = FALSE, freeBulkData = FALSE; u8 pktIndToSme = FALSE, freeBulkData = FALSE;
func_enter(); func_enter();
...@@ -490,7 +490,7 @@ unifi_process_receive_event(void *ospriv, ...@@ -490,7 +490,7 @@ unifi_process_receive_event(void *ospriv,
u8 *destAddr; u8 *destAddr;
CsrResult res; CsrResult res;
u16 interfaceTag = 0; u16 interfaceTag = 0;
CsrBool isMcastPkt = TRUE; u8 isMcastPkt = TRUE;
unifi_trace(priv, UDBG6, "Received a WAPI data packet when the Unicast/Multicast filter is set\n"); unifi_trace(priv, UDBG6, "Received a WAPI data packet when the Unicast/Multicast filter is set\n");
res = read_unpack_signal(sigdata, &signal); res = read_unpack_signal(sigdata, &signal);
...@@ -578,7 +578,7 @@ unifi_process_receive_event(void *ospriv, ...@@ -578,7 +578,7 @@ unifi_process_receive_event(void *ospriv,
#ifdef CSR_WIFI_RX_PATH_SPLIT #ifdef CSR_WIFI_RX_PATH_SPLIT
static CsrBool signal_buffer_is_full(unifi_priv_t* priv) static u8 signal_buffer_is_full(unifi_priv_t* priv)
{ {
return (((priv->rxSignalBuffer.writePointer + 1)% priv->rxSignalBuffer.size) == (priv->rxSignalBuffer.readPointer)); return (((priv->rxSignalBuffer.writePointer + 1)% priv->rxSignalBuffer.size) == (priv->rxSignalBuffer.readPointer));
} }
......
drivers/staging/csr/unifi_pdu_processing.c
View file @ 5379b13d
...@@ -129,7 +129,7 @@ unifi_frame_ma_packet_req(unifi_priv_t *priv, CSR_PRIORITY priority, ...@@ -129,7 +129,7 @@ unifi_frame_ma_packet_req(unifi_priv_t *priv, CSR_PRIORITY priority,
static static
int frame_and_send_queued_pdu(unifi_priv_t* priv,tx_buffered_packets_t* buffered_pkt, int frame_and_send_queued_pdu(unifi_priv_t* priv,tx_buffered_packets_t* buffered_pkt,
CsrWifiRouterCtrlStaInfo_t *staRecord,CsrBool moreData , CsrBool eosp) CsrWifiRouterCtrlStaInfo_t *staRecord,u8 moreData , u8 eosp)
{ {
CSR_SIGNAL signal; CSR_SIGNAL signal;
...@@ -300,7 +300,7 @@ void verify_and_accomodate_tx_packet(unifi_priv_t *priv) ...@@ -300,7 +300,7 @@ void verify_and_accomodate_tx_packet(unifi_priv_t *priv)
struct list_head *listHead, *list; struct list_head *listHead, *list;
struct list_head *placeHolder; struct list_head *placeHolder;
u8 i, j,eospFramedeleted=0; u8 i, j,eospFramedeleted=0;
CsrBool thresholdExcedeDueToBroadcast = TRUE; u8 thresholdExcedeDueToBroadcast = TRUE;
/* it will be made it interface Specific in the future when multi interfaces are supported , /* it will be made it interface Specific in the future when multi interfaces are supported ,
right now interface 0 is considered */ right now interface 0 is considered */
netInterface_priv_t *interfacePriv = priv->interfacePriv[0]; netInterface_priv_t *interfacePriv = priv->interfacePriv[0];
...@@ -385,7 +385,7 @@ void verify_and_accomodate_tx_packet(unifi_priv_t *priv) ...@@ -385,7 +385,7 @@ void verify_and_accomodate_tx_packet(unifi_priv_t *priv)
static static
CsrResult enque_tx_data_pdu(unifi_priv_t *priv, bulk_data_param_t *bulkdata, CsrResult enque_tx_data_pdu(unifi_priv_t *priv, bulk_data_param_t *bulkdata,
struct list_head *list, CSR_SIGNAL *signal, struct list_head *list, CSR_SIGNAL *signal,
CsrBool requeueOnSamePos) u8 requeueOnSamePos)
{ {
/* queue the tx data packets on to appropriate queue */ /* queue the tx data packets on to appropriate queue */
...@@ -754,7 +754,7 @@ void uf_handle_tim_cfm(unifi_priv_t *priv, CSR_MLME_SET_TIM_CONFIRM *cfm, u16 re ...@@ -754,7 +754,7 @@ void uf_handle_tim_cfm(unifi_priv_t *priv, CSR_MLME_SET_TIM_CONFIRM *cfm, u16 re
* If failure crosses this Limit, we have to take a call to FIX * If failure crosses this Limit, we have to take a call to FIX
*/ */
if (retryCount > UNIFI_MAX_RETRY_LIMIT) { if (retryCount > UNIFI_MAX_RETRY_LIMIT) {
CsrBool moreData = FALSE; u8 moreData = FALSE;
retryCount = 0; retryCount = 0;
/* Because of continuos traffic in fh_cmd_q the tim set request is failing (exceeding retry limit) /* Because of continuos traffic in fh_cmd_q the tim set request is failing (exceeding retry limit)
* but if we didn't synchronize our timSet varible state with firmware then it can cause below issues * but if we didn't synchronize our timSet varible state with firmware then it can cause below issues
...@@ -959,7 +959,7 @@ void process_peer_active_transition(unifi_priv_t * priv, ...@@ -959,7 +959,7 @@ void process_peer_active_transition(unifi_priv_t * priv,
u16 interfaceTag) u16 interfaceTag)
{ {
int r,i; int r,i;
CsrBool spaceAvail[4] = {TRUE,TRUE,TRUE,TRUE}; u8 spaceAvail[4] = {TRUE,TRUE,TRUE,TRUE};
tx_buffered_packets_t * buffered_pkt = NULL; tx_buffered_packets_t * buffered_pkt = NULL;
unsigned long lock_flags; unsigned long lock_flags;
netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
...@@ -1514,8 +1514,8 @@ uf_ap_process_data_pdu(unifi_priv_t *priv, struct sk_buff *skb, ...@@ -1514,8 +1514,8 @@ uf_ap_process_data_pdu(unifi_priv_t *priv, struct sk_buff *skb,
struct sk_buff *newSkb = NULL; struct sk_buff *newSkb = NULL;
/* pointer to skb or private skb created using skb_copy() */ /* pointer to skb or private skb created using skb_copy() */
struct sk_buff *skbPtr = skb; struct sk_buff *skbPtr = skb;
CsrBool sendToNetdev = FALSE; u8 sendToNetdev = FALSE;
CsrBool qosDestination = FALSE; u8 qosDestination = FALSE;
CSR_PRIORITY priority = CSR_CONTENTION; CSR_PRIORITY priority = CSR_CONTENTION;
CsrWifiRouterCtrlStaInfo_t *dstStaInfo = NULL; CsrWifiRouterCtrlStaInfo_t *dstStaInfo = NULL;
netInterface_priv_t *interfacePriv; netInterface_priv_t *interfacePriv;
...@@ -1660,13 +1660,13 @@ CsrResult uf_process_ma_packet_req(unifi_priv_t *priv, ...@@ -1660,13 +1660,13 @@ CsrResult uf_process_ma_packet_req(unifi_priv_t *priv,
const u8 *macHdrLocation = bulkdata->d[0].os_data_ptr; const u8 *macHdrLocation = bulkdata->d[0].os_data_ptr;
CsrWifiPacketType pktType; CsrWifiPacketType pktType;
int frameType = 0; int frameType = 0;
CsrBool queuePacketDozing = FALSE; u8 queuePacketDozing = FALSE;
u32 priority_q; u32 priority_q;
u16 frmCtrl; u16 frmCtrl;
struct list_head * list = NULL; /* List to which buffered PDUs are to be enqueued*/ struct list_head * list = NULL; /* List to which buffered PDUs are to be enqueued*/
CsrBool setBcTim=FALSE; u8 setBcTim=FALSE;
netInterface_priv_t *interfacePriv; netInterface_priv_t *interfacePriv;
CsrBool requeueOnSamePos = FALSE; u8 requeueOnSamePos = FALSE;
u32 handle = 0xFFFFFFFF; u32 handle = 0xFFFFFFFF;
unsigned long lock_flags; unsigned long lock_flags;
...@@ -2021,7 +2021,7 @@ u8 send_multicast_frames(unifi_priv_t *priv, u16 interfaceTag) ...@@ -2021,7 +2021,7 @@ u8 send_multicast_frames(unifi_priv_t *priv, u16 interfaceTag)
{ {
int r; int r;
tx_buffered_packets_t * buffered_pkt = NULL; tx_buffered_packets_t * buffered_pkt = NULL;
CsrBool moreData = FALSE; u8 moreData = FALSE;
u8 pduSent =0; u8 pduSent =0;
unsigned long lock_flags; unsigned long lock_flags;
netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
...@@ -2203,7 +2203,7 @@ void uf_process_ma_vif_availibility_ind(unifi_priv_t *priv,u8 *sigdata, ...@@ -2203,7 +2203,7 @@ void uf_process_ma_vif_availibility_ind(unifi_priv_t *priv,u8 *sigdata,
#define GET_ACTIVE_INTERFACE_TAG(priv) 0 #define GET_ACTIVE_INTERFACE_TAG(priv) 0
static CsrBool uf_is_more_data_for_delivery_ac(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t *staRecord) static u8 uf_is_more_data_for_delivery_ac(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t *staRecord)
{ {
s8 i; s8 i;
...@@ -2221,7 +2221,7 @@ static CsrBool uf_is_more_data_for_delivery_ac(unifi_priv_t *priv, CsrWifiRouter ...@@ -2221,7 +2221,7 @@ static CsrBool uf_is_more_data_for_delivery_ac(unifi_priv_t *priv, CsrWifiRouter
return FALSE; return FALSE;
} }
static CsrBool uf_is_more_data_for_usp_delivery(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t *staRecord, unifi_TrafficQueue queue) static u8 uf_is_more_data_for_usp_delivery(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t *staRecord, unifi_TrafficQueue queue)
{ {
s8 i; s8 i;
...@@ -2268,9 +2268,9 @@ void uf_send_buffered_data_from_delivery_ac(unifi_priv_t *priv, ...@@ -2268,9 +2268,9 @@ void uf_send_buffered_data_from_delivery_ac(unifi_priv_t *priv,
u16 interfaceTag = GET_ACTIVE_INTERFACE_TAG(priv); u16 interfaceTag = GET_ACTIVE_INTERFACE_TAG(priv);
tx_buffered_packets_t * buffered_pkt = NULL; tx_buffered_packets_t * buffered_pkt = NULL;
unsigned long lock_flags; unsigned long lock_flags;
CsrBool eosp=FALSE; u8 eosp=FALSE;
s8 r =0; s8 r =0;
CsrBool moreData = FALSE; u8 moreData = FALSE;
netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
unifi_trace(priv, UDBG2, "++uf_send_buffered_data_from_delivery_ac, active=%x\n", staInfo->uapsdActive); unifi_trace(priv, UDBG2, "++uf_send_buffered_data_from_delivery_ac, active=%x\n", staInfo->uapsdActive);
...@@ -2368,8 +2368,8 @@ void uf_send_buffered_data_from_ac(unifi_priv_t *priv, ...@@ -2368,8 +2368,8 @@ void uf_send_buffered_data_from_ac(unifi_priv_t *priv,
{ {
tx_buffered_packets_t * buffered_pkt = NULL; tx_buffered_packets_t * buffered_pkt = NULL;
unsigned long lock_flags; unsigned long lock_flags;
CsrBool eosp=FALSE; u8 eosp=FALSE;
CsrBool moreData = FALSE; u8 moreData = FALSE;
s8 r =0; s8 r =0;
func_enter(); func_enter();
...@@ -2412,7 +2412,7 @@ void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q) ...@@ -2412,7 +2412,7 @@ void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q)
u32 startIndex=0,endIndex=0; u32 startIndex=0,endIndex=0;
CsrWifiRouterCtrlStaInfo_t * staInfo = NULL; CsrWifiRouterCtrlStaInfo_t * staInfo = NULL;
u8 queue; u8 queue;
CsrBool moreData = FALSE; u8 moreData = FALSE;
netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
...@@ -2549,7 +2549,7 @@ void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q) ...@@ -2549,7 +2549,7 @@ void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q)
} }
CsrBool uf_is_more_data_for_non_delivery_ac(CsrWifiRouterCtrlStaInfo_t *staRecord) u8 uf_is_more_data_for_non_delivery_ac(CsrWifiRouterCtrlStaInfo_t *staRecord)
{ {
u8 i; u8 i;
...@@ -2916,7 +2916,7 @@ void uf_send_nulldata(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI ...@@ -2916,7 +2916,7 @@ void uf_send_nulldata(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI
return; return;
} }
CsrBool uf_check_broadcast_bssid(unifi_priv_t *priv, const bulk_data_param_t *bulkdata) u8 uf_check_broadcast_bssid(unifi_priv_t *priv, const bulk_data_param_t *bulkdata)
{ {
u8 *bssid = NULL; u8 *bssid = NULL;
static const CsrWifiMacAddress broadcast_address = {{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}}; static const CsrWifiMacAddress broadcast_address = {{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}};
...@@ -2957,11 +2957,11 @@ CsrBool uf_check_broadcast_bssid(unifi_priv_t *priv, const bulk_data_param_t *bu ...@@ -2957,11 +2957,11 @@ CsrBool uf_check_broadcast_bssid(unifi_priv_t *priv, const bulk_data_param_t *bu
} }
CsrBool uf_process_pm_bit_for_peer(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t * srcStaInfo, u8 uf_process_pm_bit_for_peer(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t * srcStaInfo,
u8 pmBit,u16 interfaceTag) u8 pmBit,u16 interfaceTag)
{ {
CsrBool moreData = FALSE; u8 moreData = FALSE;
CsrBool powerSaveChanged = FALSE; u8 powerSaveChanged = FALSE;
unsigned long lock_flags; unsigned long lock_flags;
unifi_trace(priv, UDBG3, "entering uf_process_pm_bit_for_peer\n"); unifi_trace(priv, UDBG3, "entering uf_process_pm_bit_for_peer\n");
...@@ -3060,7 +3060,7 @@ void uf_process_ps_poll(unifi_priv_t *priv,u8* sa,u8* da,u8 pmBit,u16 interfaceT ...@@ -3060,7 +3060,7 @@ void uf_process_ps_poll(unifi_priv_t *priv,u8* sa,u8* da,u8 pmBit,u16 interfaceT
CsrWifiMacAddress peerMacAddress; CsrWifiMacAddress peerMacAddress;
unsigned long lock_flags; unsigned long lock_flags;
s8 r =0; s8 r =0;
CsrBool moreData = FALSE; u8 moreData = FALSE;
netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
unifi_trace(priv, UDBG3, "entering uf_process_ps_poll\n"); unifi_trace(priv, UDBG3, "entering uf_process_ps_poll\n");
...@@ -3594,7 +3594,7 @@ void resume_unicast_buffered_frames(unifi_priv_t *priv, u16 interfaceTag) ...@@ -3594,7 +3594,7 @@ void resume_unicast_buffered_frames(unifi_priv_t *priv, u16 interfaceTag)
u8 i; u8 i;
int j; int j;
tx_buffered_packets_t * buffered_pkt = NULL; tx_buffered_packets_t * buffered_pkt = NULL;
CsrBool hipslotFree[4] = {TRUE,TRUE,TRUE,TRUE}; u8 hipslotFree[4] = {TRUE,TRUE,TRUE,TRUE};
int r; int r;
unsigned long lock_flags; unsigned long lock_flags;
......
drivers/staging/csr/unifi_priv.h
View file @ 5379b13d
...@@ -323,10 +323,10 @@ typedef struct CsrWifiRouterCtrlStaInfo_t { ...@@ -323,10 +323,10 @@ typedef struct CsrWifiRouterCtrlStaInfo_t {
/* Sme sends these parameters */ /* Sme sends these parameters */
CsrWifiMacAddress peerMacAddress; CsrWifiMacAddress peerMacAddress;
u32 assignedHandle; u32 assignedHandle;
CsrBool wmmOrQosEnabled; u8 wmmOrQosEnabled;
CsrWifiAcPowersaveMode powersaveMode[MAX_ACCESS_CATOGORY]; CsrWifiAcPowersaveMode powersaveMode[MAX_ACCESS_CATOGORY];
u16 maxSpLength; u16 maxSpLength;
CsrBool uapsdActive; u8 uapsdActive;
u16 noOfSpFramesSent; u16 noOfSpFramesSent;
/* Router/Driver database */ /* Router/Driver database */
...@@ -337,7 +337,7 @@ typedef struct CsrWifiRouterCtrlStaInfo_t { ...@@ -337,7 +337,7 @@ typedef struct CsrWifiRouterCtrlStaInfo_t {
/* Inactivity feature parameters */ /* Inactivity feature parameters */
struct netInterface_priv *interfacePriv; struct netInterface_priv *interfacePriv;
struct work_struct send_disconnected_ind_task; struct work_struct send_disconnected_ind_task;
CsrBool activity_flag; u8 activity_flag;
u16 listenIntervalInTus; u16 listenIntervalInTus;
CSR_CLIENT_TAG nullDataHostTag; CSR_CLIENT_TAG nullDataHostTag;
...@@ -345,7 +345,7 @@ typedef struct CsrWifiRouterCtrlStaInfo_t { ...@@ -345,7 +345,7 @@ typedef struct CsrWifiRouterCtrlStaInfo_t {
CsrTime lastActivity; CsrTime lastActivity;
/* during m/c transmission sp suspended */ /* during m/c transmission sp suspended */
CsrBool uspSuspend; u8 uspSuspend;
CSR_PRIORITY triggerFramePriority; CSR_PRIORITY triggerFramePriority;
#endif #endif
CsrWifiRouterCtrlPeerStatus currentPeerState; CsrWifiRouterCtrlPeerStatus currentPeerState;
...@@ -354,9 +354,9 @@ typedef struct CsrWifiRouterCtrlStaInfo_t { ...@@ -354,9 +354,9 @@ typedef struct CsrWifiRouterCtrlStaInfo_t {
u8 spStatus; u8 spStatus;
u8 prevFrmType; u8 prevFrmType;
u8 prevFrmAccessCatogory; u8 prevFrmAccessCatogory;
CsrBool protection; u8 protection;
u16 aid; u16 aid;
CsrBool txSuspend; u8 txSuspend;
u8 timSet; u8 timSet;
/* Dont change the value of below macro for SET & RESET */ /* Dont change the value of below macro for SET & RESET */
#define CSR_WIFI_TIM_RESET 0 #define CSR_WIFI_TIM_RESET 0
...@@ -364,7 +364,7 @@ typedef struct CsrWifiRouterCtrlStaInfo_t { ...@@ -364,7 +364,7 @@ typedef struct CsrWifiRouterCtrlStaInfo_t {
#define CSR_WIFI_TIM_RESETTING 2 #define CSR_WIFI_TIM_RESETTING 2
#define CSR_WIFI_TIM_SETTING 3 #define CSR_WIFI_TIM_SETTING 3
CsrBool timRequestPendingFlag; u8 timRequestPendingFlag;
u8 updateTimReqQueued; u8 updateTimReqQueued;
u16 noOfPktQueued; u16 noOfPktQueued;
}CsrWifiRouterCtrlStaInfo_t; }CsrWifiRouterCtrlStaInfo_t;
...@@ -501,7 +501,7 @@ struct unifi_priv { ...@@ -501,7 +501,7 @@ struct unifi_priv {
#define CSR_WIFI_DRIVER_MAX_PKT_QUEUING_THRESHOLD_PER_PEER 64 #define CSR_WIFI_DRIVER_MAX_PKT_QUEUING_THRESHOLD_PER_PEER 64
#define CSR_WIFI_DRIVER_MINIMUM_BROADCAST_PKT_THRESHOLD 3 #define CSR_WIFI_DRIVER_MINIMUM_BROADCAST_PKT_THRESHOLD 3
CsrBool routerBufferEnable[MAX_ACCESS_CATOGORY]; u8 routerBufferEnable[MAX_ACCESS_CATOGORY];
/* lock to protect stainfo members and priv members*/ /* lock to protect stainfo members and priv members*/
spinlock_t staRecord_lock; spinlock_t staRecord_lock;
#endif #endif
...@@ -616,7 +616,7 @@ struct unifi_priv { ...@@ -616,7 +616,7 @@ struct unifi_priv {
int ptest_mode; /* Set when in production test mode */ int ptest_mode; /* Set when in production test mode */
int coredump_mode; /* Set when SME has requested a coredump */ int coredump_mode; /* Set when SME has requested a coredump */
CsrBool wol_suspend; /* Set when suspending with UniFi powered */ u8 wol_suspend; /* Set when suspending with UniFi powered */
#define UF_UNCONTROLLED_PORT_Q 0 #define UF_UNCONTROLLED_PORT_Q 0
#define UF_CONTROLLED_PORT_Q 1 #define UF_CONTROLLED_PORT_Q 1
...@@ -660,7 +660,7 @@ struct unifi_priv { ...@@ -660,7 +660,7 @@ struct unifi_priv {
u8 wapi_unicast_filter; u8 wapi_unicast_filter;
u8 wapi_unicast_queued_pkt_filter; u8 wapi_unicast_queued_pkt_filter;
#ifdef CSR_WIFI_SECURITY_WAPI_QOSCTRL_MIC_WORKAROUND #ifdef CSR_WIFI_SECURITY_WAPI_QOSCTRL_MIC_WORKAROUND
CsrBool isWapiConnection; u8 isWapiConnection;
#endif #endif
#endif #endif
...@@ -668,7 +668,7 @@ struct unifi_priv { ...@@ -668,7 +668,7 @@ struct unifi_priv {
CsrWifiRouterCtrlModeSetReq pending_mode_set; CsrWifiRouterCtrlModeSetReq pending_mode_set;
#endif #endif
CsrBool cmanrTestMode; u8 cmanrTestMode;
CSR_RATE cmanrTestModeTransmitRate; CSR_RATE cmanrTestModeTransmitRate;
}; };
...@@ -680,7 +680,7 @@ typedef struct { ...@@ -680,7 +680,7 @@ typedef struct {
typedef struct { typedef struct {
CsrBool active; u8 active;
bulk_data_param_t bulkdata; bulk_data_param_t bulkdata;
CSR_SIGNAL signal; CSR_SIGNAL signal;
u16 sn; u16 sn;
...@@ -695,7 +695,7 @@ typedef struct { ...@@ -695,7 +695,7 @@ typedef struct {
u16 timeout; u16 timeout;
u16 expected_sn; u16 expected_sn;
u16 start_sn; u16 start_sn;
CsrBool trigger_ba_after_ssn; u8 trigger_ba_after_ssn;
struct netInterface_priv *interfacePriv; struct netInterface_priv *interfacePriv;
u16 tID; u16 tID;
CsrWifiMacAddress macAddress; CsrWifiMacAddress macAddress;
...@@ -724,7 +724,7 @@ typedef struct netInterface_priv ...@@ -724,7 +724,7 @@ typedef struct netInterface_priv
#endif #endif
struct net_device_stats stats; struct net_device_stats stats;
u8 interfaceMode; u8 interfaceMode;
CsrBool protect; u8 protect;
CsrWifiMacAddress bssid; CsrWifiMacAddress bssid;
/* /*
* Flag to reflect state of CONNECTED indication signal. * Flag to reflect state of CONNECTED indication signal.
...@@ -739,9 +739,9 @@ typedef struct netInterface_priv ...@@ -739,9 +739,9 @@ typedef struct netInterface_priv
} connected; } connected;
#ifdef CSR_SUPPORT_WEXT #ifdef CSR_SUPPORT_WEXT
/* Tracks when we are waiting for a netdevice state change callback */ /* Tracks when we are waiting for a netdevice state change callback */
CsrBool wait_netdev_change; u8 wait_netdev_change;
/* True if we have successfully registered for netdev callbacks */ /* True if we have successfully registered for netdev callbacks */
CsrBool netdev_callback_registered; u8 netdev_callback_registered;
#endif /* CSR_SUPPORT_WEXT */ #endif /* CSR_SUPPORT_WEXT */
unsigned int netdev_registered; unsigned int netdev_registered;
#define UNIFI_MAX_MULTICAST_ADDRESSES 10 #define UNIFI_MAX_MULTICAST_ADDRESSES 10
...@@ -764,7 +764,7 @@ typedef struct netInterface_priv ...@@ -764,7 +764,7 @@ typedef struct netInterface_priv
/* Timer for detecting station inactivity */ /* Timer for detecting station inactivity */
struct timer_list sta_activity_check_timer; struct timer_list sta_activity_check_timer;
CsrBool sta_activity_check_enabled; u8 sta_activity_check_enabled;
/* Timestamp when the last inactivity check was done */ /* Timestamp when the last inactivity check was done */
CsrTime last_inactivity_check; CsrTime last_inactivity_check;
...@@ -787,15 +787,15 @@ typedef struct netInterface_priv ...@@ -787,15 +787,15 @@ typedef struct netInterface_priv
#endif #endif
/* This should be removed and m4_hostTag should be used for checking*/ /* This should be removed and m4_hostTag should be used for checking*/
CsrBool m4_sent; u8 m4_sent;
CSR_CLIENT_TAG m4_hostTag; CSR_CLIENT_TAG m4_hostTag;
CsrBool dtimActive; u8 dtimActive;
CsrBool intraBssEnabled; u8 intraBssEnabled;
u32 multicastPduHostTag; /* Used to set the tim after getting u32 multicastPduHostTag; /* Used to set the tim after getting
a confirm for it */ a confirm for it */
CsrBool bcTimSet; u8 bcTimSet;
CsrBool bcTimSetReqPendingFlag; u8 bcTimSetReqPendingFlag;
CsrBool bcTimSetReqQueued; u8 bcTimSetReqQueued;
} netInterface_priv_t; } netInterface_priv_t;
#ifndef ALLOW_Q_PAUSE #ifndef ALLOW_Q_PAUSE
...@@ -895,7 +895,7 @@ unifi_priv_t *uf_alloc_netdevice(CsrSdioFunction *sdio_dev, int bus_id); ...@@ -895,7 +895,7 @@ unifi_priv_t *uf_alloc_netdevice(CsrSdioFunction *sdio_dev, int bus_id);
int uf_free_netdevice(unifi_priv_t *priv); int uf_free_netdevice(unifi_priv_t *priv);
/* Allocating function for other interfaces */ /* Allocating function for other interfaces */
CsrBool uf_alloc_netdevice_for_other_interfaces(unifi_priv_t *priv, u16 interfaceTag); u8 uf_alloc_netdevice_for_other_interfaces(unifi_priv_t *priv, u16 interfaceTag);
/* /*
* Firmware download related functions. * Firmware download related functions.
...@@ -956,15 +956,15 @@ int uf_verify_m4(unifi_priv_t *priv, const unsigned char *packet, ...@@ -956,15 +956,15 @@ int uf_verify_m4(unifi_priv_t *priv, const unsigned char *packet,
unsigned int length); unsigned int length);
#ifdef CSR_SUPPORT_SME #ifdef CSR_SUPPORT_SME
CsrBool uf_check_broadcast_bssid(unifi_priv_t *priv, const bulk_data_param_t *bulkdata); u8 uf_check_broadcast_bssid(unifi_priv_t *priv, const bulk_data_param_t *bulkdata);
CsrBool uf_process_pm_bit_for_peer(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t * srcStaInfo,u8 pmBit,u16 interfaceTag); u8 uf_process_pm_bit_for_peer(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t * srcStaInfo,u8 pmBit,u16 interfaceTag);
void uf_process_ps_poll(unifi_priv_t *priv,u8* sa,u8* da,u8 pmBit,u16 interfaceTag); void uf_process_ps_poll(unifi_priv_t *priv,u8* sa,u8* da,u8 pmBit,u16 interfaceTag);
int uf_ap_process_data_pdu(unifi_priv_t *priv, struct sk_buff *skb, int uf_ap_process_data_pdu(unifi_priv_t *priv, struct sk_buff *skb,
struct ethhdr *ehdr, CsrWifiRouterCtrlStaInfo_t * srcStaInfo, struct ethhdr *ehdr, CsrWifiRouterCtrlStaInfo_t * srcStaInfo,
const CSR_SIGNAL *signal, const CSR_SIGNAL *signal,
bulk_data_param_t *bulkdata, bulk_data_param_t *bulkdata,
u8 macHeaderLengthInBytes); u8 macHeaderLengthInBytes);
CsrBool uf_is_more_data_for_non_delivery_ac(CsrWifiRouterCtrlStaInfo_t *staRecord); u8 uf_is_more_data_for_non_delivery_ac(CsrWifiRouterCtrlStaInfo_t *staRecord);
void uf_process_wmm_deliver_ac_uapsd ( unifi_priv_t * priv, void uf_process_wmm_deliver_ac_uapsd ( unifi_priv_t * priv,
CsrWifiRouterCtrlStaInfo_t * srcStaInfo, CsrWifiRouterCtrlStaInfo_t * srcStaInfo,
u16 qosControl, u16 qosControl,
...@@ -1031,7 +1031,7 @@ int prepare_and_add_macheader(unifi_priv_t *priv, ...@@ -1031,7 +1031,7 @@ int prepare_and_add_macheader(unifi_priv_t *priv,
u16 interfaceTag, u16 interfaceTag,
const u8 *daddr, const u8 *daddr,
const u8 *saddr, const u8 *saddr,
CsrBool protection); u8 protection);
CSR_PRIORITY CSR_PRIORITY
get_packet_priority(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr *ehdr, netInterface_priv_t *interfacePriv); get_packet_priority(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr *ehdr, netInterface_priv_t *interfacePriv);
...@@ -1064,7 +1064,7 @@ void scroll_ba_window(unifi_priv_t *priv, ...@@ -1064,7 +1064,7 @@ void scroll_ba_window(unifi_priv_t *priv,
ba_session_rx_struct *ba_session, ba_session_rx_struct *ba_session,
u16 sn); u16 sn);
CsrBool blockack_session_stop(unifi_priv_t *priv, u8 blockack_session_stop(unifi_priv_t *priv,
u16 interfaceTag, u16 interfaceTag,
CsrWifiRouterCtrlBlockAckRole role, CsrWifiRouterCtrlBlockAckRole role,
u16 tID, u16 tID,
......
drivers/staging/csr/unifi_sme.c
View file @ 5379b13d
...@@ -115,7 +115,7 @@ sme_log_event(ul_client_t *pcli, ...@@ -115,7 +115,7 @@ sme_log_event(ul_client_t *pcli,
if (unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_MA_PACKET_INDICATION_ID) if (unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_MA_PACKET_INDICATION_ID)
{ {
u16 frmCtrl; u16 frmCtrl;
CsrBool unicastPdu = TRUE; u8 unicastPdu = TRUE;
u8 *macHdrLocation; u8 *macHdrLocation;
u8 *raddr = NULL, *taddr = NULL; u8 *raddr = NULL, *taddr = NULL;
CsrWifiMacAddress peerMacAddress; CsrWifiMacAddress peerMacAddress;
...@@ -727,7 +727,7 @@ int unifi_cfg_wmm_delts(unifi_priv_t *priv, unsigned char *arg) ...@@ -727,7 +727,7 @@ int unifi_cfg_wmm_delts(unifi_priv_t *priv, unsigned char *arg)
int unifi_cfg_strict_draft_n(unifi_priv_t *priv, unsigned char *arg) int unifi_cfg_strict_draft_n(unifi_priv_t *priv, unsigned char *arg)
{ {
CsrBool strict_draft_n; u8 strict_draft_n;
u8 *strict_draft_n_params; u8 *strict_draft_n_params;
int rc; int rc;
...@@ -735,7 +735,7 @@ int unifi_cfg_strict_draft_n(unifi_priv_t *priv, unsigned char *arg) ...@@ -735,7 +735,7 @@ int unifi_cfg_strict_draft_n(unifi_priv_t *priv, unsigned char *arg)
CsrWifiSmeDeviceConfig deviceConfig; CsrWifiSmeDeviceConfig deviceConfig;
strict_draft_n_params = (u8*)(((unifi_cfg_command_t*)arg) + 1); strict_draft_n_params = (u8*)(((unifi_cfg_command_t*)arg) + 1);
if (get_user(strict_draft_n, (CsrBool*)strict_draft_n_params)) { if (get_user(strict_draft_n, (u8*)strict_draft_n_params)) {
unifi_error(priv, "unifi_cfg_strict_draft_n: Failed to get the argument\n"); unifi_error(priv, "unifi_cfg_strict_draft_n: Failed to get the argument\n");
return -EFAULT; return -EFAULT;
} }
...@@ -763,7 +763,7 @@ int unifi_cfg_strict_draft_n(unifi_priv_t *priv, unsigned char *arg) ...@@ -763,7 +763,7 @@ int unifi_cfg_strict_draft_n(unifi_priv_t *priv, unsigned char *arg)
int unifi_cfg_enable_okc(unifi_priv_t *priv, unsigned char *arg) int unifi_cfg_enable_okc(unifi_priv_t *priv, unsigned char *arg)
{ {
CsrBool enable_okc; u8 enable_okc;
u8 *enable_okc_params; u8 *enable_okc_params;
int rc; int rc;
...@@ -771,7 +771,7 @@ int unifi_cfg_enable_okc(unifi_priv_t *priv, unsigned char *arg) ...@@ -771,7 +771,7 @@ int unifi_cfg_enable_okc(unifi_priv_t *priv, unsigned char *arg)
CsrWifiSmeDeviceConfig deviceConfig; CsrWifiSmeDeviceConfig deviceConfig;
enable_okc_params = (u8*)(((unifi_cfg_command_t*)arg) + 1); enable_okc_params = (u8*)(((unifi_cfg_command_t*)arg) + 1);
if (get_user(enable_okc, (CsrBool*)enable_okc_params)) { if (get_user(enable_okc, (u8*)enable_okc_params)) {
unifi_error(priv, "unifi_cfg_enable_okc: Failed to get the argument\n"); unifi_error(priv, "unifi_cfg_enable_okc: Failed to get the argument\n");
return -EFAULT; return -EFAULT;
} }
...@@ -914,7 +914,7 @@ int ...@@ -914,7 +914,7 @@ int
uf_configure_supported_rates(u8 * supportedRates, u8 phySupportedBitmap) uf_configure_supported_rates(u8 * supportedRates, u8 phySupportedBitmap)
{ {
int i=0; int i=0;
CsrBool b=FALSE, g = FALSE, n = FALSE; u8 b=FALSE, g = FALSE, n = FALSE;
b = phySupportedBitmap & CSR_WIFI_SME_AP_PHY_SUPPORT_B; b = phySupportedBitmap & CSR_WIFI_SME_AP_PHY_SUPPORT_B;
n = phySupportedBitmap & CSR_WIFI_SME_AP_PHY_SUPPORT_N; n = phySupportedBitmap & CSR_WIFI_SME_AP_PHY_SUPPORT_N;
g = phySupportedBitmap & CSR_WIFI_SME_AP_PHY_SUPPORT_G; g = phySupportedBitmap & CSR_WIFI_SME_AP_PHY_SUPPORT_G;
......
drivers/staging/csr/unifi_sme.h
View file @ 5379b13d
...@@ -27,7 +27,7 @@ typedef int unifi_data_port_action; ...@@ -27,7 +27,7 @@ typedef int unifi_data_port_action;
typedef struct unifi_port_cfg typedef struct unifi_port_cfg
{ {
/* TRUE if this port entry is allocated */ /* TRUE if this port entry is allocated */
CsrBool in_use; u8 in_use;
CsrWifiRouterCtrlPortAction port_action; CsrWifiRouterCtrlPortAction port_action;
CsrWifiMacAddress mac_address; CsrWifiMacAddress mac_address;
} unifi_port_cfg_t; } unifi_port_cfg_t;
......
drivers/staging/csr/unifi_wext.h
View file @ 5379b13d
...@@ -60,7 +60,7 @@ void wext_send_disassoc_event(unifi_priv_t *priv); ...@@ -60,7 +60,7 @@ void wext_send_disassoc_event(unifi_priv_t *priv);
void wext_send_michaelmicfailure_event(unifi_priv_t *priv, void wext_send_michaelmicfailure_event(unifi_priv_t *priv,
u16 count, CsrWifiMacAddress address, u16 count, CsrWifiMacAddress address,
CsrWifiSmeKeyType keyType, u16 interfaceTag); CsrWifiSmeKeyType keyType, u16 interfaceTag);
void wext_send_pmkid_candidate_event(unifi_priv_t *priv, CsrWifiMacAddress bssid, CsrBool preauth_allowed, u16 interfaceTag); void wext_send_pmkid_candidate_event(unifi_priv_t *priv, CsrWifiMacAddress bssid, u8 preauth_allowed, u16 interfaceTag);
void wext_send_started_event(unifi_priv_t *priv); void wext_send_started_event(unifi_priv_t *priv);
......
drivers/staging/csr/unifiio.h
View file @ 5379b13d
...@@ -314,15 +314,15 @@ typedef struct uf_cfg_ap_config ...@@ -314,15 +314,15 @@ typedef struct uf_cfg_ap_config
u8 channel; u8 channel;
u16 beaconInterval; u16 beaconInterval;
u8 dtimPeriod; u8 dtimPeriod;
CsrBool wmmEnabled; u8 wmmEnabled;
u8 shortSlotTimeEnabled; u8 shortSlotTimeEnabled;
u16 groupkeyTimeout; u16 groupkeyTimeout;
CsrBool strictGtkRekeyEnabled; u8 strictGtkRekeyEnabled;
u16 gmkTimeout; u16 gmkTimeout;
u16 responseTimeout; u16 responseTimeout;
u8 retransLimit; u8 retransLimit;
u8 rxStbc; u8 rxStbc;
CsrBool rifsModeAllowed; u8 rifsModeAllowed;
u8 dualCtsProtection; u8 dualCtsProtection;
u8 ctsProtectionType; u8 ctsProtectionType;
u16 maxListenInterval; u16 maxListenInterval;
......
drivers/staging/csr/wext_events.c
View file @ 5379b13d
...@@ -238,7 +238,7 @@ wext_send_michaelmicfailure_event(unifi_priv_t *priv, ...@@ -238,7 +238,7 @@ wext_send_michaelmicfailure_event(unifi_priv_t *priv,
} /* wext_send_michaelmicfailure_event() */ } /* wext_send_michaelmicfailure_event() */
void void
wext_send_pmkid_candidate_event(unifi_priv_t *priv, CsrWifiMacAddress bssid, CsrBool preauth_allowed, u16 interfaceTag) wext_send_pmkid_candidate_event(unifi_priv_t *priv, CsrWifiMacAddress bssid, u8 preauth_allowed, u16 interfaceTag)
{ {
#if WIRELESS_EXT > 17 #if WIRELESS_EXT > 17
union iwreq_data wrqu; union iwreq_data wrqu;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7