diff options
| author |   Jim Lieb <lieb@canonical.com> | 2009-08-12 14:54:16 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:08 -0700 |
| commit | 256a816b6b78bf29fba0c0f1bbcf998953429422 (patch) | |
| tree | c74cbe782154efac2cac80e075c06e44efb81055 /drivers/staging/vt6655/card.c | |
| parent | Staging: vt665x: remove tbit.h (diff) | |
| download | linux-dev-256a816b6b78bf29fba0c0f1bbcf998953429422.tar.xz linux-dev-256a816b6b78bf29fba0c0f1bbcf998953429422.zip | |
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/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 06d5be19906e..db786142717f 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -47,7 +47,6 @@ #include "tmacro.h" #include "card.h" -#include "tbit.h" #include "baseband.h" #include "mac.h" #include "desc.h" @@ -2374,7 +2373,7 @@ CARDbyAutoChannelSelect( } if (sChannelTbl[ii].byMAP == 0) { return ((BYTE) ii); - } else if (BITbIsBitOff(sChannelTbl[ii].byMAP, 0x08)) { + } else if ( !(sChannelTbl[ii].byMAP & 0x08)) { byOptionChannel = (BYTE) ii; } } @@ -2385,7 +2384,7 @@ CARDbyAutoChannelSelect( if (sChannelTbl[ii].bValid == TRUE) { if (sChannelTbl[ii].byMAP == 0) { aiWeight[ii] += 100; - } else if (BITbIsBitOn(sChannelTbl[ii].byMAP, 0x01)) { + } else if (sChannelTbl[ii].byMAP & 0x01) { if (ii > 3) { aiWeight[ii-3] -= 10; } @@ -2973,7 +2972,7 @@ BOOL CARDbGetCurrentTSF (DWORD_PTR dwIoBase, PQWORD pqwCurrTSF) MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TSFCNTRRD); for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { VNSvInPortB(dwIoBase + MAC_REG_TFTCTL, &byData); - if (BITbIsBitOff(byData, TFTCTL_TSFCNTRRD)) + if ( !(byData & TFTCTL_TSFCNTRRD)) break; } if (ww == W_MAX_TIMEOUT) |