diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-02 22:10:07 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-02 22:10:07 -0800 |
commit | 7a53c7f56bbfc9b0ef892e68f5cfae3d902544d1 (patch) | |
tree | 19dec256fc80ad06d631ece78b9eb68a457ce66b /drivers/staging/vt6655/rf.c | |
parent | Input: atkbd - add a quirk for OQO 01+ multimedia keys (diff) | |
parent | Linux 2.6.32-rc5 (diff) | |
download | linux-dev-7a53c7f56bbfc9b0ef892e68f5cfae3d902544d1.tar.xz linux-dev-7a53c7f56bbfc9b0ef892e68f5cfae3d902544d1.zip |
Merge commit 'v2.6.32-rc5' into for-linus
Diffstat (limited to 'drivers/staging/vt6655/rf.c')
-rw-r--r-- | drivers/staging/vt6655/rf.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index 9d4e3eb7c8e5..01ab73f1cc3f 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c @@ -31,21 +31,11 @@ * Revision History: * */ -#if !defined(__MAC_H__) + #include "mac.h" -#endif -#if !defined(__SROM_H__) #include "srom.h" -#endif -#if !defined(__TBIT_H__) -#include "tbit.h" -#endif -#if !defined(__RF_H__) #include "rf.h" -#endif -#if !defined(__BASEBAND_H__) #include "baseband.h" -#endif /*--------------------- Static Definitions -------------------------*/ @@ -642,7 +632,7 @@ BOOL IFRFbWriteEmbeded (DWORD_PTR dwIoBase, DWORD dwData) // W_MAX_TIMEOUT is the timeout period for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { VNSvInPortD(dwIoBase + MAC_REG_IFREGCTL, &dwValue); - if (BITbIsBitOn(dwValue, IFREGCTL_DONE)) + if (dwValue & IFREGCTL_DONE) break; } @@ -1215,7 +1205,7 @@ VOID RFvRSSITodBm ( IN PSDevice pDevice, IN BYTE byCurrRSSI, - OUT PLONG pldBm + long * pldBm ) { BYTE byIdx = (((byCurrRSSI & 0xC0) >> 6) & 0x03); |