diff options
author | Jim Lieb <lieb@canonical.com> | 2009-08-12 17:54:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:02:08 -0400 |
commit | 256a816b6b78bf29fba0c0f1bbcf998953429422 (patch) | |
tree | c74cbe782154efac2cac80e075c06e44efb81055 /drivers/staging/vt6655 | |
parent | 8a3d91b02830dd7c58d27e5de65222219ac2163f (diff) |
Staging: vt665x: remove tbit.h part 2
Remove use of tbit macros adn remove header file.
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655')
-rw-r--r-- | drivers/staging/vt6655/baseband.c | 9 | ||||
-rw-r--r-- | drivers/staging/vt6655/bssdb.c | 19 | ||||
-rw-r--r-- | drivers/staging/vt6655/card.c | 7 | ||||
-rw-r--r-- | drivers/staging/vt6655/device_main.c | 23 | ||||
-rw-r--r-- | drivers/staging/vt6655/dpc.c | 11 | ||||
-rw-r--r-- | drivers/staging/vt6655/key.c | 1 | ||||
-rw-r--r-- | drivers/staging/vt6655/mac.c | 75 | ||||
-rw-r--r-- | drivers/staging/vt6655/mib.c | 101 | ||||
-rw-r--r-- | drivers/staging/vt6655/michael.c | 1 | ||||
-rw-r--r-- | drivers/staging/vt6655/power.c | 2 | ||||
-rw-r--r-- | drivers/staging/vt6655/rf.c | 3 | ||||
-rw-r--r-- | drivers/staging/vt6655/rxtx.c | 1 | ||||
-rw-r--r-- | drivers/staging/vt6655/srom.c | 15 | ||||
-rw-r--r-- | drivers/staging/vt6655/tbit.h | 73 | ||||
-rw-r--r-- | drivers/staging/vt6655/tcrc.c | 1 | ||||
-rw-r--r-- | drivers/staging/vt6655/tether.c | 3 | ||||
-rw-r--r-- | drivers/staging/vt6655/tkip.c | 1 | ||||
-rw-r--r-- | drivers/staging/vt6655/vntwifi.c | 3 | ||||
-rw-r--r-- | drivers/staging/vt6655/wmgr.c | 1 |
19 files changed, 129 insertions, 221 deletions
diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index 685e9e8c82e..cd5b8ea0253 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c | |||
@@ -50,7 +50,6 @@ | |||
50 | */ | 50 | */ |
51 | 51 | ||
52 | #include "tmacro.h" | 52 | #include "tmacro.h" |
53 | #include "tbit.h" | ||
54 | #include "tether.h" | 53 | #include "tether.h" |
55 | #include "mac.h" | 54 | #include "mac.h" |
56 | #include "baseband.h" | 55 | #include "baseband.h" |
@@ -2029,7 +2028,7 @@ BOOL BBbReadEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, PBYTE pbyData) | |||
2029 | // W_MAX_TIMEOUT is the timeout period | 2028 | // W_MAX_TIMEOUT is the timeout period |
2030 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 2029 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
2031 | VNSvInPortB(dwIoBase + MAC_REG_BBREGCTL, &byValue); | 2030 | VNSvInPortB(dwIoBase + MAC_REG_BBREGCTL, &byValue); |
2032 | if (BITbIsBitOn(byValue, BBREGCTL_DONE)) | 2031 | if (byValue & BBREGCTL_DONE) |
2033 | break; | 2032 | break; |
2034 | } | 2033 | } |
2035 | 2034 | ||
@@ -2074,7 +2073,7 @@ BOOL BBbWriteEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byData) | |||
2074 | // W_MAX_TIMEOUT is the timeout period | 2073 | // W_MAX_TIMEOUT is the timeout period |
2075 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 2074 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
2076 | VNSvInPortB(dwIoBase + MAC_REG_BBREGCTL, &byValue); | 2075 | VNSvInPortB(dwIoBase + MAC_REG_BBREGCTL, &byValue); |
2077 | if (BITbIsBitOn(byValue, BBREGCTL_DONE)) | 2076 | if (byValue & BBREGCTL_DONE) |
2078 | break; | 2077 | break; |
2079 | } | 2078 | } |
2080 | 2079 | ||
@@ -2106,7 +2105,7 @@ BOOL BBbIsRegBitsOn (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits) | |||
2106 | BYTE byOrgData; | 2105 | BYTE byOrgData; |
2107 | 2106 | ||
2108 | BBbReadEmbeded(dwIoBase, byBBAddr, &byOrgData); | 2107 | BBbReadEmbeded(dwIoBase, byBBAddr, &byOrgData); |
2109 | return BITbIsAllBitsOn(byOrgData, byTestBits); | 2108 | return (byOrgData & byTestBits) == byTestBits; |
2110 | } | 2109 | } |
2111 | 2110 | ||
2112 | 2111 | ||
@@ -2129,7 +2128,7 @@ BOOL BBbIsRegBitsOff (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byTestBits) | |||
2129 | BYTE byOrgData; | 2128 | BYTE byOrgData; |
2130 | 2129 | ||
2131 | BBbReadEmbeded(dwIoBase, byBBAddr, &byOrgData); | 2130 | BBbReadEmbeded(dwIoBase, byBBAddr, &byOrgData); |
2132 | return BITbIsAllBitsOff(byOrgData, byTestBits); | 2131 | return (byOrgData & byTestBits) == 0; |
2133 | } | 2132 | } |
2134 | 2133 | ||
2135 | /* | 2134 | /* |
diff --git a/drivers/staging/vt6655/bssdb.c b/drivers/staging/vt6655/bssdb.c index f5ef1b57130..9535d4473c5 100644 --- a/drivers/staging/vt6655/bssdb.c +++ b/drivers/staging/vt6655/bssdb.c | |||
@@ -39,7 +39,6 @@ | |||
39 | * | 39 | * |
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "tbit.h" | ||
43 | #include "ttype.h" | 42 | #include "ttype.h" |
44 | #include "tmacro.h" | 43 | #include "tmacro.h" |
45 | #include "tether.h" | 44 | #include "tether.h" |
@@ -1035,14 +1034,14 @@ BSSvSecondCallBack( | |||
1035 | //2008-4-14 <add> by chester for led issue | 1034 | //2008-4-14 <add> by chester for led issue |
1036 | #ifdef FOR_LED_ON_NOTEBOOK | 1035 | #ifdef FOR_LED_ON_NOTEBOOK |
1037 | MACvGPIOIn(pDevice->PortOffset, &pDevice->byGPIO); | 1036 | MACvGPIOIn(pDevice->PortOffset, &pDevice->byGPIO); |
1038 | if (((BITbIsBitOff(pDevice->byGPIO,GPIO0_DATA)&&(pDevice->bHWRadioOff == FALSE))||(BITbIsBitOn(pDevice->byGPIO,GPIO0_DATA)&&(pDevice->bHWRadioOff == TRUE)))&&(cc==FALSE)){ | 1037 | if ((( !(pDevice->byGPIO & GPIO0_DATA)&&(pDevice->bHWRadioOff == FALSE))||((pDevice->byGPIO & GPIO0_DATA)&&(pDevice->bHWRadioOff == TRUE)))&&(cc==FALSE)){ |
1039 | cc=TRUE; | 1038 | cc=TRUE; |
1040 | } | 1039 | } |
1041 | else if(cc==TRUE){ | 1040 | else if(cc==TRUE){ |
1042 | 1041 | ||
1043 | if(pDevice->bHWRadioOff == TRUE){ | 1042 | if(pDevice->bHWRadioOff == TRUE){ |
1044 | if (BITbIsBitOff(pDevice->byGPIO,GPIO0_DATA)) | 1043 | if ( !(pDevice->byGPIO & GPIO0_DATA)) |
1045 | //||(BITbIsBitOff(pDevice->byGPIO,GPIO0_DATA) && BITbIsBitOn(pDevice->byRadioCtl, EEP_RADIOCTL_INV))) | 1044 | //||( !(pDevice->byGPIO & GPIO0_DATA) && (pDevice->byRadioCtl & EEP_RADIOCTL_INV))) |
1046 | {if(status==1) goto start; | 1045 | {if(status==1) goto start; |
1047 | status=1; | 1046 | status=1; |
1048 | CARDbRadioPowerOff(pDevice); | 1047 | CARDbRadioPowerOff(pDevice); |
@@ -1053,15 +1052,15 @@ CARDbRadioPowerOff(pDevice); | |||
1053 | pDevice->bLinkPass = FALSE; | 1052 | pDevice->bLinkPass = FALSE; |
1054 | 1053 | ||
1055 | } | 1054 | } |
1056 | if (BITbIsBitOn(pDevice->byGPIO,GPIO0_DATA)) | 1055 | if (pDevice->byGPIO &GPIO0_DATA) |
1057 | //||(BITbIsBitOff(pDevice->byGPIO,GPIO0_DATA) && BITbIsBitOn(pDevice->byRadioCtl, EEP_RADIOCTL_INV))) | 1056 | //||( !(pDevice->byGPIO & GPIO0_DATA) && (pDevice->byRadioCtl & EEP_RADIOCTL_INV))) |
1058 | {if(status==2) goto start; | 1057 | {if(status==2) goto start; |
1059 | status=2; | 1058 | status=2; |
1060 | CARDbRadioPowerOn(pDevice); | 1059 | CARDbRadioPowerOn(pDevice); |
1061 | } } | 1060 | } } |
1062 | else{ | 1061 | else{ |
1063 | if (BITbIsBitOn(pDevice->byGPIO,GPIO0_DATA)) | 1062 | if (pDevice->byGPIO & GPIO0_DATA) |
1064 | //||(BITbIsBitOff(pDevice->byGPIO,GPIO0_DATA) && BITbIsBitOn(pDevice->byRadioCtl, EEP_RADIOCTL_INV))) | 1063 | //||( !(pDevice->byGPIO & GPIO0_DATA) && (pDevice->byRadioCtl & EEP_RADIOCTL_INV))) |
1065 | {if(status==3) goto start; | 1064 | {if(status==3) goto start; |
1066 | status=3; | 1065 | status=3; |
1067 | CARDbRadioPowerOff(pDevice); | 1066 | CARDbRadioPowerOff(pDevice); |
@@ -1072,8 +1071,8 @@ CARDbRadioPowerOff(pDevice); | |||
1072 | pDevice->bLinkPass = FALSE; | 1071 | pDevice->bLinkPass = FALSE; |
1073 | 1072 | ||
1074 | } | 1073 | } |
1075 | if (BITbIsBitOff(pDevice->byGPIO,GPIO0_DATA)) | 1074 | if ( !(pDevice->byGPIO & GPIO0_DATA)) |
1076 | //||(BITbIsBitOff(pDevice->byGPIO,GPIO0_DATA) && BITbIsBitOn(pDevice->byRadioCtl, EEP_RADIOCTL_INV))) | 1075 | //||( !(pDevice->byGPIO & GPIO0_DATA) && (pDevice->byRadioCtl & EEP_RADIOCTL_INV))) |
1077 | {if(status==4) goto start; | 1076 | {if(status==4) goto start; |
1078 | status=4; | 1077 | status=4; |
1079 | CARDbRadioPowerOn(pDevice); | 1078 | CARDbRadioPowerOn(pDevice); |
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 06d5be19906..db786142717 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/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" |
@@ -2374,7 +2373,7 @@ CARDbyAutoChannelSelect( | |||
2374 | } | 2373 | } |
2375 | if (sChannelTbl[ii].byMAP == 0) { | 2374 | if (sChannelTbl[ii].byMAP == 0) { |
2376 | return ((BYTE) ii); | 2375 | return ((BYTE) ii); |
2377 | } else if (BITbIsBitOff(sChannelTbl[ii].byMAP, 0x08)) { | 2376 | } else if ( !(sChannelTbl[ii].byMAP & 0x08)) { |
2378 | byOptionChannel = (BYTE) ii; | 2377 | byOptionChannel = (BYTE) ii; |
2379 | } | 2378 | } |
2380 | } | 2379 | } |
@@ -2385,7 +2384,7 @@ CARDbyAutoChannelSelect( | |||
2385 | if (sChannelTbl[ii].bValid == TRUE) { | 2384 | if (sChannelTbl[ii].bValid == TRUE) { |
2386 | if (sChannelTbl[ii].byMAP == 0) { | 2385 | if (sChannelTbl[ii].byMAP == 0) { |
2387 | aiWeight[ii] += 100; | 2386 | aiWeight[ii] += 100; |
2388 | } else if (BITbIsBitOn(sChannelTbl[ii].byMAP, 0x01)) { | 2387 | } else if (sChannelTbl[ii].byMAP & 0x01) { |
2389 | if (ii > 3) { | 2388 | if (ii > 3) { |
2390 | aiWeight[ii-3] -= 10; | 2389 | aiWeight[ii-3] -= 10; |
2391 | } | 2390 | } |
@@ -2973,7 +2972,7 @@ BOOL CARDbGetCurrentTSF (DWORD_PTR dwIoBase, PQWORD pqwCurrTSF) | |||
2973 | MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TSFCNTRRD); | 2972 | MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TSFCNTRRD); |
2974 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 2973 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
2975 | VNSvInPortB(dwIoBase + MAC_REG_TFTCTL, &byData); | 2974 | VNSvInPortB(dwIoBase + MAC_REG_TFTCTL, &byData); |
2976 | if (BITbIsBitOff(byData, TFTCTL_TSFCNTRRD)) | 2975 | if ( !(byData & TFTCTL_TSFCNTRRD)) |
2977 | break; | 2976 | break; |
2978 | } | 2977 | } |
2979 | if (ww == W_MAX_TIMEOUT) | 2978 | if (ww == W_MAX_TIMEOUT) |
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 545cf42a8a7..449e47a839d 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c | |||
@@ -62,7 +62,6 @@ | |||
62 | 62 | ||
63 | #include "device.h" | 63 | #include "device.h" |
64 | #include "card.h" | 64 | #include "card.h" |
65 | #include "tbit.h" | ||
66 | #include "baseband.h" | 65 | #include "baseband.h" |
67 | #include "mac.h" | 66 | #include "mac.h" |
68 | #include "tether.h" | 67 | #include "tether.h" |
@@ -789,8 +788,8 @@ else | |||
789 | MACvGPIOIn(pDevice->PortOffset, &pDevice->byGPIO); | 788 | MACvGPIOIn(pDevice->PortOffset, &pDevice->byGPIO); |
790 | //2008-4-14 <add> by chester for led issue | 789 | //2008-4-14 <add> by chester for led issue |
791 | #ifdef FOR_LED_ON_NOTEBOOK | 790 | #ifdef FOR_LED_ON_NOTEBOOK |
792 | if (BITbIsBitOn(pDevice->byGPIO,GPIO0_DATA)){pDevice->bHWRadioOff = TRUE;} | 791 | if (pDevice->byGPIO & GPIO0_DATA){pDevice->bHWRadioOff = TRUE;} |
793 | if (BITbIsBitOff(pDevice->byGPIO,GPIO0_DATA)){pDevice->bHWRadioOff = FALSE;} | 792 | if ( !(pDevice->byGPIO & GPIO0_DATA)){pDevice->bHWRadioOff = FALSE;} |
794 | 793 | ||
795 | } | 794 | } |
796 | if ( (pDevice->bRadioControlOff == TRUE)) { | 795 | if ( (pDevice->bRadioControlOff == TRUE)) { |
@@ -798,8 +797,8 @@ if (BITbIsBitOff(pDevice->byGPIO,GPIO0_DATA)){pDevice->bHWRadioOff = FALSE;} | |||
798 | } | 797 | } |
799 | else CARDbRadioPowerOn(pDevice); | 798 | else CARDbRadioPowerOn(pDevice); |
800 | #else | 799 | #else |
801 | if ((BITbIsBitOn(pDevice->byGPIO,GPIO0_DATA) && BITbIsBitOff(pDevice->byRadioCtl, EEP_RADIOCTL_INV)) || | 800 | if (((pDevice->byGPIO & GPIO0_DATA) && !(pDevice->byRadioCtl & EEP_RADIOCTL_INV)) || |
802 | (BITbIsBitOff(pDevice->byGPIO,GPIO0_DATA) && BITbIsBitOn(pDevice->byRadioCtl, EEP_RADIOCTL_INV))) { | 801 | ( !(pDevice->byGPIO & GPIO0_DATA) && (pDevice->byRadioCtl & EEP_RADIOCTL_INV))) { |
803 | pDevice->bHWRadioOff = TRUE; | 802 | pDevice->bHWRadioOff = TRUE; |
804 | } | 803 | } |
805 | } | 804 | } |
@@ -1703,7 +1702,7 @@ static int device_tx_srv(PSDevice pDevice, UINT uIdx) { | |||
1703 | uFIFOHeaderSize | 1702 | uFIFOHeaderSize |
1704 | ); | 1703 | ); |
1705 | 1704 | ||
1706 | if (BITbIsBitOff(byTsr1, TSR1_TERR)) { | 1705 | if ( !(byTsr1 & TSR1_TERR)) { |
1707 | if (byTsr0 != 0) { | 1706 | if (byTsr0 != 0) { |
1708 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Tx[%d] OK but has error. tsr1[%02X] tsr0[%02X].\n", | 1707 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Tx[%d] OK but has error. tsr1[%02X] tsr0[%02X].\n", |
1709 | (INT)uIdx, byTsr1, byTsr0); | 1708 | (INT)uIdx, byTsr1, byTsr0); |
@@ -1735,7 +1734,7 @@ static int device_tx_srv(PSDevice pDevice, UINT uIdx) { | |||
1735 | } | 1734 | } |
1736 | } | 1735 | } |
1737 | 1736 | ||
1738 | if (BITbIsBitOn(byTsr1, TSR1_TERR)) { | 1737 | if (byTsr1 & TSR1_TERR) { |
1739 | if ((pTD->pTDInfo->byFlags & TD_FLAGS_PRIV_SKB) != 0) { | 1738 | if ((pTD->pTDInfo->byFlags & TD_FLAGS_PRIV_SKB) != 0) { |
1740 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Tx[%d] fail has error. tsr1[%02X] tsr0[%02X].\n", | 1739 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Tx[%d] fail has error. tsr1[%02X] tsr0[%02X].\n", |
1741 | (INT)uIdx, byTsr1, byTsr0); | 1740 | (INT)uIdx, byTsr1, byTsr0); |
@@ -2691,7 +2690,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) { | |||
2691 | /* | 2690 | /* |
2692 | // 2008-05-21 <mark> by Richardtai, we can't read RSSI here, because no packet bound with RSSI | 2691 | // 2008-05-21 <mark> by Richardtai, we can't read RSSI here, because no packet bound with RSSI |
2693 | 2692 | ||
2694 | if ((BITbIsBitOn(pDevice->dwIsr, ISR_RXDMA0)) && | 2693 | if ((pDevice->dwIsr & ISR_RXDMA0) && |
2695 | (pDevice->byLocalID != REV_ID_VT3253_B0) && | 2694 | (pDevice->byLocalID != REV_ID_VT3253_B0) && |
2696 | (pDevice->bBSSIDFilter == TRUE)) { | 2695 | (pDevice->bBSSIDFilter == TRUE)) { |
2697 | // update RSSI | 2696 | // update RSSI |
@@ -2732,7 +2731,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) { | |||
2732 | 2731 | ||
2733 | if (pDevice->byLocalID > REV_ID_VT3253_B1) { | 2732 | if (pDevice->byLocalID > REV_ID_VT3253_B1) { |
2734 | 2733 | ||
2735 | if (BITbIsBitOn(pDevice->dwIsr, ISR_MEASURESTART)) { | 2734 | if (pDevice->dwIsr & ISR_MEASURESTART) { |
2736 | // 802.11h measure start | 2735 | // 802.11h measure start |
2737 | pDevice->byOrgChannel = pDevice->byCurrentCh; | 2736 | pDevice->byOrgChannel = pDevice->byCurrentCh; |
2738 | VNSvInPortB(pDevice->PortOffset + MAC_REG_RCR, &(pDevice->byOrgRCR)); | 2737 | VNSvInPortB(pDevice->PortOffset + MAC_REG_RCR, &(pDevice->byOrgRCR)); |
@@ -2764,7 +2763,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) { | |||
2764 | MACvSelectPage0(pDevice->PortOffset); | 2763 | MACvSelectPage0(pDevice->PortOffset); |
2765 | } | 2764 | } |
2766 | } | 2765 | } |
2767 | if (BITbIsBitOn(pDevice->dwIsr, ISR_MEASUREEND)) { | 2766 | if (pDevice->dwIsr & ISR_MEASUREEND) { |
2768 | // 802.11h measure end | 2767 | // 802.11h measure end |
2769 | pDevice->bMeasureInProgress = FALSE; | 2768 | pDevice->bMeasureInProgress = FALSE; |
2770 | VNSvOutPortB(pDevice->PortOffset + MAC_REG_RCR, pDevice->byOrgRCR); | 2769 | VNSvOutPortB(pDevice->PortOffset + MAC_REG_RCR, pDevice->byOrgRCR); |
@@ -2783,7 +2782,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) { | |||
2783 | MACvSelectPage1(pDevice->PortOffset); | 2782 | MACvSelectPage1(pDevice->PortOffset); |
2784 | MACvRegBitsOn(pDevice->PortOffset, MAC_REG_MSRCTL+1, MSRCTL1_TXPAUSE); | 2783 | MACvRegBitsOn(pDevice->PortOffset, MAC_REG_MSRCTL+1, MSRCTL1_TXPAUSE); |
2785 | MACvSelectPage0(pDevice->PortOffset); | 2784 | MACvSelectPage0(pDevice->PortOffset); |
2786 | if (BITbIsBitOn(byData, MSRCTL_FINISH)) { | 2785 | if (byData & MSRCTL_FINISH) { |
2787 | // measure success | 2786 | // measure success |
2788 | s_vCompleteCurrentMeasure(pDevice, 0); | 2787 | s_vCompleteCurrentMeasure(pDevice, 0); |
2789 | } else { | 2788 | } else { |
@@ -2791,7 +2790,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) { | |||
2791 | s_vCompleteCurrentMeasure(pDevice, MEASURE_MODE_LATE); | 2790 | s_vCompleteCurrentMeasure(pDevice, MEASURE_MODE_LATE); |
2792 | } | 2791 | } |
2793 | } | 2792 | } |
2794 | if (BITbIsBitOn(pDevice->dwIsr, ISR_QUIETSTART)) { | 2793 | if (pDevice->dwIsr & ISR_QUIETSTART) { |
2795 | do { | 2794 | do { |
2796 | ; | 2795 | ; |
2797 | } while (CARDbStartQuiet(pDevice) == FALSE); | 2796 | } while (CARDbStartQuiet(pDevice) == FALSE); |
diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c index fa32229ef1d..67f238c01b4 100644 --- a/drivers/staging/vt6655/dpc.c +++ b/drivers/staging/vt6655/dpc.c | |||
@@ -50,7 +50,6 @@ | |||
50 | #include "tcrc.h" | 50 | #include "tcrc.h" |
51 | #include "wctl.h" | 51 | #include "wctl.h" |
52 | #include "wroute.h" | 52 | #include "wroute.h" |
53 | #include "tbit.h" | ||
54 | #include "hostap.h" | 53 | #include "hostap.h" |
55 | #include "rf.h" | 54 | #include "rf.h" |
56 | #include "iowpa.h" | 55 | #include "iowpa.h" |
@@ -441,7 +440,7 @@ device_receive_frame ( | |||
441 | dwDuration = (FrameSize << 4); | 440 | dwDuration = (FrameSize << 4); |
442 | dwDuration /= acbyRxRate[*pbyRxRate%MAX_RATE]; | 441 | dwDuration /= acbyRxRate[*pbyRxRate%MAX_RATE]; |
443 | if (*pbyRxRate <= RATE_11M) { | 442 | if (*pbyRxRate <= RATE_11M) { |
444 | if (BITbIsBitOn(*pbyRxSts, 0x01)) { | 443 | if (*pbyRxSts & 0x01) { |
445 | // long preamble | 444 | // long preamble |
446 | dwDuration += 192; | 445 | dwDuration += 192; |
447 | } else { | 446 | } else { |
@@ -572,7 +571,7 @@ device_receive_frame ( | |||
572 | //remove the CRC length | 571 | //remove the CRC length |
573 | FrameSize -= U_CRC_LEN; | 572 | FrameSize -= U_CRC_LEN; |
574 | 573 | ||
575 | if ((BITbIsAllBitsOff(*pbyRsr, (RSR_ADDRBROAD | RSR_ADDRMULTI))) && // unicast address | 574 | if (( !(*pbyRsr & (RSR_ADDRBROAD | RSR_ADDRMULTI))) && // unicast address |
576 | (IS_FRAGMENT_PKT((skb->data+4))) | 575 | (IS_FRAGMENT_PKT((skb->data+4))) |
577 | ) { | 576 | ) { |
578 | // defragment | 577 | // defragment |
@@ -661,7 +660,7 @@ device_receive_frame ( | |||
661 | else { | 660 | else { |
662 | if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) { | 661 | if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) { |
663 | //In AP mode, hw only check addr1(BSSID or RA) if equal to local MAC. | 662 | //In AP mode, hw only check addr1(BSSID or RA) if equal to local MAC. |
664 | if (BITbIsBitOff(*pbyRsr, RSR_BSSIDOK)) { | 663 | if ( !(*pbyRsr & RSR_BSSIDOK)) { |
665 | if (bDeFragRx) { | 664 | if (bDeFragRx) { |
666 | if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) { | 665 | if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) { |
667 | DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n", | 666 | DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n", |
@@ -674,7 +673,7 @@ device_receive_frame ( | |||
674 | else { | 673 | else { |
675 | // discard DATA packet while not associate || BSSID error | 674 | // discard DATA packet while not associate || BSSID error |
676 | if ((pDevice->bLinkPass == FALSE) || | 675 | if ((pDevice->bLinkPass == FALSE) || |
677 | BITbIsBitOff(*pbyRsr, RSR_BSSIDOK)) { | 676 | !(*pbyRsr & RSR_BSSIDOK)) { |
678 | if (bDeFragRx) { | 677 | if (bDeFragRx) { |
679 | if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) { | 678 | if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) { |
680 | DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n", | 679 | DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n", |
@@ -712,7 +711,7 @@ device_receive_frame ( | |||
712 | 711 | ||
713 | if (pDevice->bEnablePSMode) { | 712 | if (pDevice->bEnablePSMode) { |
714 | if (IS_FC_MOREDATA((skb->data+4))) { | 713 | if (IS_FC_MOREDATA((skb->data+4))) { |
715 | if (BITbIsBitOn(*pbyRsr, RSR_ADDROK)) { | 714 | if (*pbyRsr & RSR_ADDROK) { |
716 | //PSbSendPSPOLL((PSDevice)pDevice); | 715 | //PSbSendPSPOLL((PSDevice)pDevice); |
717 | } | 716 | } |
718 | } | 717 | } |
diff --git a/drivers/staging/vt6655/key.c b/drivers/staging/vt6655/key.c index 781a371e79a..a4d2184d826 100644 --- a/drivers/staging/vt6655/key.c +++ b/drivers/staging/vt6655/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 | 42 | ||
diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 889866c13c7..cdd7cd5e409 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c | |||
@@ -69,7 +69,6 @@ | |||
69 | */ | 69 | */ |
70 | 70 | ||
71 | #include "tmacro.h" | 71 | #include "tmacro.h" |
72 | #include "tbit.h" | ||
73 | #include "tether.h" | 72 | #include "tether.h" |
74 | #include "mac.h" | 73 | #include "mac.h" |
75 | 74 | ||
@@ -146,7 +145,7 @@ BOOL MACbIsRegBitsOn (DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits) | |||
146 | BYTE byData; | 145 | BYTE byData; |
147 | 146 | ||
148 | VNSvInPortB(dwIoBase + byRegOfs, &byData); | 147 | VNSvInPortB(dwIoBase + byRegOfs, &byData); |
149 | return BITbIsAllBitsOn(byData, byTestBits); | 148 | return (byData & byTestBits) == byTestBits; |
150 | } | 149 | } |
151 | 150 | ||
152 | /* | 151 | /* |
@@ -169,7 +168,7 @@ BOOL MACbIsRegBitsOff (DWORD_PTR dwIoBase, BYTE byRegOfs, BYTE byTestBits) | |||
169 | BYTE byData; | 168 | BYTE byData; |
170 | 169 | ||
171 | VNSvInPortB(dwIoBase + byRegOfs, &byData); | 170 | VNSvInPortB(dwIoBase + byRegOfs, &byData); |
172 | return BITbIsAllBitsOff(byData, byTestBits); | 171 | return !(byData & byTestBits); |
173 | } | 172 | } |
174 | 173 | ||
175 | /* | 174 | /* |
@@ -565,7 +564,7 @@ BOOL MACbIsInLoopbackMode (DWORD_PTR dwIoBase) | |||
565 | BYTE byOrgValue; | 564 | BYTE byOrgValue; |
566 | 565 | ||
567 | VNSvInPortB(dwIoBase + MAC_REG_TEST, &byOrgValue); | 566 | VNSvInPortB(dwIoBase + MAC_REG_TEST, &byOrgValue); |
568 | if (BITbIsAnyBitsOn(byOrgValue, (TEST_LBINT | TEST_LBEXT))) | 567 | if (byOrgValue & (TEST_LBINT | TEST_LBEXT)) |
569 | return TRUE; | 568 | return TRUE; |
570 | return FALSE; | 569 | return FALSE; |
571 | } | 570 | } |
@@ -592,7 +591,7 @@ void MACvSetPacketFilter (DWORD_PTR dwIoBase, WORD wFilterType) | |||
592 | // if only in DIRECTED mode, multicast-address will set to zero, | 591 | // if only in DIRECTED mode, multicast-address will set to zero, |
593 | // but if other mode exist (e.g. PROMISCUOUS), multicast-address | 592 | // but if other mode exist (e.g. PROMISCUOUS), multicast-address |
594 | // will be open | 593 | // will be open |
595 | if (BITbIsBitOn(wFilterType, PKT_TYPE_DIRECTED)) { | 594 | if (wFilterType & PKT_TYPE_DIRECTED) { |
596 | // set multicast address to accept none | 595 | // set multicast address to accept none |
597 | MACvSelectPage1(dwIoBase); | 596 | MACvSelectPage1(dwIoBase); |
598 | VNSvOutPortD(dwIoBase + MAC_REG_MAR0, 0L); | 597 | VNSvOutPortD(dwIoBase + MAC_REG_MAR0, 0L); |
@@ -600,7 +599,7 @@ void MACvSetPacketFilter (DWORD_PTR dwIoBase, WORD wFilterType) | |||
600 | MACvSelectPage0(dwIoBase); | 599 | MACvSelectPage0(dwIoBase); |
601 | } | 600 | } |
602 | 601 | ||
603 | if (BITbIsAnyBitsOn(wFilterType, PKT_TYPE_PROMISCUOUS | PKT_TYPE_ALL_MULTICAST)) { | 602 | if (wFilterType & (PKT_TYPE_PROMISCUOUS | PKT_TYPE_ALL_MULTICAST)) { |
604 | // set multicast address to accept all | 603 | // set multicast address to accept all |
605 | MACvSelectPage1(dwIoBase); | 604 | MACvSelectPage1(dwIoBase); |
606 | VNSvOutPortD(dwIoBase + MAC_REG_MAR0, 0xFFFFFFFFL); | 605 | VNSvOutPortD(dwIoBase + MAC_REG_MAR0, 0xFFFFFFFFL); |
@@ -608,20 +607,20 @@ void MACvSetPacketFilter (DWORD_PTR dwIoBase, WORD wFilterType) | |||
608 | MACvSelectPage0(dwIoBase); | 607 | MACvSelectPage0(dwIoBase); |
609 | } | 608 | } |
610 | 609 | ||
611 | if (BITbIsBitOn(wFilterType, PKT_TYPE_PROMISCUOUS)) { | 610 | if (wFilterType & PKT_TYPE_PROMISCUOUS) { |
612 | 611 | ||
613 | byNewRCR |= (RCR_RXALLTYPE | RCR_UNICAST | RCR_MULTICAST | RCR_BROADCAST); | 612 | byNewRCR |= (RCR_RXALLTYPE | RCR_UNICAST | RCR_MULTICAST | RCR_BROADCAST); |
614 | 613 | ||
615 | byNewRCR &= ~RCR_BSSID; | 614 | byNewRCR &= ~RCR_BSSID; |
616 | } | 615 | } |
617 | 616 | ||
618 | if (BITbIsAnyBitsOn(wFilterType, (PKT_TYPE_ALL_MULTICAST | PKT_TYPE_MULTICAST))) | 617 | if (wFilterType & (PKT_TYPE_ALL_MULTICAST | PKT_TYPE_MULTICAST)) |
619 | byNewRCR |= RCR_MULTICAST; | 618 | byNewRCR |= RCR_MULTICAST; |
620 | 619 | ||
621 | if (BITbIsBitOn(wFilterType, PKT_TYPE_BROADCAST)) | 620 | if (wFilterType & PKT_TYPE_BROADCAST) |
622 | byNewRCR |= RCR_BROADCAST; | 621 | byNewRCR |= RCR_BROADCAST; |
623 | 622 | ||
624 | if (BITbIsBitOn(wFilterType, PKT_TYPE_ERROR_CRC)) | 623 | if (wFilterType & PKT_TYPE_ERROR_CRC) |
625 | byNewRCR |= RCR_ERRCRC; | 624 | byNewRCR |= RCR_ERRCRC; |
626 | 625 | ||
627 | VNSvInPortB(dwIoBase + MAC_REG_RCR, &byOldRCR); | 626 | VNSvInPortB(dwIoBase + MAC_REG_RCR, &byOldRCR); |
@@ -785,7 +784,7 @@ BOOL MACbSoftwareReset (DWORD_PTR dwIoBase) | |||
785 | 784 | ||
786 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 785 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
787 | VNSvInPortB(dwIoBase + MAC_REG_HOSTCR, &byData); | 786 | VNSvInPortB(dwIoBase + MAC_REG_HOSTCR, &byData); |
788 | if (BITbIsBitOff(byData, HOSTCR_SOFTRST)) | 787 | if ( !(byData & HOSTCR_SOFTRST)) |
789 | break; | 788 | break; |
790 | } | 789 | } |
791 | if (ww == W_MAX_TIMEOUT) | 790 | if (ww == W_MAX_TIMEOUT) |
@@ -853,7 +852,7 @@ BOOL MACbSafeRxOff (DWORD_PTR dwIoBase) | |||
853 | VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, DMACTL_CLRRUN); | 852 | VNSvOutPortD(dwIoBase + MAC_REG_RXDMACTL1, DMACTL_CLRRUN); |
854 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 853 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
855 | VNSvInPortD(dwIoBase + MAC_REG_RXDMACTL0, &dwData); | 854 | VNSvInPortD(dwIoBase + MAC_REG_RXDMACTL0, &dwData); |
856 | if (BITbIsAllBitsOff(dwData, DMACTL_RUN)) | 855 | if (!(dwData & DMACTL_RUN)) |
857 | break; | 856 | break; |
858 | } | 857 | } |
859 | if (ww == W_MAX_TIMEOUT) { | 858 | if (ww == W_MAX_TIMEOUT) { |
@@ -863,7 +862,7 @@ BOOL MACbSafeRxOff (DWORD_PTR dwIoBase) | |||
863 | } | 862 | } |
864 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 863 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
865 | VNSvInPortD(dwIoBase + MAC_REG_RXDMACTL1, &dwData); | 864 | VNSvInPortD(dwIoBase + MAC_REG_RXDMACTL1, &dwData); |
866 | if (BITbIsAllBitsOff(dwData, DMACTL_RUN)) | 865 | if ( !(dwData & DMACTL_RUN)) |
867 | break; | 866 | break; |
868 | } | 867 | } |
869 | if (ww == W_MAX_TIMEOUT) { | 868 | if (ww == W_MAX_TIMEOUT) { |
@@ -877,7 +876,7 @@ BOOL MACbSafeRxOff (DWORD_PTR dwIoBase) | |||
877 | // W_MAX_TIMEOUT is the timeout period | 876 | // W_MAX_TIMEOUT is the timeout period |
878 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 877 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
879 | VNSvInPortB(dwIoBase + MAC_REG_HOSTCR, &byData); | 878 | VNSvInPortB(dwIoBase + MAC_REG_HOSTCR, &byData); |
880 | if (BITbIsAllBitsOff(byData, HOSTCR_RXONST)) | 879 | if ( !(byData & HOSTCR_RXONST)) |
881 | break; | 880 | break; |
882 | } | 881 | } |
883 | if (ww == W_MAX_TIMEOUT) { | 882 | if (ww == W_MAX_TIMEOUT) { |
@@ -916,7 +915,7 @@ BOOL MACbSafeTxOff (DWORD_PTR dwIoBase) | |||
916 | 915 | ||
917 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 916 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
918 | VNSvInPortD(dwIoBase + MAC_REG_TXDMACTL0, &dwData); | 917 | VNSvInPortD(dwIoBase + MAC_REG_TXDMACTL0, &dwData); |
919 | if (BITbIsAllBitsOff(dwData, DMACTL_RUN)) | 918 | if ( !(dwData & DMACTL_RUN)) |
920 | break; | 919 | break; |
921 | } | 920 | } |
922 | if (ww == W_MAX_TIMEOUT) { | 921 | if (ww == W_MAX_TIMEOUT) { |
@@ -926,7 +925,7 @@ BOOL MACbSafeTxOff (DWORD_PTR dwIoBase) | |||
926 | } | 925 | } |
927 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 926 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
928 | VNSvInPortD(dwIoBase + MAC_REG_AC0DMACTL, &dwData); | 927 | VNSvInPortD(dwIoBase + MAC_REG_AC0DMACTL, &dwData); |
929 | if (BITbIsAllBitsOff(dwData, DMACTL_RUN)) | 928 | if ( !(dwData & DMACTL_RUN)) |
930 | break; | 929 | break; |
931 | } | 930 | } |
932 | if (ww == W_MAX_TIMEOUT) { | 931 | if (ww == W_MAX_TIMEOUT) { |
@@ -941,7 +940,7 @@ BOOL MACbSafeTxOff (DWORD_PTR dwIoBase) | |||
941 | // W_MAX_TIMEOUT is the timeout period | 940 | // W_MAX_TIMEOUT is the timeout period |
942 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 941 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
943 | VNSvInPortB(dwIoBase + MAC_REG_HOSTCR, &byData); | 942 | VNSvInPortB(dwIoBase + MAC_REG_HOSTCR, &byData); |
944 | if (BITbIsAllBitsOff(byData, HOSTCR_TXONST)) | 943 | if ( !(byData & HOSTCR_TXONST)) |
945 | break; | 944 | break; |
946 | } | 945 | } |
947 | if (ww == W_MAX_TIMEOUT) { | 946 | if (ww == W_MAX_TIMEOUT) { |
@@ -1049,7 +1048,7 @@ void MACvInitialize (DWORD_PTR dwIoBase) | |||
1049 | //while (TRUE) { | 1048 | //while (TRUE) { |
1050 | // U8 u8Data; | 1049 | // U8 u8Data; |
1051 | // VNSvInPortB(dwIoBase + MAC_REG_I2MCSR, &u8Data); | 1050 | // VNSvInPortB(dwIoBase + MAC_REG_I2MCSR, &u8Data); |
1052 | // if (BITbIsBitOff(u8Data, I2MCSR_AUTOLD)) | 1051 | // if ( !(u8Data & I2MCSR_AUTOLD)) |
1053 | // break; | 1052 | // break; |
1054 | //} | 1053 | //} |
1055 | 1054 | ||
@@ -1087,19 +1086,19 @@ BYTE byData; | |||
1087 | BYTE byOrgDMACtl; | 1086 | BYTE byOrgDMACtl; |
1088 | 1087 | ||
1089 | VNSvInPortB(dwIoBase + MAC_REG_RXDMACTL0, &byOrgDMACtl); | 1088 | VNSvInPortB(dwIoBase + MAC_REG_RXDMACTL0, &byOrgDMACtl); |
1090 | if (BITbIsAllBitsOn(byOrgDMACtl, DMACTL_RUN)) { | 1089 | if (byOrgDMACtl & DMACTL_RUN) { |
1091 | VNSvOutPortB(dwIoBase + MAC_REG_RXDMACTL0+2, DMACTL_RUN); | 1090 | VNSvOutPortB(dwIoBase + MAC_REG_RXDMACTL0+2, DMACTL_RUN); |
1092 | } | 1091 | } |
1093 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 1092 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
1094 | VNSvInPortB(dwIoBase + MAC_REG_RXDMACTL0, &byData); | 1093 | VNSvInPortB(dwIoBase + MAC_REG_RXDMACTL0, &byData); |
1095 | if (BITbIsAllBitsOff(byData, DMACTL_RUN)) | 1094 | if ( !(byData & DMACTL_RUN)) |
1096 | break; | 1095 | break; |
1097 | } | 1096 | } |
1098 | if (ww == W_MAX_TIMEOUT) { | 1097 | if (ww == W_MAX_TIMEOUT) { |
1099 | DBG_PORT80(0x13); | 1098 | DBG_PORT80(0x13); |
1100 | } | 1099 | } |
1101 | VNSvOutPortD(dwIoBase + MAC_REG_RXDMAPTR0, dwCurrDescAddr); | 1100 | VNSvOutPortD(dwIoBase + MAC_REG_RXDMAPTR0, dwCurrDescAddr); |
1102 | if (BITbIsAllBitsOn(byOrgDMACtl, DMACTL_RUN)) { | 1101 | if (byOrgDMACtl & DMACTL_RUN) { |
1103 | VNSvOutPortB(dwIoBase + MAC_REG_RXDMACTL0, DMACTL_RUN); | 1102 | VNSvOutPortB(dwIoBase + MAC_REG_RXDMACTL0, DMACTL_RUN); |
1104 | } | 1103 | } |
1105 | } | 1104 | } |
@@ -1125,19 +1124,19 @@ BYTE byData; | |||
1125 | BYTE byOrgDMACtl; | 1124 | BYTE byOrgDMACtl; |
1126 | 1125 | ||
1127 | VNSvInPortB(dwIoBase + MAC_REG_RXDMACTL1, &byOrgDMACtl); | 1126 | VNSvInPortB(dwIoBase + MAC_REG_RXDMACTL1, &byOrgDMACtl); |
1128 | if (BITbIsAllBitsOn(byOrgDMACtl, DMACTL_RUN)) { | 1127 | if (byOrgDMACtl & DMACTL_RUN) { |
1129 | VNSvOutPortB(dwIoBase + MAC_REG_RXDMACTL1+2, DMACTL_RUN); | 1128 | VNSvOutPortB(dwIoBase + MAC_REG_RXDMACTL1+2, DMACTL_RUN); |
1130 | } | 1129 | } |
1131 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 1130 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
1132 | VNSvInPortB(dwIoBase + MAC_REG_RXDMACTL1, &byData); | 1131 | VNSvInPortB(dwIoBase + MAC_REG_RXDMACTL1, &byData); |
1133 | if (BITbIsAllBitsOff(byData, DMACTL_RUN)) | 1132 | if ( !(byData & DMACTL_RUN)) |
1134 | break; | 1133 | break; |
1135 | } | 1134 | } |
1136 | if (ww == W_MAX_TIMEOUT) { | 1135 | if (ww == W_MAX_TIMEOUT) { |
1137 | DBG_PORT80(0x14); | 1136 | DBG_PORT80(0x14); |
1138 | } | 1137 | } |
1139 | VNSvOutPortD(dwIoBase + MAC_REG_RXDMAPTR1, dwCurrDescAddr); | 1138 | VNSvOutPortD(dwIoBase + MAC_REG_RXDMAPTR1, dwCurrDescAddr); |
1140 | if (BITbIsAllBitsOn(byOrgDMACtl, DMACTL_RUN)) { | 1139 | if (byOrgDMACtl & DMACTL_RUN) { |
1141 | VNSvOutPortB(dwIoBase + MAC_REG_RXDMACTL1, DMACTL_RUN); | 1140 | VNSvOutPortB(dwIoBase + MAC_REG_RXDMACTL1, DMACTL_RUN); |
1142 | } | 1141 | } |
1143 | } | 1142 | } |
@@ -1163,19 +1162,19 @@ BYTE byData; | |||
1163 | BYTE byOrgDMACtl; | 1162 | BYTE byOrgDMACtl; |
1164 | 1163 | ||
1165 | VNSvInPortB(dwIoBase + MAC_REG_TXDMACTL0, &byOrgDMACtl); | 1164 | VNSvInPortB(dwIoBase + MAC_REG_TXDMACTL0, &byOrgDMACtl); |
1166 | if (BITbIsAllBitsOn(byOrgDMACtl, DMACTL_RUN)) { | 1165 | if (byOrgDMACtl & DMACTL_RUN) { |
1167 | VNSvOutPortB(dwIoBase + MAC_REG_TXDMACTL0+2, DMACTL_RUN); | 1166 | VNSvOutPortB(dwIoBase + MAC_REG_TXDMACTL0+2, DMACTL_RUN); |
1168 | } | 1167 | } |
1169 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 1168 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
1170 | VNSvInPortB(dwIoBase + MAC_REG_TXDMACTL0, &byData); | 1169 | VNSvInPortB(dwIoBase + MAC_REG_TXDMACTL0, &byData); |
1171 | if (BITbIsAllBitsOff(byData, DMACTL_RUN)) | 1170 | if ( !(byData & DMACTL_RUN)) |
1172 | break; | 1171 | break; |
1173 | } | 1172 | } |
1174 | if (ww == W_MAX_TIMEOUT) { | 1173 | if (ww == W_MAX_TIMEOUT) { |
1175 | DBG_PORT80(0x25); | 1174 | DBG_PORT80(0x25); |
1176 | } | 1175 | } |
1177 | VNSvOutPortD(dwIoBase + MAC_REG_TXDMAPTR0, dwCurrDescAddr); | 1176 | VNSvOutPortD(dwIoBase + MAC_REG_TXDMAPTR0, dwCurrDescAddr); |
1178 | if (BITbIsAllBitsOn(byOrgDMACtl, DMACTL_RUN)) { | 1177 | if (byOrgDMACtl & DMACTL_RUN) { |
1179 | VNSvOutPortB(dwIoBase + MAC_REG_TXDMACTL0, DMACTL_RUN); | 1178 | VNSvOutPortB(dwIoBase + MAC_REG_TXDMACTL0, DMACTL_RUN); |
1180 | } | 1179 | } |
1181 | } | 1180 | } |
@@ -1202,12 +1201,12 @@ BYTE byData; | |||
1202 | BYTE byOrgDMACtl; | 1201 | BYTE byOrgDMACtl; |
1203 | 1202 | ||
1204 | VNSvInPortB(dwIoBase + MAC_REG_AC0DMACTL, &byOrgDMACtl); | 1203 | VNSvInPortB(dwIoBase + MAC_REG_AC0DMACTL, &byOrgDMACtl); |
1205 | if (BITbIsAllBitsOn(byOrgDMACtl, DMACTL_RUN)) { | 1204 | if (byOrgDMACtl & DMACTL_RUN) { |
1206 | VNSvOutPortB(dwIoBase + MAC_REG_AC0DMACTL+2, DMACTL_RUN); | 1205 | VNSvOutPortB(dwIoBase + MAC_REG_AC0DMACTL+2, DMACTL_RUN); |
1207 | } | 1206 | } |
1208 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 1207 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
1209 | VNSvInPortB(dwIoBase + MAC_REG_AC0DMACTL, &byData); | 1208 | VNSvInPortB(dwIoBase + MAC_REG_AC0DMACTL, &byData); |
1210 | if (BITbIsAllBitsOff(byData, DMACTL_RUN)) | 1209 | if (!(byData & DMACTL_RUN)) |
1211 | break; | 1210 | break; |
1212 | } | 1211 | } |
1213 | if (ww == W_MAX_TIMEOUT) { | 1212 | if (ww == W_MAX_TIMEOUT) { |
@@ -1215,7 +1214,7 @@ BYTE byOrgDMACtl; | |||
1215 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x26)\n"); | 1214 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x26)\n"); |
1216 | } | 1215 | } |
1217 | VNSvOutPortD(dwIoBase + MAC_REG_AC0DMAPTR, dwCurrDescAddr); | 1216 | VNSvOutPortD(dwIoBase + MAC_REG_AC0DMAPTR, dwCurrDescAddr); |
1218 | if (BITbIsAllBitsOn(byOrgDMACtl, DMACTL_RUN)) { | 1217 | if (byOrgDMACtl & DMACTL_RUN) { |
1219 | VNSvOutPortB(dwIoBase + MAC_REG_AC0DMACTL, DMACTL_RUN); | 1218 | VNSvOutPortB(dwIoBase + MAC_REG_AC0DMACTL, DMACTL_RUN); |
1220 | } | 1219 | } |
1221 | } | 1220 | } |
@@ -1257,7 +1256,7 @@ UINT uu,ii; | |||
1257 | for (uu = 0; uu < uDelay; uu++) { | 1256 | for (uu = 0; uu < uDelay; uu++) { |
1258 | VNSvInPortB(dwIoBase + MAC_REG_TMCTL0, &byValue); | 1257 | VNSvInPortB(dwIoBase + MAC_REG_TMCTL0, &byValue); |
1259 | if ((byValue == 0) || | 1258 | if ((byValue == 0) || |
1260 | (BITbIsAllBitsOn(byValue, TMCTL_TSUSP))) { | 1259 | (byValue & TMCTL_TSUSP)) { |
1261 | VNSvOutPortB(dwIoBase + MAC_REG_TMCTL0, 0); | 1260 | VNSvOutPortB(dwIoBase + MAC_REG_TMCTL0, 0); |
1262 | return; | 1261 | return; |
1263 | } | 1262 | } |
@@ -1329,14 +1328,14 @@ UINT ww = 0; | |||
1329 | VNSvOutPortB(dwIoBase + MAC_REG_TXDMACTL0+2, DMACTL_RUN); | 1328 | VNSvOutPortB(dwIoBase + MAC_REG_TXDMACTL0+2, DMACTL_RUN); |
1330 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 1329 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
1331 | VNSvInPortB(dwIoBase + MAC_REG_TXDMACTL0, &byData); | 1330 | VNSvInPortB(dwIoBase + MAC_REG_TXDMACTL0, &byData); |
1332 | if (BITbIsAllBitsOff(byData, DMACTL_RUN)) | 1331 | if ( !(byData & DMACTL_RUN)) |
1333 | break; | 1332 | break; |
1334 | } | 1333 | } |
1335 | } else if (idx == TYPE_AC0DMA) { | 1334 | } else if (idx == TYPE_AC0DMA) { |
1336 | VNSvOutPortB(dwIoBase + MAC_REG_AC0DMACTL+2, DMACTL_RUN); | 1335 | VNSvOutPortB(dwIoBase + MAC_REG_AC0DMACTL+2, DMACTL_RUN); |
1337 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 1336 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
1338 | VNSvInPortB(dwIoBase + MAC_REG_AC0DMACTL, &byData); | 1337 | VNSvInPortB(dwIoBase + MAC_REG_AC0DMACTL, &byData); |
1339 | if (BITbIsAllBitsOff(byData, DMACTL_RUN)) | 1338 | if ( !(byData & DMACTL_RUN)) |
1340 | break; | 1339 | break; |
1341 | } | 1340 | } |
1342 | } | 1341 | } |
@@ -1354,14 +1353,14 @@ void MACvClearBusSusInd (DWORD_PTR dwIoBase) | |||
1354 | UINT ww; | 1353 | UINT ww; |
1355 | // check if BcnSusInd enabled | 1354 | // check if BcnSusInd enabled |
1356 | VNSvInPortD(dwIoBase + MAC_REG_ENCFG , &dwOrgValue); | 1355 | VNSvInPortD(dwIoBase + MAC_REG_ENCFG , &dwOrgValue); |
1357 | if(BITbIsBitOff(dwOrgValue, EnCFG_BcnSusInd)) | 1356 | if( !(dwOrgValue & EnCFG_BcnSusInd)) |
1358 | return; | 1357 | return; |
1359 | //Set BcnSusClr | 1358 | //Set BcnSusClr |
1360 | dwOrgValue = dwOrgValue | EnCFG_BcnSusClr; | 1359 | dwOrgValue = dwOrgValue | EnCFG_BcnSusClr; |
1361 | VNSvOutPortD(dwIoBase + MAC_REG_ENCFG, dwOrgValue); | 1360 | VNSvOutPortD(dwIoBase + MAC_REG_ENCFG, dwOrgValue); |
1362 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 1361 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
1363 | VNSvInPortD(dwIoBase + MAC_REG_ENCFG , &dwOrgValue); | 1362 | VNSvInPortD(dwIoBase + MAC_REG_ENCFG , &dwOrgValue); |
1364 | if(BITbIsBitOff(dwOrgValue, EnCFG_BcnSusInd)) | 1363 | if( !(dwOrgValue & EnCFG_BcnSusInd)) |
1365 | break; | 1364 | break; |
1366 | } | 1365 | } |
1367 | if (ww == W_MAX_TIMEOUT) { | 1366 | if (ww == W_MAX_TIMEOUT) { |
@@ -1383,7 +1382,7 @@ void MACvEnableBusSusEn (DWORD_PTR dwIoBase) | |||
1383 | VNSvOutPortB(dwIoBase + MAC_REG_ENCFG, byOrgValue); | 1382 | VNSvOutPortB(dwIoBase + MAC_REG_ENCFG, byOrgValue); |
1384 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 1383 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
1385 | VNSvInPortD(dwIoBase + MAC_REG_ENCFG , &dwOrgValue); | 1384 | VNSvInPortD(dwIoBase + MAC_REG_ENCFG , &dwOrgValue); |
1386 | if(BITbIsBitOn(dwOrgValue, EnCFG_BcnSusInd)) | 1385 | if(dwOrgValue & EnCFG_BcnSusInd) |
1387 | break; | 1386 | break; |
1388 | } | 1387 | } |
1389 | if (ww == W_MAX_TIMEOUT) { | 1388 | if (ww == W_MAX_TIMEOUT) { |
@@ -1406,7 +1405,7 @@ BOOL MACbFlushSYNCFifo (DWORD_PTR dwIoBase) | |||
1406 | // Check if SyncFlushOK | 1405 | // Check if SyncFlushOK |
1407 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 1406 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
1408 | VNSvInPortB(dwIoBase + MAC_REG_MACCR , &byOrgValue); | 1407 | VNSvInPortB(dwIoBase + MAC_REG_MACCR , &byOrgValue); |
1409 | if(BITbIsBitOn(byOrgValue, MACCR_SYNCFLUSHOK)) | 1408 | if(byOrgValue & MACCR_SYNCFLUSHOK) |
1410 | break; | 1409 | break; |
1411 | } | 1410 | } |
1412 | if (ww == W_MAX_TIMEOUT) { | 1411 | if (ww == W_MAX_TIMEOUT) { |
@@ -1430,7 +1429,7 @@ BOOL MACbPSWakeup (DWORD_PTR dwIoBase) | |||
1430 | // Check if SyncFlushOK | 1429 | // Check if SyncFlushOK |
1431 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 1430 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
1432 | VNSvInPortB(dwIoBase + MAC_REG_PSCTL , &byOrgValue); | 1431 | VNSvInPortB(dwIoBase + MAC_REG_PSCTL , &byOrgValue); |
1433 | if(BITbIsBitOn(byOrgValue, PSCTL_WAKEDONE)) | 1432 | if(byOrgValue & PSCTL_WAKEDONE) |
1434 | break; | 1433 | break; |
1435 | } | 1434 | } |
1436 | if (ww == W_MAX_TIMEOUT) { | 1435 | if (ww == W_MAX_TIMEOUT) { |
diff --git a/drivers/staging/vt6655/mib.c b/drivers/staging/vt6655/mib.c index 48484bbe7f2..fb11595c82c 100644 --- a/drivers/staging/vt6655/mib.c +++ b/drivers/staging/vt6655/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" |
@@ -104,58 +103,58 @@ void STAvUpdateIsrStatCounter (PSStatCounter pStatistic, DWORD dwIsr) | |||
104 | } | 103 | } |
105 | 104 | ||
106 | //Added by Kyle | 105 | //Added by Kyle |
107 | if (BITbIsBitOn(dwIsr, ISR_TXDMA0)) // ISR, bit0 | 106 | if (dwIsr & ISR_TXDMA0) // ISR, bit0 |
108 | pStatistic->ISRStat.dwIsrTx0OK++; // TXDMA0 successful | 107 | pStatistic->ISRStat.dwIsrTx0OK++; // TXDMA0 successful |
109 | 108 | ||
110 | if (BITbIsBitOn(dwIsr, ISR_AC0DMA)) // ISR, bit1 | 109 | if (dwIsr & ISR_AC0DMA) // ISR, bit1 |
111 | pStatistic->ISRStat.dwIsrAC0TxOK++; // AC0DMA successful | 110 | pStatistic->ISRStat.dwIsrAC0TxOK++; // AC0DMA successful |
112 | 111 | ||
113 | if (BITbIsBitOn(dwIsr, ISR_BNTX)) // ISR, bit2 | 112 | if (dwIsr & ISR_BNTX) // ISR, bit2 |
114 | pStatistic->ISRStat.dwIsrBeaconTxOK++; // BeaconTx successful | 113 | pStatistic->ISRStat.dwIsrBeaconTxOK++; // BeaconTx successful |
115 | 114 | ||
116 | if (BITbIsBitOn(dwIsr, ISR_RXDMA0)) // ISR, bit3 | 115 | if (dwIsr & ISR_RXDMA0) // ISR, bit3 |
117 | pStatistic->ISRStat.dwIsrRx0OK++; // Rx0 successful | 116 | pStatistic->ISRStat.dwIsrRx0OK++; // Rx0 successful |
118 | 117 | ||
119 | if (BITbIsBitOn(dwIsr, ISR_TBTT)) // ISR, bit4 | 118 | if (dwIsr & ISR_TBTT) // ISR, bit4 |
120 | pStatistic->ISRStat.dwIsrTBTTInt++; // TBTT successful | 119 | pStatistic->ISRStat.dwIsrTBTTInt++; // TBTT successful |
121 | 120 | ||
122 | if (BITbIsBitOn(dwIsr, ISR_SOFTTIMER)) // ISR, bit6 | 121 | if (dwIsr & ISR_SOFTTIMER) // ISR, bit6 |
123 | pStatistic->ISRStat.dwIsrSTIMERInt++; | 122 | pStatistic->ISRStat.dwIsrSTIMERInt++; |
124 | 123 | ||
125 | if (BITbIsBitOn(dwIsr, ISR_WATCHDOG)) // ISR, bit7 | 124 | if (dwIsr & ISR_WATCHDOG) // ISR, bit7 |
126 | pStatistic->ISRStat.dwIsrWatchDog++; | 125 | pStatistic->ISRStat.dwIsrWatchDog++; |
127 | 126 | ||
128 | if (BITbIsBitOn(dwIsr, ISR_FETALERR)) // ISR, bit8 | 127 | if (dwIsr & ISR_FETALERR) // ISR, bit8 |
129 | pStatistic->ISRStat.dwIsrUnrecoverableError++; | 128 | pStatistic->ISRStat.dwIsrUnrecoverableError++; |
130 | 129 | ||
131 | if (BITbIsBitOn(dwIsr, ISR_SOFTINT)) // ISR, bit9 | 130 | if (dwIsr & ISR_SOFTINT) // ISR, bit9 |
132 | pStatistic->ISRStat.dwIsrSoftInterrupt++; // software interrupt | 131 | pStatistic->ISRStat.dwIsrSoftInterrupt++; // software interrupt |
133 | 132 | ||
134 | if (BITbIsBitOn(dwIsr, ISR_MIBNEARFULL)) // ISR, bit10 | 133 | if (dwIsr & ISR_MIBNEARFULL) // ISR, bit10 |
135 | pStatistic->ISRStat.dwIsrMIBNearfull++; | 134 | pStatistic->ISRStat.dwIsrMIBNearfull++; |
136 | 135 | ||
137 | if (BITbIsBitOn(dwIsr, ISR_RXNOBUF)) // ISR, bit11 | 136 | if (dwIsr & ISR_RXNOBUF) // ISR, bit11 |
138 | pStatistic->ISRStat.dwIsrRxNoBuf++; // Rx No Buff | 137 | pStatistic->ISRStat.dwIsrRxNoBuf++; // Rx No Buff |
139 | 138 | ||
140 | if (BITbIsBitOn(dwIsr, ISR_RXDMA1)) // ISR, bit12 | 139 | if (dwIsr & ISR_RXDMA1) // ISR, bit12 |
141 | pStatistic->ISRStat.dwIsrRx1OK++; // Rx1 successful | 140 | pStatistic->ISRStat.dwIsrRx1OK++; // Rx1 successful |
142 | 141 | ||
143 | // if (BITbIsBitOn(dwIsr, ISR_ATIMTX)) // ISR, bit13 | 142 | // if (dwIsr & ISR_ATIMTX) // ISR, bit13 |
144 | // pStatistic->ISRStat.dwIsrATIMTxOK++; // ATIMTX successful | 143 | // pStatistic->ISRStat.dwIsrATIMTxOK++; // ATIMTX successful |
145 | 144 | ||
146 | // if (BITbIsBitOn(dwIsr, ISR_SYNCTX)) // ISR, bit14 | 145 | // if (dwIsr & ISR_SYNCTX) // ISR, bit14 |
147 | // pStatistic->ISRStat.dwIsrSYNCTxOK++; // SYNCTX successful | 146 | // pStatistic->ISRStat.dwIsrSYNCTxOK++; // SYNCTX successful |
148 | 147 | ||
149 | // if (BITbIsBitOn(dwIsr, ISR_CFPEND)) // ISR, bit18 | 148 | // if (dwIsr & ISR_CFPEND) // ISR, bit18 |
150 | // pStatistic->ISRStat.dwIsrCFPEnd++; | 149 | // pStatistic->ISRStat.dwIsrCFPEnd++; |
151 | 150 | ||
152 | // if (BITbIsBitOn(dwIsr, ISR_ATIMEND)) // ISR, bit19 | 151 | // if (dwIsr & ISR_ATIMEND) // ISR, bit19 |
153 | // pStatistic->ISRStat.dwIsrATIMEnd++; | 152 | // pStatistic->ISRStat.dwIsrATIMEnd++; |
154 | 153 | ||
155 | // if (BITbIsBitOn(dwIsr, ISR_SYNCFLUSHOK)) // ISR, bit20 | 154 | // if (dwIsr & ISR_SYNCFLUSHOK) // ISR, bit20 |
156 | // pStatistic->ISRStat.dwIsrSYNCFlushOK++; | 155 | // pStatistic->ISRStat.dwIsrSYNCFlushOK++; |
157 | 156 | ||
158 | if (BITbIsBitOn(dwIsr, ISR_SOFTTIMER1)) // ISR, bit21 | 157 | if (dwIsr & ISR_SOFTTIMER1) // ISR, bit21 |
159 | pStatistic->ISRStat.dwIsrSTIMER1Int++; | 158 | pStatistic->ISRStat.dwIsrSTIMER1Int++; |
160 | 159 | ||
161 | } | 160 | } |
@@ -184,20 +183,20 @@ void STAvUpdateRDStatCounter (PSStatCounter pStatistic, | |||
184 | //need change | 183 | //need change |
185 | PS802_11Header pHeader = (PS802_11Header)pbyBuffer; | 184 | PS802_11Header pHeader = (PS802_11Header)pbyBuffer; |
186 | 185 | ||
187 | if (BITbIsBitOn(byRSR, RSR_ADDROK)) | 186 | if (byRSR & RSR_ADDROK) |
188 | pStatistic->dwRsrADDROk++; | 187 | pStatistic->dwRsrADDROk++; |
189 | if (BITbIsBitOn(byRSR, RSR_CRCOK)) { | 188 | if (byRSR & RSR_CRCOK) { |
190 | pStatistic->dwRsrCRCOk++; | 189 | pStatistic->dwRsrCRCOk++; |
191 | 190 | ||
192 | pStatistic->ullRsrOK++; | 191 | pStatistic->ullRsrOK++; |
193 | 192 | ||
194 | if (cbFrameLength >= U_ETHER_ADDR_LEN) { | 193 | if (cbFrameLength >= U_ETHER_ADDR_LEN) { |
195 | // update counters in case that successful transmit | 194 | // update counters in case that successful transmit |
196 | if (BITbIsBitOn(byRSR, RSR_ADDRBROAD)) { | 195 | if (byRSR & RSR_ADDRBROAD) { |
197 | pStatistic->ullRxBroadcastFrames++; | 196 | pStatistic->ullRxBroadcastFrames++; |
198 | pStatistic->ullRxBroadcastBytes += (ULONGLONG)cbFrameLength; | 197 | pStatistic->ullRxBroadcastBytes += (ULONGLONG)cbFrameLength; |
199 | } | 198 | } |
200 | else if (BITbIsBitOn(byRSR, RSR_ADDRMULTI)) { | 199 | else if (byRSR & RSR_ADDRMULTI) { |
201 | pStatistic->ullRxMulticastFrames++; | 200 | pStatistic->ullRxMulticastFrames++; |
202 | pStatistic->ullRxMulticastBytes += (ULONGLONG)cbFrameLength; | 201 | pStatistic->ullRxMulticastBytes += (ULONGLONG)cbFrameLength; |
203 | } | 202 | } |
@@ -210,84 +209,84 @@ void STAvUpdateRDStatCounter (PSStatCounter pStatistic, | |||
210 | 209 | ||
211 | if(byRxRate==22) { | 210 | if(byRxRate==22) { |
212 | pStatistic->CustomStat.ullRsr11M++; | 211 | pStatistic->CustomStat.ullRsr11M++; |
213 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 212 | if(byRSR & RSR_CRCOK) { |
214 | pStatistic->CustomStat.ullRsr11MCRCOk++; | 213 | pStatistic->CustomStat.ullRsr11MCRCOk++; |
215 | } | 214 | } |
216 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"11M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr11M, (INT)pStatistic->CustomStat.ullRsr11MCRCOk, byRSR); | 215 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"11M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr11M, (INT)pStatistic->CustomStat.ullRsr11MCRCOk, byRSR); |
217 | } | 216 | } |
218 | else if(byRxRate==11) { | 217 | else if(byRxRate==11) { |
219 | pStatistic->CustomStat.ullRsr5M++; | 218 | pStatistic->CustomStat.ullRsr5M++; |
220 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 219 | if(byRSR & RSR_CRCOK) { |
221 | pStatistic->CustomStat.ullRsr5MCRCOk++; | 220 | pStatistic->CustomStat.ullRsr5MCRCOk++; |
222 | } | 221 | } |
223 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 5M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr5M, (INT)pStatistic->CustomStat.ullRsr5MCRCOk, byRSR); | 222 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 5M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr5M, (INT)pStatistic->CustomStat.ullRsr5MCRCOk, byRSR); |
224 | } | 223 | } |
225 | else if(byRxRate==4) { | 224 | else if(byRxRate==4) { |
226 | pStatistic->CustomStat.ullRsr2M++; | 225 | pStatistic->CustomStat.ullRsr2M++; |
227 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 226 | if(byRSR & RSR_CRCOK) { |
228 | pStatistic->CustomStat.ullRsr2MCRCOk++; | 227 | pStatistic->CustomStat.ullRsr2MCRCOk++; |
229 | } | 228 | } |
230 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 2M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr2M, (INT)pStatistic->CustomStat.ullRsr2MCRCOk, byRSR); | 229 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 2M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr2M, (INT)pStatistic->CustomStat.ullRsr2MCRCOk, byRSR); |
231 | } | 230 | } |
232 | else if(byRxRate==2){ | 231 | else if(byRxRate==2){ |
233 | pStatistic->CustomStat.ullRsr1M++; | 232 | pStatistic->CustomStat.ullRsr1M++; |
234 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 233 | if(byRSR & RSR_CRCOK) { |
235 | pStatistic->CustomStat.ullRsr1MCRCOk++; | 234 | pStatistic->CustomStat.ullRsr1MCRCOk++; |
236 | } | 235 | } |
237 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 1M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr1M, (INT)pStatistic->CustomStat.ullRsr1MCRCOk, byRSR); | 236 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 1M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr1M, (INT)pStatistic->CustomStat.ullRsr1MCRCOk, byRSR); |
238 | } | 237 | } |
239 | else if(byRxRate==12){ | 238 | else if(byRxRate==12){ |
240 | pStatistic->CustomStat.ullRsr6M++; | 239 | pStatistic->CustomStat.ullRsr6M++; |
241 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 240 | if(byRSR & RSR_CRCOK) { |
242 | pStatistic->CustomStat.ullRsr6MCRCOk++; | 241 | pStatistic->CustomStat.ullRsr6MCRCOk++; |
243 | } | 242 | } |
244 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 6M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr6M, (INT)pStatistic->CustomStat.ullRsr6MCRCOk); | 243 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 6M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr6M, (INT)pStatistic->CustomStat.ullRsr6MCRCOk); |
245 | } | 244 | } |
246 | else if(byRxRate==18){ | 245 | else if(byRxRate==18){ |
247 | pStatistic->CustomStat.ullRsr9M++; | 246 | pStatistic->CustomStat.ullRsr9M++; |
248 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 247 | if(byRSR & RSR_CRCOK) { |
249 | pStatistic->CustomStat.ullRsr9MCRCOk++; | 248 | pStatistic->CustomStat.ullRsr9MCRCOk++; |
250 | } | 249 | } |
251 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 9M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr9M, (INT)pStatistic->CustomStat.ullRsr9MCRCOk); | 250 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 9M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr9M, (INT)pStatistic->CustomStat.ullRsr9MCRCOk); |
252 | } | 251 | } |
253 | else if(byRxRate==24){ | 252 | else if(byRxRate==24){ |
254 | pStatistic->CustomStat.ullRsr12M++; | 253 | pStatistic->CustomStat.ullRsr12M++; |
255 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 254 | if(byRSR & RSR_CRCOK) { |
256 | pStatistic->CustomStat.ullRsr12MCRCOk++; | 255 | pStatistic->CustomStat.ullRsr12MCRCOk++; |
257 | } | 256 | } |
258 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"12M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr12M, (INT)pStatistic->CustomStat.ullRsr12MCRCOk); | 257 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"12M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr12M, (INT)pStatistic->CustomStat.ullRsr12MCRCOk); |
259 | } | 258 | } |
260 | else if(byRxRate==36){ | 259 | else if(byRxRate==36){ |
261 | pStatistic->CustomStat.ullRsr18M++; | 260 | pStatistic->CustomStat.ullRsr18M++; |
262 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 261 | if(byRSR & RSR_CRCOK) { |
263 | pStatistic->CustomStat.ullRsr18MCRCOk++; | 262 | pStatistic->CustomStat.ullRsr18MCRCOk++; |
264 | } | 263 | } |
265 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"18M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr18M, (INT)pStatistic->CustomStat.ullRsr18MCRCOk); | 264 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"18M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr18M, (INT)pStatistic->CustomStat.ullRsr18MCRCOk); |
266 | } | 265 | } |
267 | else if(byRxRate==48){ | 266 | else if(byRxRate==48){ |
268 | pStatistic->CustomStat.ullRsr24M++; | 267 | pStatistic->CustomStat.ullRsr24M++; |
269 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 268 | if(byRSR & RSR_CRCOK) { |
270 | pStatistic->CustomStat.ullRsr24MCRCOk++; | 269 | pStatistic->CustomStat.ullRsr24MCRCOk++; |
271 | } | 270 | } |
272 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"24M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr24M, (INT)pStatistic->CustomStat.ullRsr24MCRCOk); | 271 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"24M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr24M, (INT)pStatistic->CustomStat.ullRsr24MCRCOk); |
273 | } | 272 | } |
274 | else if(byRxRate==72){ | 273 | else if(byRxRate==72){ |
275 | pStatistic->CustomStat.ullRsr36M++; | 274 | pStatistic->CustomStat.ullRsr36M++; |
276 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 275 | if(byRSR & RSR_CRCOK) { |
277 | pStatistic->CustomStat.ullRsr36MCRCOk++; | 276 | pStatistic->CustomStat.ullRsr36MCRCOk++; |
278 | } | 277 | } |
279 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"36M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr36M, (INT)pStatistic->CustomStat.ullRsr36MCRCOk); | 278 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"36M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr36M, (INT)pStatistic->CustomStat.ullRsr36MCRCOk); |
280 | } | 279 | } |
281 | else if(byRxRate==96){ | 280 | else if(byRxRate==96){ |
282 | pStatistic->CustomStat.ullRsr48M++; | 281 | pStatistic->CustomStat.ullRsr48M++; |
283 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 282 | if(byRSR & RSR_CRCOK) { |
284 | pStatistic->CustomStat.ullRsr48MCRCOk++; | 283 | pStatistic->CustomStat.ullRsr48MCRCOk++; |
285 | } | 284 | } |
286 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"48M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr48M, (INT)pStatistic->CustomStat.ullRsr48MCRCOk); | 285 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"48M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr48M, (INT)pStatistic->CustomStat.ullRsr48MCRCOk); |
287 | } | 286 | } |
288 | else if(byRxRate==108){ | 287 | else if(byRxRate==108){ |
289 | pStatistic->CustomStat.ullRsr54M++; | 288 | pStatistic->CustomStat.ullRsr54M++; |
290 | if(BITbIsBitOn(byRSR, RSR_CRCOK)) { | 289 | if(byRSR & RSR_CRCOK) { |
291 | pStatistic->CustomStat.ullRsr54MCRCOk++; | 290 | pStatistic->CustomStat.ullRsr54MCRCOk++; |
292 | } | 291 | } |
293 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"54M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr54M, (INT)pStatistic->CustomStat.ullRsr54MCRCOk); | 292 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"54M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr54M, (INT)pStatistic->CustomStat.ullRsr54MCRCOk); |
@@ -296,27 +295,27 @@ void STAvUpdateRDStatCounter (PSStatCounter pStatistic, | |||
296 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Unknown: Total[%d], CRCOK[%d]\n", (INT)pStatistic->dwRsrRxPacket+1, (INT)pStatistic->dwRsrCRCOk); | 295 | DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Unknown: Total[%d], CRCOK[%d]\n", (INT)pStatistic->dwRsrRxPacket+1, (INT)pStatistic->dwRsrCRCOk); |
297 | } | 296 | } |
298 | 297 | ||
299 | if (BITbIsBitOn(byRSR, RSR_BSSIDOK)) | 298 | if (byRSR & RSR_BSSIDOK) |
300 | pStatistic->dwRsrBSSIDOk++; | 299 | pStatistic->dwRsrBSSIDOk++; |
301 | 300 | ||
302 | if (BITbIsBitOn(byRSR, RSR_BCNSSIDOK)) | 301 | if (byRSR & RSR_BCNSSIDOK) |
303 | pStatistic->dwRsrBCNSSIDOk++; | 302 | pStatistic->dwRsrBCNSSIDOk++; |
304 | if (BITbIsBitOn(byRSR, RSR_IVLDLEN)) //invalid len (> 2312 byte) | 303 | if (byRSR & RSR_IVLDLEN) //invalid len (> 2312 byte) |
305 | pStatistic->dwRsrLENErr++; | 304 | pStatistic->dwRsrLENErr++; |
306 | if (BITbIsBitOn(byRSR, RSR_IVLDTYP)) //invalid packet type | 305 | if (byRSR & RSR_IVLDTYP) //invalid packet type |
307 | pStatistic->dwRsrTYPErr++; | 306 | pStatistic->dwRsrTYPErr++; |
308 | if (BITbIsBitOn(byRSR, (RSR_IVLDTYP | RSR_IVLDLEN))) | 307 | if (byRSR & (RSR_IVLDTYP | RSR_IVLDLEN)) |
309 | pStatistic->dwRsrErr++; | 308 | pStatistic->dwRsrErr++; |
310 | 309 | ||
311 | if (BITbIsBitOn(byNewRSR, NEWRSR_DECRYPTOK)) | 310 | if (byNewRSR & NEWRSR_DECRYPTOK) |
312 | pStatistic->dwNewRsrDECRYPTOK++; | 311 | pStatistic->dwNewRsrDECRYPTOK++; |
313 | if (BITbIsBitOn(byNewRSR, NEWRSR_CFPIND)) | 312 | if (byNewRSR & NEWRSR_CFPIND) |
314 | pStatistic->dwNewRsrCFP++; | 313 | pStatistic->dwNewRsrCFP++; |
315 | if (BITbIsBitOn(byNewRSR, NEWRSR_HWUTSF)) | 314 | if (byNewRSR & NEWRSR_HWUTSF) |
316 | pStatistic->dwNewRsrUTSF++; | 315 | pStatistic->dwNewRsrUTSF++; |
317 | if (BITbIsBitOn(byNewRSR, NEWRSR_BCNHITAID)) | 316 | if (byNewRSR & NEWRSR_BCNHITAID) |
318 | pStatistic->dwNewRsrHITAID++; | 317 | pStatistic->dwNewRsrHITAID++; |
319 | if (BITbIsBitOn(byNewRSR, NEWRSR_BCNHITAID0)) | 318 | if (byNewRSR & NEWRSR_BCNHITAID0) |
320 | pStatistic->dwNewRsrHITAID0++; | 319 | pStatistic->dwNewRsrHITAID0++; |
321 | 320 | ||
322 | // increase rx packet count | 321 | // increase rx packet count |
@@ -332,9 +331,9 @@ void STAvUpdateRDStatCounter (PSStatCounter pStatistic, | |||
332 | pStatistic->dwRsrRxControl++; | 331 | pStatistic->dwRsrRxControl++; |
333 | } | 332 | } |
334 | 333 | ||
335 | if (BITbIsBitOn(byRSR, RSR_ADDRBROAD)) | 334 | if (byRSR & RSR_ADDRBROAD) |
336 | pStatistic->dwRsrBroadcast++; | 335 | pStatistic->dwRsrBroadcast++; |
337 | else if (BITbIsBitOn(byRSR, RSR_ADDRMULTI)) | 336 | else if (byRSR & RSR_ADDRMULTI) |
338 | pStatistic->dwRsrMulticast++; | 337 | pStatistic->dwRsrMulticast++; |
339 | else | 338 | else |
340 | pStatistic->dwRsrDirected++; | 339 | pStatistic->dwRsrDirected++; |
@@ -486,13 +485,13 @@ STAvUpdateTDStatCounter ( | |||
486 | } | 485 | } |
487 | } | 486 | } |
488 | else { | 487 | else { |
489 | if (BITbIsBitOn(byTSR1, TSR1_TERR)) | 488 | if (byTSR1 & TSR1_TERR) |
490 | pStatistic->dwTsrErr[uIdx]++; | 489 | pStatistic->dwTsrErr[uIdx]++; |
491 | if (BITbIsBitOn(byTSR1, TSR1_RETRYTMO)) | 490 | if (byTSR1 & TSR1_RETRYTMO) |
492 | pStatistic->dwTsrRetryTimeout[uIdx]++; | 491 | pStatistic->dwTsrRetryTimeout[uIdx]++; |
493 | if (BITbIsBitOn(byTSR1, TSR1_TMO)) | 492 | if (byTSR1 & TSR1_TMO) |
494 | pStatistic->dwTsrTransmitTimeout[uIdx]++; | 493 | pStatistic->dwTsrTransmitTimeout[uIdx]++; |
495 | if (BITbIsBitOn(byTSR1, ACK_DATA)) | 494 | if (byTSR1 & ACK_DATA) |
496 | pStatistic->dwTsrACKData[uIdx]++; | 495 | pStatistic->dwTsrACKData[uIdx]++; |
497 | } | 496 | } |
498 | 497 | ||
diff --git a/drivers/staging/vt6655/michael.c b/drivers/staging/vt6655/michael.c index 2c8f875659d..c930e0cdb85 100644 --- a/drivers/staging/vt6655/michael.c +++ b/drivers/staging/vt6655/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/vt6655/power.c b/drivers/staging/vt6655/power.c index 255cfc51c16..84eda045538 100644 --- a/drivers/staging/vt6655/power.c +++ b/drivers/staging/vt6655/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 | 48 | ||
diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index 73648ba88a3..01ab73f1cc3 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c | |||
@@ -34,7 +34,6 @@ | |||
34 | 34 | ||
35 | #include "mac.h" | 35 | #include "mac.h" |
36 | #include "srom.h" | 36 | #include "srom.h" |
37 | #include "tbit.h" | ||
38 | #include "rf.h" | 37 | #include "rf.h" |
39 | #include "baseband.h" | 38 | #include "baseband.h" |
40 | 39 | ||
@@ -633,7 +632,7 @@ BOOL IFRFbWriteEmbeded (DWORD_PTR dwIoBase, DWORD dwData) | |||
633 | // W_MAX_TIMEOUT is the timeout period | 632 | // W_MAX_TIMEOUT is the timeout period |
634 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { | 633 | for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { |
635 | VNSvInPortD(dwIoBase + MAC_REG_IFREGCTL, &dwValue); | 634 | VNSvInPortD(dwIoBase + MAC_REG_IFREGCTL, &dwValue); |
636 | if (BITbIsBitOn(dwValue, IFREGCTL_DONE)) | 635 | if (dwValue & IFREGCTL_DONE) |
637 | break; | 636 | break; |
638 | } | 637 | } |
639 | 638 | ||
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 0c5ff19db35..ed3070edcac 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c | |||
@@ -60,7 +60,6 @@ | |||
60 | #include "tcrc.h" | 60 | #include "tcrc.h" |
61 | #include "wctl.h" | 61 | #include "wctl.h" |
62 | #include "wroute.h" | 62 | #include "wroute.h" |
63 | #include "tbit.h" | ||
64 | #include "hostap.h" | 63 | #include "hostap.h" |
65 | #include "rf.h" | 64 | #include "rf.h" |
66 | 65 | ||
diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c index 81b3934326f..5a7c6ca724b 100644 --- a/drivers/staging/vt6655/srom.c +++ b/drivers/staging/vt6655/srom.c | |||
@@ -44,7 +44,6 @@ | |||
44 | 44 | ||
45 | #include "upc.h" | 45 | #include "upc.h" |
46 | #include "tmacro.h" | 46 | #include "tmacro.h" |
47 | #include "tbit.h" | ||
48 | #include "tether.h" | 47 | #include "tether.h" |
49 | #include "mac.h" | 48 | #include "mac.h" |
50 | #include "srom.h" | 49 | #include "srom.h" |
@@ -97,12 +96,12 @@ BYTE SROMbyReadEmbedded(DWORD_PTR dwIoBase, BYTE byContntOffset) | |||
97 | // wait DONE be set | 96 | // wait DONE be set |
98 | for (wDelay = 0; wDelay < W_MAX_TIMEOUT; wDelay++) { | 97 | for (wDelay = 0; wDelay < W_MAX_TIMEOUT; wDelay++) { |
99 | VNSvInPortB(dwIoBase + MAC_REG_I2MCSR, &byWait); | 98 | VNSvInPortB(dwIoBase + MAC_REG_I2MCSR, &byWait); |
100 | if (BITbIsAnyBitsOn(byWait, (I2MCSR_DONE | I2MCSR_NACK))) | 99 | if (byWait & (I2MCSR_DONE | I2MCSR_NACK)) |
101 | break; | 100 | break; |
102 | PCAvDelayByIO(CB_DELAY_LOOP_WAIT); | 101 | PCAvDelayByIO(CB_DELAY_LOOP_WAIT); |
103 | } | 102 | } |
104 | if ((wDelay < W_MAX_TIMEOUT) && | 103 | if ((wDelay < W_MAX_TIMEOUT) && |
105 | (BITbIsBitOff(byWait, I2MCSR_NACK))) { | 104 | ( !(byWait & I2MCSR_NACK))) { |
106 | break; | 105 | break; |
107 | } | 106 | } |
108 | } | 107 | } |
@@ -146,13 +145,13 @@ BOOL SROMbWriteEmbedded (DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byData) | |||
146 | // wait DONE be set | 145 | // wait DONE be set |
147 | for (wDelay = 0; wDelay < W_MAX_TIMEOUT; wDelay++) { | 146 | for (wDelay = 0; wDelay < W_MAX_TIMEOUT; wDelay++) { |
148 | VNSvInPortB(dwIoBase + MAC_REG_I2MCSR, &byWait); | 147 | VNSvInPortB(dwIoBase + MAC_REG_I2MCSR, &byWait); |
149 | if (BITbIsAnyBitsOn(byWait, (I2MCSR_DONE | I2MCSR_NACK))) | 148 | if (byWait & (I2MCSR_DONE | I2MCSR_NACK)) |
150 | break; | 149 | break; |
151 | PCAvDelayByIO(CB_DELAY_LOOP_WAIT); | 150 | PCAvDelayByIO(CB_DELAY_LOOP_WAIT); |
152 | } | 151 | } |
153 | 152 | ||
154 | if ((wDelay < W_MAX_TIMEOUT) && | 153 | if ((wDelay < W_MAX_TIMEOUT) && |
155 | (BITbIsBitOff(byWait, I2MCSR_NACK))) { | 154 | ( !(byWait & I2MCSR_NACK))) { |
156 | break; | 155 | break; |
157 | } | 156 | } |
158 | } | 157 | } |
@@ -228,7 +227,7 @@ BOOL SROMbIsRegBitsOn (DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits) | |||
228 | BYTE byOrgData; | 227 | BYTE byOrgData; |
229 | 228 | ||
230 | byOrgData = SROMbyReadEmbedded(dwIoBase, byContntOffset); | 229 | byOrgData = SROMbyReadEmbedded(dwIoBase, byContntOffset); |
231 | return BITbIsAllBitsOn(byOrgData, byTestBits); | 230 | return (byOrgData & byTestBits) == byTestBits; |
232 | } | 231 | } |
233 | 232 | ||
234 | 233 | ||
@@ -251,7 +250,7 @@ BOOL SROMbIsRegBitsOff (DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits | |||
251 | BYTE byOrgData; | 250 | BYTE byOrgData; |
252 | 251 | ||
253 | byOrgData = SROMbyReadEmbedded(dwIoBase, byContntOffset); | 252 | byOrgData = SROMbyReadEmbedded(dwIoBase, byContntOffset); |
254 | return BITbIsAllBitsOff(byOrgData, byTestBits); | 253 | return !(byOrgData & byTestBits); |
255 | } | 254 | } |
256 | 255 | ||
257 | 256 | ||
@@ -407,7 +406,7 @@ BOOL SROMbAutoLoad (DWORD_PTR dwIoBase) | |||
407 | for (ii = 0; ii < EEP_MAX_CONTEXT_SIZE; ii++) { | 406 | for (ii = 0; ii < EEP_MAX_CONTEXT_SIZE; ii++) { |
408 | MACvTimer0MicroSDelay(dwIoBase, CB_EEPROM_READBYTE_WAIT); | 407 | MACvTimer0MicroSDelay(dwIoBase, CB_EEPROM_READBYTE_WAIT); |
409 | VNSvInPortB(dwIoBase + MAC_REG_I2MCSR, &byWait); | 408 | VNSvInPortB(dwIoBase + MAC_REG_I2MCSR, &byWait); |
410 | if (BITbIsBitOff(byWait, I2MCSR_AUTOLD)) | 409 | if ( !(byWait & I2MCSR_AUTOLD)) |
411 | break; | 410 | break; |
412 | } | 411 | } |
413 | 412 | ||
diff --git a/drivers/staging/vt6655/tbit.h b/drivers/staging/vt6655/tbit.h deleted file mode 100644 index 1850282ce44..00000000000 --- a/drivers/staging/vt6655/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/vt6655/tcrc.c b/drivers/staging/vt6655/tcrc.c index 79347e48369..5f0c74763f8 100644 --- a/drivers/staging/vt6655/tcrc.c +++ b/drivers/staging/vt6655/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/vt6655/tether.c b/drivers/staging/vt6655/tether.c index 7268735d01c..c90b469ad54 100644 --- a/drivers/staging/vt6655/tether.c +++ b/drivers/staging/vt6655/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/vt6655/tkip.c b/drivers/staging/vt6655/tkip.c index bbb3e62f03c..8ca154080e9 100644 --- a/drivers/staging/vt6655/tkip.c +++ b/drivers/staging/vt6655/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/vt6655/vntwifi.c b/drivers/staging/vt6655/vntwifi.c index b9e70043fdf..fbe27a834ce 100644 --- a/drivers/staging/vt6655/vntwifi.c +++ b/drivers/staging/vt6655/vntwifi.c | |||
@@ -32,7 +32,6 @@ | |||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include "vntwifi.h" | 34 | #include "vntwifi.h" |
35 | #include "tbit.h" | ||
36 | #include "IEEE11h.h" | 35 | #include "IEEE11h.h" |
37 | #include "country.h" | 36 | #include "country.h" |
38 | #include "device.h" | 37 | #include "device.h" |
@@ -691,7 +690,7 @@ VNTWIFIwGetMaxSupportRate( | |||
691 | PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; | 690 | PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; |
692 | 691 | ||
693 | for(wRate = RATE_54M; wRate > RATE_1M; wRate--) { | 692 | for(wRate = RATE_54M; wRate > RATE_1M; wRate--) { |
694 | if (BITbIsBitOn(pMgmt->sNodeDBTable[0].wSuppRate, (1<<wRate))) { | 693 | if (pMgmt->sNodeDBTable[0].wSuppRate & (1<<wRate)) { |
695 | return (wRate); | 694 | return (wRate); |
696 | } | 695 | } |
697 | } | 696 | } |
diff --git a/drivers/staging/vt6655/wmgr.c b/drivers/staging/vt6655/wmgr.c index 0c5bfa2e226..659be05a33e 100644 --- a/drivers/staging/vt6655/wmgr.c +++ b/drivers/staging/vt6655/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" |