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/srom.c | |
parent | 8a3d91b02830dd7c58d27e5de65222219ac2163f (diff) | |
download | op-kernel-dev-256a816b6b78bf29fba0c0f1bbcf998953429422.zip op-kernel-dev-256a816b6b78bf29fba0c0f1bbcf998953429422.tar.gz |
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/srom.c')
-rw-r--r-- | drivers/staging/vt6655/srom.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c index 81b3934..5a7c6ca 100644 --- a/drivers/staging/vt6655/srom.c +++ b/drivers/staging/vt6655/srom.c @@ -44,7 +44,6 @@ #include "upc.h" #include "tmacro.h" -#include "tbit.h" #include "tether.h" #include "mac.h" #include "srom.h" @@ -97,12 +96,12 @@ BYTE SROMbyReadEmbedded(DWORD_PTR dwIoBase, BYTE byContntOffset) // wait DONE be set for (wDelay = 0; wDelay < W_MAX_TIMEOUT; wDelay++) { VNSvInPortB(dwIoBase + MAC_REG_I2MCSR, &byWait); - if (BITbIsAnyBitsOn(byWait, (I2MCSR_DONE | I2MCSR_NACK))) + if (byWait & (I2MCSR_DONE | I2MCSR_NACK)) break; PCAvDelayByIO(CB_DELAY_LOOP_WAIT); } if ((wDelay < W_MAX_TIMEOUT) && - (BITbIsBitOff(byWait, I2MCSR_NACK))) { + ( !(byWait & I2MCSR_NACK))) { break; } } @@ -146,13 +145,13 @@ BOOL SROMbWriteEmbedded (DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byData) // wait DONE be set for (wDelay = 0; wDelay < W_MAX_TIMEOUT; wDelay++) { VNSvInPortB(dwIoBase + MAC_REG_I2MCSR, &byWait); - if (BITbIsAnyBitsOn(byWait, (I2MCSR_DONE | I2MCSR_NACK))) + if (byWait & (I2MCSR_DONE | I2MCSR_NACK)) break; PCAvDelayByIO(CB_DELAY_LOOP_WAIT); } if ((wDelay < W_MAX_TIMEOUT) && - (BITbIsBitOff(byWait, I2MCSR_NACK))) { + ( !(byWait & I2MCSR_NACK))) { break; } } @@ -228,7 +227,7 @@ BOOL SROMbIsRegBitsOn (DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits) BYTE byOrgData; byOrgData = SROMbyReadEmbedded(dwIoBase, byContntOffset); - return BITbIsAllBitsOn(byOrgData, byTestBits); + return (byOrgData & byTestBits) == byTestBits; } @@ -251,7 +250,7 @@ BOOL SROMbIsRegBitsOff (DWORD_PTR dwIoBase, BYTE byContntOffset, BYTE byTestBits BYTE byOrgData; byOrgData = SROMbyReadEmbedded(dwIoBase, byContntOffset); - return BITbIsAllBitsOff(byOrgData, byTestBits); + return !(byOrgData & byTestBits); } @@ -407,7 +406,7 @@ BOOL SROMbAutoLoad (DWORD_PTR dwIoBase) for (ii = 0; ii < EEP_MAX_CONTEXT_SIZE; ii++) { MACvTimer0MicroSDelay(dwIoBase, CB_EEPROM_READBYTE_WAIT); VNSvInPortB(dwIoBase + MAC_REG_I2MCSR, &byWait); - if (BITbIsBitOff(byWait, I2MCSR_AUTOLD)) + if ( !(byWait & I2MCSR_AUTOLD)) break; } |