---

yaml --- r: 318157 b: refs/heads/master c: 5379b13 h: refs/heads/master i: 318155: 4acda4b v: v3
git-mirror · Jul 20, 2012 · 157c38f · 157c38f
1 parent 8b96ab1
commit 157c38f
Show file tree

Hide file tree

Showing 39 changed files with 265 additions and 268 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c781b96b8007d758a38e9c670957ba48e254f039
+refs/heads/master: 5379b13d9e063e9bb2078a1c642f8df8c914e022
diff --git a/trunk/drivers/staging/csr/csr_log.h b/trunk/drivers/staging/csr/csr_log.h
@@ -71,9 +71,9 @@ typedef u32 CsrLogLevelTask;
 /* The bit masks between here are reserved for future usage */
 #define CSR_LOG_LEVEL_TASK_ALL                 ((CsrLogLevelTask) 0xFFFFFFFF & ~(CSR_LOG_LEVEL_TASK_PRIM_ONLY_TYPE | CSR_LOG_LEVEL_TASK_PRIM_APPLY_LIMIT)) /* All info possible to log for a task are logged. WARNING: By using this define the application also accepts future possible task data/events in the logs */
 
-CsrBool CsrLogEnvironmentIsFiltered(CsrLogLevelEnvironment level);
+u8 CsrLogEnvironmentIsFiltered(CsrLogLevelEnvironment level);
 CsrLogLevelTask CsrLogTaskFilterGet(CsrSchedQid taskId);
-CsrBool CsrLogTaskIsFiltered(CsrSchedQid taskId, CsrLogLevelTask level);
+u8 CsrLogTaskIsFiltered(CsrSchedQid taskId, CsrLogLevelTask level);
 
 /*
  * Logging stuff
@@ -193,7 +193,7 @@ void CsrLogMessagePut(u32 line,
 
 void CsrLogMessageGet(CsrSchedQid src_task_id,
     CsrSchedQid dst_taskid,
-    CsrBool get_res,
+    u8 get_res,
     CsrSchedMsgId msg_id,
     u16 prim_type,
     const void *msg);
@@ -216,7 +216,7 @@ void CsrLogTimedEventCancel(u32 line,
     const char *file,
     CsrSchedQid task_id,
     CsrSchedTid tid,
-    CsrBool cancel_res);
+    u8 cancel_res);
 
 void CsrLogBgintRegister(u8 thread_id,
     CsrSchedBgint irq,

diff --git a/trunk/drivers/staging/csr/csr_macro.h b/trunk/drivers/staging/csr/csr_macro.h
@@ -23,7 +23,7 @@ extern "C" {
 #define CSR_MASK_IS_UNSET(val, mask) ((((val) & (mask)) ^ mask) == (mask))
 #define CSR_MASK_SET(val, mask)    ((val) |= (mask))
 #define CSR_MASK_UNSET(val, mask)  ((val) = ((val) ^ (mask)) & (val)) /* Unsets the bits in val that are set in mask */
-#define CSR_BIT_IS_SET(val, bit)   ((CsrBool) ((((val) & (1UL << (bit))) != 0)))
+#define CSR_BIT_IS_SET(val, bit)   ((u8) ((((val) & (1UL << (bit))) != 0)))
 #define CSR_BIT_SET(val, bit)      ((val) |= (1UL << (bit)))
 #define CSR_BIT_UNSET(val, bit)    ((val) &= ~(1UL << (bit)))
 #define CSR_BIT_TOGGLE(val, bit)   ((val) ^= (1UL << (bit)))

diff --git a/trunk/drivers/staging/csr/csr_msgconv.c b/trunk/drivers/staging/csr/csr_msgconv.c
@@ -133,10 +133,10 @@ static CsrSize sizeof_message(u16 primType, void *msg)
     return ret;
 }
 
