Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b6a0013 authored by Charles Clément's avatar Charles Clément Committed by Greg Kroah-Hartman
Browse files

Staging: vt6655: replace BOOL with in kernel bool 



Signed-off-by: default avatarCharles Clément <caratorn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5a5a2a6a

drivers/staging/vt6655/IEEE11h.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -98,11 +98,11 @@ typedef struct _WLAN_FRAME_TPCREP { 
/*---------------------  Static Variables  --------------------------*/

/*---------------------  Static Variables  --------------------------*/





/*---------------------  Static Functions  --------------------------*/

/*---------------------  Static Functions  --------------------------*/

static BOOL s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq,

static bool s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq,

		unsigned int uLength)

		unsigned int uLength)

{

{

    size_t    uNumOfEIDs = 0;

    size_t    uNumOfEIDs = 0;

    BOOL    bResult = true;

    bool bResult = true;





    if (uLength <= WLAN_A3FR_MAXLEN) {

    if (uLength <= WLAN_A3FR_MAXLEN) {

        memcpy(pMgmt->abyCurrentMSRReq, pMSRReq, uLength);

        memcpy(pMgmt->abyCurrentMSRReq, pMSRReq, uLength);
@@ -118,7 +118,7 @@ static BOOL s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq, 
}

}









static BOOL s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, unsigned char byRate, unsigned char byRSSI)

static bool s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, unsigned char byRate, unsigned char byRSSI)

{

{

    PWLAN_FRAME_TPCREP  pFrame;

    PWLAN_FRAME_TPCREP  pFrame;

    PSTxMgmtPacket      pTxPacket = NULL;

    PSTxMgmtPacket      pTxPacket = NULL;
@@ -203,7 +203,7 @@ static BOOL s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, unsigned 
 * Return Value: None.

 * Return Value: None.

 *

 *

-*/

-*/

BOOL

bool

IEEE11hbMgrRxAction (

IEEE11hbMgrRxAction (

    void *pMgmtHandle,

    void *pMgmtHandle,

    void *pRxPacket

    void *pRxPacket
@@ -266,7 +266,7 @@ IEEE11hbMgrRxAction ( 
}

}









BOOL IEEE11hbMSRRepTx (

bool IEEE11hbMSRRepTx (

    void *pMgmtHandle

    void *pMgmtHandle

    )

    )

{

{

drivers/staging/vt6655/IEEE11h.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ 




/*---------------------  Export Functions  --------------------------*/

/*---------------------  Export Functions  --------------------------*/





BOOL IEEE11hbMSRRepTx (

bool IEEE11hbMSRRepTx (

    void *pMgmtHandle

    void *pMgmtHandle

    );

    );

drivers/staging/vt6655/aes_ccmp.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -243,7 +243,7 @@ unsigned char abyRoundKey[16]; 
 * Return Value: MIC compare result

 * Return Value: MIC compare result

 *

 *

 */

 */

BOOL AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned short wFrameSize)

bool AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned short wFrameSize)

{

{

unsigned char abyNonce[13];

unsigned char abyNonce[13];

unsigned char MIC_IV[16];

unsigned char MIC_IV[16];
@@ -260,7 +260,7 @@ unsigned char *pbyIV; 
unsigned char *pbyPayload;

unsigned char *pbyPayload;

unsigned short wHLen = 22;

unsigned short wHLen = 22;

unsigned short wPayloadSize = wFrameSize - 8 - 8 - 4 - WLAN_HDR_ADDR3_LEN;//8 is IV, 8 is MIC, 4 is CRC

unsigned short wPayloadSize = wFrameSize - 8 - 8 - 4 - WLAN_HDR_ADDR3_LEN;//8 is IV, 8 is MIC, 4 is CRC

BOOL            bA4 = false;

bool bA4 = false;

unsigned char byTmp;

unsigned char byTmp;

unsigned short wCnt;

unsigned short wCnt;

int             ii,jj,kk;

int             ii,jj,kk;

drivers/staging/vt6655/aes_ccmp.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -41,6 +41,6 @@ 
/*---------------------  Export Variables  --------------------------*/

/*---------------------  Export Variables  --------------------------*/





/*---------------------  Export Functions  --------------------------*/

/*---------------------  Export Functions  --------------------------*/

BOOL AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned short wFrameSize);

bool AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned short wFrameSize);





#endif //__AES_H__
 
#endif //__AES_H__

drivers/staging/vt6655/baseband.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -1857,9 +1857,9 @@ BBvCaculateParameter ( 
    unsigned int cbBitCount;

    unsigned int cbBitCount;

    unsigned int cbUsCount = 0;

    unsigned int cbUsCount = 0;

    unsigned int cbTmp;

    unsigned int cbTmp;

    BOOL bExtBit;

    bool bExtBit;

    unsigned char byPreambleType = pDevice->byPreambleType;

    unsigned char byPreambleType = pDevice->byPreambleType;

    BOOL bCCK = pDevice->bCCK;

    bool bCCK = pDevice->bCCK;





    cbBitCount = cbFrameLength * 8;

    cbBitCount = cbFrameLength * 8;

    bExtBit = false;

    bExtBit = false;
@@ -2015,7 +2015,7 @@ BBvCaculateParameter ( 
 * Return Value: true if succeeded; false if failed.

 * Return Value: true if succeeded; false if failed.

 *

 *

 */

 */

BOOL BBbReadEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char *pbyData)

bool BBbReadEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char *pbyData)

{

{

    unsigned short ww;

    unsigned short ww;

    unsigned char byValue;

    unsigned char byValue;
@@ -2058,7 +2058,7 @@ BOOL BBbReadEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned ch 
 * Return Value: true if succeeded; false if failed.

 * Return Value: true if succeeded; false if failed.

 *

 *

 */

 */

BOOL BBbWriteEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byData)

bool BBbWriteEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byData)

{

{

    unsigned short ww;

    unsigned short ww;

    unsigned char byValue;

    unsigned char byValue;
@@ -2100,7 +2100,7 @@ BOOL BBbWriteEmbeded (unsigned long dwIoBase, unsigned char byBBAddr, unsigned c 
 * Return Value: true if all TestBits are set; false otherwise.

 * Return Value: true if all TestBits are set; false otherwise.

 *

 *

 */

 */

BOOL BBbIsRegBitsOn (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits)

bool BBbIsRegBitsOn (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits)

{

{

    unsigned char byOrgData;

    unsigned char byOrgData;
@@ -2123,7 +2123,7 @@ BOOL BBbIsRegBitsOn (unsigned long dwIoBase, unsigned char byBBAddr, unsigned ch 
 * Return Value: true if all TestBits are clear; false otherwise.

 * Return Value: true if all TestBits are clear; false otherwise.

 *

 *

 */

 */

BOOL BBbIsRegBitsOff (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits)

bool BBbIsRegBitsOff (unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits)

{

{

    unsigned char byOrgData;

    unsigned char byOrgData;
@@ -2146,9 +2146,9 @@ BOOL BBbIsRegBitsOff (unsigned long dwIoBase, unsigned char byBBAddr, unsigned c 
 *

 *

 */

 */





BOOL BBbVT3253Init (PSDevice pDevice)

bool BBbVT3253Init (PSDevice pDevice)

{

{

    BOOL       bResult = true;

    bool bResult = true;

    int        ii;

    int        ii;

    unsigned long dwIoBase = pDevice->PortOffset;

    unsigned long dwIoBase = pDevice->PortOffset;

    unsigned char byRFType = pDevice->byRFType;

    unsigned char byRFType = pDevice->byRFType;