diff options
author | Jim Lieb <lieb@canonical.com> | 2009-08-12 17:54:15 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:02:08 -0400 |
commit | 8a3d91b02830dd7c58d27e5de65222219ac2163f (patch) | |
tree | 90144dce79d0be450803761e51969e1b93ad62f4 /drivers/staging | |
parent | dad72fed3692a918fb567915f110ae71fb7ffe32 (diff) |
Staging: vt665x: remove tbit.h
Remove use of tbit macros and remove the header file.
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/vt6656/baseband.c | 1 | ||||
-rw-r--r-- | drivers/staging/vt6656/bssdb.c | 5 | ||||
-rw-r--r-- | drivers/staging/vt6656/card.c | 1 | ||||
-rw-r--r-- | drivers/staging/vt6656/dpc.c | 9 | ||||
-rw-r--r-- | drivers/staging/vt6656/int.c | 15 | ||||
-rw-r--r-- | drivers/staging/vt6656/key.c | 1 | ||||
-rw-r--r-- | drivers/staging/vt6656/mac.c | 1 | ||||
-rw-r--r-- | drivers/staging/vt6656/main_usb.c | 1 | ||||
-rw-r--r-- | drivers/staging/vt6656/mib.c | 83 | ||||
-rw-r--r-- | drivers/staging/vt6656/michael.c | 1 | ||||
-rw-r--r-- | drivers/staging/vt6656/power.c | 2 | ||||
-rw-r--r-- | drivers/staging/vt6656/rxtx.c | 1 | ||||
-rw-r--r-- | drivers/staging/vt6656/tbit.h | 73 | ||||
-rw-r--r-- | drivers/staging/vt6656/tcrc.c | 1 | ||||
-rw-r--r-- | drivers/staging/vt6656/tether.c | 3 | ||||
-rw-r--r-- | drivers/staging/vt6656/tkip.c | 1 | ||||
-rw-r--r-- | drivers/staging/vt6656/wmgr.c | 1 |
17 files changed, 55 insertions, 145 deletions
diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c index c5430d99b5f..820a7b8e6fb 100644 --- a/drivers/staging/vt6656/baseband.c +++ b/drivers/staging/vt6656/baseband.c | |||
@@ -38,7 +38,6 @@ | |||
38 | */ | 38 | */ |
39 | 39 | ||
40 | #include "tmacro.h" | 40 | #include "tmacro.h" |
41 | #include "tbit.h" | ||
42 | #include "tether.h" | 41 | #include "tether.h" |
43 | #include "mac.h" | 42 | #include "mac.h" |
44 | #include "baseband.h" | 43 | #include "baseband.h" |
diff --git a/drivers/staging/vt6656/bssdb.c b/drivers/staging/vt6656/bssdb.c index a8e53d94df4..6b1678bfd61 100644 --- a/drivers/staging/vt6656/bssdb.c +++ b/drivers/staging/vt6656/bssdb.c | |||
@@ -55,7 +55,6 @@ | |||
55 | #include "card.h" | 55 | #include "card.h" |
56 | #include "mac.h" | 56 | #include "mac.h" |
57 | #include "wpa2.h" | 57 | #include "wpa2.h" |
58 | #include "tbit.h" | ||
59 | #include "control.h" | 58 | #include "control.h" |
60 | #include "rndis.h" | 59 | #include "rndis.h" |
61 | #include "iowpa.h" | 60 | #include "iowpa.h" |
@@ -1437,7 +1436,7 @@ BSSvUpdateNodeTxCounter( | |||
1437 | //DBG_PRN_GRP21(("Device %08X, wRate %04X, byTSR %02X\n", hDeviceContext, wRate, byTSR)); | 1436 | //DBG_PRN_GRP21(("Device %08X, wRate %04X, byTSR %02X\n", hDeviceContext, wRate, byTSR)); |
1438 | if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA) { | 1437 | if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA) { |
1439 | pMgmt->sNodeDBTable[0].uTxAttempts += 1; | 1438 | pMgmt->sNodeDBTable[0].uTxAttempts += 1; |
1440 | if (BITbIsAllBitsOff(byTSR, (TSR_TMO | TSR_RETRYTMO))) { | 1439 | if ( !(byTSR & (TSR_TMO | TSR_RETRYTMO))) { |
1441 | // transmit success, TxAttempts at least plus one | 1440 | // transmit success, TxAttempts at least plus one |
1442 | pMgmt->sNodeDBTable[0].uTxOk[MAX_RATE]++; | 1441 | pMgmt->sNodeDBTable[0].uTxOk[MAX_RATE]++; |
1443 | if ( (byFallBack == AUTO_FB_NONE) || | 1442 | if ( (byFallBack == AUTO_FB_NONE) || |
@@ -1489,7 +1488,7 @@ BSSvUpdateNodeTxCounter( | |||
1489 | 1488 | ||
1490 | if (BSSbIsSTAInNodeDB((HANDLE)pDevice, pbyDestAddr, &uNodeIndex)){ | 1489 | if (BSSbIsSTAInNodeDB((HANDLE)pDevice, pbyDestAddr, &uNodeIndex)){ |
1491 | pMgmt->sNodeDBTable[uNodeIndex].uTxAttempts += 1; | 1490 | pMgmt->sNodeDBTable[uNodeIndex].uTxAttempts += 1; |
1492 | if (BITbIsAllBitsOff(byTSR, (TSR_TMO | TSR_RETRYTMO))) { | 1491 | if ( !(byTSR & (TSR_TMO | TSR_RETRYTMO))) { |
1493 | // transmit success, TxAttempts at least plus one | 1492 | // transmit success, TxAttempts at least plus one |
1494 | pMgmt->sNodeDBTable[uNodeIndex].uTxOk[MAX_RATE]++; | 1493 | pMgmt->sNodeDBTable[uNodeIndex].uTxOk[MAX_RATE]++; |
1495 | if ( (byFallBack == AUTO_FB_NONE) || | 1494 | if ( (byFallBack == AUTO_FB_NONE) || |
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index edc744e96c8..d73efeea2d5 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c | |||
@@ -47,7 +47,6 @@ | |||
47 | 47 | ||
48 | #include "tmacro.h" | 48 | #include "tmacro.h" |
49 | #include "card.h" | 49 | #include "card.h" |
50 | #include "tbit.h" | ||
51 | #include "baseband.h" | 50 | #include "baseband.h" |
52 | #include "mac.h" | 51 | #include "mac.h" |
53 | #include "desc.h" | 52 | #include "desc.h" |
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c index 16fd33c6bca..835c6d6967b 100644 --- a/drivers/staging/vt6656/dpc.c +++ b/drivers/staging/vt6656/dpc.c | |||
@@ -49,7 +49,6 @@ | |||
49 | #include "tkip.h" | 49 | #include "tkip.h" |
50 | #include "tcrc.h" | 50 | #include "tcrc.h" |
51 | #include "wctl.h" | 51 | #include "wctl.h" |
52 | #include "tbit.h" | ||
53 | #include "hostap.h" | 52 | #include "hostap.h" |
54 | #include "rf.h" | 53 | #include "rf.h" |
55 | #include "iowpa.h" | 54 | #include "iowpa.h" |
@@ -568,7 +567,7 @@ RXbBulkInProcessData ( | |||
568 | //remove the CRC length | 567 | //remove the CRC length |
569 | FrameSize -= U_CRC_LEN; | 568 | FrameSize -= U_CRC_LEN; |
570 | 569 | ||
571 | if ((BITbIsAllBitsOff(*pbyRsr, (RSR_ADDRBROAD | RSR_ADDRMULTI))) && // unicast address | 570 | if ( !(*pbyRsr & (RSR_ADDRBROAD | RSR_ADDRMULTI)) && // unicast address |
572 | (IS_FRAGMENT_PKT((pbyFrame))) | 571 | (IS_FRAGMENT_PKT((pbyFrame))) |
573 | ) { | 572 | ) { |
574 | // defragment | 573 | // defragment |
@@ -663,7 +662,7 @@ RXbBulkInProcessData ( | |||
663 | else { | 662 | else { |
664 | if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) { | 663 | if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) { |
665 | //In AP mode, hw only check addr1(BSSID or RA) if equal to local MAC. | 664 | //In AP mode, hw only check addr1(BSSID or RA) if equal to local MAC. |
666 | if (BITbIsBitOff(*pbyRsr, RSR_BSSIDOK)) { | 665 | if ( !(*pbyRsr & RSR_BSSIDOK)) { |
667 | if (bDeFragRx) { | 666 | if (bDeFragRx) { |
668 | if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) { | 667 | if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) { |
669 | DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n", | 668 | DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n", |
@@ -676,7 +675,7 @@ RXbBulkInProcessData ( | |||
676 | else { | 675 | else { |
677 | // discard DATA packet while not associate || BSSID error | 676 | // discard DATA packet while not associate || BSSID error |
678 | if ((pDevice->bLinkPass == FALSE) || | 677 | if ((pDevice->bLinkPass == FALSE) || |
679 | BITbIsBitOff(*pbyRsr, RSR_BSSIDOK)) { | 678 | !(*pbyRsr & RSR_BSSIDOK)) { |
680 | if (bDeFragRx) { | 679 | if (bDeFragRx) { |
681 | if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) { | 680 | if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) { |
682 | DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n", | 681 | DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n", |
@@ -724,7 +723,7 @@ RXbBulkInProcessData ( | |||
724 | 723 | ||
725 | if (pDevice->bEnablePSMode) { | 724 | if (pDevice->bEnablePSMode) { |
726 | if (IS_FC_MOREDATA((pbyFrame))) { | 725 | if (IS_FC_MOREDATA((pbyFrame))) { |
727 | if (BITbIsBitOn(*pbyRsr, RSR_ADDROK)) { | 726 | if (*pbyRsr & RSR_ADDROK) { |
728 | //PSbSendPSPOLL((PSDevice)pDevice); | 727 | //PSbSendPSPOLL((PSDevice)pDevice); |
729 | } | 728 | } |
730 | } | 729 | } |
diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c index 60d6a13fb8c..35053be6900 100644 --- a/drivers/staging/vt6656/int.c +++ b/drivers/staging/vt6656/int.c | |||
@@ -34,7 +34,6 @@ | |||
34 | 34 | ||
35 | #include "int.h" | 35 | #include "int.h" |
36 | #include "mib.h" | 36 | #include "mib.h" |
37 | #include "tbit.h" | ||
38 | #include "tmacro.h" | 37 | #include "tmacro.h" |
39 | #include "mac.h" | 38 | #include "mac.h" |
40 | #include "power.h" | 39 | #include "power.h" |
@@ -112,28 +111,28 @@ INTnsProcessData( | |||
112 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsInterruptProcessData\n"); | 111 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsInterruptProcessData\n"); |
113 | 112 | ||
114 | pINTData = (PSINTData) pDevice->intBuf.pDataBuf; | 113 | pINTData = (PSINTData) pDevice->intBuf.pDataBuf; |
115 | if (BITbIsBitOn(pINTData->byTSR0, TSR_VALID)) { | 114 | if (pINTData->byTSR0 & TSR_VALID) { |
116 | STAvUpdateTDStatCounter (&(pDevice->scStatistic), (BYTE) (pINTData->byPkt0 & 0x0F), (BYTE) (pINTData->byPkt0>>4), pINTData->byTSR0); | 115 | STAvUpdateTDStatCounter (&(pDevice->scStatistic), (BYTE) (pINTData->byPkt0 & 0x0F), (BYTE) (pINTData->byPkt0>>4), pINTData->byTSR0); |
117 | BSSvUpdateNodeTxCounter (pDevice, &(pDevice->scStatistic), pINTData->byTSR0, pINTData->byPkt0); | 116 | BSSvUpdateNodeTxCounter (pDevice, &(pDevice->scStatistic), pINTData->byTSR0, pINTData->byPkt0); |
118 | //DBG_PRN_GRP01(("TSR0 %02x\n", pINTData->byTSR0)); | 117 | //DBG_PRN_GRP01(("TSR0 %02x\n", pINTData->byTSR0)); |
119 | } | 118 | } |
120 | if (BITbIsBitOn(pINTData->byTSR1, TSR_VALID)) { | 119 | if (pINTData->byTSR1 & TSR_VALID) { |
121 | STAvUpdateTDStatCounter (&(pDevice->scStatistic), (BYTE) (pINTData->byPkt1 & 0x0F), (BYTE) (pINTData->byPkt1>>4), pINTData->byTSR1); | 120 | STAvUpdateTDStatCounter (&(pDevice->scStatistic), (BYTE) (pINTData->byPkt1 & 0x0F), (BYTE) (pINTData->byPkt1>>4), pINTData->byTSR1); |
122 | BSSvUpdateNodeTxCounter (pDevice, &(pDevice->scStatistic), pINTData->byTSR1, pINTData->byPkt1); | 121 | BSSvUpdateNodeTxCounter (pDevice, &(pDevice->scStatistic), pINTData->byTSR1, pINTData->byPkt1); |
123 | //DBG_PRN_GRP01(("TSR1 %02x\n", pINTData->byTSR1)); | 122 | //DBG_PRN_GRP01(("TSR1 %02x\n", pINTData->byTSR1)); |
124 | } | 123 | } |
125 | if (BITbIsBitOn(pINTData->byTSR2, TSR_VALID)) { | 124 | if (pINTData->byTSR2 & TSR_VALID) { |
126 | STAvUpdateTDStatCounter (&(pDevice->scStatistic), (BYTE) (pINTData->byPkt2 & 0x0F), (BYTE) (pINTData->byPkt2>>4), pINTData->byTSR2); | 125 | STAvUpdateTDStatCounter (&(pDevice->scStatistic), (BYTE) (pINTData->byPkt2 & 0x0F), (BYTE) (pINTData->byPkt2>>4), pINTData->byTSR2); |
127 | BSSvUpdateNodeTxCounter (pDevice, &(pDevice->scStatistic), pINTData->byTSR2, pINTData->byPkt2); | 126 | BSSvUpdateNodeTxCounter (pDevice, &(pDevice->scStatistic), pINTData->byTSR2, pINTData->byPkt2); |
128 | //DBG_PRN_GRP01(("TSR2 %02x\n", pINTData->byTSR2)); | 127 | //DBG_PRN_GRP01(("TSR2 %02x\n", pINTData->byTSR2)); |
129 | } | 128 | } |
130 | if (BITbIsBitOn(pINTData->byTSR3, TSR_VALID)) { | 129 | if (pINTData->byTSR3 & TSR_VALID) { |
131 | STAvUpdateTDStatCounter (&(pDevice->scStatistic), (BYTE) (pINTData->byPkt3 & 0x0F), (BYTE) (pINTData->byPkt3>>4), pINTData->byTSR3); | 130 | STAvUpdateTDStatCounter (&(pDevice->scStatistic), (BYTE) (pINTData->byPkt3 & 0x0F), (BYTE) (pINTData->byPkt3>>4), pINTData->byTSR3); |
132 | BSSvUpdateNodeTxCounter (pDevice, &(pDevice->scStatistic), pINTData->byTSR3, pINTData->byPkt3); | 131 | BSSvUpdateNodeTxCounter (pDevice, &(pDevice->scStatistic), pINTData->byTSR3, pINTData->byPkt3); |
133 | //DBG_PRN_GRP01(("TSR3 %02x\n", pINTData->byTSR3)); | 132 | //DBG_PRN_GRP01(("TSR3 %02x\n", pINTData->byTSR3)); |
134 | } | 133 | } |
135 | if ( pINTData->byISR0 != 0 ) { | 134 | if ( pINTData->byISR0 != 0 ) { |
136 | if ( BITbIsBitOn(pINTData->byISR0, ISR_BNTX) ) { | 135 | if (pINTData->byISR0 & ISR_BNTX) { |
137 | 136 | ||
138 | if (pDevice->eOPMode == OP_MODE_AP) { | 137 | if (pDevice->eOPMode == OP_MODE_AP) { |
139 | if(pMgmt->byDTIMCount > 0) { | 138 | if(pMgmt->byDTIMCount > 0) { |
@@ -154,7 +153,7 @@ INTnsProcessData( | |||
154 | } else { | 153 | } else { |
155 | pDevice->bBeaconSent = FALSE; | 154 | pDevice->bBeaconSent = FALSE; |
156 | } | 155 | } |
157 | if ( BITbIsBitOn(pINTData->byISR0, ISR_TBTT) ) { | 156 | if (pINTData->byISR0 & ISR_TBTT) { |
158 | if ( pDevice->bEnablePSMode ) { | 157 | if ( pDevice->bEnablePSMode ) { |
159 | bScheduleCommand((HANDLE) pDevice, WLAN_CMD_TBTT_WAKEUP, NULL); | 158 | bScheduleCommand((HANDLE) pDevice, WLAN_CMD_TBTT_WAKEUP, NULL); |
160 | } | 159 | } |
@@ -176,7 +175,7 @@ INTnsProcessData( | |||
176 | } | 175 | } |
177 | 176 | ||
178 | if ( pINTData->byISR1 != 0 ) { | 177 | if ( pINTData->byISR1 != 0 ) { |
179 | if ( BITbIsBitOn(pINTData->byISR1, ISR_GPIO3) ) { | 178 | if (pINTData->byISR1 & ISR_GPIO3) { |
180 | bScheduleCommand((HANDLE) pDevice, WLAN_CMD_RADIO, NULL); | 179 | bScheduleCommand((HANDLE) pDevice, WLAN_CMD_RADIO, NULL); |
181 | } | 180 | } |
182 | } | 181 | } |
diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c index b82bc46886c..13fc69a1a08 100644 --- a/drivers/staging/vt6656/key.c +++ b/drivers/staging/vt6656/key.c | |||
@@ -37,7 +37,6 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "tmacro.h" | 39 | #include "tmacro.h" |
40 | #include "tbit.h" | ||
41 | #include "key.h" | 40 | #include "key.h" |
42 | #include "mac.h" | 41 | #include "mac.h" |
43 | #include "rndis.h" | 42 | #include "rndis.h" |
diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c index fe37192a427..55a798668fa 100644 --- a/drivers/staging/vt6656/mac.c +++ b/drivers/staging/vt6656/mac.c | |||
@@ -31,7 +31,6 @@ | |||
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include "tmacro.h" | 33 | #include "tmacro.h" |
34 | #include "tbit.h" | ||
35 | #include "tether.h" | 34 | #include "tether.h" |
36 | #include "desc.h" | 35 | #include "desc.h" |
37 | #include "mac.h" | 36 | #include "mac.h" |
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index faa4b5275b8..7f96bcaf1c6 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c | |||
@@ -48,7 +48,6 @@ | |||
48 | 48 | ||
49 | #include "device.h" | 49 | #include "device.h" |
50 | #include "card.h" | 50 | #include "card.h" |
51 | #include "tbit.h" | ||
52 | #include "baseband.h" | 51 | #include "baseband.h" |
53 | #include "mac.h" | 52 | #include "mac.h" |
54 | #include "tether.h" | 53 | #include "tether.h" |
diff --git a/drivers/staging/vt6656/mib.c b/drivers/staging/vt6656/mib.c index bb7c0cfcbe7..910e610b7cc 100644 --- a/drivers/staging/vt6656/mib.c +++ b/drivers/staging/vt6656/mib.c | |||
@@ -39,7 +39,6 @@ | |||
39 | 39 | ||
40 | #include "upc.h" | 40 | #include "upc.h" |
41 | #include "mac.h" | 41 | #include "mac.h" |
42 | #include "tbit.h" | ||
43 | #include "tether.h" | 42 | #include "tether.h" |
44 | #include "mib.h" | 43 | #include "mib.h" |
45 | #include "wctl.h" | 44 | #include "wctl.h" |
@@ -103,35 +102,35 @@ void STAvUpdateIsrStatCounter (PSStatCounter pStatistic, BYTE byIsr0, BYTE byIsr | |||
103 | } | 102 | } |
104 | 103 | ||
105 | 104 | ||
106 | if (BITbIsBitOn(byIsr0, ISR_ACTX)) // ISR, bit0 | 105 | if (byIsr0 & ISR_ACTX) // ISR, bit0 |
107 | pStatistic->ISRStat.dwIsrTx0OK++; // TXDMA0 successful | 106 | pStatistic->ISRStat.dwIsrTx0OK++; // TXDMA0 successful |
108 | 107 | ||
109 | if (BITbIsBitOn(byIsr0, ISR_BNTX)) // ISR, bit2 | 108 | if (byIsr0 & ISR_BNTX) // ISR, bit2 |
110 | pStatistic->ISRStat.dwIsrBeaconTxOK++; // BeaconTx successful | 109 | pStatistic->ISRStat.dwIsrBeaconTxOK++; // BeaconTx successful |
111 | 110 | ||
112 | if (BITbIsBitOn(byIsr0, ISR_RXDMA0)) // ISR, bit3 | 111 | if (byIsr0 & ISR_RXDMA0) // ISR, bit3 |
113 | pStatistic->ISRStat.dwIsrRx0OK++; // Rx0 successful | 112 | pStatistic->ISRStat.dwIsrRx0OK++; // Rx0 successful |
114 | 113 | ||
115 | if (BITbIsBitOn(byIsr0, ISR_TBTT)) // ISR, bit4 | 114 | if (byIsr0 & ISR_TBTT) // ISR, bit4 |
116 | pStatistic->ISRStat.dwIsrTBTTInt++; // TBTT successful | 115 | pStatistic->ISRStat.dwIsrTBTTInt++; // TBTT successful |
117 | 116 | ||
118 | if (BITbIsBitOn(byIsr0, ISR_SOFTTIMER)) // ISR, bit6 | 117 | if (byIsr0 & ISR_SOFTTIMER) // ISR, bit6 |
119 | pStatistic->ISRStat.dwIsrSTIMERInt++; | 118 | pStatistic->ISRStat.dwIsrSTIMERInt++; |
120 | 119 | ||
121 | if (BITbIsBitOn(byIsr0, ISR_WATCHDOG)) // ISR, bit7 | 120 | if (byIsr0 & ISR_WATCHDOG) // ISR, bit7 |
122 | pStatistic->ISRStat.dwIsrWatchDog++; | 121 | pStatistic->ISRStat.dwIsrWatchDog++; |
123 | 122 | ||
124 | 123 | ||
125 | if (BITbIsBitOn(byIsr1, ISR_FETALERR)) // ISR, bit8 | 124 | if (byIsr1 & ISR_FETALERR) // ISR, bit8 |
126 | pStatistic->ISRStat.dwIsrUnrecoverableError++; | 125 | pStatistic->ISRStat.dwIsrUnrecoverableError++; |
127 | 126 | ||
128 | if (BITbIsBitOn(byIsr1, ISR_SOFTINT)) // ISR, bit9 | 127 | if (byIsr1 & ISR_SOFTINT) // ISR, bit9 |
129 | pStatistic->ISRStat.dwIsrSoftInterrupt++; // software interrupt | 128 | pStatistic->ISRStat.dwIsrSoftInterrupt++; // software interrupt |
130 | 129 | ||
131 | if (BITbIsBitOn(byIsr1, ISR_MIBNEARFULL)) // ISR, bit10 | 130 | if (byIsr1 & ISR_MIBNEARFULL) // ISR, bit10 |
132 | pStatistic->ISRStat.dwIsrMIBNearfull++; | 131 | pStatistic->ISRStat.dwIsrMIBNearfull++; |
133 | 132 | ||
134 | if (BITbIsBitOn(byIsr1, ISR_RXNOBUF)) // ISR, bit11 | 133 | if (byIsr1 & ISR_RXNOBUF) // ISR, bit11 |
135 | pStatistic->ISRStat.dwIsrRxNoBuf++; // Rx No Buff | 134 | pStatistic->ISRStat.dwIsrRxNoBuf++; // Rx No Buff |
136 | 135 | ||
137 | } | 136 | } |
@@ -160,20 +159,20 @@ void STAvUpdateRDStatCounter (PSStatCounter pStatistic, | |||
160 | //need change | 159 | //need change |
161 | PS802_11Header pHeader = (PS802_11Header)pbyBuffer; | 160 | PS802_11Header pHeader = (PS802_11Header)pbyBuffer; |
162 | 161 | ||
163 | if (BITbIsBitOn(byRSR, RSR_ADDROK)) | 162 | if (byRSR & RSR_ADDROK) |
164 | pStatistic->dwRsrADDROk++; | 163 | pStatistic->dwRsrADDROk++; |
165 | if (BITbIsBitOn(byRSR, RSR_CRCOK)) { | 164 | if (byRSR & RSR_CRCOK) { |
166 | pStatistic->dwRsrCRCOk++; | 165 | pStatistic->dwRsrCRCOk++; |
167 | 166 | ||
168 | pStatistic->ullRsrOK++; | 167 | pStatistic->ullRsrOK++; |
169 | 168 | ||
170 | if (cbFrameLength >= U_ETHER_ADDR_LEN) { | 169 | if (cbFrameLength >= U_ETHER_ADDR_LEN) { |
171 | // update counters in case that successful transmit | 170 | // update counters in case that successful transmit |
172 | if (BITbIsBitOn(byRSR, RSR_ADDRBROAD)) { | 171 | if (byRSR & RSR_ADDRBROAD) { |
173 | pStatistic->ullRxBroadcastFrames++; | 172 | pStatistic->ullRxBroadcastFrames++; |
174 | pStatistic->ullRxBroadcastBytes += (ULONGLONG)cbFrameLength; | 173 | pStatistic->ullRxBroadcastBytes += (ULONGLONG)cbFrameLength; |
175 | } | 174 | } |
176 | else if (BITbIsBitOn(byRSR, RSR_ADDRMULTI)) { | 175 | else if (byRSR & RSR_ADDRMULTI) { |
177 | pStatistic->ullRxMulticastFrames++; | 176 | pStatistic->ullRxMulticastFrames++; |
178 | pStatistic->ullRxMulticastBytes += (ULONGLONG)cbFrameLength; | 177 | pStatistic->ullRxMulticastBytes += (ULONGLONG)cbFrameLength; |
179 | } | 178 | } |
@@ -186,84 +185,84 @@ void STAvUpdateRDStatCounter (PSStatCounter pStatistic, | |||
186 | 185 | ||
187 | if(byRxRate==22) { | 186 | if(byRxRate==22) { |
188 | pStatistic->CustomStat.ullRsr11M++; | 187 | pStatistic->CustomStat.ullRsr11M++; |
189 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 188 | if(byRSR & RSR_CRCOK) { |
190 | pStatistic->CustomStat.ullRsr11MCRCOk++; | 189 | pStatistic->CustomStat.ullRsr11MCRCOk++; |
191 | } | 190 | } |
192 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"11M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr11M, (INT)pStatistic->CustomStat.ullRsr11MCRCOk, byRSR); | 191 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"11M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr11M, (INT)pStatistic->CustomStat.ullRsr11MCRCOk, byRSR); |
193 | } | 192 | } |
194 | else if(byRxRate==11) { | 193 | else if(byRxRate==11) { |
195 | pStatistic->CustomStat.ullRsr5M++; | 194 | pStatistic->CustomStat.ullRsr5M++; |
196 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 195 | if(byRSR & RSR_CRCOK) { |
197 | pStatistic->CustomStat.ullRsr5MCRCOk++; | 196 | pStatistic->CustomStat.ullRsr5MCRCOk++; |
198 | } | 197 | } |
199 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 5M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr5M, (INT)pStatistic->CustomStat.ullRsr5MCRCOk, byRSR); | 198 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 5M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr5M, (INT)pStatistic->CustomStat.ullRsr5MCRCOk, byRSR); |
200 | } | 199 | } |
201 | else if(byRxRate==4) { | 200 | else if(byRxRate==4) { |
202 | pStatistic->CustomStat.ullRsr2M++; | 201 | pStatistic->CustomStat.ullRsr2M++; |
203 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 202 | if(byRSR & RSR_CRCOK) { |
204 | pStatistic->CustomStat.ullRsr2MCRCOk++; | 203 | pStatistic->CustomStat.ullRsr2MCRCOk++; |
205 | } | 204 | } |
206 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 2M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr2M, (INT)pStatistic->CustomStat.ullRsr2MCRCOk, byRSR); | 205 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 2M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr2M, (INT)pStatistic->CustomStat.ullRsr2MCRCOk, byRSR); |
207 | } | 206 | } |
208 | else if(byRxRate==2){ | 207 | else if(byRxRate==2){ |
209 | pStatistic->CustomStat.ullRsr1M++; | 208 | pStatistic->CustomStat.ullRsr1M++; |
210 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 209 | if(byRSR & RSR_CRCOK) { |
211 | pStatistic->CustomStat.ullRsr1MCRCOk++; | 210 | pStatistic->CustomStat.ullRsr1MCRCOk++; |
212 | } | 211 | } |
213 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 1M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr1M, (INT)pStatistic->CustomStat.ullRsr1MCRCOk, byRSR); | 212 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 1M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr1M, (INT)pStatistic->CustomStat.ullRsr1MCRCOk, byRSR); |
214 | } | 213 | } |
215 | else if(byRxRate==12){ | 214 | else if(byRxRate==12){ |
216 | pStatistic->CustomStat.ullRsr6M++; | 215 | pStatistic->CustomStat.ullRsr6M++; |
217 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 216 | if(byRSR & RSR_CRCOK) { |
218 | pStatistic->CustomStat.ullRsr6MCRCOk++; | 217 | pStatistic->CustomStat.ullRsr6MCRCOk++; |
219 | } | 218 | } |
220 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 6M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr6M, (INT)pStatistic->CustomStat.ullRsr6MCRCOk); | 219 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 6M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr6M, (INT)pStatistic->CustomStat.ullRsr6MCRCOk); |
221 | } | 220 | } |
222 | else if(byRxRate==18){ | 221 | else if(byRxRate==18){ |
223 | pStatistic->CustomStat.ullRsr9M++; | 222 | pStatistic->CustomStat.ullRsr9M++; |
224 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 223 | if(byRSR & RSR_CRCOK) { |
225 | pStatistic->CustomStat.ullRsr9MCRCOk++; | 224 | pStatistic->CustomStat.ullRsr9MCRCOk++; |
226 | } | 225 | } |
227 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 9M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr9M, (INT)pStatistic->CustomStat.ullRsr9MCRCOk); | 226 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 9M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr9M, (INT)pStatistic->CustomStat.ullRsr9MCRCOk); |
228 | } | 227 | } |
229 | else if(byRxRate==24){ | 228 | else if(byRxRate==24){ |
230 | pStatistic->CustomStat.ullRsr12M++; | 229 | pStatistic->CustomStat.ullRsr12M++; |
231 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 230 | if(byRSR & RSR_CRCOK) { |
232 | pStatistic->CustomStat.ullRsr12MCRCOk++; | 231 | pStatistic->CustomStat.ullRsr12MCRCOk++; |
233 | } | 232 | } |
234 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"12M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr12M, (INT)pStatistic->CustomStat.ullRsr12MCRCOk); | 233 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"12M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr12M, (INT)pStatistic->CustomStat.ullRsr12MCRCOk); |
235 | } | 234 | } |
236 | else if(byRxRate==36){ | 235 | else if(byRxRate==36){ |
237 | pStatistic->CustomStat.ullRsr18M++; | 236 | pStatistic->CustomStat.ullRsr18M++; |
238 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 237 | if(byRSR & RSR_CRCOK) { |
239 | pStatistic->CustomStat.ullRsr18MCRCOk++; | 238 | pStatistic->CustomStat.ullRsr18MCRCOk++; |
240 | } | 239 | } |
241 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"18M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr18M, (INT)pStatistic->CustomStat.ullRsr18MCRCOk); | 240 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"18M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr18M, (INT)pStatistic->CustomStat.ullRsr18MCRCOk); |
242 | } | 241 | } |
243 | else if(byRxRate==48){ | 242 | else if(byRxRate==48){ |
244 | pStatistic->CustomStat.ullRsr24M++; | 243 | pStatistic->CustomStat.ullRsr24M++; |
245 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 244 | if(byRSR & RSR_CRCOK) { |
246 | pStatistic->CustomStat.ullRsr24MCRCOk++; | 245 | pStatistic->CustomStat.ullRsr24MCRCOk++; |
247 | } | 246 | } |
248 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"24M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr24M, (INT)pStatistic->CustomStat.ullRsr24MCRCOk); | 247 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"24M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr24M, (INT)pStatistic->CustomStat.ullRsr24MCRCOk); |
249 | } | 248 | } |
250 | else if(byRxRate==72){ | 249 | else if(byRxRate==72){ |
251 | pStatistic->CustomStat.ullRsr36M++; | 250 | pStatistic->CustomStat.ullRsr36M++; |
252 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 251 | if(byRSR & RSR_CRCOK) { |
253 | pStatistic->CustomStat.ullRsr36MCRCOk++; | 252 | pStatistic->CustomStat.ullRsr36MCRCOk++; |
254 | } | 253 | } |
255 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"36M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr36M, (INT)pStatistic->CustomStat.ullRsr36MCRCOk); | 254 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"36M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr36M, (INT)pStatistic->CustomStat.ullRsr36MCRCOk); |
256 | } | 255 | } |
257 | else if(byRxRate==96){ | 256 | else if(byRxRate==96){ |
258 | pStatistic->CustomStat.ullRsr48M++; | 257 | pStatistic->CustomStat.ullRsr48M++; |
259 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 258 | if(byRSR & RSR_CRCOK) { |
260 | pStatistic->CustomStat.ullRsr48MCRCOk++; | 259 | pStatistic->CustomStat.ullRsr48MCRCOk++; |
261 | } | 260 | } |
262 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"48M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr48M, (INT)pStatistic->CustomStat.ullRsr48MCRCOk); | 261 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"48M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr48M, (INT)pStatistic->CustomStat.ullRsr48MCRCOk); |
263 | } | 262 | } |
264 | else if(byRxRate==108){ | 263 | else if(byRxRate==108){ |
265 | pStatistic->CustomStat.ullRsr54M++; | 264 | pStatistic->CustomStat.ullRsr54M++; |
266 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 265 | if(byRSR & RSR_CRCOK) { |
267 | pStatistic->CustomStat.ullRsr54MCRCOk++; | 266 | pStatistic->CustomStat.ullRsr54MCRCOk++; |
268 | } | 267 | } |
269 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"54M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr54M, (INT)pStatistic->CustomStat.ullRsr54MCRCOk); | 268 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"54M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr54M, (INT)pStatistic->CustomStat.ullRsr54MCRCOk); |
@@ -272,27 +271,27 @@ void STAvUpdateRDStatCounter (PSStatCounter pStatistic, | |||
272 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Unknown: Total[%d], CRCOK[%d]\n", (INT)pStatistic->dwRsrRxPacket+1, (INT)pStatistic->dwRsrCRCOk); | 271 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Unknown: Total[%d], CRCOK[%d]\n", (INT)pStatistic->dwRsrRxPacket+1, (INT)pStatistic->dwRsrCRCOk); |
273 | } | 272 | } |
274 | 273 | ||
275 | if (BITbIsBitOn(byRSR, RSR_BSSIDOK)) | 274 | if (byRSR & RSR_BSSIDOK) |
276 | pStatistic->dwRsrBSSIDOk++; | 275 | pStatistic->dwRsrBSSIDOk++; |
277 | 276 | ||
278 | if (BITbIsBitOn(byRSR, RSR_BCNSSIDOK)) | 277 | if (byRSR & RSR_BCNSSIDOK) |
279 | pStatistic->dwRsrBCNSSIDOk++; | 278 | pStatistic->dwRsrBCNSSIDOk++; |
280 | if (BITbIsBitOn(byRSR, RSR_IVLDLEN)) //invalid len (> 2312 byte) | 279 | if (byRSR & RSR_IVLDLEN) //invalid len (> 2312 byte) |
281 | pStatistic->dwRsrLENErr++; | 280 | pStatistic->dwRsrLENErr++; |
282 | if (BITbIsBitOn(byRSR, RSR_IVLDTYP)) //invalid packet type | 281 | if (byRSR & RSR_IVLDTYP) //invalid packet type |
283 | pStatistic->dwRsrTYPErr++; | 282 | pStatistic->dwRsrTYPErr++; |
284 | if (BITbIsBitOn(byRSR, (RSR_IVLDTYP | RSR_IVLDLEN)) || BITbIsBitOff(byRSR, RSR_CRCOK)) | 283 | if ((byRSR & (RSR_IVLDTYP | RSR_IVLDLEN)) || !(byRSR & RSR_CRCOK)) |
285 | pStatistic->dwRsrErr++; | 284 | pStatistic->dwRsrErr++; |
286 | 285 | ||
287 | if (BITbIsBitOn(byNewRSR, NEWRSR_DECRYPTOK)) | 286 | if (byNewRSR & NEWRSR_DECRYPTOK) |
288 | pStatistic->dwNewRsrDECRYPTOK++; | 287 | pStatistic->dwNewRsrDECRYPTOK++; |
289 | if (BITbIsBitOn(byNewRSR, NEWRSR_CFPIND)) | 288 | if (byNewRSR & NEWRSR_CFPIND) |
290 | pStatistic->dwNewRsrCFP++; | 289 | pStatistic->dwNewRsrCFP++; |
291 | if (BITbIsBitOn(byNewRSR, NEWRSR_HWUTSF)) | 290 | if (byNewRSR & NEWRSR_HWUTSF) |
292 | pStatistic->dwNewRsrUTSF++; | 291 | pStatistic->dwNewRsrUTSF++; |
293 | if (BITbIsBitOn(byNewRSR, NEWRSR_BCNHITAID)) | 292 | if (byNewRSR & NEWRSR_BCNHITAID) |
294 | pStatistic->dwNewRsrHITAID++; | 293 | pStatistic->dwNewRsrHITAID++; |
295 | if (BITbIsBitOn(byNewRSR, NEWRSR_BCNHITAID0)) | 294 | if (byNewRSR & NEWRSR_BCNHITAID0) |
296 | pStatistic->dwNewRsrHITAID0++; | 295 | pStatistic->dwNewRsrHITAID0++; |
297 | 296 | ||
298 | // increase rx packet count | 297 | // increase rx packet count |
@@ -308,9 +307,9 @@ void STAvUpdateRDStatCounter (PSStatCounter pStatistic, | |||
308 | pStatistic->dwRsrRxControl++; | 307 | pStatistic->dwRsrRxControl++; |
309 | } | 308 | } |
310 | 309 | ||
311 | if (BITbIsBitOn(byRSR, RSR_ADDRBROAD)) | 310 | if (byRSR & RSR_ADDRBROAD) |
312 | pStatistic->dwRsrBroadcast++; | 311 | pStatistic->dwRsrBroadcast++; |
313 | else if (BITbIsBitOn(byRSR, RSR_ADDRMULTI)) | 312 | else if (byRSR & RSR_ADDRMULTI) |
314 | pStatistic->dwRsrMulticast++; | 313 | pStatistic->dwRsrMulticast++; |
315 | else | 314 | else |
316 | pStatistic->dwRsrDirected++; | 315 | pStatistic->dwRsrDirected++; |
@@ -436,7 +435,7 @@ STAvUpdateTDStatCounter ( | |||
436 | pStatistic->dwTxRetryCount[byRetyCnt-1]++; | 435 | pStatistic->dwTxRetryCount[byRetyCnt-1]++; |
437 | 436 | ||
438 | } | 437 | } |
439 | if (BITbIsAllBitsOff(byTSR, (TSR_TMO | TSR_RETRYTMO))) { | 438 | if ( !(byTSR & (TSR_TMO | TSR_RETRYTMO))) { |
440 | 439 | ||
441 | #ifdef Calcu_LinkQual | 440 | #ifdef Calcu_LinkQual |
442 | if (byRetyCnt < 2) | 441 | if (byRetyCnt < 2) |
@@ -469,9 +468,9 @@ STAvUpdateTDStatCounter ( | |||
469 | #endif | 468 | #endif |
470 | 469 | ||
471 | pStatistic->dwTsrErr++; | 470 | pStatistic->dwTsrErr++; |
472 | if (BITbIsBitOn(byTSR, TSR_RETRYTMO)) | 471 | if (byTSR & TSR_RETRYTMO) |
473 | pStatistic->dwTsrRetryTimeout++; | 472 | pStatistic->dwTsrRetryTimeout++; |
474 | if (BITbIsBitOn(byTSR, TSR_TMO)) | 473 | if (byTSR & TSR_TMO) |
475 | pStatistic->dwTsrTransmitTimeout++; | 474 | pStatistic->dwTsrTransmitTimeout++; |
476 | } | 475 | } |
477 | 476 | ||
diff --git a/drivers/staging/vt6656/michael.c b/drivers/staging/vt6656/michael.c index 2c8f875659d..c930e0cdb85 100644 --- a/drivers/staging/vt6656/michael.c +++ b/drivers/staging/vt6656/michael.c | |||
@@ -40,7 +40,6 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "tmacro.h" | 42 | #include "tmacro.h" |
43 | #include "tbit.h" | ||
44 | #include "michael.h" | 43 | #include "michael.h" |
45 | 44 | ||
46 | /*--------------------- Static Definitions -------------------------*/ | 45 | /*--------------------- Static Definitions -------------------------*/ |
diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c index 6461355a40b..b5702b098e1 100644 --- a/drivers/staging/vt6656/power.c +++ b/drivers/staging/vt6656/power.c | |||
@@ -38,13 +38,11 @@ | |||
38 | */ | 38 | */ |
39 | 39 | ||
40 | #include "ttype.h" | 40 | #include "ttype.h" |
41 | #include "tbit.h" | ||
42 | #include "mac.h" | 41 | #include "mac.h" |
43 | #include "device.h" | 42 | #include "device.h" |
44 | #include "wmgr.h" | 43 | #include "wmgr.h" |
45 | #include "power.h" | 44 | #include "power.h" |
46 | #include "wcmd.h" | 45 | #include "wcmd.h" |
47 | #include "tbit.h" | ||
48 | #include "rxtx.h" | 46 | #include "rxtx.h" |
49 | #include "card.h" | 47 | #include "card.h" |
50 | #include "control.h" | 48 | #include "control.h" |
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 6a8eb1d26ca..94ddf8bab62 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c | |||
@@ -57,7 +57,6 @@ | |||
57 | #include "tkip.h" | 57 | #include "tkip.h" |
58 | #include "tcrc.h" | 58 | #include "tcrc.h" |
59 | #include "wctl.h" | 59 | #include "wctl.h" |
60 | #include "tbit.h" | ||
61 | #include "hostap.h" | 60 | #include "hostap.h" |
62 | #include "rf.h" | 61 | #include "rf.h" |
63 | #include "datarate.h" | 62 | #include "datarate.h" |
diff --git a/drivers/staging/vt6656/tbit.h b/drivers/staging/vt6656/tbit.h deleted file mode 100644 index 1850282ce44..00000000000 --- a/drivers/staging/vt6656/tbit.h +++ /dev/null | |||
@@ -1,73 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc. | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This program is free software; you can redistribute it and/or modify | ||
6 | * it under the terms of the GNU General Public License as published by | ||
7 | * the Free Software Foundation; either version 2 of the License, or | ||
8 | * (at your option) any later version. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, | ||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | * GNU General Public License for more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public License along | ||
16 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
17 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
18 | * | ||
19 | * | ||
20 | * File: tbit.h | ||
21 | * | ||
22 | * Purpose: Bit routines | ||
23 | * | ||
24 | * Author: Tevin Chen | ||
25 | * | ||
26 | * Date: May 21, 1996 | ||
27 | * | ||
28 | */ | ||
29 | |||
30 | #ifndef __TBIT_H__ | ||
31 | #define __TBIT_H__ | ||
32 | |||
33 | #include "ttype.h" | ||
34 | |||
35 | /*--------------------- Export Definitions -------------------------*/ | ||
36 | |||
37 | /*--------------------- Export Types ------------------------------*/ | ||
38 | |||
39 | /*--------------------- Export Macros ------------------------------*/ | ||
40 | |||
41 | // test single bit on | ||
42 | #define BITbIsBitOn(tData, tTestBit) \ | ||
43 | (((tData) & (tTestBit)) != 0) | ||
44 | |||
45 | // test single bit off | ||
46 | #define BITbIsBitOff(tData, tTestBit) \ | ||
47 | (((tData) & (tTestBit)) == 0) | ||
48 | |||
49 | |||
50 | #define BITbIsAllBitsOn(tData, tTestBit) \ | ||
51 | (((tData) & (tTestBit)) == (tTestBit)) | ||
52 | |||
53 | #define BITbIsAllBitsOff(tData, tTestBit) \ | ||
54 | (((tData) & (tTestBit)) == 0) | ||
55 | |||
56 | #define BITbIsAnyBitsOn(tData, tTestBit) \ | ||
57 | (((tData) & (tTestBit)) != 0) | ||
58 | |||
59 | #define BITbIsAnyBitsOff(tData, tTestBit) \ | ||
60 | (((tData) & (tTestBit)) != (tTestBit)) | ||
61 | |||
62 | /*--------------------- Export Classes ----------------------------*/ | ||
63 | |||
64 | /*--------------------- Export Variables --------------------------*/ | ||
65 | |||
66 | /*--------------------- Export Functions --------------------------*/ | ||
67 | |||
68 | |||
69 | |||
70 | #endif // __TBIT_H__ | ||
71 | |||
72 | |||
73 | |||
diff --git a/drivers/staging/vt6656/tcrc.c b/drivers/staging/vt6656/tcrc.c index 79347e48369..5f0c74763f8 100644 --- a/drivers/staging/vt6656/tcrc.c +++ b/drivers/staging/vt6656/tcrc.c | |||
@@ -33,7 +33,6 @@ | |||
33 | * | 33 | * |
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include "tbit.h" | ||
37 | #include "tcrc.h" | 36 | #include "tcrc.h" |
38 | 37 | ||
39 | /*--------------------- Static Definitions -------------------------*/ | 38 | /*--------------------- Static Definitions -------------------------*/ |
diff --git a/drivers/staging/vt6656/tether.c b/drivers/staging/vt6656/tether.c index 7268735d01c..c90b469ad54 100644 --- a/drivers/staging/vt6656/tether.c +++ b/drivers/staging/vt6656/tether.c | |||
@@ -34,7 +34,6 @@ | |||
34 | 34 | ||
35 | #include "device.h" | 35 | #include "device.h" |
36 | #include "tmacro.h" | 36 | #include "tmacro.h" |
37 | #include "tbit.h" | ||
38 | #include "tcrc.h" | 37 | #include "tcrc.h" |
39 | #include "tether.h" | 38 | #include "tether.h" |
40 | 39 | ||
@@ -74,7 +73,7 @@ BYTE ETHbyGetHashIndexByCrc32 (PBYTE pbyMultiAddr) | |||
74 | // reverse most bit to least bit | 73 | // reverse most bit to least bit |
75 | for (ii = 0; ii < (sizeof(byTmpHash) * 8); ii++) { | 74 | for (ii = 0; ii < (sizeof(byTmpHash) * 8); ii++) { |
76 | byHash <<= 1; | 75 | byHash <<= 1; |
77 | if (BITbIsBitOn(byTmpHash, 0x01)) | 76 | if (byTmpHash & 0x01) |
78 | byHash |= 1; | 77 | byHash |= 1; |
79 | byTmpHash >>= 1; | 78 | byTmpHash >>= 1; |
80 | } | 79 | } |
diff --git a/drivers/staging/vt6656/tkip.c b/drivers/staging/vt6656/tkip.c index bbb3e62f03c..8ca154080e9 100644 --- a/drivers/staging/vt6656/tkip.c +++ b/drivers/staging/vt6656/tkip.c | |||
@@ -33,7 +33,6 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "tmacro.h" | 35 | #include "tmacro.h" |
36 | #include "tbit.h" | ||
37 | #include "tkip.h" | 36 | #include "tkip.h" |
38 | 37 | ||
39 | /*--------------------- Static Definitions -------------------------*/ | 38 | /*--------------------- Static Definitions -------------------------*/ |
diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c index d40d1bcf0cf..330aea69d23 100644 --- a/drivers/staging/vt6656/wmgr.c +++ b/drivers/staging/vt6656/wmgr.c | |||
@@ -62,7 +62,6 @@ | |||
62 | */ | 62 | */ |
63 | 63 | ||
64 | #include "tmacro.h" | 64 | #include "tmacro.h" |
65 | #include "tbit.h" | ||
66 | #include "desc.h" | 65 | #include "desc.h" |
67 | #include "device.h" | 66 | #include "device.h" |
68 | #include "card.h" | 67 | #include "card.h" |