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