Skip to contentSkip to conversation

staging: vt6656: channel, datarate, device, dpc: Change BOOL to int

PATCH In review Marcos Paulo de Souza 1 participant 1 message Dec 5, 2011 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 staging: vt6656: channel, datarate, device, dpc: Change BOOL to int

This patch change all variables of BOOL type for int. This change is needed by the TODO file, asking to remove the ttype.h file. The BOOL type is just a typedef of int type, so remove it.

---
 drivers/staging/vt6656/channel.c  |   13 ++--
 drivers/staging/vt6656/channel.h  |    6 +-
 drivers/staging/vt6656/datarate.c |    4 +-
 drivers/staging/vt6656/datarate.h |    2 +-
 drivers/staging/vt6656/device.h   |  138 ++++++++++++++++++------------------
 drivers/staging/vt6656/dpc.c      |   59 +++++++---------
 drivers/staging/vt6656/dpc.h      |    4 +-
 drivers/staging/vt6656/firmware.c |   10 +--
 drivers/staging/vt6656/firmware.h |    6 +-
 drivers/staging/vt6656/hostap.c   |    2 +-
 10 files changed, 116 insertions(+), 128 deletions(-)
drivers/staging/vt6656/channel.c +5 -8
index 99e054d..69d3717 100644
@@ -389,10 +389,9 @@ static  struct
 // 5G => Ch 7, 8, 9, 11, 12, 16, 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64,
 // 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 153, 157, 161, 165 (Value 23 ~ 56)
  ************************************************************************/
