aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655/rxtx.c
diff options
context:
space:
mode:
authorCharles Clément <caratorn@gmail.com>2010-08-01 11:15:50 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-02 21:17:57 -0400
commit7b6a001313a9b11a1f0985de05fff514db41d72d (patch)
treec5f5bdcb4fcef70b5a2613a6382a0cd065bda892 /drivers/staging/vt6655/rxtx.c
parent5a5a2a6ad4aa2467bcc34fa50e85c2afc90bab05 (diff)
Staging: vt6655: replace BOOL with in kernel bool
Signed-off-by: Charles Clément <caratorn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655/rxtx.c')
-rw-r--r--drivers/staging/vt6655/rxtx.c64
1 files changed, 32 insertions, 32 deletions
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 91c9a0d0b63..c920cf69405 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -135,8 +135,8 @@ s_vFillRTSHead(
135 unsigned char byPktType, 135 unsigned char byPktType,
136 void * pvRTS, 136 void * pvRTS,
137 unsigned int cbFrameLength, 137 unsigned int cbFrameLength,
138 BOOL bNeedAck, 138 bool bNeedAck,
139 BOOL bDisCRC, 139 bool bDisCRC,
140 PSEthernetHeader psEthHeader, 140 PSEthernetHeader psEthHeader,
141 unsigned short wCurrentRate, 141 unsigned short wCurrentRate,
142 unsigned char byFBOption 142 unsigned char byFBOption
@@ -152,7 +152,7 @@ s_vGenerateTxParameter(
152 void * pvRTS, 152 void * pvRTS,
153 void * pvCTS, 153 void * pvCTS,
154 unsigned int cbFrameSize, 154 unsigned int cbFrameSize,
155 BOOL bNeedACK, 155 bool bNeedACK,
156 unsigned int uDMAIdx, 156 unsigned int uDMAIdx,
157 PSEthernetHeader psEthHeader, 157 PSEthernetHeader psEthHeader,
158 unsigned short wCurrentRate 158 unsigned short wCurrentRate
@@ -173,7 +173,7 @@ static void s_vFillFragParameter(
173static unsigned int 173static unsigned int
174s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, 174s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr,
175 unsigned int cbFrameBodySize, unsigned int uDMAIdx, PSTxDesc pHeadTD, 175 unsigned int cbFrameBodySize, unsigned int uDMAIdx, PSTxDesc pHeadTD,
176 PSEthernetHeader psEthHeader, unsigned char *pPacket, BOOL bNeedEncrypt, 176 PSEthernetHeader psEthHeader, unsigned char *pPacket, bool bNeedEncrypt,
177 PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum); 177 PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum);
178 178
179 179
@@ -185,7 +185,7 @@ s_uFillDataHead (
185 void * pTxDataHead, 185 void * pTxDataHead,
186 unsigned int cbFrameLength, 186 unsigned int cbFrameLength,
187 unsigned int uDMAIdx, 187 unsigned int uDMAIdx,
188 BOOL bNeedAck, 188 bool bNeedAck,
189 unsigned int uFragIdx, 189 unsigned int uFragIdx,
190 unsigned int cbLastFragmentSize, 190 unsigned int cbLastFragmentSize,
191 unsigned int uMACfragNum, 191 unsigned int uMACfragNum,
@@ -372,7 +372,7 @@ s_uGetTxRsvTime (
372 unsigned char byPktType, 372 unsigned char byPktType,
373 unsigned int cbFrameLength, 373 unsigned int cbFrameLength,
374 unsigned short wRate, 374 unsigned short wRate,
375 BOOL bNeedAck 375 bool bNeedAck
376 ) 376 )
377{ 377{
378 unsigned int uDataTime, uAckTime; 378 unsigned int uDataTime, uAckTime;
@@ -446,14 +446,14 @@ s_uGetDataDuration (
446 unsigned int cbFrameLength, 446 unsigned int cbFrameLength,
447 unsigned char byPktType, 447 unsigned char byPktType,
448 unsigned short wRate, 448 unsigned short wRate,
449 BOOL bNeedAck, 449 bool bNeedAck,
450 unsigned int uFragIdx, 450 unsigned int uFragIdx,
451 unsigned int cbLastFragmentSize, 451 unsigned int cbLastFragmentSize,
452 unsigned int uMACfragNum, 452 unsigned int uMACfragNum,
453 unsigned char byFBOption 453 unsigned char byFBOption
454 ) 454 )
455{ 455{
456 BOOL bLastFrag = 0; 456 bool bLastFrag = 0;
457 unsigned int uAckTime =0, uNextPktTime = 0; 457 unsigned int uAckTime =0, uNextPktTime = 0;
458 458
459 459
@@ -617,7 +617,7 @@ s_uGetRTSCTSDuration (
617 unsigned int cbFrameLength, 617 unsigned int cbFrameLength,
618 unsigned char byPktType, 618 unsigned char byPktType,
619 unsigned short wRate, 619 unsigned short wRate,
620 BOOL bNeedAck, 620 bool bNeedAck,
621 unsigned char byFBOption 621 unsigned char byFBOption
622 ) 622 )
623{ 623{
@@ -715,7 +715,7 @@ s_uFillDataHead (
715 void * pTxDataHead, 715 void * pTxDataHead,
716 unsigned int cbFrameLength, 716 unsigned int cbFrameLength,
717 unsigned int uDMAIdx, 717 unsigned int uDMAIdx,
718 BOOL bNeedAck, 718 bool bNeedAck,
719 unsigned int uFragIdx, 719 unsigned int uFragIdx,
720 unsigned int cbLastFragmentSize, 720 unsigned int cbLastFragmentSize,
721 unsigned int uMACfragNum, 721 unsigned int uMACfragNum,
@@ -846,8 +846,8 @@ s_vFillRTSHead (
846 unsigned char byPktType, 846 unsigned char byPktType,
847 void * pvRTS, 847 void * pvRTS,
848 unsigned int cbFrameLength, 848 unsigned int cbFrameLength,
849 BOOL bNeedAck, 849 bool bNeedAck,
850 BOOL bDisCRC, 850 bool bDisCRC,
851 PSEthernetHeader psEthHeader, 851 PSEthernetHeader psEthHeader,
852 unsigned short wCurrentRate, 852 unsigned short wCurrentRate,
853 unsigned char byFBOption 853 unsigned char byFBOption
@@ -1041,8 +1041,8 @@ s_vFillCTSHead (
1041 unsigned char byPktType, 1041 unsigned char byPktType,
1042 void * pvCTS, 1042 void * pvCTS,
1043 unsigned int cbFrameLength, 1043 unsigned int cbFrameLength,
1044 BOOL bNeedAck, 1044 bool bNeedAck,
1045 BOOL bDisCRC, 1045 bool bDisCRC,
1046 unsigned short wCurrentRate, 1046 unsigned short wCurrentRate,
1047 unsigned char byFBOption 1047 unsigned char byFBOption
1048 ) 1048 )
@@ -1148,7 +1148,7 @@ s_vGenerateTxParameter (
1148 void * pvRTS, 1148 void * pvRTS,
1149 void * pvCTS, 1149 void * pvCTS,
1150 unsigned int cbFrameSize, 1150 unsigned int cbFrameSize,
1151 BOOL bNeedACK, 1151 bool bNeedACK,
1152 unsigned int uDMAIdx, 1152 unsigned int uDMAIdx,
1153 PSEthernetHeader psEthHeader, 1153 PSEthernetHeader psEthHeader,
1154 unsigned short wCurrentRate 1154 unsigned short wCurrentRate
@@ -1156,7 +1156,7 @@ s_vGenerateTxParameter (
1156{ 1156{
1157 unsigned int cbMACHdLen = WLAN_HDR_ADDR3_LEN; //24 1157 unsigned int cbMACHdLen = WLAN_HDR_ADDR3_LEN; //24
1158 unsigned short wFifoCtl; 1158 unsigned short wFifoCtl;
1159 BOOL bDisCRC = false; 1159 bool bDisCRC = false;
1160 unsigned char byFBOption = AUTO_FB_NONE; 1160 unsigned char byFBOption = AUTO_FB_NONE;
1161// unsigned short wCurrentRate = pDevice->wCurrentRate; 1161// unsigned short wCurrentRate = pDevice->wCurrentRate;
1162 1162
@@ -1307,7 +1307,7 @@ s_vFillFragParameter(
1307static unsigned int 1307static unsigned int
1308s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, 1308s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr,
1309 unsigned int cbFrameBodySize, unsigned int uDMAIdx, PSTxDesc pHeadTD, 1309 unsigned int cbFrameBodySize, unsigned int uDMAIdx, PSTxDesc pHeadTD,
1310 PSEthernetHeader psEthHeader, unsigned char *pPacket, BOOL bNeedEncrypt, 1310 PSEthernetHeader psEthHeader, unsigned char *pPacket, bool bNeedEncrypt,
1311 PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum) 1311 PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum)
1312{ 1312{
1313 unsigned int cbMACHdLen; 1313 unsigned int cbMACHdLen;
@@ -1340,15 +1340,15 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT
1340 unsigned long *pdwMIC_L; 1340 unsigned long *pdwMIC_L;
1341 unsigned long *pdwMIC_R; 1341 unsigned long *pdwMIC_R;
1342 unsigned long dwSafeMIC_L, dwSafeMIC_R; //Fix "Last Frag Size" < "MIC length". 1342 unsigned long dwSafeMIC_L, dwSafeMIC_R; //Fix "Last Frag Size" < "MIC length".
1343 BOOL bMIC2Frag = false; 1343 bool bMIC2Frag = false;
1344 unsigned int uMICFragLen = 0; 1344 unsigned int uMICFragLen = 0;
1345 unsigned int uMACfragNum = 1; 1345 unsigned int uMACfragNum = 1;
1346 unsigned int uPadding = 0; 1346 unsigned int uPadding = 0;
1347 unsigned int cbReqCount = 0; 1347 unsigned int cbReqCount = 0;
1348 1348
1349 BOOL bNeedACK; 1349 bool bNeedACK;
1350 BOOL bRTS; 1350 bool bRTS;
1351 BOOL bIsAdhoc; 1351 bool bIsAdhoc;
1352 unsigned char *pbyType; 1352 unsigned char *pbyType;
1353 PSTxDesc ptdCurr; 1353 PSTxDesc ptdCurr;
1354 PSTxBufHead psTxBufHd = (PSTxBufHead) pbyTxBufferAddr; 1354 PSTxBufHead psTxBufHd = (PSTxBufHead) pbyTxBufferAddr;
@@ -1362,7 +1362,7 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT
1362 unsigned short wTxBufSize; // FFinfo size 1362 unsigned short wTxBufSize; // FFinfo size
1363 unsigned int uTotalCopyLength = 0; 1363 unsigned int uTotalCopyLength = 0;
1364 unsigned char byFBOption = AUTO_FB_NONE; 1364 unsigned char byFBOption = AUTO_FB_NONE;
1365 BOOL bIsWEP256 = false; 1365 bool bIsWEP256 = false;
1366 PSMgmtObject pMgmt = pDevice->pMgmt; 1366 PSMgmtObject pMgmt = pDevice->pMgmt;
1367 1367
1368 1368
@@ -2070,14 +2070,14 @@ s_cbFillTxBufHead(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyT
2070 2070
2071void 2071void
2072vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, 2072vGenerateFIFOHeader(PSDevice pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr,
2073 BOOL bNeedEncrypt, unsigned int cbPayloadSize, unsigned int uDMAIdx, 2073 bool bNeedEncrypt, unsigned int cbPayloadSize, unsigned int uDMAIdx,
2074 PSTxDesc pHeadTD, PSEthernetHeader psEthHeader, unsigned char *pPacket, 2074 PSTxDesc pHeadTD, PSEthernetHeader psEthHeader, unsigned char *pPacket,
2075 PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum, 2075 PSKeyItem pTransmitKey, unsigned int uNodeIndex, unsigned int *puMACfragNum,
2076 unsigned int *pcbHeaderSize) 2076 unsigned int *pcbHeaderSize)
2077{ 2077{
2078 unsigned int wTxBufSize; // FFinfo size 2078 unsigned int wTxBufSize; // FFinfo size
2079 BOOL bNeedACK; 2079 bool bNeedACK;
2080 BOOL bIsAdhoc; 2080 bool bIsAdhoc;
2081 unsigned short cbMacHdLen; 2081 unsigned short cbMacHdLen;
2082 PSTxBufHead pTxBufHead = (PSTxBufHead) pbyTxBufferAddr; 2082 PSTxBufHead pTxBufHead = (PSTxBufHead) pbyTxBufferAddr;
2083 2083
@@ -2234,7 +2234,7 @@ vGenerateMACHeader (
2234 unsigned char *pbyBufferAddr, 2234 unsigned char *pbyBufferAddr,
2235 unsigned short wDuration, 2235 unsigned short wDuration,
2236 PSEthernetHeader psEthHeader, 2236 PSEthernetHeader psEthHeader,
2237 BOOL bNeedEncrypt, 2237 bool bNeedEncrypt,
2238 unsigned short wFragType, 2238 unsigned short wFragType,
2239 unsigned int uDMAIdx, 2239 unsigned int uDMAIdx,
2240 unsigned int uFragIdx 2240 unsigned int uFragIdx
@@ -2314,8 +2314,8 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
2314 PS802_11Header pMACHeader; 2314 PS802_11Header pMACHeader;
2315 unsigned int cbHeaderSize; 2315 unsigned int cbHeaderSize;
2316 unsigned int cbFrameBodySize; 2316 unsigned int cbFrameBodySize;
2317 BOOL bNeedACK; 2317 bool bNeedACK;
2318 BOOL bIsPSPOLL = false; 2318 bool bIsPSPOLL = false;
2319 PSTxBufHead pTxBufHead; 2319 PSTxBufHead pTxBufHead;
2320 unsigned int cbFrameSize; 2320 unsigned int cbFrameSize;
2321 unsigned int cbIVlen = 0; 2321 unsigned int cbIVlen = 0;
@@ -2716,7 +2716,7 @@ cbGetFragCount (
2716 unsigned int cbMIClen = 0; 2716 unsigned int cbMIClen = 0;
2717 unsigned int cbFCSlen = 4; 2717 unsigned int cbFCSlen = 4;
2718 unsigned int uMACfragNum = 1; 2718 unsigned int uMACfragNum = 1;
2719 BOOL bNeedACK; 2719 bool bNeedACK;
2720 2720
2721 2721
2722 2722
@@ -2798,8 +2798,8 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un
2798 PS802_11Header pMACHeader; 2798 PS802_11Header pMACHeader;
2799 unsigned int cbHeaderSize; 2799 unsigned int cbHeaderSize;
2800 unsigned int cbFrameBodySize; 2800 unsigned int cbFrameBodySize;
2801 BOOL bNeedACK; 2801 bool bNeedACK;
2802 BOOL bIsPSPOLL = false; 2802 bool bIsPSPOLL = false;
2803 PSTxBufHead pTxBufHead; 2803 PSTxBufHead pTxBufHead;
2804 unsigned int cbFrameSize; 2804 unsigned int cbFrameSize;
2805 unsigned int cbIVlen = 0; 2805 unsigned int cbIVlen = 0;
@@ -2822,7 +2822,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un
2822 unsigned short wCurrentRate = RATE_1M; 2822 unsigned short wCurrentRate = RATE_1M;
2823 PUWLAN_80211HDR p80211Header; 2823 PUWLAN_80211HDR p80211Header;
2824 unsigned int uNodeIndex = 0; 2824 unsigned int uNodeIndex = 0;
2825 BOOL bNodeExist = false; 2825 bool bNodeExist = false;
2826 SKeyItem STempKey; 2826 SKeyItem STempKey;
2827 PSKeyItem pTransmitKey = NULL; 2827 PSKeyItem pTransmitKey = NULL;
2828 unsigned char *pbyIVHead; 2828 unsigned char *pbyIVHead;