-static CsrBool free_message(u16 primType, u8 *data)
+static u8 free_message(u16 primType, u8 *data)
 {
     CsrMsgConvPrimEntry *ptr;
-    CsrBool ret;
+    u8 ret;
 
     ptr = CsrMsgConvFind(primType);
 

diff --git a/trunk/drivers/staging/csr/csr_msgconv.h b/trunk/drivers/staging/csr/csr_msgconv.h
@@ -51,7 +51,7 @@ typedef struct
 {
     CsrMsgConvPrimEntry *profile_converters;
     void *(*deserialize_data)(u16 primType, CsrSize length, u8 * data);
-    CsrBool (*free_message)(u16 primType, u8 *data);
+    u8 (*free_message)(u16 primType, u8 *data);
     CsrSize (*sizeof_message)(u16 primType, void *msg);
     u8 *(*serialize_message)(u16 primType, void *msg,
                                    CsrSize * length,

diff --git a/trunk/drivers/staging/csr/csr_sched.h b/trunk/drivers/staging/csr/csr_sched.h
@@ -185,15 +185,15 @@ void CsrSchedMessageBroadcast(u16 mi,
  *      The message consists of one or both of a u16 and a void *.
  *
  *  RETURNS
- *      CsrBool - TRUE if a message has been obtained from the queue, else FALSE.
+ *      u8 - TRUE if a message has been obtained from the queue, else FALSE.
  *      If a message is taken from the queue, then "*pmi" and "*pmv" are set to
  *      the "mi" and "mv" passed to CsrSchedMessagePut() respectively.
  *
  *      "pmi" and "pmv" can be null, in which case the corresponding value from
  *      them message is discarded.
  *
  *----------------------------------------------------------------------------*/
-CsrBool CsrSchedMessageGet(u16 *pmi, void **pmv);
+u8 CsrSchedMessageGet(u16 *pmi, void **pmv);
 
 /*----------------------------------------------------------------------------*
  *  NAME
@@ -241,18 +241,18 @@ CsrSchedTid CsrSchedTimerSet(CsrTime delay,
  *      occurring.
  *
  *  RETURNS
- *      CsrBool - TRUE if cancelled, FALSE if the event has already occurred.
+ *      u8 - TRUE if cancelled, FALSE if the event has already occurred.
  *
  *----------------------------------------------------------------------------*/
 #if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER)
-CsrBool CsrSchedTimerCancelStringLog(CsrSchedTid eventid,
+u8 CsrSchedTimerCancelStringLog(CsrSchedTid eventid,
     u16 *pmi,
     void **pmv,
     u32 line,
     const char *file);
 #define CsrSchedTimerCancel(e, pmi, pmv) CsrSchedTimerCancelStringLog((e), (pmi), (pmv), __LINE__, __FILE__)
 #else
-CsrBool CsrSchedTimerCancel(CsrSchedTid eventid,
+u8 CsrSchedTimerCancel(CsrSchedTid eventid,
     u16 *pmi,
     void **pmv);
 #endif

diff --git a/trunk/drivers/staging/csr/csr_types.h b/trunk/drivers/staging/csr/csr_types.h
@@ -32,9 +32,6 @@ typedef ptrdiff_t CsrPtrdiff;   /* Type of the result of subtracting two pointer
 typedef uintptr_t CsrUintptr;   /* Unsigned integer large enough to hold any pointer (ISO/IEC 9899:1999 7.18.1.4) */
 typedef ptrdiff_t CsrIntptr;    /* intptr_t is not defined in kernel. Use the equivalent ptrdiff_t. */
 
-/* Boolean */
-typedef u8 CsrBool;
-
 /*
  * 64-bit integers
  *

diff --git a/trunk/drivers/staging/csr/csr_utf16.c b/trunk/drivers/staging/csr/csr_utf16.c
@@ -261,7 +261,7 @@ u8 *CsrUtf16String2Utf8(const u16 *source)
     u32 length;
     u32 sourceLength;
     u8 bytes;
-    CsrBool appendNull = FALSE;
+    u8 appendNull = FALSE;
 
     u8 firstByteMark[5] = {0x00, 0x00, 0xC0, 0xE0, 0xF0};
 
@@ -463,7 +463,7 @@ u8 *CsrUtf16String2Utf8(const u16 *source)
         TRUE if the given code unit is legal.
 
 *****************************************************************************/
-static CsrBool isLegalUtf8(const u8 *codeUnit, u32 length)
+static u8 isLegalUtf8(const u8 *codeUnit, u32 length)
 {
     const u8 *srcPtr = codeUnit + length;
     u8 byte;
@@ -815,7 +815,7 @@ u16 *CsrUtf16String2XML(u16 *str)
     u16 *outputString = NULL;
     u16 *resultString = str;
     u32 stringLength = 0;
-    CsrBool encodeChars = FALSE;
+    u8 encodeChars = FALSE;
 
     scanString = str;
     if (scanString)
@@ -908,7 +908,7 @@ u16 *CsrXML2Utf16String(u16 *str)
     u16 *outputString = NULL;
     u16 *resultString = str;
     u32 stringLength = 0;
-    CsrBool encodeChars = FALSE;
+    u8 encodeChars = FALSE;
 
     scanString = str;
     if (scanString)

diff --git a/trunk/drivers/staging/csr/csr_util.c b/trunk/drivers/staging/csr/csr_util.c
@@ -53,7 +53,7 @@ u8 CsrBitCountDense(u32 n)
 /*------------------------------------------------------------------*/
 /* Base conversion */
 /*------------------------------------------------------------------*/
-CsrBool CsrHexStrToUint8(const char *string, u8 *returnValue)
+u8 CsrHexStrToUint8(const char *string, u8 *returnValue)
 {
     u16 currentIndex = 0;
     *returnValue = 0;
@@ -77,7 +77,7 @@ CsrBool CsrHexStrToUint8(const char *string, u8 *returnValue)
     return FALSE;
 }
 
-CsrBool CsrHexStrToUint16(const char *string, u16 *returnValue)
+u8 CsrHexStrToUint16(const char *string, u16 *returnValue)
 {
     u16 currentIndex = 0;
     *returnValue = 0;
@@ -101,7 +101,7 @@ CsrBool CsrHexStrToUint16(const char *string, u16 *returnValue)
     return FALSE;
 }
 
-CsrBool CsrHexStrToUint32(const char *string, u32 *returnValue)
+u8 CsrHexStrToUint32(const char *string, u32 *returnValue)
 {
     u16 currentIndex = 0;
     *returnValue = 0;
@@ -150,7 +150,7 @@ void CsrIntToBase10(s32 number, char *str)
     s32 digit;
     u8 index;
     char res[I2B10_MAX];
-    CsrBool foundDigit = FALSE;
+    u8 foundDigit = FALSE;
 
     for (digit = 0; digit < I2B10_MAX; digit++)
     {
@@ -423,7 +423,7 @@ const char *CsrGetBaseName(const char *file)
 /*------------------------------------------------------------------*/
 /* Misc */
 /*------------------------------------------------------------------*/
-CsrBool CsrIsSpace(u8 c)
+u8 CsrIsSpace(u8 c)
 {
     switch (c)
     {

diff --git a/trunk/drivers/staging/csr/csr_util.h b/trunk/drivers/staging/csr/csr_util.h
@@ -26,9 +26,9 @@ u8 CsrBitCountDense(u32 n);
 /*------------------------------------------------------------------*/
 /* Base conversion */
 /*------------------------------------------------------------------*/
-CsrBool CsrHexStrToUint8(const char *string, u8 *returnValue);
-CsrBool CsrHexStrToUint16(const char *string, u16 *returnValue);
-CsrBool CsrHexStrToUint32(const char *string, u32 *returnValue);
+u8 CsrHexStrToUint8(const char *string, u8 *returnValue);
+u8 CsrHexStrToUint16(const char *string, u16 *returnValue);
+u8 CsrHexStrToUint32(const char *string, u32 *returnValue);
 u32 CsrPow(u32 base, u32 exponent);
 void CsrIntToBase10(s32 number, char *str);
 void CsrUInt16ToHex(u16 number, char *str);
@@ -85,7 +85,7 @@ const char *CsrGetBaseName(const char *file);
 /*------------------------------------------------------------------*/
 /* Misc */
 /*------------------------------------------------------------------*/
-CsrBool CsrIsSpace(u8 c);
+u8 CsrIsSpace(u8 c);
 #define CsrOffsetOf(st, m)  ((CsrSize) & ((st *) 0)->m)
 
 #ifdef __cplusplus

diff --git a/trunk/drivers/staging/csr/csr_wifi_fsm.h b/trunk/drivers/staging/csr/csr_wifi_fsm.h
@@ -226,9 +226,9 @@ extern void CsrWifiFsmTestAdvanceTime(CsrWifiFsmContext *context, u32 ms);
  * @param[in]    context    : FSM context
  *
  * @return
- *   CsrBool returns TRUE if there are events for the FSM to process
+ *   u8 returns TRUE if there are events for the FSM to process
  */
-extern CsrBool CsrWifiFsmHasEvents(CsrWifiFsmContext *context);
+extern u8 CsrWifiFsmHasEvents(CsrWifiFsmContext *context);
 
 /**
  * @brief

diff --git a/trunk/drivers/staging/csr/csr_wifi_fsm_types.h b/trunk/drivers/staging/csr/csr_wifi_fsm_types.h
@@ -220,7 +220,7 @@ typedef struct
 typedef struct
 {
     const u8              numEntries;
-    const CsrBool               saveAll;
+    const u8               saveAll;
     const CsrWifiFsmEventEntry *eventEntryArray; /* array of transition function pointers for state */
 #ifdef CSR_LOG_ENABLE
     u16            stateNumber;
@@ -391,7 +391,7 @@ struct CsrWifiFsmContext
 #endif
     u32                          timeOffset;            /* Amount to adjust the TimeOfDayMs by          */
     CsrWifiFsmTimerList                timerQueue;            /* The internal timer queue                     */
-    CsrBool                            useTempSaveList;       /* Should the temp save list be used            */
+    u8                            useTempSaveList;       /* Should the temp save list be used            */
     CsrWifiFsmEventList                tempSaveList;          /* The temp save event queue                    */
     CsrWifiFsmEvent                   *eventForwardedOrSaved; /* The event that was forwarded or Saved        */
     u16                          maxProcesses;          /* Size of instanceArray                        */

diff --git a/trunk/drivers/staging/csr/csr_wifi_hip_card.h b/trunk/drivers/staging/csr/csr_wifi_hip_card.h
@@ -43,7 +43,7 @@ CsrResult CardGenInt(card_t *card);
 /*****************************************************************************
  * CardPendingInt -
  */
-CsrResult CardPendingInt(card_t *card, CsrBool *pintr);
+CsrResult CardPendingInt(card_t *card, u8 *pintr);
 
 /*****************************************************************************
  * CardDisableInt -
@@ -63,7 +63,7 @@ void CardDisable(card_t *card);
 /*****************************************************************************
  * CardIntEnabled -
  */
-CsrResult CardIntEnabled(card_t *card, CsrBool *enabled);
+CsrResult CardIntEnabled(card_t *card, u8 *enabled);
 
 /*****************************************************************************
  * CardGetDataSlotSize

diff --git a/trunk/drivers/staging/csr/csr_wifi_hip_card_sdio.c b/trunk/drivers/staging/csr/csr_wifi_hip_card_sdio.c
@@ -3261,7 +3261,7 @@ CsrResult CardDisableInt(card_t *card)
  *      CSR_RESULT_FAILURE            if an SDIO error occurred,
  * ---------------------------------------------------------------------------
  */
-CsrResult CardPendingInt(card_t *card, CsrBool *pintr)
+CsrResult CardPendingInt(card_t *card, u8 *pintr)
 {
     CsrResult r;
     u8 pending;
@@ -3303,7 +3303,7 @@ CsrResult CardPendingInt(card_t *card, CsrBool *pintr)
 CsrResult CardClearInt(card_t *card)
 {
     CsrResult r;
-    CsrBool intr;
+    u8 intr;
 
     if (card->chip_id > SDIO_CARD_ID_UNIFI_2)
     {
@@ -3361,7 +3361,7 @@ CsrResult CardClearInt(card_t *card)
  *      CSR_RESULT_FAILURE            if an SDIO error occurred,
  * ---------------------------------------------------------------------------
  */
-CsrResult CardIntEnabled(card_t *card, CsrBool *enabled)
+CsrResult CardIntEnabled(card_t *card, u8 *enabled)
 {
     CsrResult r;
     u8 int_enable;
@@ -4036,7 +4036,7 @@ CsrResult unifi_check_io_status(card_t *card, s32 *status)
 {
     u8 io_en;
     CsrResult r;
-    CsrBool pending;
+    u8 pending;
 
     *status = 0;
 

diff --git a/trunk/drivers/staging/csr/csr_wifi_hip_card_sdio.h b/trunk/drivers/staging/csr/csr_wifi_hip_card_sdio.h
@@ -300,7 +300,7 @@ typedef struct
     u16 packets_interval;
 
     /* Once a queue reaches a stable state, avoid processing */
-    CsrBool queue_stable[UNIFI_NO_OF_TX_QS];
+    u8 queue_stable[UNIFI_NO_OF_TX_QS];
 } card_dynamic_slot_t;
 
 
@@ -566,7 +566,7 @@ struct card
     u16 sdio_io_block_size;
 
     /* Pad transfer sizes to SDIO block boundaries */
-    CsrBool sdio_io_block_pad;
+    u8 sdio_io_block_pad;
 
     /* Read from the XBV */
     struct FWOV fwov;

diff --git a/trunk/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c b/trunk/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c
@@ -43,7 +43,7 @@
 
 
 static CsrResult process_bh(card_t *card);
-static CsrResult handle_host_protocol(card_t *card, CsrBool *processed_something);
+static CsrResult handle_host_protocol(card_t *card, u8 *processed_something);
 
 static CsrResult flush_fh_buffer(card_t *card);
 
@@ -358,7 +358,7 @@ CsrResult unifi_bh(card_t *card, u32 *remaining)
 {
     CsrResult r;
     CsrResult csrResult;
-    CsrBool pending;
+    u8 pending;
     s32 iostate, j;
     const enum unifi_low_power_mode low_power_mode = card->low_power_mode;
     u16 data_slots_used = 0;
@@ -700,7 +700,7 @@ static CsrResult process_clock_request(card_t *card)
 static CsrResult process_bh(card_t *card)
 {
     CsrResult r;
-    CsrBool more;
+    u8 more;
     more = FALSE;
 
     /* Process the reasons (interrupt, signals) */
@@ -842,7 +842,7 @@ static CsrResult process_bh(card_t *card)
  *      CSR_RESULT_SUCCESS on success or CSR error code.
  * ---------------------------------------------------------------------------
  */
-static CsrResult handle_host_protocol(card_t *card, CsrBool *processed_something)
+static CsrResult handle_host_protocol(card_t *card, u8 *processed_something)
 {
     CsrResult r;
     s32 done;

diff --git a/trunk/drivers/staging/csr/csr_wifi_nme_ap_prim.h b/trunk/drivers/staging/csr/csr_wifi_nme_ap_prim.h
@@ -78,7 +78,7 @@ typedef u8 CsrWifiNmeApPersCredentialType;
 typedef struct
 {
     u16 apGroupkeyTimeout;
-    CsrBool   apStrictGtkRekey;
+    u8   apStrictGtkRekey;
     u16 apGmkTimeout;
     u16 apResponseTimeout;
     u8  apRetransLimit;
@@ -256,14 +256,14 @@ typedef struct
     CsrWifiFsmEvent         common;
     u16               interfaceTag;
     CsrWifiSmeApType        apType;
-    CsrBool                 cloakSsid;
+    u8                 cloakSsid;
     CsrWifiSsid             ssid;
     CsrWifiSmeRadioIF       ifIndex;
     u8                channel;
     CsrWifiNmeApCredentials apCredentials;
     u8                maxConnections;
     CsrWifiSmeApP2pGoConfig p2pGoParam;
-    CsrBool                 wpsEnabled;
+    u8                 wpsEnabled;
 } CsrWifiNmeApStartReq;
 
 /*******************************************************************************
@@ -334,7 +334,7 @@ typedef struct
     CsrWifiFsmEvent   common;
     u16         interfaceTag;
     CsrWifiMacAddress staMacAddress;
-    CsrBool           keepBlocking;
+    u8           keepBlocking;
 } CsrWifiNmeApStaRemoveReq;
 
 /*******************************************************************************