-BOOL
-ChannelValid(unsigned int CountryCode, unsigned int ChannelIndex)
+int ChannelValid(unsigned int CountryCode, unsigned int ChannelIndex)
 {
-    BOOL    bValid;
+	int bValid;
 
     bValid = FALSE;
     /*
@@ -424,10 +423,8 @@ exit:
  *                          0x0000000000000003 means channel 1,2 are supported
  *                          0x000000000000000F means channel 1,2,..15 are supported
  ************************************************************************/
-BOOL
-CHvChannelGetList (
-      unsigned int       uCountryCodeIdx,
-     PBYTE      pbyChannelTable
+int CHvChannelGetList (unsigned int uCountryCodeIdx,
+		       PBYTE pbyChannelTable
     )
 {
     if (uCountryCodeIdx >= CCODE_MAX) {
@@ -441,7 +438,7 @@ CHvChannelGetList (
 void CHvInitChannelTable(void *pDeviceHandler)
 {
     PSDevice    pDevice = (PSDevice) pDeviceHandler;
-    BOOL        bMultiBand = FALSE;
+	int bMultiBand = FALSE;
     unsigned int ii;
 
     for (ii = 1; ii <= CB_MAX_CHANNEL; ii++)
drivers/staging/vt6656/channel.h +3 -3
index e7b3c12..dc5cf60 100644
@@ -39,17 +39,17 @@
 typedef struct tagSChannelTblElement {
     BYTE    byChannelNumber;
     unsigned int    uFrequency;
-    BOOL    bValid;
+	int bValid;
 } SChannelTblElement, *PSChannelTblElement;
 
 /*---------------------  Export Variables  --------------------------*/
 
 /*---------------------  Export Functions  --------------------------*/
 
-BOOL    ChannelValid(unsigned int CountryCode, unsigned int ChannelNum);
+int ChannelValid(unsigned int CountryCode, unsigned int ChannelNum);
 void    CHvInitChannelTable(void *pDeviceHandler);
 BYTE    CHbyGetChannelMapping(BYTE byChannelNumber);
 
-BOOL CHvChannelGetList(unsigned int uCountryCodeIdx, PBYTE pbyChannelTable);
+int CHvChannelGetList(unsigned int uCountryCodeIdx, PBYTE pbyChannelTable);
 
 #endif  /* _CHANNEL_H_ */
drivers/staging/vt6656/datarate.c +2 -2
index 5c2719f..8331060 100644
@@ -192,7 +192,7 @@ void RATEvParseMaxRate(
      void *pDeviceHandler,
      PWLAN_IE_SUPP_RATES pItemRates,
      PWLAN_IE_SUPP_RATES pItemExtRates,
-     BOOL bUpdateBasicRate,
+	int bUpdateBasicRate,
      PWORD pwMaxBasicRate,
      PWORD pwMaxSuppRate,
      PWORD pwSuppRate,
@@ -311,7 +311,7 @@ PSDevice        pDevice = (PSDevice) pDeviceHandler;
 PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);
 WORD            wIdxDownRate = 0;
 unsigned int            ii;
-BOOL            bAutoRate[MAX_RATE]    = {TRUE,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE};
+	int bAutoRate[MAX_RATE]    = {TRUE,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE};
 DWORD           dwThroughputTbl[MAX_RATE] = {10, 20, 55, 110, 60, 90, 120, 180, 240, 360, 480, 540};
 DWORD           dwThroughput = 0;
 WORD            wIdxUpRate = 0;
drivers/staging/vt6656/datarate.h +1 -1
index c6f5163..6b1222d 100644
@@ -74,7 +74,7 @@ RATEvParseMaxRate(
      void *pDeviceHandler,
      PWLAN_IE_SUPP_RATES pItemRates,
      PWLAN_IE_SUPP_RATES pItemExtRates,
-     BOOL bUpdateBasicRate,
+	int bUpdateBasicRate,
      PWORD pwMaxBasicRate,
      PWORD pwMaxSuppRate,
      PWORD pwSuppRate,
drivers/staging/vt6656/device.h +69 -69

321 lines not on this page · raw message

drivers/staging/vt6656/dpc.c +26 -33

174 lines not on this page · raw message

drivers/staging/vt6656/dpc.h +2 -2
index d4fca43..499800d 100644
@@ -48,10 +48,10 @@ void RXvMngWorkItem(void *Context);
 void
 RXvFreeRCB(
      PRCB pRCB,
-     BOOL bReAllocSkb
+	int bReAllocSkb
     );
 
-BOOL
+int
 RXbBulkInProcessData(
      PSDevice         pDevice,
      PRCB             pRCB,
drivers/staging/vt6656/firmware.c +4 -6
index 8c8126a..47c92c7 100644
@@ -55,8 +55,7 @@ static int          msglevel                =MSG_LEVEL_INFO;
 
 /*---------------------  Export Functions  --------------------------*/
 
-
-BOOL
+int
 FIRMWAREbDownload(
      PSDevice pDevice
     )
@@ -64,7 +63,7 @@ FIRMWAREbDownload(
 	const struct firmware *fw;
 	int NdisStatus;
 	void *pBuffer = NULL;
-	BOOL result = FALSE;
+	int result = FALSE;
 	u16 wLength;
 	int ii;
 
@@ -116,7 +115,7 @@ out:
 }
 MODULE_FIRMWARE(FIRMWARE_NAME);
 
-BOOL
+int
 FIRMWAREbBrach2Sram(
      PSDevice pDevice
     )
@@ -140,8 +139,7 @@ FIRMWAREbBrach2Sram(
     }
 }
 
-
-BOOL
+int
 FIRMWAREbCheckVersion(
      PSDevice pDevice
     )
drivers/staging/vt6656/firmware.h +3 -3
index b2f5b58..37a0e7c 100644
@@ -41,17 +41,17 @@
 
 /*---------------------  Export Functions  --------------------------*/
 
-BOOL
+int
 FIRMWAREbDownload(
      PSDevice pDevice
     );
 
-BOOL
+int
 FIRMWAREbBrach2Sram(
      PSDevice pDevice
     );
 
-BOOL
+int
 FIRMWAREbCheckVersion(
      PSDevice pDevice
     );
drivers/staging/vt6656/hostap.c +1 -1
index 51b5adf..97cb8da 100644
@@ -474,7 +474,7 @@ static int hostap_set_encryption(PSDevice pDevice,
 	int     ret = 0;
 	int     iNodeIndex = -1;
 	int     ii;
-	BOOL    bKeyTableFull = FALSE;
+	int bKeyTableFull = FALSE;
 	WORD    wKeyCtl = 0;
 
 
Signature · 1 line
1.7.4.4