Commit ff970453 authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo

rtlwifi: rtl8192{c,u}: Remove CamelCase variables

This patch affects modules rtl8192ce, rtl8192cu, and rtl8192com.

The following checkpatch exceptions are also fixed:

CHECK: No space is necessary after a cast
#237: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c:90:
+                                                     (u8 *) (&rfstate));

CHECK: No space is necessary after a cast
#744: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.c:329:
+                       pwr_val[i] = (u8) ((writeval & (0x7f <<

CHECK: No space is necessary after a cast
#784: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.c:365:
+                                              (u8) writeval);

CHECK: spaces preferred around that '/' (ctx:VxV)
#963: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c:513:
+               txqpageunit = txqpagenum/outepnum;
                                        ^

CHECK: Unnecessary parentheses around 'outepnum > 1'
#975: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c:521:
+               if ((outepnum > 1) && (txqremaininpage))

CHECK: Alignment should match open parenthesis
#1059: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c:617:
+static void _rtl92cu_init_chipn_two_out_ep_priority(struct ieee80211_hw *hw,
                                                                bool wmm_enable,

ERROR: "foo * bar" should be "foo *bar"
#1940: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c:591:
+void rtl92cu_fill_fake_txdesc(struct ieee80211_hw *hw, u8 *pdesc,

Note that not all checkpatch exceptions are addressed. Those will be
handled in later patches.
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent d4201106
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#define DM_DIG_FA_TH1 0x100 #define DM_DIG_FA_TH1 0x100
#define DM_DIG_FA_TH2 0x200 #define DM_DIG_FA_TH2 0x200
#define RXPATHSELECTION_SS_TH_lOW 30 #define RXPATHSELECTION_SS_TH_LOW 30
#define RXPATHSELECTION_DIFF_TH 18 #define RXPATHSELECTION_DIFF_TH 18
#define DM_RATR_STA_INIT 0 #define DM_RATR_STA_INIT 0
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#define CTS2SELF_THVAL 30 #define CTS2SELF_THVAL 30
#define REGC38_TH 20 #define REGC38_TH 20
#define WAIOTTHVal 25 #define WAIOTTHVAL 25
#define TXHIGHPWRLEVEL_NORMAL 0 #define TXHIGHPWRLEVEL_NORMAL 0
#define TXHIGHPWRLEVEL_LEVEL1 1 #define TXHIGHPWRLEVEL_LEVEL1 1
......
...@@ -57,27 +57,27 @@ static void _rtl92c_write_fw(struct ieee80211_hw *hw, ...@@ -57,27 +57,27 @@ static void _rtl92c_write_fw(struct ieee80211_hw *hw,
RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "FW size is %d bytes,\n", size); RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "FW size is %d bytes,\n", size);
is_version_b = IS_NORMAL_CHIP(version); is_version_b = IS_NORMAL_CHIP(version);
if (is_version_b) { if (is_version_b) {
u32 pageNums, remainsize; u32 pagenums, remainsize;
u32 page, offset; u32 page, offset;
if (rtlhal->hw_type == HARDWARE_TYPE_RTL8192CE) if (rtlhal->hw_type == HARDWARE_TYPE_RTL8192CE)
rtl_fill_dummy(bufferptr, &size); rtl_fill_dummy(bufferptr, &size);
pageNums = size / FW_8192C_PAGE_SIZE; pagenums = size / FW_8192C_PAGE_SIZE;
remainsize = size % FW_8192C_PAGE_SIZE; remainsize = size % FW_8192C_PAGE_SIZE;
if (pageNums > 4) if (pagenums > 4)
pr_err("Page numbers should not greater then 4\n"); pr_err("Page numbers should not greater then 4\n");
for (page = 0; page < pageNums; page++) { for (page = 0; page < pagenums; page++) {
offset = page * FW_8192C_PAGE_SIZE; offset = page * FW_8192C_PAGE_SIZE;
rtl_fw_page_write(hw, page, (bufferptr + offset), rtl_fw_page_write(hw, page, (bufferptr + offset),
FW_8192C_PAGE_SIZE); FW_8192C_PAGE_SIZE);
} }
if (remainsize) { if (remainsize) {
offset = pageNums * FW_8192C_PAGE_SIZE; offset = pagenums * FW_8192C_PAGE_SIZE;
page = pageNums; page = pagenums;
rtl_fw_page_write(hw, page, (bufferptr + offset), rtl_fw_page_write(hw, page, (bufferptr + offset),
remainsize); remainsize);
} }
...@@ -96,7 +96,7 @@ static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw) ...@@ -96,7 +96,7 @@ static int _rtl92c_fw_free_to_go(struct ieee80211_hw *hw)
do { do {
value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL); value32 = rtl_read_dword(rtlpriv, REG_MCUFWDL);
} while ((counter++ < FW_8192C_POLLING_TIMEOUT_COUNT) && } while ((counter++ < FW_8192C_POLLING_TIMEOUT_COUNT) &&
(!(value32 & FWDL_ChkSum_rpt))); (!(value32 & FWDL_CHKSUM_RPT)));
if (counter >= FW_8192C_POLLING_TIMEOUT_COUNT) { if (counter >= FW_8192C_POLLING_TIMEOUT_COUNT) {
pr_err("chksum report fail! REG_MCUFWDL:0x%08x .\n", pr_err("chksum report fail! REG_MCUFWDL:0x%08x .\n",
......
...@@ -217,7 +217,7 @@ bool _rtl92c_phy_bb8192c_config_parafile(struct ieee80211_hw *hw) ...@@ -217,7 +217,7 @@ bool _rtl92c_phy_bb8192c_config_parafile(struct ieee80211_hw *hw)
EXPORT_SYMBOL(_rtl92c_phy_bb8192c_config_parafile); EXPORT_SYMBOL(_rtl92c_phy_bb8192c_config_parafile);
void _rtl92c_store_pwrIndex_diffrate_offset(struct ieee80211_hw *hw, void _rtl92c_store_pwrindex_diffrate_offset(struct ieee80211_hw *hw,
u32 regaddr, u32 bitmask, u32 regaddr, u32 bitmask,
u32 data) u32 data)
{ {
...@@ -371,7 +371,7 @@ void _rtl92c_store_pwrIndex_diffrate_offset(struct ieee80211_hw *hw, ...@@ -371,7 +371,7 @@ void _rtl92c_store_pwrIndex_diffrate_offset(struct ieee80211_hw *hw,
rtlphy->pwrgroup_cnt++; rtlphy->pwrgroup_cnt++;
} }
} }
EXPORT_SYMBOL(_rtl92c_store_pwrIndex_diffrate_offset); EXPORT_SYMBOL(_rtl92c_store_pwrindex_diffrate_offset);
void rtl92c_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw) void rtl92c_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw)
{ {
...@@ -430,10 +430,10 @@ void _rtl92c_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw) ...@@ -430,10 +430,10 @@ void _rtl92c_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw)
rtlphy->phyreg_def[RF90_PATH_B].rf3wire_offset = rtlphy->phyreg_def[RF90_PATH_B].rf3wire_offset =
RFPGA0_XB_LSSIPARAMETER; RFPGA0_XB_LSSIPARAMETER;
rtlphy->phyreg_def[RF90_PATH_A].rflssi_select = rFPGA0_XAB_RFPARAMETER; rtlphy->phyreg_def[RF90_PATH_A].rflssi_select = RFPGA0_XAB_RFPARAMETER;
rtlphy->phyreg_def[RF90_PATH_B].rflssi_select = rFPGA0_XAB_RFPARAMETER; rtlphy->phyreg_def[RF90_PATH_B].rflssi_select = RFPGA0_XAB_RFPARAMETER;
rtlphy->phyreg_def[RF90_PATH_C].rflssi_select = rFPGA0_XCD_RFPARAMETER; rtlphy->phyreg_def[RF90_PATH_C].rflssi_select = RFPGA0_XCD_RFPARAMETER;
rtlphy->phyreg_def[RF90_PATH_D].rflssi_select = rFPGA0_XCD_RFPARAMETER; rtlphy->phyreg_def[RF90_PATH_D].rflssi_select = RFPGA0_XCD_RFPARAMETER;
rtlphy->phyreg_def[RF90_PATH_A].rftxgain_stage = RFPGA0_TXGAINSTAGE; rtlphy->phyreg_def[RF90_PATH_A].rftxgain_stage = RFPGA0_TXGAINSTAGE;
rtlphy->phyreg_def[RF90_PATH_B].rftxgain_stage = RFPGA0_TXGAINSTAGE; rtlphy->phyreg_def[RF90_PATH_B].rftxgain_stage = RFPGA0_TXGAINSTAGE;
...@@ -1098,19 +1098,19 @@ static void _rtl92c_phy_reload_mac_registers(struct ieee80211_hw *hw, ...@@ -1098,19 +1098,19 @@ static void _rtl92c_phy_reload_mac_registers(struct ieee80211_hw *hw,
static void _rtl92c_phy_path_adda_on(struct ieee80211_hw *hw, static void _rtl92c_phy_path_adda_on(struct ieee80211_hw *hw,
u32 *addareg, bool is_patha_on, bool is2t) u32 *addareg, bool is_patha_on, bool is2t)
{ {
u32 pathOn; u32 pathon;
u32 i; u32 i;
pathOn = is_patha_on ? 0x04db25a4 : 0x0b1b25a4; pathon = is_patha_on ? 0x04db25a4 : 0x0b1b25a4;
if (false == is2t) { if (false == is2t) {
pathOn = 0x0bdb25a0; pathon = 0x0bdb25a0;
rtl_set_bbreg(hw, addareg[0], MASKDWORD, 0x0b1b25a0); rtl_set_bbreg(hw, addareg[0], MASKDWORD, 0x0b1b25a0);
} else { } else {
rtl_set_bbreg(hw, addareg[0], MASKDWORD, pathOn); rtl_set_bbreg(hw, addareg[0], MASKDWORD, pathon);
} }
for (i = 1; i < IQK_ADDA_REG_NUM; i++) for (i = 1; i < IQK_ADDA_REG_NUM; i++)
rtl_set_bbreg(hw, addareg[i], MASKDWORD, pathOn); rtl_set_bbreg(hw, addareg[i], MASKDWORD, pathon);
} }
static void _rtl92c_phy_mac_setting_calibration(struct ieee80211_hw *hw, static void _rtl92c_phy_mac_setting_calibration(struct ieee80211_hw *hw,
...@@ -1339,7 +1339,7 @@ static void _rtl92c_phy_set_rfpath_switch(struct ieee80211_hw *hw, ...@@ -1339,7 +1339,7 @@ static void _rtl92c_phy_set_rfpath_switch(struct ieee80211_hw *hw,
if (is_hal_stop(rtlhal)) { if (is_hal_stop(rtlhal)) {
rtl_set_bbreg(hw, REG_LEDCFG0, BIT(23), 0x01); rtl_set_bbreg(hw, REG_LEDCFG0, BIT(23), 0x01);
rtl_set_bbreg(hw, rFPGA0_XAB_RFPARAMETER, BIT(13), 0x01); rtl_set_bbreg(hw, RFPGA0_XAB_RFPARAMETER, BIT(13), 0x01);
} }
if (is2t) { if (is2t) {
if (bmain) if (bmain)
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
#define LOOP_LIMIT 5 #define LOOP_LIMIT 5
#define MAX_STALL_TIME 50 #define MAX_STALL_TIME 50
#define AntennaDiversityValue 0x80 #define ANTENNADIVERSITYVALUE 0x80
#define MAX_TXPWR_IDX_NMODE_92S 63 #define MAX_TXPWR_IDX_NMODE_92S 63
#define Reset_Cnt_Limit 3 #define RESET_CNT_LIMIT 3
#define IQK_ADDA_REG_NUM 16 #define IQK_ADDA_REG_NUM 16
#define IQK_MAC_REG_NUM 4 #define IQK_MAC_REG_NUM 4
...@@ -220,7 +220,7 @@ void _rtl92c_phy_rf_serial_write(struct ieee80211_hw *hw, ...@@ -220,7 +220,7 @@ void _rtl92c_phy_rf_serial_write(struct ieee80211_hw *hw,
enum radio_path rfpath, u32 offset, enum radio_path rfpath, u32 offset,
u32 data); u32 data);
bool _rtl92c_phy_bb8192c_config_parafile(struct ieee80211_hw *hw); bool _rtl92c_phy_bb8192c_config_parafile(struct ieee80211_hw *hw);
void _rtl92c_store_pwrIndex_diffrate_offset(struct ieee80211_hw *hw, void _rtl92c_store_pwrindex_diffrate_offset(struct ieee80211_hw *hw,
u32 regaddr, u32 bitmask, u32 regaddr, u32 bitmask,
u32 data); u32 data);
bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype); bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype);
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#define DM_DIG_FA_TH1 0x100 #define DM_DIG_FA_TH1 0x100
#define DM_DIG_FA_TH2 0x200 #define DM_DIG_FA_TH2 0x200
#define RXPATHSELECTION_SS_TH_lOW 30 #define RXPATHSELECTION_SS_TH_LOW 30
#define RXPATHSELECTION_DIFF_TH 18 #define RXPATHSELECTION_DIFF_TH 18
#define DM_RATR_STA_INIT 0 #define DM_RATR_STA_INIT 0
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#define CTS2SELF_THVAL 30 #define CTS2SELF_THVAL 30
#define REGC38_TH 20 #define REGC38_TH 20
#define WAIOTTHVal 25 #define WAIOTTHVAL 25
#define TXHIGHPWRLEVEL_NORMAL 0 #define TXHIGHPWRLEVEL_NORMAL 0
#define TXHIGHPWRLEVEL_LEVEL1 1 #define TXHIGHPWRLEVEL_LEVEL1 1
......
...@@ -82,13 +82,13 @@ void rtl92ce_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) ...@@ -82,13 +82,13 @@ void rtl92ce_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
*((enum rf_pwrstate *)(val)) = ppsc->rfpwr_state; *((enum rf_pwrstate *)(val)) = ppsc->rfpwr_state;
break; break;
case HW_VAR_FWLPS_RF_ON:{ case HW_VAR_FWLPS_RF_ON:{
enum rf_pwrstate rfState; enum rf_pwrstate rfstate;
u32 val_rcr; u32 val_rcr;
rtlpriv->cfg->ops->get_hw_reg(hw, rtlpriv->cfg->ops->get_hw_reg(hw,
HW_VAR_RF_STATE, HW_VAR_RF_STATE,
(u8 *) (&rfState)); (u8 *)(&rfstate));
if (rfState == ERFOFF) { if (rfstate == ERFOFF) {
*((bool *) (val)) = true; *((bool *) (val)) = true;
} else { } else {
val_rcr = rtl_read_dword(rtlpriv, REG_RCR); val_rcr = rtl_read_dword(rtlpriv, REG_RCR);
...@@ -314,13 +314,13 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) ...@@ -314,13 +314,13 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
if (acm) { if (acm) {
switch (e_aci) { switch (e_aci) {
case AC0_BE: case AC0_BE:
acm_ctrl |= AcmHw_BeqEn; acm_ctrl |= ACMHW_BEQEN;
break; break;
case AC2_VI: case AC2_VI:
acm_ctrl |= AcmHw_ViqEn; acm_ctrl |= ACMHW_VIQEN;
break; break;
case AC3_VO: case AC3_VO:
acm_ctrl |= AcmHw_VoqEn; acm_ctrl |= ACMHW_VOQEN;
break; break;
default: default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
...@@ -331,13 +331,13 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) ...@@ -331,13 +331,13 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
} else { } else {
switch (e_aci) { switch (e_aci) {
case AC0_BE: case AC0_BE:
acm_ctrl &= (~AcmHw_BeqEn); acm_ctrl &= (~ACMHW_BEQEN);
break; break;
case AC2_VI: case AC2_VI:
acm_ctrl &= (~AcmHw_ViqEn); acm_ctrl &= (~ACMHW_VIQEN);
break; break;
case AC3_VO: case AC3_VO:
acm_ctrl &= (~AcmHw_VoqEn); acm_ctrl &= (~ACMHW_VOQEN);
break; break;
default: default:
pr_err("switch case %#x not processed\n", pr_err("switch case %#x not processed\n",
...@@ -562,23 +562,23 @@ static bool _rtl92ce_llt_table_init(struct ieee80211_hw *hw) ...@@ -562,23 +562,23 @@ static bool _rtl92ce_llt_table_init(struct ieee80211_hw *hw)
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
unsigned short i; unsigned short i;
u8 txpktbuf_bndy; u8 txpktbuf_bndy;
u8 maxPage; u8 maxpage;
bool status; bool status;
#if LLT_CONFIG == 1 #if LLT_CONFIG == 1
maxPage = 255; maxpage = 255;
txpktbuf_bndy = 252; txpktbuf_bndy = 252;
#elif LLT_CONFIG == 2 #elif LLT_CONFIG == 2
maxPage = 127; maxpage = 127;
txpktbuf_bndy = 124; txpktbuf_bndy = 124;
#elif LLT_CONFIG == 3 #elif LLT_CONFIG == 3
maxPage = 255; maxpage = 255;
txpktbuf_bndy = 174; txpktbuf_bndy = 174;
#elif LLT_CONFIG == 4 #elif LLT_CONFIG == 4
maxPage = 255; maxpage = 255;
txpktbuf_bndy = 246; txpktbuf_bndy = 246;
#elif LLT_CONFIG == 5 #elif LLT_CONFIG == 5
maxPage = 255; maxpage = 255;
txpktbuf_bndy = 246; txpktbuf_bndy = 246;
#endif #endif
...@@ -617,13 +617,13 @@ static bool _rtl92ce_llt_table_init(struct ieee80211_hw *hw) ...@@ -617,13 +617,13 @@ static bool _rtl92ce_llt_table_init(struct ieee80211_hw *hw)
if (true != status) if (true != status)
return status; return status;
for (i = txpktbuf_bndy; i < maxPage; i++) { for (i = txpktbuf_bndy; i < maxpage; i++) {
status = _rtl92ce_llt_write(hw, i, (i + 1)); status = _rtl92ce_llt_write(hw, i, (i + 1));
if (true != status) if (true != status)
return status; return status;
} }
status = _rtl92ce_llt_write(hw, maxPage, txpktbuf_bndy); status = _rtl92ce_llt_write(hw, maxpage, txpktbuf_bndy);
if (true != status) if (true != status)
return status; return status;
...@@ -876,7 +876,7 @@ void rtl92ce_enable_hw_security_config(struct ieee80211_hw *hw) ...@@ -876,7 +876,7 @@ void rtl92ce_enable_hw_security_config(struct ieee80211_hw *hw)
u8 sec_reg_value; u8 sec_reg_value;
RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
"PairwiseEncAlgorithm = %d GroupEncAlgorithm = %d\n", "PairwiseENcAlgorithm = %d GroupEncAlgorithm = %d\n",
rtlpriv->sec.pairwise_enc_algorithm, rtlpriv->sec.pairwise_enc_algorithm,
rtlpriv->sec.group_enc_algorithm); rtlpriv->sec.group_enc_algorithm);
...@@ -886,11 +886,11 @@ void rtl92ce_enable_hw_security_config(struct ieee80211_hw *hw) ...@@ -886,11 +886,11 @@ void rtl92ce_enable_hw_security_config(struct ieee80211_hw *hw)
return; return;
} }
sec_reg_value = SCR_TxEncEnable | SCR_RxDecEnable; sec_reg_value = SCR_TXENCENABLE | SCR_RXDECENABLE;
if (rtlpriv->sec.use_defaultkey) { if (rtlpriv->sec.use_defaultkey) {
sec_reg_value |= SCR_TxUseDK; sec_reg_value |= SCR_TXUSEDK;
sec_reg_value |= SCR_RxUseDK; sec_reg_value |= SCR_RXUSEDK;
} }
sec_reg_value |= (SCR_RXBCUSEDK | SCR_TXBCUSEDK); sec_reg_value |= (SCR_RXBCUSEDK | SCR_TXBCUSEDK);
......
...@@ -82,7 +82,7 @@ bool rtl92c_phy_bb_config(struct ieee80211_hw *hw) ...@@ -82,7 +82,7 @@ bool rtl92c_phy_bb_config(struct ieee80211_hw *hw)
rtl_write_byte(rtlpriv, REG_RF_CTRL, RF_EN | RF_RSTB | RF_SDMRSTB); rtl_write_byte(rtlpriv, REG_RF_CTRL, RF_EN | RF_RSTB | RF_SDMRSTB);
rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN,
FEN_PPLL | FEN_PCIEA | FEN_DIO_PCIE | FEN_PPLL | FEN_PCIEA | FEN_DIO_PCIE |
FEN_BB_GLB_RSTn | FEN_BBRSTB); FEN_BB_GLB_RSTN | FEN_BBRSTB);
rtl_write_byte(rtlpriv, REG_AFE_XTAL_CTRL + 1, 0x80); rtl_write_byte(rtlpriv, REG_AFE_XTAL_CTRL + 1, 0x80);
regvaldw = rtl_read_dword(rtlpriv, REG_LEDCFG0); regvaldw = rtl_read_dword(rtlpriv, REG_LEDCFG0);
rtl_write_dword(rtlpriv, REG_LEDCFG0, regvaldw | BIT(23)); rtl_write_dword(rtlpriv, REG_LEDCFG0, regvaldw | BIT(23));
...@@ -214,7 +214,7 @@ bool _rtl92ce_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw, ...@@ -214,7 +214,7 @@ bool _rtl92ce_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
for (i = 0; i < phy_regarray_pg_len; i = i + 3) { for (i = 0; i < phy_regarray_pg_len; i = i + 3) {
rtl_addr_delay(phy_regarray_table_pg[i]); rtl_addr_delay(phy_regarray_table_pg[i]);
_rtl92c_store_pwrIndex_diffrate_offset(hw, _rtl92c_store_pwrindex_diffrate_offset(hw,
phy_regarray_table_pg[i], phy_regarray_table_pg[i],
phy_regarray_table_pg[i + 1], phy_regarray_table_pg[i + 1],
phy_regarray_table_pg[i + 2]); phy_regarray_table_pg[i + 2]);
...@@ -442,13 +442,13 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw, ...@@ -442,13 +442,13 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
if ((ppsc->rfpwr_state == ERFOFF) && if ((ppsc->rfpwr_state == ERFOFF) &&
RT_IN_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC)) { RT_IN_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC)) {
bool rtstatus; bool rtstatus;
u32 InitializeCount = 0; u32 initializecount = 0;
do { do {
InitializeCount++; initializecount++;
RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
"IPS Set eRf nic enable\n"); "IPS Set eRf nic enable\n");
rtstatus = rtl_ps_enable_nic(hw); rtstatus = rtl_ps_enable_nic(hw);
} while (!rtstatus && (InitializeCount < 10)); } while (!rtstatus && (initializecount < 10));
RT_CLEAR_PS_LEVEL(ppsc, RT_CLEAR_PS_LEVEL(ppsc,
RT_RF_OFF_LEVL_HALT_NIC); RT_RF_OFF_LEVL_HALT_NIC);
} else { } else {
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
#define LOOP_LIMIT 5 #define LOOP_LIMIT 5
#define MAX_STALL_TIME 50 #define MAX_STALL_TIME 50
#define AntennaDiversityValue 0x80 #define ANTENNADIVERSITYVALUE 0x80
#define MAX_TXPWR_IDX_NMODE_92S 63 #define MAX_TXPWR_IDX_NMODE_92S 63
#define Reset_Cnt_Limit 3 #define RESET_CNT_LIMIT 3
#define IQK_ADDA_REG_NUM 16 #define IQK_ADDA_REG_NUM 16
#define IQK_MAC_REG_NUM 4 #define IQK_MAC_REG_NUM 4
...@@ -100,7 +100,7 @@ void _rtl92c_phy_rf_serial_write(struct ieee80211_hw *hw, ...@@ -100,7 +100,7 @@ void _rtl92c_phy_rf_serial_write(struct ieee80211_hw *hw,
void _rtl92c_phy_fw_rf_serial_write(struct ieee80211_hw *hw, void _rtl92c_phy_fw_rf_serial_write(struct ieee80211_hw *hw,
enum radio_path rfpath, u32 offset, enum radio_path rfpath, u32 offset,
u32 data); u32 data);
void _rtl92c_store_pwrIndex_diffrate_offset(struct ieee80211_hw *hw, void _rtl92c_store_pwrindex_diffrate_offset(struct ieee80211_hw *hw,
u32 regaddr, u32 bitmask, u32 data); u32 regaddr, u32 bitmask, u32 data);
bool _rtl92ce_phy_config_mac_with_headerfile(struct ieee80211_hw *hw); bool _rtl92ce_phy_config_mac_with_headerfile(struct ieee80211_hw *hw);
void _rtl92c_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw); void _rtl92c_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw);
......
...@@ -680,7 +680,7 @@ ...@@ -680,7 +680,7 @@
#define PWC_EV12V BIT(15) #define PWC_EV12V BIT(15)
#define FEN_BBRSTB BIT(0) #define FEN_BBRSTB BIT(0)
#define FEN_BB_GLB_RSTn BIT(1) #define FEN_BB_GLB_RSTN BIT(1)
#define FEN_USBA BIT(2) #define FEN_USBA BIT(2)
#define FEN_UPLL BIT(3) #define FEN_UPLL BIT(3)
#define FEN_USBD BIT(4) #define FEN_USBD BIT(4)
...@@ -700,7 +700,7 @@ ...@@ -700,7 +700,7 @@
#define PFM_ALDN BIT(1) #define PFM_ALDN BIT(1)
#define PFM_LDKP BIT(2) #define PFM_LDKP BIT(2)
#define PFM_WOWL BIT(3) #define PFM_WOWL BIT(3)
#define EnPDN BIT(4) #define ENPDN BIT(4)
#define PDN_PL BIT(5) #define PDN_PL BIT(5)
#define APFM_ONMAC BIT(8) #define APFM_ONMAC BIT(8)
#define APFM_OFF BIT(9) #define APFM_OFF BIT(9)
...@@ -815,19 +815,19 @@ ...@@ -815,19 +815,19 @@
#define LDOE25_EN BIT(31) #define LDOE25_EN BIT(31)
#define RSM_EN BIT(0) #define RSM_EN BIT(0)
#define Timer_EN BIT(4) #define TIMER_EN BIT(4)
#define TRSW0EN BIT(2) #define TRSW0EN BIT(2)
#define TRSW1EN BIT(3) #define TRSW1EN BIT(3)
#define EROM_EN BIT(4) #define EROM_EN BIT(4)
#define EnBT BIT(5) #define ENBT BIT(5)
#define EnUart BIT(8) #define ENUART BIT(8)
#define Uart_910 BIT(9) #define UART_910 BIT(9)
#define EnPMAC BIT(10) #define ENPMAC BIT(10)
#define SIC_SWRST BIT(11) #define SIC_SWRST BIT(11)
#define EnSIC BIT(12) #define ENSIC BIT(12)
#define SIC_23 BIT(13) #define SIC_23 BIT(13)
#define EnHDP BIT(14) #define ENHDP BIT(14)
#define SIC_LBK BIT(15) #define SIC_LBK BIT(15)
#define LED0PL BIT(4) #define LED0PL BIT(4)
...@@ -836,7 +836,7 @@ ...@@ -836,7 +836,7 @@
#define MCUFWDL_EN BIT(0) #define MCUFWDL_EN BIT(0)
#define MCUFWDL_RDY BIT(1) #define MCUFWDL_RDY BIT(1)
#define FWDL_ChkSum_rpt BIT(2) #define FWDL_CHKSUM_RPT BIT(2)
#define MACINI_RDY BIT(3) #define MACINI_RDY BIT(3)
#define BBINI_RDY BIT(4) #define BBINI_RDY BIT(4)
#define RFINI_RDY BIT(5) #define RFINI_RDY BIT(5)
...@@ -1054,13 +1054,13 @@ ...@@ -1054,13 +1054,13 @@
#define DIS_TSF_UDT0_NORMAL_CHIP BIT(4) #define DIS_TSF_UDT0_NORMAL_CHIP BIT(4)
#define DIS_TSF_UDT0_TEST_CHIP BIT(5) #define DIS_TSF_UDT0_TEST_CHIP BIT(5)
#define AcmHw_HwEn BIT(0) #define ACMHW_HWEN BIT(0)
#define AcmHw_BeqEn BIT(1) #define ACMHW_BEQEN BIT(1)
#define AcmHw_ViqEn BIT(2) #define ACMHW_VIQEN BIT(2)
#define AcmHw_VoqEn BIT(3) #define ACMHW_VOQEN BIT(3)
#define AcmHw_BeqStatus BIT(4) #define ACMHW_BEQSTATUS BIT(4)
#define AcmHw_ViqStatus BIT(5) #define ACMHW_VIQSTATUS BIT(5)
#define AcmHw_VoqStatus BIT(6) #define ACMHW_VOQSTATUS BIT(6)
#define APSDOFF BIT(6) #define APSDOFF BIT(6)
#define APSDOFF_STATUS BIT(7) #define APSDOFF_STATUS BIT(7)
...@@ -1099,7 +1099,7 @@ ...@@ -1099,7 +1099,7 @@
#define BM_DATA_EN BIT(17) #define BM_DATA_EN BIT(17)
#define MFBEN BIT(22) #define MFBEN BIT(22)
#define LSIGEN BIT(23) #define LSIGEN BIT(23)
#define EnMBID BIT(24) #define ENMBID BIT(24)
#define APP_BASSN BIT(27) #define APP_BASSN BIT(27)
#define APP_PHYSTS BIT(28) #define APP_PHYSTS BIT(28)
#define APP_ICV BIT(29) #define APP_ICV BIT(29)
...@@ -1128,12 +1128,12 @@ ...@@ -1128,12 +1128,12 @@
#define RXERR_RPT_RST BIT(27) #define RXERR_RPT_RST BIT(27)
#define _RXERR_RPT_SEL(type) ((type) << 28) #define _RXERR_RPT_SEL(type) ((type) << 28)
#define SCR_TxUseDK BIT(0) #define SCR_TXUSEDK BIT(0)
#define SCR_RxUseDK BIT(1) #define SCR_RXUSEDK BIT(1)
#define SCR_TxEncEnable BIT(2) #define SCR_TXENCENABLE BIT(2)
#define SCR_RxDecEnable BIT(3) #define SCR_RXDECENABLE BIT(3)
#define SCR_SKByA2 BIT(4) #define SCR_SKBYA2 BIT(4)
#define SCR_NoSKMC BIT(5) #define SCR_NOSKMC BIT(5)
#define SCR_TXBCUSEDK BIT(6) #define SCR_TXBCUSEDK BIT(6)
#define SCR_RXBCUSEDK BIT(7) #define SCR_RXBCUSEDK BIT(7)
...@@ -1186,7 +1186,7 @@ ...@@ -1186,7 +1186,7 @@
#define RPMAC_CCKPLCPHEADER 0x144 #define RPMAC_CCKPLCPHEADER 0x144
#define RPMAC_CCKCRC16 0x148 #define RPMAC_CCKCRC16 0x148
#define RPMAC_OFDMRXCRC32OK 0x170 #define RPMAC_OFDMRXCRC32OK 0x170
#define RPMAC_OFDMRXCRC32Er 0x174 #define RPMAC_OFDMRXCRC32ER 0x174
#define RPMAC_OFDMRXPARITYER 0x178 #define RPMAC_OFDMRXPARITYER 0x178
#define RPMAC_OFDMRXCRC8ER 0x17c #define RPMAC_OFDMRXCRC8ER 0x17c
#define RPMAC_CCKCRXRC16ER 0x180 #define RPMAC_CCKCRXRC16ER 0x180
...@@ -1224,8 +1224,8 @@ ...@@ -1224,8 +1224,8 @@
#define RFPGA0_XAB_RFINTERFACESW 0x870 #define RFPGA0_XAB_RFINTERFACESW 0x870
#define RFPGA0_XCD_RFINTERFACESW 0x874 #define RFPGA0_XCD_RFINTERFACESW 0x874
#define rFPGA0_XAB_RFPARAMETER 0x878 #define RFPGA0_XAB_RFPARAMETER 0x878
#define rFPGA0_XCD_RFPARAMETER 0x87c #define RFPGA0_XCD_RFPARAMETER 0x87c
#define RFPGA0_ANALOGPARAMETER1 0x880 #define RFPGA0_ANALOGPARAMETER1 0x880
#define RFPGA0_ANALOGPARAMETER2 0x884 #define RFPGA0_ANALOGPARAMETER2 0x884
...@@ -1499,8 +1499,8 @@ ...@@ -1499,8 +1499,8 @@
#define BCCKTXCRC16 0xffff #define BCCKTXCRC16 0xffff
#define BCCKTXSTATUS 0x1 #define BCCKTXSTATUS 0x1
#define BOFDMTXSTATUS 0x2 #define BOFDMTXSTATUS 0x2
#define IS_BB_REG_OFFSET_92S(_Offset) \ #define IS_BB_REG_OFFSET_92S(_offset) \
((_Offset >= 0x800) && (_Offset <= 0xfff)) (((_offset) >= 0x800) && ((_offset) <= 0xfff))
#define BRFMOD 0x1 #define BRFMOD 0x1
#define BJAPANMODE 0x2 #define BJAPANMODE 0x2
...@@ -1693,7 +1693,6 @@ ...@@ -1693,7 +1693,6 @@
#define BCCK_RF_EXTEND 0x20000000 #define BCCK_RF_EXTEND 0x20000000
#define BCCK_RXAGC_SATLEVEL 0x1f000000 #define BCCK_RXAGC_SATLEVEL 0x1f000000
#define BCCK_RXAGC_SATCOUNT 0xe0 #define BCCK_RXAGC_SATCOUNT 0xe0
#define bCCKRxRFSettle 0x1f
#define BCCK_FIXED_RXAGC 0x8000 #define BCCK_FIXED_RXAGC 0x8000
#define BCCK_ANTENNA_POLARITY 0x2000 #define BCCK_ANTENNA_POLARITY 0x2000
#define BCCK_TXFILTER_TYPE 0x0c00 #define BCCK_TXFILTER_TYPE 0x0c00
......
...@@ -128,18 +128,18 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw, ...@@ -128,18 +128,18 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_phy *rtlphy = &(rtlpriv->phy); struct rtl_phy *rtlphy = &(rtlpriv->phy);
struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw)); struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
u32 powerBase0, powerBase1; u32 powerbase0, powerbase1;
u8 legacy_pwrdiff, ht20_pwrdiff; u8 legacy_pwrdiff, ht20_pwrdiff;
u8 i, powerlevel[2]; u8 i, powerlevel[2];
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
powerlevel[i] = ppowerlevel[i]; powerlevel[i] = ppowerlevel[i];
legacy_pwrdiff = rtlefuse->txpwr_legacyhtdiff[i][channel - 1]; legacy_pwrdiff = rtlefuse->txpwr_legacyhtdiff[i][channel - 1];
powerBase0 = powerlevel[i] + legacy_pwrdiff; powerbase0 = powerlevel[i] + legacy_pwrdiff;
powerBase0 = (powerBase0 << 24) | (powerBase0 << 16) | powerbase0 = (powerbase0 << 24) | (powerbase0 << 16) |
(powerBase0 << 8) | powerBase0; (powerbase0 << 8) | powerbase0;
*(ofdmbase + i) = powerBase0; *(ofdmbase + i) = powerbase0;
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
" [OFDM power base index rf(%c) = 0x%x]\n", " [OFDM power base index rf(%c) = 0x%x]\n",
i == 0 ? 'A' : 'B', *(ofdmbase + i)); i == 0 ? 'A' : 'B', *(ofdmbase + i));
...@@ -150,11 +150,11 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw, ...@@ -150,11 +150,11 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
ht20_pwrdiff = rtlefuse->txpwr_ht20diff[i][channel - 1]; ht20_pwrdiff = rtlefuse->txpwr_ht20diff[i][channel - 1];
powerlevel[i] += ht20_pwrdiff; powerlevel[i] += ht20_pwrdiff;
} }
powerBase1 = powerlevel[i]; powerbase1 = powerlevel[i];
powerBase1 = (powerBase1 << 24) | powerbase1 = (powerbase1 << 24) |
(powerBase1 << 16) | (powerBase1 << 8) | powerBase1; (powerbase1 << 16) | (powerbase1 << 8) | powerbase1;
*(mcsbase + i) = powerBase1; *(mcsbase + i) = powerbase1;
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
" [MCS power base index rf(%c) = 0x%x]\n", " [MCS power base index rf(%c) = 0x%x]\n",
...@@ -164,37 +164,37 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw, ...@@ -164,37 +164,37 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
u8 channel, u8 index, u8 channel, u8 index,
u32 *powerBase0, u32 *powerbase0,
u32 *powerBase1, u32 *powerbase1,
u32 *p_outwriteval) u32 *p_outwriteval)
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_phy *rtlphy = &(rtlpriv->phy); struct rtl_phy *rtlphy = &(rtlpriv->phy);
struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw)); struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
u8 i, chnlgroup = 0, pwr_diff_limit[4]; u8 i, chnlgroup = 0, pwr_diff_limit[4];
u32 writeVal, customer_limit, rf; u32 writeval, customer_limit, rf;
for (rf = 0; rf < 2; rf++) { for (rf = 0; rf < 2; rf++) {
switch (rtlefuse->eeprom_regulatory) { switch (rtlefuse->eeprom_regulatory) {
case 0: case 0:
chnlgroup = 0; chnlgroup = 0;
writeVal = rtlphy->mcs_offset[chnlgroup][index + writeval = rtlphy->mcs_offset[chnlgroup][index +
(rf ? 8 : 0)] (rf ? 8 : 0)]
+ ((index < 2) ? powerBase0[rf] : powerBase1[rf]); + ((index < 2) ? powerbase0[rf] : powerbase1[rf]);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
"RTK better performance, writeVal(%c) = 0x%x\n", "RTK better performance, writeval(%c) = 0x%x\n",
rf == 0 ? 'A' : 'B', writeVal); rf == 0 ? 'A' : 'B', writeval);
break; break;
case 1: case 1:
if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) { if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
writeVal = ((index < 2) ? powerBase0[rf] : writeval = ((index < 2) ? powerbase0[rf] :
powerBase1[rf]); powerbase1[rf]);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
"Realtek regulatory, 40MHz, writeVal(%c) = 0x%x\n", "Realtek regulatory, 40MHz, writeval(%c) = 0x%x\n",
rf == 0 ? 'A' : 'B', writeVal); rf == 0 ? 'A' : 'B', writeval);
} else { } else {
if (rtlphy->pwrgroup_cnt == 1) if (rtlphy->pwrgroup_cnt == 1)
chnlgroup = 0; chnlgroup = 0;
...@@ -209,23 +209,23 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, ...@@ -209,23 +209,23 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
chnlgroup++; chnlgroup++;
} }
writeVal = rtlphy->mcs_offset[chnlgroup] writeval = rtlphy->mcs_offset[chnlgroup]
[index + (rf ? 8 : 0)] + ((index < 2) ? [index + (rf ? 8 : 0)] + ((index < 2) ?
powerBase0[rf] : powerbase0[rf] :
powerBase1[rf]); powerbase1[rf]);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
"Realtek regulatory, 20MHz, writeVal(%c) = 0x%x\n", "Realtek regulatory, 20MHz, writeval(%c) = 0x%x\n",
rf == 0 ? 'A' : 'B', writeVal); rf == 0 ? 'A' : 'B', writeval);
} }
break; break;
case 2: case 2:
writeVal = writeval =
((index < 2) ? powerBase0[rf] : powerBase1[rf]); ((index < 2) ? powerbase0[rf] : powerbase1[rf]);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
"Better regulatory, writeVal(%c) = 0x%x\n", "Better regulatory, writeval(%c) = 0x%x\n",
rf == 0 ? 'A' : 'B', writeVal); rf == 0 ? 'A' : 'B', writeval);
break; break;
case 3: case 3:
chnlgroup = 0; chnlgroup = 0;
...@@ -275,36 +275,36 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, ...@@ -275,36 +275,36 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
"Customer's limit rf(%c) = 0x%x\n", "Customer's limit rf(%c) = 0x%x\n",
rf == 0 ? 'A' : 'B', customer_limit); rf == 0 ? 'A' : 'B', customer_limit);
writeVal = customer_limit + writeval = customer_limit +
((index < 2) ? powerBase0[rf] : powerBase1[rf]); ((index < 2) ? powerbase0[rf] : powerbase1[rf]);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
"Customer, writeVal rf(%c)= 0x%x\n", "Customer, writeval rf(%c)= 0x%x\n",
rf == 0 ? 'A' : 'B', writeVal); rf == 0 ? 'A' : 'B', writeval);
break; break;
default: default:
chnlgroup = 0; chnlgroup = 0;
writeVal = rtlphy->mcs_offset[chnlgroup] writeval = rtlphy->mcs_offset[chnlgroup]
[index + (rf ? 8 : 0)] [index + (rf ? 8 : 0)]
+ ((index < 2) ? powerBase0[rf] : powerBase1[rf]); + ((index < 2) ? powerbase0[rf] : powerbase1[rf]);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
"RTK better performance, writeVal rf(%c) = 0x%x\n", "RTK better performance, writeval rf(%c) = 0x%x\n",
rf == 0 ? 'A' : 'B', writeVal); rf == 0 ? 'A' : 'B', writeval);
break; break;
} }
if (rtlpriv->dm.dynamic_txhighpower_lvl == TXHIGHPWRLEVEL_BT1) if (rtlpriv->dm.dynamic_txhighpower_lvl == TXHIGHPWRLEVEL_BT1)
writeVal = writeVal - 0x06060606; writeval = writeval - 0x06060606;
else if (rtlpriv->dm.dynamic_txhighpower_lvl == else if (rtlpriv->dm.dynamic_txhighpower_lvl ==
TXHIGHPWRLEVEL_BT2) TXHIGHPWRLEVEL_BT2)
writeVal = writeVal - 0x0c0c0c0c; writeval = writeval - 0x0c0c0c0c;
*(p_outwriteval + rf) = writeVal; *(p_outwriteval + rf) = writeval;
} }
} }
static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw, static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
u8 index, u32 *pValue) u8 index, u32 *value)
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_phy *rtlphy = &(rtlpriv->phy); struct rtl_phy *rtlphy = &(rtlpriv->phy);
...@@ -320,29 +320,29 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw, ...@@ -320,29 +320,29 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
RTXAGC_B_MCS11_MCS08, RTXAGC_B_MCS15_MCS12 RTXAGC_B_MCS11_MCS08, RTXAGC_B_MCS15_MCS12
}; };
u8 i, rf, pwr_val[4]; u8 i, rf, pwr_val[4];
u32 writeVal; u32 writeval;
u16 regoffset; u16 regoffset;
for (rf = 0; rf < 2; rf++) { for (rf = 0; rf < 2; rf++) {
writeVal = pValue[rf]; writeval = value[rf];
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
pwr_val[i] = (u8) ((writeVal & (0x7f << pwr_val[i] = (u8)((writeval & (0x7f <<
(i * 8))) >> (i * 8)); (i * 8))) >> (i * 8));
if (pwr_val[i] > RF6052_MAX_TX_PWR) if (pwr_val[i] > RF6052_MAX_TX_PWR)
pwr_val[i] = RF6052_MAX_TX_PWR; pwr_val[i] = RF6052_MAX_TX_PWR;
} }
writeVal = (pwr_val[3] << 24) | (pwr_val[2] << 16) | writeval = (pwr_val[3] << 24) | (pwr_val[2] << 16) |
(pwr_val[1] << 8) | pwr_val[0]; (pwr_val[1] << 8) | pwr_val[0];
if (rf == 0) if (rf == 0)
regoffset = regoffset_a[index]; regoffset = regoffset_a[index];
else else
regoffset = regoffset_b[index]; regoffset = regoffset_b[index];
rtl_set_bbreg(hw, regoffset, MASKDWORD, writeVal); rtl_set_bbreg(hw, regoffset, MASKDWORD, writeval);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
"Set 0x%x = %08x\n", regoffset, writeVal); "Set 0x%x = %08x\n", regoffset, writeval);
if (((get_rf_type(rtlphy) == RF_2T2R) && if (((get_rf_type(rtlphy) == RF_2T2R) &&
(regoffset == RTXAGC_A_MCS15_MCS12 || (regoffset == RTXAGC_A_MCS15_MCS12 ||
...@@ -351,7 +351,7 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw, ...@@ -351,7 +351,7 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
(regoffset == RTXAGC_A_MCS07_MCS04 || (regoffset == RTXAGC_A_MCS07_MCS04 ||
regoffset == RTXAGC_B_MCS07_MCS04))) { regoffset == RTXAGC_B_MCS07_MCS04))) {
writeVal = pwr_val[3]; writeval = pwr_val[3];
if (regoffset == RTXAGC_A_MCS15_MCS12 || if (regoffset == RTXAGC_A_MCS15_MCS12 ||
regoffset == RTXAGC_A_MCS07_MCS04) regoffset == RTXAGC_A_MCS07_MCS04)
regoffset = 0xc90; regoffset = 0xc90;
...@@ -360,9 +360,9 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw, ...@@ -360,9 +360,9 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
regoffset = 0xc98; regoffset = 0xc98;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
writeVal = (writeVal > 6) ? (writeVal - 6) : 0; writeval = (writeval > 6) ? (writeval - 6) : 0;
rtl_write_byte(rtlpriv, (u32) (regoffset + i), rtl_write_byte(rtlpriv, (u32) (regoffset + i),
(u8) writeVal); (u8)writeval);
} }
} }
} }
...@@ -371,20 +371,20 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw, ...@@ -371,20 +371,20 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
void rtl92ce_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw, void rtl92ce_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw,
u8 *ppowerlevel, u8 channel) u8 *ppowerlevel, u8 channel)
{ {
u32 writeVal[2], powerBase0[2], powerBase1[2]; u32 writeval[2], powerbase0[2], powerbase1[2];
u8 index; u8 index;
rtl92c_phy_get_power_base(hw, ppowerlevel, rtl92c_phy_get_power_base(hw, ppowerlevel,
channel, &powerBase0[0], &powerBase1[0]); channel, &powerbase0[0], &powerbase1[0]);
for (index = 0; index < 6; index++) { for (index = 0; index < 6; index++) {
_rtl92c_get_txpower_writeval_by_regulatory(hw, _rtl92c_get_txpower_writeval_by_regulatory(hw,
channel, index, channel, index,
&powerBase0[0], &powerbase0[0],
&powerBase1[0], &powerbase1[0],
&writeVal[0]); &writeval[0]);
_rtl92c_write_ofdm_power_reg(hw, index, &writeVal[0]); _rtl92c_write_ofdm_power_reg(hw, index, &writeval[0]);
} }
} }
......
...@@ -49,14 +49,14 @@ ...@@ -49,14 +49,14 @@
/* should be renamed and moved to another file */ /* should be renamed and moved to another file */
enum _BOARD_TYPE_8192CUSB { enum _BOARD_TYPE_8192CUSB {
BOARD_USB_DONGLE = 0, /* USB dongle */ BOARD_USB_DONGLE = 0, /* USB dongle */
BOARD_USB_High_PA = 1, /* USB dongle - high power PA */ BOARD_USB_HIGH_PA = 1, /* USB dongle - high power PA */
BOARD_MINICARD = 2, /* Minicard */ BOARD_MINICARD = 2, /* Minicard */
BOARD_USB_SOLO = 3, /* USB solo-Slim module */ BOARD_USB_SOLO = 3, /* USB solo-Slim module */
BOARD_USB_COMBO = 4, /* USB Combo-Slim module */ BOARD_USB_COMBO = 4, /* USB Combo-Slim module */
}; };
#define IS_HIGHT_PA(boardtype) \ #define IS_HIGHT_PA(boardtype) \
((boardtype == BOARD_USB_High_PA) ? true : false) ((boardtype == BOARD_USB_HIGH_PA) ? true : false)
#define RTL92C_DRIVER_INFO_SIZE 4 #define RTL92C_DRIVER_INFO_SIZE 4
void rtl92cu_read_eeprom_info(struct ieee80211_hw *hw); void rtl92cu_read_eeprom_info(struct ieee80211_hw *hw);
......
...@@ -14,7 +14,7 @@ static void _rtl92cu_init_led(struct ieee80211_hw *hw, ...@@ -14,7 +14,7 @@ static void _rtl92cu_init_led(struct ieee80211_hw *hw,
pled->ledon = false; pled->ledon = false;
} }
static void _rtl92cu_deInit_led(struct rtl_led *pled) static void rtl92cu_deinit_led(struct rtl_led *pled)
{ {
} }
...@@ -88,8 +88,8 @@ void rtl92cu_deinit_sw_leds(struct ieee80211_hw *hw) ...@@ -88,8 +88,8 @@ void rtl92cu_deinit_sw_leds(struct ieee80211_hw *hw)
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
_rtl92cu_deInit_led(&rtlpriv->ledctl.sw_led0); rtl92cu_deinit_led(&rtlpriv->ledctl.sw_led0);
_rtl92cu_deInit_led(&rtlpriv->ledctl.sw_led1); rtl92cu_deinit_led(&rtlpriv->ledctl.sw_led1);
} }
static void _rtl92cu_sw_led_control(struct ieee80211_hw *hw, static void _rtl92cu_sw_led_control(struct ieee80211_hw *hw,
......
...@@ -103,7 +103,7 @@ bool rtl92cu_phy_bb_config(struct ieee80211_hw *hw) ...@@ -103,7 +103,7 @@ bool rtl92cu_phy_bb_config(struct ieee80211_hw *hw)
rtl_write_byte(rtlpriv, REG_AFE_PLL_CTRL + 1, 0xdb); rtl_write_byte(rtlpriv, REG_AFE_PLL_CTRL + 1, 0xdb);
rtl_write_byte(rtlpriv, REG_RF_CTRL, RF_EN | RF_RSTB | RF_SDMRSTB); rtl_write_byte(rtlpriv, REG_RF_CTRL, RF_EN | RF_RSTB | RF_SDMRSTB);
rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, FEN_USBA | FEN_USBD | rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, FEN_USBA | FEN_USBD |
FEN_BB_GLB_RSTn | FEN_BBRSTB); FEN_BB_GLB_RSTN | FEN_BBRSTB);
regval32 = rtl_read_dword(rtlpriv, 0x87c); regval32 = rtl_read_dword(rtlpriv, 0x87c);
rtl_write_dword(rtlpriv, 0x87c, regval32 & (~BIT(31))); rtl_write_dword(rtlpriv, 0x87c, regval32 & (~BIT(31)));
rtl_write_byte(rtlpriv, REG_LDOHCI12_CTRL, 0x0f); rtl_write_byte(rtlpriv, REG_LDOHCI12_CTRL, 0x0f);
...@@ -121,7 +121,7 @@ bool _rtl92cu_phy_config_mac_with_headerfile(struct ieee80211_hw *hw) ...@@ -121,7 +121,7 @@ bool _rtl92cu_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
u32 arraylength; u32 arraylength;
u32 *ptrarray; u32 *ptrarray;
RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl819XMACPHY_Array\n"); RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl819XMACPHY_ARRAY\n");
arraylength = rtlphy->hwparam_tables[MAC_REG].length ; arraylength = rtlphy->hwparam_tables[MAC_REG].length ;
ptrarray = rtlphy->hwparam_tables[MAC_REG].pdata; ptrarray = rtlphy->hwparam_tables[MAC_REG].pdata;
RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Img:RTL8192CUMAC_2T_ARRAY\n"); RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Img:RTL8192CUMAC_2T_ARRAY\n");
...@@ -159,7 +159,7 @@ bool _rtl92cu_phy_config_bb_with_headerfile(struct ieee80211_hw *hw, ...@@ -159,7 +159,7 @@ bool _rtl92cu_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
phy_regarray_table[i + 1]); phy_regarray_table[i + 1]);
udelay(1); udelay(1);
RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
"The phy_regarray_table[0] is %x Rtl819XPHY_REGArray[1] is %x\n", "The phy_regarray_table[0] is %x Rtl819XPHY_REGARRAY[1] is %x\n",
phy_regarray_table[i], phy_regarray_table[i],
phy_regarray_table[i + 1]); phy_regarray_table[i + 1]);
} }
...@@ -169,7 +169,7 @@ bool _rtl92cu_phy_config_bb_with_headerfile(struct ieee80211_hw *hw, ...@@ -169,7 +169,7 @@ bool _rtl92cu_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
agctab_array_table[i + 1]); agctab_array_table[i + 1]);
udelay(1); udelay(1);
RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
"The agctab_array_table[0] is %x Rtl819XPHY_REGArray[1] is %x\n", "The agctab_array_table[0] is %x Rtl819XPHY_REGARRAY[1] is %x\n",
agctab_array_table[i], agctab_array_table[i],
agctab_array_table[i + 1]); agctab_array_table[i + 1]);
} }
...@@ -192,7 +192,7 @@ bool _rtl92cu_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw, ...@@ -192,7 +192,7 @@ bool _rtl92cu_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
if (configtype == BASEBAND_CONFIG_PHY_REG) { if (configtype == BASEBAND_CONFIG_PHY_REG) {
for (i = 0; i < phy_regarray_pg_len; i = i + 3) { for (i = 0; i < phy_regarray_pg_len; i = i + 3) {
rtl_addr_delay(phy_regarray_table_pg[i]); rtl_addr_delay(phy_regarray_table_pg[i]);
_rtl92c_store_pwrIndex_diffrate_offset(hw, _rtl92c_store_pwrindex_diffrate_offset(hw,
phy_regarray_table_pg[i], phy_regarray_table_pg[i],
phy_regarray_table_pg[i + 1], phy_regarray_table_pg[i + 1],
phy_regarray_table_pg[i + 2]); phy_regarray_table_pg[i + 2]);
...@@ -386,14 +386,14 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw, ...@@ -386,14 +386,14 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw,
if ((ppsc->rfpwr_state == ERFOFF) && if ((ppsc->rfpwr_state == ERFOFF) &&
RT_IN_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC)) { RT_IN_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC)) {
bool rtstatus; bool rtstatus;
u32 InitializeCount = 0; u32 init_count = 0;
do { do {
InitializeCount++; init_count++;
RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,
"IPS Set eRf nic enable\n"); "IPS Set eRf nic enable\n");
rtstatus = rtl_ps_enable_nic(hw); rtstatus = rtl_ps_enable_nic(hw);
} while (!rtstatus && (InitializeCount < 10)); } while (!rtstatus && (init_count < 10));
RT_CLEAR_PS_LEVEL(ppsc, RT_CLEAR_PS_LEVEL(ppsc,
RT_RF_OFF_LEVL_HALT_NIC); RT_RF_OFF_LEVL_HALT_NIC);
} else { } else {
......
...@@ -126,17 +126,17 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw, ...@@ -126,17 +126,17 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_phy *rtlphy = &(rtlpriv->phy); struct rtl_phy *rtlphy = &(rtlpriv->phy);
struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw)); struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
u32 powerBase0, powerBase1; u32 powerbase0, powerbase1;
u8 legacy_pwrdiff = 0, ht20_pwrdiff = 0; u8 legacy_pwrdiff = 0, ht20_pwrdiff = 0;
u8 i, powerlevel[2]; u8 i, powerlevel[2];
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
powerlevel[i] = ppowerlevel[i]; powerlevel[i] = ppowerlevel[i];
legacy_pwrdiff = rtlefuse->txpwr_legacyhtdiff[i][channel - 1]; legacy_pwrdiff = rtlefuse->txpwr_legacyhtdiff[i][channel - 1];
powerBase0 = powerlevel[i] + legacy_pwrdiff; powerbase0 = powerlevel[i] + legacy_pwrdiff;
powerBase0 = (powerBase0 << 24) | (powerBase0 << 16) | powerbase0 = (powerbase0 << 24) | (powerbase0 << 16) |
(powerBase0 << 8) | powerBase0; (powerbase0 << 8) | powerbase0;
*(ofdmbase + i) = powerBase0; *(ofdmbase + i) = powerbase0;
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
" [OFDM power base index rf(%c) = 0x%x]\n", " [OFDM power base index rf(%c) = 0x%x]\n",
i == 0 ? 'A' : 'B', *(ofdmbase + i)); i == 0 ? 'A' : 'B', *(ofdmbase + i));
...@@ -146,10 +146,10 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw, ...@@ -146,10 +146,10 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
ht20_pwrdiff = rtlefuse->txpwr_ht20diff[i][channel - 1]; ht20_pwrdiff = rtlefuse->txpwr_ht20diff[i][channel - 1];
powerlevel[i] += ht20_pwrdiff; powerlevel[i] += ht20_pwrdiff;
} }
powerBase1 = powerlevel[i]; powerbase1 = powerlevel[i];
powerBase1 = (powerBase1 << 24) | powerbase1 = (powerbase1 << 24) |
(powerBase1 << 16) | (powerBase1 << 8) | powerBase1; (powerbase1 << 16) | (powerbase1 << 8) | powerbase1;
*(mcsbase + i) = powerBase1; *(mcsbase + i) = powerbase1;
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
" [MCS power base index rf(%c) = 0x%x]\n", " [MCS power base index rf(%c) = 0x%x]\n",
i == 0 ? 'A' : 'B', *(mcsbase + i)); i == 0 ? 'A' : 'B', *(mcsbase + i));
...@@ -158,26 +158,26 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw, ...@@ -158,26 +158,26 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
u8 channel, u8 index, u8 channel, u8 index,
u32 *powerBase0, u32 *powerbase0,
u32 *powerBase1, u32 *powerbase1,
u32 *p_outwriteval) u32 *p_outwriteval)
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_phy *rtlphy = &(rtlpriv->phy); struct rtl_phy *rtlphy = &(rtlpriv->phy);
struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw)); struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
u8 i, chnlgroup = 0, pwr_diff_limit[4]; u8 i, chnlgroup = 0, pwr_diff_limit[4];
u32 writeVal, customer_limit, rf; u32 writeval, customer_limit, rf;
for (rf = 0; rf < 2; rf++) { for (rf = 0; rf < 2; rf++) {
switch (rtlefuse->eeprom_regulatory) { switch (rtlefuse->eeprom_regulatory) {
case 0: case 0:
chnlgroup = 0; chnlgroup = 0;
writeVal = rtlphy->mcs_offset writeval = rtlphy->mcs_offset
[chnlgroup][index + (rf ? 8 : 0)] [chnlgroup][index + (rf ? 8 : 0)]
+ ((index < 2) ? powerBase0[rf] : powerBase1[rf]); + ((index < 2) ? powerbase0[rf] : powerbase1[rf]);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
"RTK better performance,writeVal(%c) = 0x%x\n", "RTK better performance,writeval(%c) = 0x%x\n",
rf == 0 ? 'A' : 'B', writeVal); rf == 0 ? 'A' : 'B', writeval);
break; break;
case 1: case 1:
if (rtlphy->pwrgroup_cnt == 1) if (rtlphy->pwrgroup_cnt == 1)
...@@ -195,20 +195,20 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, ...@@ -195,20 +195,20 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
else else
chnlgroup += 4; chnlgroup += 4;
} }
writeVal = rtlphy->mcs_offset[chnlgroup][index + writeval = rtlphy->mcs_offset[chnlgroup][index +
(rf ? 8 : 0)] + (rf ? 8 : 0)] +
((index < 2) ? powerBase0[rf] : ((index < 2) ? powerbase0[rf] :
powerBase1[rf]); powerbase1[rf]);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
"Realtek regulatory, 20MHz, writeVal(%c) = 0x%x\n", "Realtek regulatory, 20MHz, writeval(%c) = 0x%x\n",
rf == 0 ? 'A' : 'B', writeVal); rf == 0 ? 'A' : 'B', writeval);
break; break;
case 2: case 2:
writeVal = ((index < 2) ? powerBase0[rf] : writeval = ((index < 2) ? powerbase0[rf] :
powerBase1[rf]); powerbase1[rf]);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
"Better regulatory,writeVal(%c) = 0x%x\n", "Better regulatory,writeval(%c) = 0x%x\n",
rf == 0 ? 'A' : 'B', writeVal); rf == 0 ? 'A' : 'B', writeval);
break; break;
case 3: case 3:
chnlgroup = 0; chnlgroup = 0;
...@@ -253,36 +253,36 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, ...@@ -253,36 +253,36 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
"Customer's limit rf(%c) = 0x%x\n", "Customer's limit rf(%c) = 0x%x\n",
rf == 0 ? 'A' : 'B', customer_limit); rf == 0 ? 'A' : 'B', customer_limit);
writeVal = customer_limit + ((index < 2) ? writeval = customer_limit + ((index < 2) ?
powerBase0[rf] : powerBase1[rf]); powerbase0[rf] : powerbase1[rf]);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
"Customer, writeVal rf(%c)= 0x%x\n", "Customer, writeval rf(%c)= 0x%x\n",
rf == 0 ? 'A' : 'B', writeVal); rf == 0 ? 'A' : 'B', writeval);
break; break;
default: default:
chnlgroup = 0; chnlgroup = 0;
writeVal = rtlphy->mcs_offset[chnlgroup] writeval = rtlphy->mcs_offset[chnlgroup]
[index + (rf ? 8 : 0)] + ((index < 2) ? [index + (rf ? 8 : 0)] + ((index < 2) ?
powerBase0[rf] : powerBase1[rf]); powerbase0[rf] : powerbase1[rf]);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
"RTK better performance, writeValrf(%c) = 0x%x\n", "RTK better performance, writevalrf(%c) = 0x%x\n",
rf == 0 ? 'A' : 'B', writeVal); rf == 0 ? 'A' : 'B', writeval);
break; break;
} }
if (rtlpriv->dm.dynamic_txhighpower_lvl == if (rtlpriv->dm.dynamic_txhighpower_lvl ==
TXHIGHPWRLEVEL_LEVEL1) TXHIGHPWRLEVEL_LEVEL1)
writeVal = 0x14141414; writeval = 0x14141414;
else if (rtlpriv->dm.dynamic_txhighpower_lvl == else if (rtlpriv->dm.dynamic_txhighpower_lvl ==
TXHIGHPWRLEVEL_LEVEL2) TXHIGHPWRLEVEL_LEVEL2)
writeVal = 0x00000000; writeval = 0x00000000;
if (rtlpriv->dm.dynamic_txhighpower_lvl == TXHIGHPWRLEVEL_BT1) if (rtlpriv->dm.dynamic_txhighpower_lvl == TXHIGHPWRLEVEL_BT1)
writeVal = writeVal - 0x06060606; writeval = writeval - 0x06060606;
*(p_outwriteval + rf) = writeVal; *(p_outwriteval + rf) = writeval;
} }
} }
static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw, static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
u8 index, u32 *pValue) u8 index, u32 *value)
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_phy *rtlphy = &(rtlpriv->phy); struct rtl_phy *rtlphy = &(rtlpriv->phy);
...@@ -297,33 +297,33 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw, ...@@ -297,33 +297,33 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
RTXAGC_B_MCS11_MCS08, RTXAGC_B_MCS15_MCS12 RTXAGC_B_MCS11_MCS08, RTXAGC_B_MCS15_MCS12
}; };
u8 i, rf, pwr_val[4]; u8 i, rf, pwr_val[4];
u32 writeVal; u32 writeval;
u16 regoffset; u16 regoffset;
for (rf = 0; rf < 2; rf++) { for (rf = 0; rf < 2; rf++) {
writeVal = pValue[rf]; writeval = value[rf];
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
pwr_val[i] = (u8)((writeVal & (0x7f << (i * 8))) >> pwr_val[i] = (u8)((writeval & (0x7f << (i * 8))) >>
(i * 8)); (i * 8));
if (pwr_val[i] > RF6052_MAX_TX_PWR) if (pwr_val[i] > RF6052_MAX_TX_PWR)
pwr_val[i] = RF6052_MAX_TX_PWR; pwr_val[i] = RF6052_MAX_TX_PWR;
} }
writeVal = (pwr_val[3] << 24) | (pwr_val[2] << 16) | writeval = (pwr_val[3] << 24) | (pwr_val[2] << 16) |
(pwr_val[1] << 8) | pwr_val[0]; (pwr_val[1] << 8) | pwr_val[0];
if (rf == 0) if (rf == 0)
regoffset = regoffset_a[index]; regoffset = regoffset_a[index];
else else
regoffset = regoffset_b[index]; regoffset = regoffset_b[index];
rtl_set_bbreg(hw, regoffset, MASKDWORD, writeVal); rtl_set_bbreg(hw, regoffset, MASKDWORD, writeval);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
"Set 0x%x = %08x\n", regoffset, writeVal); "Set 0x%x = %08x\n", regoffset, writeval);
if (((get_rf_type(rtlphy) == RF_2T2R) && if (((get_rf_type(rtlphy) == RF_2T2R) &&
(regoffset == RTXAGC_A_MCS15_MCS12 || (regoffset == RTXAGC_A_MCS15_MCS12 ||
regoffset == RTXAGC_B_MCS15_MCS12)) || regoffset == RTXAGC_B_MCS15_MCS12)) ||
((get_rf_type(rtlphy) != RF_2T2R) && ((get_rf_type(rtlphy) != RF_2T2R) &&
(regoffset == RTXAGC_A_MCS07_MCS04 || (regoffset == RTXAGC_A_MCS07_MCS04 ||
regoffset == RTXAGC_B_MCS07_MCS04))) { regoffset == RTXAGC_B_MCS07_MCS04))) {
writeVal = pwr_val[3]; writeval = pwr_val[3];
if (regoffset == RTXAGC_A_MCS15_MCS12 || if (regoffset == RTXAGC_A_MCS15_MCS12 ||
regoffset == RTXAGC_A_MCS07_MCS04) regoffset == RTXAGC_A_MCS07_MCS04)
regoffset = 0xc90; regoffset = 0xc90;
...@@ -332,13 +332,13 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw, ...@@ -332,13 +332,13 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
regoffset = 0xc98; regoffset = 0xc98;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (i != 2) if (i != 2)
writeVal = (writeVal > 8) ? writeval = (writeval > 8) ?
(writeVal - 8) : 0; (writeval - 8) : 0;
else else
writeVal = (writeVal > 6) ? writeval = (writeval > 6) ?
(writeVal - 6) : 0; (writeval - 6) : 0;
rtl_write_byte(rtlpriv, (u32)(regoffset + i), rtl_write_byte(rtlpriv, (u32)(regoffset + i),
(u8)writeVal); (u8)writeval);
} }
} }
} }
...@@ -347,18 +347,18 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw, ...@@ -347,18 +347,18 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
void rtl92cu_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw, void rtl92cu_phy_rf6052_set_ofdm_txpower(struct ieee80211_hw *hw,
u8 *ppowerlevel, u8 channel) u8 *ppowerlevel, u8 channel)
{ {
u32 writeVal[2], powerBase0[2], powerBase1[2]; u32 writeval[2], powerbase0[2], powerbase1[2];
u8 index = 0; u8 index = 0;
rtl92c_phy_get_power_base(hw, ppowerlevel, rtl92c_phy_get_power_base(hw, ppowerlevel,
channel, &powerBase0[0], &powerBase1[0]); channel, &powerbase0[0], &powerbase1[0]);
for (index = 0; index < 6; index++) { for (index = 0; index < 6; index++) {
_rtl92c_get_txpower_writeval_by_regulatory(hw, _rtl92c_get_txpower_writeval_by_regulatory(hw,
channel, index, channel, index,
&powerBase0[0], &powerbase0[0],
&powerBase1[0], &powerbase1[0],
&writeVal[0]); &writeval[0]);
_rtl92c_write_ofdm_power_reg(hw, index, &writeVal[0]); _rtl92c_write_ofdm_power_reg(hw, index, &writeval[0]);
} }
} }
......
...@@ -1247,7 +1247,7 @@ u32 RTL8192CUAGCTAB_1TARRAY[RTL8192CUAGCTAB_1TARRAYLENGTH] = { ...@@ -1247,7 +1247,7 @@ u32 RTL8192CUAGCTAB_1TARRAY[RTL8192CUAGCTAB_1TARRAYLENGTH] = {
0xc78, 0x621f001e, 0xc78, 0x621f001e,
}; };
u32 RTL8192CUPHY_REG_1T_HPArray[RTL8192CUPHY_REG_1T_HPArrayLength] = { u32 RTL8192CUPHY_REG_1T_HPARRAY[RTL8192CUPHY_REG_1T_HPARRAYLENGTH] = {
0x024, 0x0011800f, 0x024, 0x0011800f,
0x028, 0x00ffdb83, 0x028, 0x00ffdb83,
0x040, 0x000c0004, 0x040, 0x000c0004,
...@@ -1439,7 +1439,7 @@ u32 RTL8192CUPHY_REG_1T_HPArray[RTL8192CUPHY_REG_1T_HPArrayLength] = { ...@@ -1439,7 +1439,7 @@ u32 RTL8192CUPHY_REG_1T_HPArray[RTL8192CUPHY_REG_1T_HPArrayLength] = {
0xf00, 0x00000300, 0xf00, 0x00000300,
}; };
u32 RTL8192CUPHY_REG_Array_PG_HP[RTL8192CUPHY_REG_Array_PG_HPLength] = { u32 RTL8192CUPHY_REG_ARRAY_PG_HP[RTL8192CUPHY_REG_ARRAY_PG_HPLENGTH] = {
0xe00, 0xffffffff, 0x06080808, 0xe00, 0xffffffff, 0x06080808,
0xe04, 0xffffffff, 0x00040406, 0xe04, 0xffffffff, 0x00040406,
0xe08, 0x0000ff00, 0x00000000, 0xe08, 0x0000ff00, 0x00000000,
...@@ -1554,7 +1554,7 @@ u32 RTL8192CUPHY_REG_Array_PG_HP[RTL8192CUPHY_REG_Array_PG_HPLength] = { ...@@ -1554,7 +1554,7 @@ u32 RTL8192CUPHY_REG_Array_PG_HP[RTL8192CUPHY_REG_Array_PG_HPLength] = {
0x868, 0xffffffff, 0x00000000, 0x868, 0xffffffff, 0x00000000,
}; };
u32 RTL8192CURadioA_1T_HPArray[RTL8192CURadioA_1T_HPArrayLength] = { u32 RTL8192CURADIOA_1T_HPARRAY[RTL8192CURADIOA_1T_HPARRAYLENGTH] = {
0x000, 0x00030159, 0x000, 0x00030159,
0x001, 0x00031284, 0x001, 0x00031284,
0x002, 0x00098000, 0x002, 0x00098000,
...@@ -1698,7 +1698,7 @@ u32 RTL8192CURadioA_1T_HPArray[RTL8192CURadioA_1T_HPArrayLength] = { ...@@ -1698,7 +1698,7 @@ u32 RTL8192CURadioA_1T_HPArray[RTL8192CURadioA_1T_HPArrayLength] = {
0x000, 0x00030159, 0x000, 0x00030159,
}; };
u32 Rtl8192CUAGCTAB_1T_HPArray[RTL8192CUAGCTAB_1T_HPArrayLength] = { u32 RTL8192CUAGCTAB_1T_HPARRAY[RTL8192CUAGCTAB_1T_HPARRAYLENGTH] = {
0xc78, 0x7b000001, 0xc78, 0x7b000001,
0xc78, 0x7b010001, 0xc78, 0x7b010001,
0xc78, 0x7b020001, 0xc78, 0x7b020001,
......
...@@ -31,15 +31,15 @@ extern u32 RTL8192CUAGCTAB_2TARRAY[RTL8192CUAGCTAB_2TARRAYLENGTH]; ...@@ -31,15 +31,15 @@ extern u32 RTL8192CUAGCTAB_2TARRAY[RTL8192CUAGCTAB_2TARRAYLENGTH];
#define RTL8192CUAGCTAB_1TARRAYLENGTH 320 #define RTL8192CUAGCTAB_1TARRAYLENGTH 320
extern u32 RTL8192CUAGCTAB_1TARRAY[RTL8192CUAGCTAB_1TARRAYLENGTH]; extern u32 RTL8192CUAGCTAB_1TARRAY[RTL8192CUAGCTAB_1TARRAYLENGTH];
#define RTL8192CUPHY_REG_1T_HPArrayLength 378 #define RTL8192CUPHY_REG_1T_HPARRAYLENGTH 378
extern u32 RTL8192CUPHY_REG_1T_HPArray[RTL8192CUPHY_REG_1T_HPArrayLength]; extern u32 RTL8192CUPHY_REG_1T_HPARRAY[RTL8192CUPHY_REG_1T_HPARRAYLENGTH];
#define RTL8192CUPHY_REG_Array_PG_HPLength 336 #define RTL8192CUPHY_REG_ARRAY_PG_HPLENGTH 336
extern u32 RTL8192CUPHY_REG_Array_PG_HP[RTL8192CUPHY_REG_Array_PG_HPLength]; extern u32 RTL8192CUPHY_REG_ARRAY_PG_HP[RTL8192CUPHY_REG_ARRAY_PG_HPLENGTH];
#define RTL8192CURadioA_1T_HPArrayLength 282 #define RTL8192CURADIOA_1T_HPARRAYLENGTH 282
extern u32 RTL8192CURadioA_1T_HPArray[RTL8192CURadioA_1T_HPArrayLength]; extern u32 RTL8192CURADIOA_1T_HPARRAY[RTL8192CURADIOA_1T_HPARRAYLENGTH];
#define RTL8192CUAGCTAB_1T_HPArrayLength 320 #define RTL8192CUAGCTAB_1T_HPARRAYLENGTH 320
extern u32 Rtl8192CUAGCTAB_1T_HPArray[RTL8192CUAGCTAB_1T_HPArrayLength]; extern u32 RTL8192CUAGCTAB_1T_HPARRAY[RTL8192CUAGCTAB_1T_HPARRAYLENGTH];
#endif #endif
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "trx.h" #include "trx.h"
#include "../rtl8192c/fw_common.h" #include "../rtl8192c/fw_common.h"
static int _ConfigVerTOutEP(struct ieee80211_hw *hw) static int configvertoutep(struct ieee80211_hw *hw)
{ {
u8 ep_cfg, txqsele; u8 ep_cfg, txqsele;
u8 ep_nums = 0; u8 ep_nums = 0;
...@@ -47,7 +47,7 @@ static int _ConfigVerTOutEP(struct ieee80211_hw *hw) ...@@ -47,7 +47,7 @@ static int _ConfigVerTOutEP(struct ieee80211_hw *hw)
return (rtlusb->out_ep_nums == ep_nums) ? 0 : -EINVAL; return (rtlusb->out_ep_nums == ep_nums) ? 0 : -EINVAL;
} }
static int _ConfigVerNOutEP(struct ieee80211_hw *hw) static int configvernoutep(struct ieee80211_hw *hw)
{ {
u8 ep_cfg; u8 ep_cfg;
u8 ep_nums = 0; u8 ep_nums = 0;
...@@ -76,7 +76,7 @@ static int _ConfigVerNOutEP(struct ieee80211_hw *hw) ...@@ -76,7 +76,7 @@ static int _ConfigVerNOutEP(struct ieee80211_hw *hw)
return (rtlusb->out_ep_nums == ep_nums) ? 0 : -EINVAL; return (rtlusb->out_ep_nums == ep_nums) ? 0 : -EINVAL;
} }
static void _TwoOutEpMapping(struct ieee80211_hw *hw, bool bIsChipB, static void twooutepmapping(struct ieee80211_hw *hw, bool is_chip8,
bool bwificfg, struct rtl_ep_map *ep_map) bool bwificfg, struct rtl_ep_map *ep_map)
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
...@@ -104,7 +104,7 @@ static void _TwoOutEpMapping(struct ieee80211_hw *hw, bool bIsChipB, ...@@ -104,7 +104,7 @@ static void _TwoOutEpMapping(struct ieee80211_hw *hw, bool bIsChipB,
} }
} }
static void _ThreeOutEpMapping(struct ieee80211_hw *hw, bool bwificfg, static void threeoutepmapping(struct ieee80211_hw *hw, bool bwificfg,
struct rtl_ep_map *ep_map) struct rtl_ep_map *ep_map)
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
...@@ -131,7 +131,7 @@ static void _ThreeOutEpMapping(struct ieee80211_hw *hw, bool bwificfg, ...@@ -131,7 +131,7 @@ static void _ThreeOutEpMapping(struct ieee80211_hw *hw, bool bwificfg,
} }
} }
static void _OneOutEpMapping(struct ieee80211_hw *hw, struct rtl_ep_map *ep_map) static void oneoutepmapping(struct ieee80211_hw *hw, struct rtl_ep_map *ep_map)
{ {
ep_map->ep_mapping[RTL_TXQ_BE] = 2; ep_map->ep_mapping[RTL_TXQ_BE] = 2;
ep_map->ep_mapping[RTL_TXQ_BK] = 2; ep_map->ep_mapping[RTL_TXQ_BK] = 2;
...@@ -144,27 +144,27 @@ static void _OneOutEpMapping(struct ieee80211_hw *hw, struct rtl_ep_map *ep_map) ...@@ -144,27 +144,27 @@ static void _OneOutEpMapping(struct ieee80211_hw *hw, struct rtl_ep_map *ep_map)
static int _out_ep_mapping(struct ieee80211_hw *hw) static int _out_ep_mapping(struct ieee80211_hw *hw)
{ {
int err = 0; int err = 0;
bool bIsChipN, bwificfg = false; bool ischipn, bwificfg = false;
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
struct rtl_usb_priv *usb_priv = rtl_usbpriv(hw); struct rtl_usb_priv *usb_priv = rtl_usbpriv(hw);
struct rtl_usb *rtlusb = rtl_usbdev(usb_priv); struct rtl_usb *rtlusb = rtl_usbdev(usb_priv);
struct rtl_ep_map *ep_map = &(rtlusb->ep_map); struct rtl_ep_map *ep_map = &(rtlusb->ep_map);
bIsChipN = IS_NORMAL_CHIP(rtlhal->version); ischipn = IS_NORMAL_CHIP(rtlhal->version);
switch (rtlusb->out_ep_nums) { switch (rtlusb->out_ep_nums) {
case 2: case 2:
_TwoOutEpMapping(hw, bIsChipN, bwificfg, ep_map); twooutepmapping(hw, ischipn, bwificfg, ep_map);
break; break;
case 3: case 3:
/* Test chip doesn't support three out EPs. */ /* Test chip doesn't support three out EPs. */
if (!bIsChipN) { if (!ischipn) {
err = -EINVAL; err = -EINVAL;
goto err_out; goto err_out;
} }
_ThreeOutEpMapping(hw, bIsChipN, ep_map); threeoutepmapping(hw, ischipn, ep_map);
break; break;
case 1: case 1:
_OneOutEpMapping(hw, ep_map); oneoutepmapping(hw, ep_map);
break; break;
default: default:
err = -EINVAL; err = -EINVAL;
...@@ -180,9 +180,9 @@ int rtl8192cu_endpoint_mapping(struct ieee80211_hw *hw) ...@@ -180,9 +180,9 @@ int rtl8192cu_endpoint_mapping(struct ieee80211_hw *hw)
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
int error = 0; int error = 0;
if (likely(IS_NORMAL_CHIP(rtlhal->version))) if (likely(IS_NORMAL_CHIP(rtlhal->version)))
error = _ConfigVerNOutEP(hw); error = configvernoutep(hw);
else else
error = _ConfigVerTOutEP(hw); error = configvertoutep(hw);
if (error) if (error)
goto err_out; goto err_out;
error = _out_ep_mapping(hw); error = _out_ep_mapping(hw);
...@@ -588,28 +588,28 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw, ...@@ -588,28 +588,28 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "==>\n"); RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "==>\n");
} }
void rtl92cu_fill_fake_txdesc(struct ieee80211_hw *hw, u8 * pDesc, void rtl92cu_fill_fake_txdesc(struct ieee80211_hw *hw, u8 *pdesc,
u32 buffer_len, bool bIsPsPoll) u32 buffer_len, bool is_pspoll)
{ {
/* Clear all status */ /* Clear all status */
memset(pDesc, 0, RTL_TX_HEADER_SIZE); memset(pdesc, 0, RTL_TX_HEADER_SIZE);
SET_TX_DESC_FIRST_SEG(pDesc, 1); /* bFirstSeg; */ SET_TX_DESC_FIRST_SEG(pdesc, 1); /* bFirstSeg; */
SET_TX_DESC_LAST_SEG(pDesc, 1); /* bLastSeg; */ SET_TX_DESC_LAST_SEG(pdesc, 1); /* bLastSeg; */
SET_TX_DESC_OFFSET(pDesc, RTL_TX_HEADER_SIZE); /* Offset = 32 */ SET_TX_DESC_OFFSET(pdesc, RTL_TX_HEADER_SIZE); /* Offset = 32 */
SET_TX_DESC_PKT_SIZE(pDesc, buffer_len); /* Buffer size + command hdr */ SET_TX_DESC_PKT_SIZE(pdesc, buffer_len); /* Buffer size + command hdr */
SET_TX_DESC_QUEUE_SEL(pDesc, QSLT_MGNT); /* Fixed queue of Mgnt queue */ SET_TX_DESC_QUEUE_SEL(pdesc, QSLT_MGNT); /* Fixed queue of Mgnt queue */
/* Set NAVUSEHDR to prevent Ps-poll AId filed to be changed to error /* Set NAVUSEHDR to prevent Ps-poll AId filed to be changed to error
* vlaue by Hw. */ * vlaue by Hw. */
if (bIsPsPoll) { if (is_pspoll) {
SET_TX_DESC_NAV_USE_HDR(pDesc, 1); SET_TX_DESC_NAV_USE_HDR(pdesc, 1);
} else { } else {
SET_TX_DESC_HWSEQ_EN(pDesc, 1); /* Hw set sequence number */ SET_TX_DESC_HWSEQ_EN(pdesc, 1); /* Hw set sequence number */
SET_TX_DESC_PKT_ID(pDesc, 0x100); /* set bit3 to 1. */ SET_TX_DESC_PKT_ID(pdesc, 0x100); /* set bit3 to 1. */
} }
SET_TX_DESC_USE_RATE(pDesc, 1); /* use data rate which is set by Sw */ SET_TX_DESC_USE_RATE(pdesc, 1); /* use data rate which is set by Sw */
SET_TX_DESC_OWN(pDesc, 1); SET_TX_DESC_OWN(pdesc, 1);
SET_TX_DESC_TX_RATE(pDesc, DESC_RATE1M); SET_TX_DESC_TX_RATE(pdesc, DESC_RATE1M);
_rtl_tx_desc_checksum(pDesc); _rtl_tx_desc_checksum(pdesc);
} }
void rtl92cu_tx_fill_cmddesc(struct ieee80211_hw *hw, void rtl92cu_tx_fill_cmddesc(struct ieee80211_hw *hw,
......
...@@ -375,8 +375,8 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw, ...@@ -375,8 +375,8 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw,
struct sk_buff *skb, struct sk_buff *skb,
u8 queue_index, u8 queue_index,
struct rtl_tcb_desc *tcb_desc); struct rtl_tcb_desc *tcb_desc);
void rtl92cu_fill_fake_txdesc(struct ieee80211_hw *hw, u8 * pDesc, void rtl92cu_fill_fake_txdesc(struct ieee80211_hw *hw, u8 *pdesc,
u32 buffer_len, bool bIsPsPoll); u32 buffer_len, bool ispspoll);
void rtl92cu_tx_fill_cmddesc(struct ieee80211_hw *hw, void rtl92cu_tx_fill_cmddesc(struct ieee80211_hw *hw,
u8 *pdesc, bool b_firstseg, u8 *pdesc, bool b_firstseg,
bool b_lastseg, struct sk_buff *skb); bool b_lastseg, struct sk_buff *skb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment