diff options
Diffstat (limited to 'drivers/staging/vt6655/baseband.c')
-rw-r--r-- | drivers/staging/vt6655/baseband.c | 9 |
1 files changed, 4 insertions, 5 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 | /* |