staging: rtl8188eu: Rework function rtl8188e_PHY_RF6052SetBandwidth()
PATCH 1/9 staging: rtl8188eu: Rework function rtl8188e_PHY_RF6052SetBandwidth()
Rename CamelCase variables and function name.
--- drivers/staging/rtl8188eu/hal/phy.c | 3 +- drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c | 58 +++++------------------ drivers/staging/rtl8188eu/include/rf.h | 2 + 3 files changed, 16 insertions(+), 47 deletions(-) create mode 100644 drivers/staging/rtl8188eu/include/rf.h
drivers/staging/rtl8188eu/hal/phy.c +2 -1
@@ -23,6 +23,7 @@#include <drv_types.h> #include <rtw_iol.h> #include <rtl8188e_hal.h> +#include <rf.h> #define MAX_PRECMD_CNT 16#define MAX_RFDEPENDCMD_CNT 16
@@ -312,7 +313,7 @@ static void phy_set_bw_mode_callback(struct adapter *adapt)case RF_PSEUDO_11N :break ;case RF_6052 : -rtl8188e_PHY_RF6052SetBandwidth (adapt, hal_data->CurrentChannelBW); +rtl88eu_phy_rf6052_set_bandwidth (adapt, hal_data->CurrentChannelBW);break ;default :break ;
drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c +12 -46
76 lines not on this page · raw message
drivers/staging/rtl8188eu/include/rf.h new file +2 -0
@@ -0,0 +1,2 @@ +void rtl88eu_phy_rf6052_set_bandwidth (struct adapter *adapt, +enum ht_channel_width bandwidth);
Signature · 1 line
1.7.10.4
PATCH 2/9 staging: rtl8188eu: Rework function rtl8188e_PHY_RF6052SetCckTxPower()
Rename CamelCase variables and function name.
Remove redundant variable TurboScanOff.
--- drivers/staging/rtl8188eu/hal/phy.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c | 124 ++++++++--------------- drivers/staging/rtl8188eu/include/rf.h | 2 + drivers/staging/rtl8188eu/include/rtl8188e_rf.h | 1 - 4 files changed, 48 insertions(+), 81 deletions(-)
drivers/staging/rtl8188eu/hal/phy.c +1 -1
@@ -237,7 +237,7 @@ void phy_set_tx_power_level(struct adapter *adapt, u8 channel)phy_power_index_check (adapt, channel, &cck_pwr[0 ], &ofdm_pwr[0 ], &bw20_pwr[0 ], &bw40_pwr[0 ]); -rtl8188e_PHY_RF6052SetCckTxPower (adapt, &cck_pwr[0 ]); +rtl88eu_phy_rf6052_set_cck_txpower (adapt, &cck_pwr[0 ]);rtl8188e_PHY_RF6052SetOFDMTxPower (adapt, &ofdm_pwr[0 ], &bw20_pwr[0 ], &bw40_pwr[0 ], channel); }
drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c +45 -79
164 lines not on this page · raw message
drivers/staging/rtl8188eu/include/rf.h +2 -0
@@ -1,2 +1,4 @@void rtl88eu_phy_rf6052_set_bandwidth (struct adapter *adapt,enum ht_channel_width bandwidth); +void rtl88eu_phy_rf6052_set_cck_txpower (struct adapter *adapt, +u8 *powerlevel);
drivers/staging/rtl8188eu/include/rtl8188e_rf.h +0 -1
@@ -28,7 +28,6 @@void rtl8188e_RF_ChangeTxPath (struct adapter *Adapter,u16 DataRate);void rtl8188e_PHY_RF6052SetBandwidth (struct adapter *Adapter,enum ht_channel_width Bandwidth); -void rtl8188e_PHY_RF6052SetCckTxPower (struct adapter *Adapter,u8 *level);void rtl8188e_PHY_RF6052SetOFDMTxPower (struct adapter *Adapter,u8 *ofdm,u8 *pwrbw20,u8 *pwrbw40,u8 channel);
Signature · 1 line
1.7.10.4
PATCH 3/9 staging: rtl8188eu: Rework function getpowerbase88e()
In reply to navin patidarRename CamelCase variables.
--- drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c | 33 ++++++++++++----------- 1 file changed, 17 insertions(+), 16 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c +17 -16
@@ -125,32 +125,33 @@ void rtl88eu_phy_rf6052_set_cck_txpower(struct adapter *adapt, u8 *powerlevel)phy_set_bb_reg (adapt, rTxAGC_B_CCK1_55_Mcs32,0xffffff00 , tmpval); } -/* */ /* powerbase0 for OFDM rates */ /* powerbase1 for HT MCS rates */ -/* */ -static void getpowerbase88e (struct adapter *Adapter,u8 *pPowerLevelOFDM, -u8 *pPowerLevelBW20,u8 *pPowerLevelBW40,u8 Channel,u32 *OfdmBase,u32 *MCSBase) +static void getpowerbase88e (struct adapter *adapt,u8 *pwr_level_ofdm, +u8 *pwr_level_bw20,u8 *pwr_level_bw40, +u8 channel,u32 *ofdmbase,u32 *mcs_base) { -struct hal_data_8188e *pHalData =GET_HAL_DATA (Adapter); -u32 powerBase0, powerBase1; +struct hal_data_8188e *hal_data =GET_HAL_DATA (adapt); +u32 powerbase0, powerbase1;u8 i, powerlevel[2 ];for (i =0 ; i <2 ; i++) { - powerBase0 = pPowerLevelOFDM[i]; + powerbase0 = pwr_level_ofdm[i]; - powerBase0 = (powerBase0<<24 ) | (powerBase0<<16 ) | (powerBase0<<8 ) | powerBase0; - *(OfdmBase+i) = powerBase0; + powerbase0 = (powerbase0<<24 ) | (powerbase0<<16 ) | + (powerbase0<<8 ) | powerbase0; + *(ofdmbase+i) = powerbase0; } -for (i =0 ; i < pHalData->NumTotalRFPath; i++) { +for (i =0 ; i < hal_data->NumTotalRFPath; i++) {/* Check HT20 to HT40 diff */ -if (pHalData->CurrentChannelBW ==HT_CHANNEL_WIDTH_20 ) - powerlevel[i] = pPowerLevelBW20[i]; +if (hal_data->CurrentChannelBW ==HT_CHANNEL_WIDTH_20 ) + powerlevel[i] = pwr_level_bw20[i];else - powerlevel[i] = pPowerLevelBW40[i]; - powerBase1 = powerlevel[i]; - powerBase1 = (powerBase1<<24 ) | (powerBase1<<16 ) | (powerBase1<<8 ) | powerBase1; - *(MCSBase+i) = powerBase1; + powerlevel[i] = pwr_level_bw40[i]; + powerbase1 = powerlevel[i]; + powerbase1 = (powerbase1<<24 ) | (powerbase1<<16 ) | + (powerbase1<<8 ) | powerbase1; + *(mcs_base+i) = powerbase1; } } static void get_rx_power_val_by_reg(struct adapter *Adapter, u8 Channel,
Signature · 1 line
1.7.10.4
PATCH 4/9 staging: rtl8188eu: Rework function rtl8188e_PHY_RF6052SetOFDMTxPower()
In reply to navin patidarRename CamelCase variables and function name.
--- drivers/staging/rtl8188eu/hal/phy.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c | 61 +++++++---------------- drivers/staging/rtl8188eu/include/rf.h | 4 ++ drivers/staging/rtl8188eu/include/rtl8188e_rf.h | 2 - 4 files changed, 22 insertions(+), 47 deletions(-)
drivers/staging/rtl8188eu/hal/phy.c +1 -1
@@ -238,7 +238,7 @@ void phy_set_tx_power_level(struct adapter *adapt, u8 channel) &bw20_pwr[0], &bw40_pwr[0]);rtl88eu_phy_rf6052_set_cck_txpower (adapt, &cck_pwr[0 ]); -rtl8188e_PHY_RF6052SetOFDMTxPower (adapt, &ofdm_pwr[0 ], &bw20_pwr[0 ], +rtl88eu_phy_rf6052_set_ofdm_txpower (adapt, &ofdm_pwr[0 ], &bw20_pwr[0 ], &bw40_pwr[0 ], channel); }
drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c +17 -44
77 lines not on this page · raw message
drivers/staging/rtl8188eu/include/rf.h +4 -0
@@ -2,3 +2,7 @@ void rtl88eu_phy_rf6052_set_bandwidth(struct adapter *adapt, enum ht_channel_width bandwidth);void rtl88eu_phy_rf6052_set_cck_txpower (struct adapter *adapt,u8 *powerlevel); +void rtl88eu_phy_rf6052_set_ofdm_txpower (struct adapter *adapt, +u8 *powerlevel_ofdm, +u8 *powerlevel_bw20, +u8 *powerlevel_bw40,u8 channel);
drivers/staging/rtl8188eu/include/rtl8188e_rf.h +0 -2
@@ -28,7 +28,5 @@void rtl8188e_RF_ChangeTxPath (struct adapter *Adapter,u16 DataRate);void rtl8188e_PHY_RF6052SetBandwidth (struct adapter *Adapter,enum ht_channel_width Bandwidth); -void rtl8188e_PHY_RF6052SetOFDMTxPower (struct adapter *Adapter,u8 *ofdm, -u8 *pwrbw20,u8 *pwrbw40,u8 channel);#endif /* __RTL8188E_RF_H__ */
Signature · 1 line
1.7.10.4
PATCH 5/9 staging: rtl8188eu: Rework function writeOFDMPowerReg88E()
In reply to navin patidarRename CamelCase variables and function name.
Remove a block of the code which is executed only if RF type is T2R2 but rtl8188eu's RF is a T1R1 type, so driver doesn't need that code.
--- drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c | 50 +++++++---------------- 1 file changed, 15 insertions(+), 35 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c +15 -35
@@ -253,55 +253,35 @@ static void get_rx_power_val_by_reg(struct adapter *Adapter, u8 Channel, *(pOutWriteVal+rf) = writeVal; } } -static void writeOFDMPowerReg88E (struct adapter *Adapter,u8 index,u32 *pValue) + +static void write_ofdm_pwr_reg (struct adapter *adapt,u8 index,u32 *pvalue) { -struct hal_data_8188e *pHalData =GET_HAL_DATA (Adapter); -u16 regoffset_a[6 ] = { - rTxAGC_A_Rate18_06, rTxAGC_A_Rate54_24, - rTxAGC_A_Mcs03_Mcs00, rTxAGC_A_Mcs07_Mcs04, - rTxAGC_A_Mcs11_Mcs08, rTxAGC_A_Mcs15_Mcs12}; -u16 regoffset_b[6 ] = { - rTxAGC_B_Rate18_06, rTxAGC_B_Rate54_24, - rTxAGC_B_Mcs03_Mcs00, rTxAGC_B_Mcs07_Mcs04, - rTxAGC_B_Mcs11_Mcs08, rTxAGC_B_Mcs15_Mcs12}; +u16 regoffset_a[6 ] = { rTxAGC_A_Rate18_06, rTxAGC_A_Rate54_24, + rTxAGC_A_Mcs03_Mcs00, rTxAGC_A_Mcs07_Mcs04, + rTxAGC_A_Mcs11_Mcs08, rTxAGC_A_Mcs15_Mcs12 }; +u16 regoffset_b[6 ] = { rTxAGC_B_Rate18_06, rTxAGC_B_Rate54_24, + rTxAGC_B_Mcs03_Mcs00, rTxAGC_B_Mcs07_Mcs04, + rTxAGC_B_Mcs11_Mcs08, rTxAGC_B_Mcs15_Mcs12 };u8 i, rf, pwr_val[4 ]; -u32 writeVal; +u32 write_val;u16 regoffset;for (rf =0 ; rf <2 ; rf++) { - writeVal = pValue[rf]; + write_val = pvalue[rf];for (i =0 ; i <4 ; i++) { - pwr_val[i] = (u8)((writeVal & (0x7f <<(i*8 )))>>(i*8 )); + pwr_val[i] = (u8)((write_val & (0x7f <<(i*8 )))>>(i*8 ));if (pwr_val[i] >RF6052_MAX_TX_PWR ) pwr_val[i] =RF6052_MAX_TX_PWR ; } - writeVal = (pwr_val[3 ]<<24 ) | (pwr_val[2 ]<<16 ) | (pwr_val[1 ]<<8 ) | pwr_val[0 ]; + write_val = (pwr_val[3 ]<<24 ) | (pwr_val[2 ]<<16 ) | + (pwr_val[1 ]<<8 ) | pwr_val[0 ];if (rf ==0 ) regoffset = regoffset_a[index];else regoffset = regoffset_b[index]; -phy_set_bb_reg (Adapter, regoffset, bMaskDWord, writeVal); - -/* 201005115 Joseph: Set Tx Power diff for Tx power training mechanism. */ -if (((pHalData->rf_type ==RF_2T2R ) && - (regoffset == rTxAGC_A_Mcs15_Mcs12 || regoffset == rTxAGC_B_Mcs15_Mcs12)) || - ((pHalData->rf_type !=RF_2T2R ) && - (regoffset == rTxAGC_A_Mcs07_Mcs04 || regoffset == rTxAGC_B_Mcs07_Mcs04))) { - writeVal = pwr_val[3 ]; -if (regoffset == rTxAGC_A_Mcs15_Mcs12 || regoffset == rTxAGC_A_Mcs07_Mcs04) - regoffset =0xc90 ; -if (regoffset == rTxAGC_B_Mcs15_Mcs12 || regoffset == rTxAGC_B_Mcs07_Mcs04) - regoffset =0xc98 ; -for (i =0 ; i <3 ; i++) { -if (i !=2 ) - writeVal = (writeVal >8 ) ? (writeVal-8 ) :0 ; -else - writeVal = (writeVal >6 ) ? (writeVal-6 ) :0 ; -usb_write8 (Adapter, (u32)(regoffset+i), (u8 )writeVal); - } - } +phy_set_bb_reg (adapt, regoffset, bMaskDWord, write_val); } }
@@ -332,6 +312,6 @@ void rtl88eu_phy_rf6052_set_ofdm_txpower(struct adapter *adapt, write_val[0 ] -= pwrtrac_value; write_val[1 ] -= pwrtrac_value; } -writeOFDMPowerReg88E (adapt, index, &write_val[0 ]); +write_ofdm_pwr_reg (adapt, index, &write_val[0 ]); } }
Signature · 1 line
1.7.10.4
PATCH 6/9 staging: rtl8188eu: Rework function get_rx_power_val_by_reg()
In reply to navin patidarRename CamelCase variables.
Remove block of the code which is specific to the bluetooth.
--- drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c | 92 +++++++++++------------ 1 file changed, 45 insertions(+), 47 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c +45 -47
@@ -154,65 +154,66 @@ static void getpowerbase88e(struct adapter *adapt, u8 *pwr_level_ofdm, *(mcs_base+i) = powerbase1; } } -static void get_rx_power_val_by_reg (struct adapter *Adapter,u8 Channel, -u8 index,u32 *powerBase0,u32 *powerBase1, -u32 *pOutWriteVal) +static void get_rx_power_val_by_reg (struct adapter *adapt,u8 channel, +u8 index,u32 *powerbase0,u32 *powerbase1, +u32 *out_val) { -struct hal_data_8188e *pHalData =GET_HAL_DATA (Adapter); -struct dm_priv *pdmpriv = &pHalData->dmpriv; -u8 i, chnlGroup =0 , pwr_diff_limit[4 ], customer_pwr_limit; -s8 pwr_diff =0 ; -u32 writeVal, customer_limit, rf; -u8 Regulatory = pHalData->EEPROMRegulatory; +struct hal_data_8188e *hal_data =GET_HAL_DATA (adapt); +struct dm_priv *pdmpriv = &hal_data->dmpriv; +u8 i, chnlGroup =0 , pwr_diff_limit[4 ], customer_pwr_limit; +s8 pwr_diff =0 ; +u32 write_val, customer_limit, rf; +u8 regulatory = hal_data->EEPROMRegulatory;/* Index 0 & 1= legacy OFDM, 2-5=HT_MCS rate */ for (rf =0 ; rf <2 ; rf++) { -switch (Regulatory) { -case 0 :/* Realtek better performance */ -/* increase power diff defined by Realtek for large power */ +u8 j = index + (rf ?8 :0 ); + +switch (regulatory) { +case 0 : chnlGroup =0 ; - writeVal = pHalData->MCSTxPowerLevelOriginalOffset[chnlGroup][index+(rf ?8 :0 )] + - ((index <2 ) ? powerBase0[rf] : powerBase1[rf]); + write_val = hal_data->MCSTxPowerLevelOriginalOffset[chnlGroup][index+(rf ?8 :0 )] + + ((index <2 ) ? powerbase0[rf] : powerbase1[rf]);break ; -case 1 :/* Realtek regulatory */ +case 1 :/* Realtek regulatory */ /* increase power diff defined by Realtek for regulatory */ -if (pHalData->pwrGroupCnt ==1 ) +if (hal_data->pwrGroupCnt ==1 ) chnlGroup =0 ; -if (pHalData->pwrGroupCnt >= pHalData->PGMaxGroup) { -if (Channel <3 )/* Channel 1-2 */ +if (hal_data->pwrGroupCnt >= hal_data->PGMaxGroup) { +if (channel <3 ) chnlGroup =0 ; -else if (Channel <6 )/* Channel 3-5 */ +else if (channel <6 ) chnlGroup =1 ; -else if (Channel <9 )/* Channel 6-8 */ +else if (channel <9 ) chnlGroup =2 ; -else if (Channel <12 )/* Channel 9-11 */ +else if (channel <12 ) chnlGroup =3 ; -else if (Channel <14 )/* Channel 12-13 */ +else if (channel <14 ) chnlGroup =4 ; -else if (Channel ==14 )/* Channel 14 */ +else if (channel ==14 ) chnlGroup =5 ; } - writeVal = pHalData->MCSTxPowerLevelOriginalOffset[chnlGroup][index+(rf ?8 :0 )] + - ((index <2 ) ? powerBase0[rf] : powerBase1[rf]); + write_val = hal_data->MCSTxPowerLevelOriginalOffset[chnlGroup][index+(rf ?8 :0 )] + + ((index <2 ) ? powerbase0[rf] : powerbase1[rf]);break ;case 2 :/* Better regulatory */ /* don't increase any power diff */ - writeVal = ((index <2 ) ? powerBase0[rf] : powerBase1[rf]); + write_val = ((index <2 ) ? powerbase0[rf] : powerbase1[rf]);break ;case 3 :/* Customer defined power diff. */ /* increase power diff defined by customer. */ chnlGroup =0 ;if (index <2 ) - pwr_diff = pHalData->TxPwrLegacyHtDiff[rf][Channel-1 ]; -else if (pHalData->CurrentChannelBW ==HT_CHANNEL_WIDTH_20 ) - pwr_diff = pHalData->TxPwrHt20Diff[rf][Channel-1 ]; + pwr_diff = hal_data->TxPwrLegacyHtDiff[rf][channel-1 ]; +else if (hal_data->CurrentChannelBW ==HT_CHANNEL_WIDTH_20 ) + pwr_diff = hal_data->TxPwrHt20Diff[rf][channel-1 ]; -if (pHalData->CurrentChannelBW ==HT_CHANNEL_WIDTH_40 ) - customer_pwr_limit = pHalData->PwrGroupHT40[rf][Channel-1 ]; +if (hal_data->CurrentChannelBW ==HT_CHANNEL_WIDTH_40 ) + customer_pwr_limit = hal_data->PwrGroupHT40[rf][channel-1 ];else - customer_pwr_limit = pHalData->PwrGroupHT20[rf][Channel-1 ]; + customer_pwr_limit = hal_data->PwrGroupHT20[rf][channel-1 ];if (pwr_diff >= customer_pwr_limit) pwr_diff =0 ;
@@ -220,19 +221,22 @@ static void get_rx_power_val_by_reg(struct adapter *Adapter, u8 Channel, pwr_diff = customer_pwr_limit - pwr_diff;for (i =0 ; i <4 ; i++) { - pwr_diff_limit[i] = (u8)((pHalData->MCSTxPowerLevelOriginalOffset[chnlGroup][index+(rf ?8 :0 )]&(0x7f <<(i*8 )))>>(i*8 )); + pwr_diff_limit[i] = (u8)((hal_data->MCSTxPowerLevelOriginalOffset[chnlGroup][j] & + (0x7f << (i *8 ))) >> (i *8 ));if (pwr_diff_limit[i] > pwr_diff) pwr_diff_limit[i] = pwr_diff; } - customer_limit = (pwr_diff_limit[3 ]<<24 ) | (pwr_diff_limit[2 ]<<16 ) | - (pwr_diff_limit[1 ]<<8 ) | (pwr_diff_limit[0 ]); - writeVal = customer_limit + ((index <2 ) ? powerBase0[rf] : powerBase1[rf]); + customer_limit = (pwr_diff_limit[3 ]<<24 ) | + (pwr_diff_limit[2 ]<<16 ) | + (pwr_diff_limit[1 ]<<8 ) | + (pwr_diff_limit[0 ]); + write_val = customer_limit + ((index <2 ) ? powerbase0[rf] : powerbase1[rf]);break ;default : chnlGroup =0 ; - writeVal = pHalData->MCSTxPowerLevelOriginalOffset[chnlGroup][index+(rf ?8 :0 )] + - ((index <2 ) ? powerBase0[rf] : powerBase1[rf]); + write_val = hal_data->MCSTxPowerLevelOriginalOffset[chnlGroup][j] + + ((index <2 ) ? powerbase0[rf] : powerbase1[rf]);break ; }/* 20100427 Joseph: Driver dynamic Tx power shall not affect Tx power. It shall be determined by power training mechanism. */
@@ -240,17 +244,11 @@ static void get_rx_power_val_by_reg(struct adapter *Adapter, u8 Channel,/* In the future, two mechanism shall be separated from each other and maintained independently. Thanks for Lanhsin's reminder. */ /* 92d do not need this */ if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level1) - writeVal =0x14141414 ; + write_val =0x14141414 ;else if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level2) - writeVal =0x00000000 ; + write_val =0x00000000 ; -/* 20100628 Joseph: High power mode for BT-Coexist mechanism. */ -/* This mechanism is only applied when Driver-Highpower-Mechanism is OFF. */ -if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_BT1) - writeVal = writeVal -0x06060606 ; -else if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_BT2) - writeVal = writeVal; - *(pOutWriteVal+rf) = writeVal; + *(out_val+rf) = write_val; } }
Signature · 1 line
1.7.10.4
PATCH 7/9 staging: rtl8188eu: Remove file rtl8188e_rf.h
In reply to navin patidarMove macros from rtl8188e_rf.h to rf.h and then remove rtl8188e_rf.h .
--- drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c | 1 + drivers/staging/rtl8188eu/include/rf.h | 3 ++ drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 1 - drivers/staging/rtl8188eu/include/rtl8188e_rf.h | 32 ---------------------- 4 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 drivers/staging/rtl8188eu/include/rtl8188e_rf.h
drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c +1 -0
@@ -20,6 +20,7 @@#include <osdep_service.h> #include <drv_types.h> #include <phy.h> +#include <rf.h> #include <rtl8188e_hal.h> void rtl88eu_phy_rf6052_set_bandwidth(struct adapter *adapt,
drivers/staging/rtl8188eu/include/rf.h +3 -0
@@ -1,3 +1,6 @@ +#define RF6052_MAX_TX_PWR 0x3F +#define RF6052_MAX_REG 0x3F +void rtl88eu_phy_rf6052_set_bandwidth (struct adapter *adapt,enum ht_channel_width bandwidth); void rtl88eu_phy_rf6052_set_cck_txpower(struct adapter *adapt,
drivers/staging/rtl8188eu/include/rtl8188e_hal.h +0 -1
@@ -25,7 +25,6 @@#include "rtl8188e_spec.h" #include "Hal8188EPhyReg.h" #include "Hal8188EPhyCfg.h" -#include "rtl8188e_rf.h" #include "rtl8188e_dm.h" #include "rtl8188e_recv.h" #include "rtl8188e_xmit.h"
drivers/staging/rtl8188eu/include/rtl8188e_rf.h deleted +0 -32
@@ -1,32 +0,0 @@ -/****************************************************************************** -* -* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of version 2 of the GNU General Public License as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -* -* -******************************************************************************/ -#ifndef __RTL8188E_RF_H__ -#define __RTL8188E_RF_H__ - -#define RF6052_MAX_TX_PWR 0x3F -#define RF6052_MAX_REG 0x3F -#define RF6052_MAX_PATH 2 - - -void rtl8188e_RF_ChangeTxPath (struct adapter *Adapter,u16 DataRate); -void rtl8188e_PHY_RF6052SetBandwidth (struct adapter *Adapter, -enum ht_channel_width Bandwidth); - -#endif /* __RTL8188E_RF_H__ */
Signature · 1 line
1.7.10.4
PATCH 8/9 staging: rtl8188eu: Rename rtl8188e_rf6052.c to rf.c
In reply to navin patidar--- drivers/staging/rtl8188eu/Makefile | 2 +- drivers/staging/rtl8188eu/hal/rf.c | 316 +++++++++++++++++++++++ drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c | 316 ----------------------- 3 files changed, 317 insertions(+), 317 deletions(-) create mode 100644 drivers/staging/rtl8188eu/hal/rf.c delete mode 100644 drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c
drivers/staging/rtl8188eu/Makefile +1 -1
@@ -35,7 +35,7 @@ r8188eu-y := \ hal/rtl8188e_dm.o \ hal/rtl8188e_hal_init.o \ hal/phy.o \ - hal/rtl8188e_rf6052.o \ + hal/rf.o \ hal/rtl8188e_rxdesc.o \ hal/rtl8188e_xmit.o \ hal/rtl8188eu_led.o \
drivers/staging/rtl8188eu/hal/rf.c new file +316 -0
316 lines not on this page · raw message
drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c deleted +0 -316
316 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 9/9 staging: rtl8188eu: Remove unused function SetBcnCtrlReg()
In reply to navin patidar--- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 18 ------------------ drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 1 - 2 files changed, 19 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +0 -18
@@ -704,21 +704,3 @@ void Hal_ReadThermalMeter_88E(struct adapter *Adapter, u8 *PROMContent, bool Aut }DBG_88E ("ThermalMeter = 0x%x\n" , pHalData->EEPROMThermalMeter); } - -/* This function is used only for 92C to set REG_BCN_CTRL(0x550) register. */ -/* We just reserve the value of the register in variable pHalData->RegBcnCtrlVal and then operate */ -/* the value of the register via atomic operation. */ -/* This prevents from race condition when setting this register. */ -/* The value of pHalData->RegBcnCtrlVal is initialized in HwConfigureRTL8192CE() function. */ - -void SetBcnCtrlReg (struct adapter *padapter,u8 SetBits,u8 ClearBits) -{ -struct hal_data_8188e *pHalData; - - pHalData =GET_HAL_DATA (padapter); - - pHalData->RegBcnCtrlVal |= SetBits; - pHalData->RegBcnCtrlVal &= ~ClearBits; - -usb_write8 (padapter,REG_BCN_CTRL , (u8 )pHalData->RegBcnCtrlVal); -}
drivers/staging/rtl8188eu/include/rtl8188e_hal.h +0 -1
@@ -417,7 +417,6 @@ void Hal_ReadPowerSavingMode88E(struct adapter *pAdapter, u8 *hwinfo,void rtl8188e_set_hal_ops (struct hal_ops *pHalFunc);/* register */ -void SetBcnCtrlReg (struct adapter *padapter,u8 SetBits,u8 ClearBits);void rtl8188e_start_thread (struct adapter *padapter);void rtl8188e_stop_thread (struct adapter *padapter);
Signature · 1 line
1.7.10.4