diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rtl8192su/r8192S_rtl6052.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192su/r8192S_rtl6052.h')
-rw-r--r-- | drivers/staging/rtl8192su/r8192S_rtl6052.h | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/drivers/staging/rtl8192su/r8192S_rtl6052.h b/drivers/staging/rtl8192su/r8192S_rtl6052.h deleted file mode 100644 index 3dcc9bb..0000000 --- a/drivers/staging/rtl8192su/r8192S_rtl6052.h +++ /dev/null @@ -1,87 +0,0 @@ -/****************************************************************************** - * - * (c) Copyright 2008, RealTEK Technologies Inc. All Rights Reserved. - * - * Module: HalRf.h ( Header File) - * - * Note: Collect every HAL RF type exter API or constant. - * - * Function: - * - * Export: - * - * Abbrev: - * - * History: - * Data Who Remark - * - * 09/25/2008 MHC Create initial version. - * - * -******************************************************************************/ -/* Check to see if the file has been included already. */ - - -/*--------------------------Define Parameters-------------------------------*/ - -// -// For RF 6052 Series -// -#define RF6052_MAX_TX_PWR 0x3F -#define RF6052_MAX_REG 0x3F -#define RF6052_MAX_PATH 4 -/*--------------------------Define Parameters-------------------------------*/ - - -/*------------------------------Define structure----------------------------*/ - -/*------------------------------Define structure----------------------------*/ - - -/*------------------------Export global variable----------------------------*/ -/*------------------------Export global variable----------------------------*/ - -/*------------------------Export Marco Definition---------------------------*/ - -/*------------------------Export Marco Definition---------------------------*/ - - -/*--------------------------Exported Function prototype---------------------*/ -//====================================================== -#if 1 -// Function prototypes for HalPhy8225.c -//1====================================================== -extern void PHY_SetRF0222DBandwidth(struct net_device* dev , HT_CHANNEL_WIDTH Bandwidth); //20M or 40M; -extern void PHY_SetRF8225Bandwidth( struct net_device* dev , HT_CHANNEL_WIDTH Bandwidth); -extern bool PHY_RF8225_Config(struct net_device* dev ); -extern void phy_RF8225_Config_HardCode(struct net_device* dev); -extern bool phy_RF8225_Config_ParaFile(struct net_device* dev); -extern void PHY_SetRF8225CckTxPower(struct net_device* dev ,u8 powerlevel); -extern void PHY_SetRF8225OfdmTxPower(struct net_device* dev ,u8 powerlevel); -extern void PHY_SetRF0222DOfdmTxPower(struct net_device* dev ,u8 powerlevel); -extern void PHY_SetRF0222DCckTxPower(struct net_device* dev ,u8 powerlevel); - -//1====================================================== -// Function prototypes for HalPhy8256.c -//1====================================================== -extern void PHY_SetRF8256Bandwidth(struct net_device* dev , HT_CHANNEL_WIDTH Bandwidth); -extern void PHY_RF8256_Config(struct net_device* dev); -extern void phy_RF8256_Config_ParaFile(struct net_device* dev); -extern void PHY_SetRF8256CCKTxPower(struct net_device* dev, u8 powerlevel); -extern void PHY_SetRF8256OFDMTxPower(struct net_device* dev, u8 powerlevel); -#endif - -// -// RF RL6052 Series API -// -extern void RF_ChangeTxPath(struct net_device * dev, u16 DataRate); -extern void PHY_RF6052SetBandwidth(struct net_device * dev,HT_CHANNEL_WIDTH Bandwidth); -extern void PHY_RF6052SetCckTxPower(struct net_device * dev, u8 powerlevel); -extern void PHY_RF6052SetOFDMTxPower(struct net_device * dev, u8 powerlevel); -extern RT_STATUS PHY_RF6052_Config(struct net_device * dev); -extern void PHY_RFShadowRefresh( struct net_device * dev); -extern void PHY_RFShadowWrite( struct net_device* dev, u32 eRFPath, u32 Offset, u32 Data); -/*--------------------------Exported Function prototype---------------------*/ - - -/* End of HalRf.h */ |