diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/vt6655/baseband.h | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
| download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/vt6655/baseband.h')
| -rw-r--r-- | drivers/staging/vt6655/baseband.h | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/drivers/staging/vt6655/baseband.h b/drivers/staging/vt6655/baseband.h index 09cf4f9..0682a396 100644 --- a/drivers/staging/vt6655/baseband.h +++ b/drivers/staging/vt6655/baseband.h @@ -16,6 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * + * * File: baseband.h * * Purpose: Implement functions to access baseband @@ -26,23 +27,12 @@ * */ - #ifndef __BASEBAND_H__ #define __BASEBAND_H__ - -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - -#if !defined(__TETHER_H__) #include "tether.h" -#endif - -#if !defined(__DEVICE_H__) #include "device.h" -#endif - /*--------------------- Export Definitions -------------------------*/ @@ -106,12 +96,11 @@ #define TOP_RATE_2M 0x00200000 #define TOP_RATE_1M 0x00100000 + /*--------------------- Export Types ------------------------------*/ /*--------------------- Export Macros ------------------------------*/ - - #define BBvClearFOE(dwIoBase) \ { \ BBbWriteEmbeded(dwIoBase, 0xB1, 0); \ @@ -128,9 +117,6 @@ /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ UINT BBuGetFrameTime( @@ -173,26 +159,19 @@ VOID BBvSetDeepSleep(DWORD_PTR dwIoBase, BYTE byLocalID); VOID BBvExitDeepSleep(DWORD_PTR dwIoBase, BYTE byLocalID); // timer for antenna diversity + VOID -TimerSQ3CallBack( - IN HANDLE hDeviceContext +TimerSQ3CallBack ( + IN HANDLE hDeviceContext ); + VOID TimerState1CallBack( - IN HANDLE hDeviceContext + IN HANDLE hDeviceContext ); void BBvAntennaDiversity(PSDevice pDevice, BYTE byRxRate, BYTE bySQ3); VOID BBvClearAntDivSQ3Value (PSDevice pDevice); - -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - #endif // __BASEBAND_H__ - - - |