Skip to content

L
linux
Commit 4c48869f authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files
Options

rtlwifi: Convert RTPRINT macro to use ##__VA_ARGS__ 

Consolidate printks to avoid possible message interleaving
and reduce the object size.

Remove unnecessary RTPRINT parentheses.
Coalesce formats.
Align arguments.

$ size drivers/net/wireless/rtlwifi/built-in.o*
   text	   data	    bss	    dec	    hex	filename
 590002	  55333	 127560	 772895	  bcb1f	drivers/net/wireless/rtlwifi/built-in.o.new
 594841	  55333	 129680	 779854	  be64e	drivers/net/wireless/rtlwifi/built-in.o.old
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f30d7507
Expand all Show whitespace changes
Inline Side-by-side
Showing with 355 additions and 370 deletions
drivers/net/wireless/rtlwifi/debug.h
View file @ 4c48869f
...@@ -175,11 +175,11 @@ do { \ ...@@ -175,11 +175,11 @@ do { \
} \ } \
} while (0) } while (0)
#define RTPRINT(rtlpriv, dbgtype, dbgflag, printstr) \ #define RTPRINT(rtlpriv, dbgtype, dbgflag, fmt, ...) \
do { \ do { \
if (unlikely(rtlpriv->dbg.dbgp_type[dbgtype] & dbgflag)) { \ if (unlikely(rtlpriv->dbg.dbgp_type[dbgtype] & dbgflag)) { \
printk(KERN_DEBUG "%s: ", KBUILD_MODNAME); \ printk(KERN_DEBUG KBUILD_MODNAME ": " fmt, \
printk printstr; \ ##__VA_ARGS__); \
} \ } \
} while (0) } while (0)
......
drivers/net/wireless/rtlwifi/efuse.c
View file @ 4c48869f
...@@ -280,7 +280,7 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf) ...@@ -280,7 +280,7 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
if (*rtemp8 != 0xFF) { if (*rtemp8 != 0xFF) {
efuse_utilized++; efuse_utilized++;
RTPRINT(rtlpriv, FEEPROM, EFUSE_READ_ALL, RTPRINT(rtlpriv, FEEPROM, EFUSE_READ_ALL,
("Addr=%d\n", efuse_addr)); "Addr=%d\n", efuse_addr);
efuse_addr++; efuse_addr++;
} }
...@@ -290,13 +290,13 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf) ...@@ -290,13 +290,13 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
if (offset < efuse_max_section) { if (offset < efuse_max_section) {
wren = (*rtemp8 & 0x0f); wren = (*rtemp8 & 0x0f);
RTPRINT(rtlpriv, FEEPROM, EFUSE_READ_ALL, RTPRINT(rtlpriv, FEEPROM, EFUSE_READ_ALL,
("offset-%d Worden=%x\n", offset, wren)); "offset-%d Worden=%x\n", offset, wren);
for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) { for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
if (!(wren & 0x01)) { if (!(wren & 0x01)) {
RTPRINT(rtlpriv, FEEPROM, RTPRINT(rtlpriv, FEEPROM,
EFUSE_READ_ALL, ("Addr=%d\n", EFUSE_READ_ALL,
efuse_addr)); "Addr=%d\n", efuse_addr);
read_efuse_byte(hw, efuse_addr, rtemp8); read_efuse_byte(hw, efuse_addr, rtemp8);
efuse_addr++; efuse_addr++;
...@@ -308,8 +308,8 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf) ...@@ -308,8 +308,8 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
break; break;
RTPRINT(rtlpriv, FEEPROM, RTPRINT(rtlpriv, FEEPROM,
EFUSE_READ_ALL, ("Addr=%d\n", EFUSE_READ_ALL,
efuse_addr)); "Addr=%d\n", efuse_addr);
read_efuse_byte(hw, efuse_addr, rtemp8); read_efuse_byte(hw, efuse_addr, rtemp8);
efuse_addr++; efuse_addr++;
...@@ -326,7 +326,7 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf) ...@@ -326,7 +326,7 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
} }
RTPRINT(rtlpriv, FEEPROM, EFUSE_READ_ALL, RTPRINT(rtlpriv, FEEPROM, EFUSE_READ_ALL,
("Addr=%d\n", efuse_addr)); "Addr=%d\n", efuse_addr);
read_efuse_byte(hw, efuse_addr, rtemp8); read_efuse_byte(hw, efuse_addr, rtemp8);
if (*rtemp8 != 0xFF && (efuse_addr < efuse_len)) { if (*rtemp8 != 0xFF && (efuse_addr < efuse_len)) {
efuse_utilized++; efuse_utilized++;
...@@ -850,7 +850,7 @@ static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr, ...@@ -850,7 +850,7 @@ static void efuse_write_data_case1(struct ieee80211_hw *hw, u16 *efuse_addr,
} }
} }
} }
RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, ("efuse PG_STATE_HEADER-1\n")); RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, "efuse PG_STATE_HEADER-1\n");
} }
static void efuse_write_data_case2(struct ieee80211_hw *hw, u16 *efuse_addr, static void efuse_write_data_case2(struct ieee80211_hw *hw, u16 *efuse_addr,
...@@ -915,7 +915,7 @@ static void efuse_write_data_case2(struct ieee80211_hw *hw, u16 *efuse_addr, ...@@ -915,7 +915,7 @@ static void efuse_write_data_case2(struct ieee80211_hw *hw, u16 *efuse_addr,
} }
RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
("efuse PG_STATE_HEADER-2\n")); "efuse PG_STATE_HEADER-2\n");
} }
} }
...@@ -935,7 +935,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw, ...@@ -935,7 +935,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
if (efuse_get_current_size(hw) >= if (efuse_get_current_size(hw) >=
(EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES)) { (EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES)) {
RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
("efuse_pg_packet_write error\n")); "efuse_pg_packet_write error\n");
return false; return false;
} }
...@@ -947,7 +947,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw, ...@@ -947,7 +947,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
efuse_word_enable_data_read(word_en, data, target_pkt.data); efuse_word_enable_data_read(word_en, data, target_pkt.data);
target_word_cnts = efuse_calculate_word_cnts(target_pkt.word_en); target_word_cnts = efuse_calculate_word_cnts(target_pkt.word_en);
RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, ("efuse Power ON\n")); RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, "efuse Power ON\n");
while (continual && (efuse_addr < while (continual && (efuse_addr <
(EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES))) { (EFUSE_MAX_SIZE - EFUSE_OOB_PROTECT_BYTES))) {
...@@ -955,7 +955,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw, ...@@ -955,7 +955,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
if (write_state == PG_STATE_HEADER) { if (write_state == PG_STATE_HEADER) {
badworden = 0x0F; badworden = 0x0F;
RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
("efuse PG_STATE_HEADER\n")); "efuse PG_STATE_HEADER\n");
if (efuse_one_byte_read(hw, efuse_addr, &efuse_data) && if (efuse_one_byte_read(hw, efuse_addr, &efuse_data) &&
(efuse_data != 0xFF)) (efuse_data != 0xFF))
...@@ -975,7 +975,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw, ...@@ -975,7 +975,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
} else if (write_state == PG_STATE_DATA) { } else if (write_state == PG_STATE_DATA) {
RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
("efuse PG_STATE_DATA\n")); "efuse PG_STATE_DATA\n");
badworden = badworden =
efuse_word_enable_data_write(hw, efuse_addr + 1, efuse_word_enable_data_write(hw, efuse_addr + 1,
target_pkt.word_en, target_pkt.word_en,
...@@ -998,7 +998,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw, ...@@ -998,7 +998,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
result = false; result = false;
} }
RTPRINT(rtlpriv, FEEPROM, EFUSE_PG, RTPRINT(rtlpriv, FEEPROM, EFUSE_PG,
("efuse PG_STATE_HEADER-3\n")); "efuse PG_STATE_HEADER-3\n");
} }
} }
} }
......
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
View file @ 4c48869f
...@@ -1362,25 +1362,24 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, ...@@ -1362,25 +1362,24 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
for (rf_path = 0; rf_path < 2; rf_path++) for (rf_path = 0; rf_path < 2; rf_path++)
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
RTPRINT(rtlpriv, FINIT, INIT_EEPROM, RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
("RF(%d) EEPROM CCK Area(%d) = 0x%x\n", rf_path, "RF(%d) EEPROM CCK Area(%d) = 0x%x\n",
i, rf_path, i,
rtlefuse-> rtlefuse->
eeprom_chnlarea_txpwr_cck[rf_path][i])); eeprom_chnlarea_txpwr_cck[rf_path][i]);
for (rf_path = 0; rf_path < 2; rf_path++) for (rf_path = 0; rf_path < 2; rf_path++)
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
RTPRINT(rtlpriv, FINIT, INIT_EEPROM, RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
("RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n", "RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n",
rf_path, i, rf_path, i,
rtlefuse-> rtlefuse->
eeprom_chnlarea_txpwr_ht40_1s[rf_path][i])); eeprom_chnlarea_txpwr_ht40_1s[rf_path][i]);
for (rf_path = 0; rf_path < 2; rf_path++) for (rf_path = 0; rf_path < 2; rf_path++)
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
RTPRINT(rtlpriv, FINIT, INIT_EEPROM, RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
("RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n", "RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n",
rf_path, i, rf_path, i,
rtlefuse-> rtlefuse->
eeprom_chnlarea_txpwr_ht40_2sdiif[rf_path] eeprom_chnlarea_txpwr_ht40_2sdiif[rf_path][i]);
[i]));
for (rf_path = 0; rf_path < 2; rf_path++) { for (rf_path = 0; rf_path < 2; rf_path++) {
for (i = 0; i < 14; i++) { for (i = 0; i < 14; i++) {
...@@ -1411,11 +1410,11 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, ...@@ -1411,11 +1410,11 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
for (i = 0; i < 14; i++) { for (i = 0; i < 14; i++) {
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = " "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = [0x%x / 0x%x / 0x%x]\n",
"[0x%x / 0x%x / 0x%x]\n", rf_path, i, rf_path, i,
rtlefuse->txpwrlevel_cck[rf_path][i], rtlefuse->txpwrlevel_cck[rf_path][i],
rtlefuse->txpwrlevel_ht40_1s[rf_path][i], rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
rtlefuse->txpwrlevel_ht40_2s[rf_path][i])); rtlefuse->txpwrlevel_ht40_2s[rf_path][i]);
} }
} }
...@@ -1452,13 +1451,13 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, ...@@ -1452,13 +1451,13 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
} }
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF-%d pwrgroup_ht20[%d] = 0x%x\n", "RF-%d pwrgroup_ht20[%d] = 0x%x\n",
rf_path, i, rf_path, i,
rtlefuse->pwrgroup_ht20[rf_path][i])); rtlefuse->pwrgroup_ht20[rf_path][i]);
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF-%d pwrgroup_ht40[%d] = 0x%x\n", "RF-%d pwrgroup_ht40[%d] = 0x%x\n",
rf_path, i, rf_path, i,
rtlefuse->pwrgroup_ht40[rf_path][i])); rtlefuse->pwrgroup_ht40[rf_path][i]);
} }
} }
...@@ -1497,27 +1496,27 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, ...@@ -1497,27 +1496,27 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
for (i = 0; i < 14; i++) for (i = 0; i < 14; i++)
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF-A Ht20 to HT40 Diff[%d] = 0x%x\n", i, "RF-A Ht20 to HT40 Diff[%d] = 0x%x\n",
rtlefuse->txpwr_ht20diff[RF90_PATH_A][i])); i, rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]);
for (i = 0; i < 14; i++) for (i = 0; i < 14; i++)
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF-A Legacy to Ht40 Diff[%d] = 0x%x\n", i, "RF-A Legacy to Ht40 Diff[%d] = 0x%x\n",
rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i])); i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]);
for (i = 0; i < 14; i++) for (i = 0; i < 14; i++)
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF-B Ht20 to HT40 Diff[%d] = 0x%x\n", i, "RF-B Ht20 to HT40 Diff[%d] = 0x%x\n",
rtlefuse->txpwr_ht20diff[RF90_PATH_B][i])); i, rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]);
for (i = 0; i < 14; i++) for (i = 0; i < 14; i++)
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF-B Legacy to HT40 Diff[%d] = 0x%x\n", i, "RF-B Legacy to HT40 Diff[%d] = 0x%x\n",
rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i])); i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]);
if (!autoload_fail) if (!autoload_fail)
rtlefuse->eeprom_regulatory = (hwinfo[RF_OPTION1] & 0x7); rtlefuse->eeprom_regulatory = (hwinfo[RF_OPTION1] & 0x7);
else else
rtlefuse->eeprom_regulatory = 0; rtlefuse->eeprom_regulatory = 0;
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory)); "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
if (!autoload_fail) { if (!autoload_fail) {
rtlefuse->eeprom_tssi[RF90_PATH_A] = hwinfo[EEPROM_TSSI_A]; rtlefuse->eeprom_tssi[RF90_PATH_A] = hwinfo[EEPROM_TSSI_A];
...@@ -1526,10 +1525,9 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, ...@@ -1526,10 +1525,9 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
rtlefuse->eeprom_tssi[RF90_PATH_A] = EEPROM_DEFAULT_TSSI; rtlefuse->eeprom_tssi[RF90_PATH_A] = EEPROM_DEFAULT_TSSI;
rtlefuse->eeprom_tssi[RF90_PATH_B] = EEPROM_DEFAULT_TSSI; rtlefuse->eeprom_tssi[RF90_PATH_B] = EEPROM_DEFAULT_TSSI;
} }
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower, "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
("TSSI_A = 0x%x, TSSI_B = 0x%x\n",
rtlefuse->eeprom_tssi[RF90_PATH_A], rtlefuse->eeprom_tssi[RF90_PATH_A],
rtlefuse->eeprom_tssi[RF90_PATH_B])); rtlefuse->eeprom_tssi[RF90_PATH_B]);
if (!autoload_fail) if (!autoload_fail)
tempval = hwinfo[EEPROM_THERMAL_METER]; tempval = hwinfo[EEPROM_THERMAL_METER];
...@@ -1542,7 +1540,7 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, ...@@ -1542,7 +1540,7 @@ static void _rtl92ce_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter; rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter;
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter)); "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
} }
static void _rtl92ce_read_adapter_info(struct ieee80211_hw *hw) static void _rtl92ce_read_adapter_info(struct ieee80211_hw *hw)
......
drivers/net/wireless/rtlwifi/rtl8192ce/rf.c
View file @ 4c48869f
...@@ -123,8 +123,8 @@ void rtl92ce_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw, ...@@ -123,8 +123,8 @@ void rtl92ce_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
rtl_set_bbreg(hw, RTXAGC_A_CCK1_MCS32, MASKBYTE1, tmpval); rtl_set_bbreg(hw, RTXAGC_A_CCK1_MCS32, MASKBYTE1, tmpval);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n", tmpval, "CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n",
RTXAGC_A_CCK1_MCS32)); tmpval, RTXAGC_A_CCK1_MCS32);
tmpval = tx_agc[RF90_PATH_A] >> 8; tmpval = tx_agc[RF90_PATH_A] >> 8;
...@@ -133,22 +133,22 @@ void rtl92ce_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw, ...@@ -133,22 +133,22 @@ void rtl92ce_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, 0xffffff00, tmpval); rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, 0xffffff00, tmpval);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n", tmpval, "CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n",
RTXAGC_B_CCK11_A_CCK2_11)); tmpval, RTXAGC_B_CCK11_A_CCK2_11);
tmpval = tx_agc[RF90_PATH_B] >> 24; tmpval = tx_agc[RF90_PATH_B] >> 24;
rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, MASKBYTE0, tmpval); rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, MASKBYTE0, tmpval);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n", tmpval, "CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n",
RTXAGC_B_CCK11_A_CCK2_11)); tmpval, RTXAGC_B_CCK11_A_CCK2_11);
tmpval = tx_agc[RF90_PATH_B] & 0x00ffffff; tmpval = tx_agc[RF90_PATH_B] & 0x00ffffff;
rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, 0xffffff00, tmpval); rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, 0xffffff00, tmpval);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n", tmpval, "CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n",
RTXAGC_B_CCK1_55_MCS32)); tmpval, RTXAGC_B_CCK1_55_MCS32);
} }
static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw, static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
...@@ -171,8 +171,8 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw, ...@@ -171,8 +171,8 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
(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));
} }
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
...@@ -187,8 +187,8 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw, ...@@ -187,8 +187,8 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
*(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));
} }
} }
...@@ -215,9 +215,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, ...@@ -215,9 +215,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
+ ((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, " "RTK better performance, writeVal(%c) = 0x%x\n",
"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) {
...@@ -225,9 +224,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, ...@@ -225,9 +224,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
powerBase1[rf]); powerBase1[rf]);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("Realtek regulatory, 40MHz, " "Realtek regulatory, 40MHz, writeVal(%c) = 0x%x\n",
"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;
...@@ -249,9 +247,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, ...@@ -249,9 +247,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
powerBase1[rf]); powerBase1[rf]);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("Realtek regulatory, 20MHz, " "Realtek regulatory, 20MHz, writeVal(%c) = 0x%x\n",
"writeVal(%c) = 0x%x\n", rf == 0 ? 'A' : 'B', writeVal);
((rf == 0) ? 'A' : 'B'), writeVal));
} }
break; break;
case 2: case 2:
...@@ -259,27 +256,24 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, ...@@ -259,27 +256,24 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
((index < 2) ? powerBase0[rf] : powerBase1[rf]); ((index < 2) ? powerBase0[rf] : powerBase1[rf]);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("Better regulatory, " "Better regulatory, writeVal(%c) = 0x%x\n",
"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;
if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) { if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("customer's limit, 40MHz " "customer's limit, 40MHz rf(%c) = 0x%x\n",
"rf(%c) = 0x%x\n", rf == 0 ? 'A' : 'B',
((rf == 0) ? 'A' : 'B'),
rtlefuse->pwrgroup_ht40[rf][channel - rtlefuse->pwrgroup_ht40[rf][channel -
1])); 1]);
} else { } else {
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("customer's limit, 20MHz " "customer's limit, 20MHz rf(%c) = 0x%x\n",
"rf(%c) = 0x%x\n", rf == 0 ? 'A' : 'B',
((rf == 0) ? 'A' : 'B'),
rtlefuse->pwrgroup_ht20[rf][channel - rtlefuse->pwrgroup_ht20[rf][channel -
1])); 1]);
} }
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
pwr_diff_limit[i] = pwr_diff_limit[i] =
...@@ -311,15 +305,15 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, ...@@ -311,15 +305,15 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
(pwr_diff_limit[1] << 8) | (pwr_diff_limit[0]); (pwr_diff_limit[1] << 8) | (pwr_diff_limit[0]);
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 + 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;
...@@ -329,9 +323,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, ...@@ -329,9 +323,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
+ ((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 " "RTK better performance, writeVal rf(%c) = 0x%x\n",
"rf(%c) = 0x%x\n", rf == 0 ? 'A' : 'B', writeVal);
((rf == 0) ? 'A' : 'B'), writeVal));
break; break;
} }
...@@ -383,7 +376,7 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw, ...@@ -383,7 +376,7 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
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 ||
......
drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
View file @ 4c48869f
...@@ -162,24 +162,24 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, ...@@ -162,24 +162,24 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
for (rf_path = 0; rf_path < 2; rf_path++) for (rf_path = 0; rf_path < 2; rf_path++)
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
RTPRINT(rtlpriv, FINIT, INIT_EEPROM, RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
("RF(%d) EEPROM CCK Area(%d) = 0x%x\n", rf_path, "RF(%d) EEPROM CCK Area(%d) = 0x%x\n",
i, rtlefuse-> rf_path, i,
eeprom_chnlarea_txpwr_cck[rf_path][i])); rtlefuse->
eeprom_chnlarea_txpwr_cck[rf_path][i]);
for (rf_path = 0; rf_path < 2; rf_path++) for (rf_path = 0; rf_path < 2; rf_path++)
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
RTPRINT(rtlpriv, FINIT, INIT_EEPROM, RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
("RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n", "RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n",
rf_path, i, rf_path, i,
rtlefuse-> rtlefuse->
eeprom_chnlarea_txpwr_ht40_1s[rf_path][i])); eeprom_chnlarea_txpwr_ht40_1s[rf_path][i]);
for (rf_path = 0; rf_path < 2; rf_path++) for (rf_path = 0; rf_path < 2; rf_path++)
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
RTPRINT(rtlpriv, FINIT, INIT_EEPROM, RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
("RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n", "RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n",
rf_path, i, rf_path, i,
rtlefuse-> rtlefuse->
eeprom_chnlarea_txpwr_ht40_2sdiif[rf_path] eeprom_chnlarea_txpwr_ht40_2sdiif[rf_path][i]);
[i]));
for (rf_path = 0; rf_path < 2; rf_path++) { for (rf_path = 0; rf_path < 2; rf_path++) {
for (i = 0; i < 14; i++) { for (i = 0; i < 14; i++) {
index = _rtl92c_get_chnl_group((u8) i); index = _rtl92c_get_chnl_group((u8) i);
...@@ -205,11 +205,10 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, ...@@ -205,11 +205,10 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
} }
for (i = 0; i < 14; i++) { for (i = 0; i < 14; i++) {
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = " "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = [0x%x / 0x%x / 0x%x]\n", rf_path, i,
"[0x%x / 0x%x / 0x%x]\n", rf_path, i,
rtlefuse->txpwrlevel_cck[rf_path][i], rtlefuse->txpwrlevel_cck[rf_path][i],
rtlefuse->txpwrlevel_ht40_1s[rf_path][i], rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
rtlefuse->txpwrlevel_ht40_2s[rf_path][i])); rtlefuse->txpwrlevel_ht40_2s[rf_path][i]);
} }
} }
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
...@@ -242,13 +241,13 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, ...@@ -242,13 +241,13 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
& 0xf0) >> 4); & 0xf0) >> 4);
} }
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF-%d pwrgroup_ht20[%d] = 0x%x\n", "RF-%d pwrgroup_ht20[%d] = 0x%x\n",
rf_path, i, rf_path, i,
rtlefuse->pwrgroup_ht20[rf_path][i])); rtlefuse->pwrgroup_ht20[rf_path][i]);
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF-%d pwrgroup_ht40[%d] = 0x%x\n", "RF-%d pwrgroup_ht40[%d] = 0x%x\n",
rf_path, i, rf_path, i,
rtlefuse->pwrgroup_ht40[rf_path][i])); rtlefuse->pwrgroup_ht40[rf_path][i]);
} }
} }
for (i = 0; i < 14; i++) { for (i = 0; i < 14; i++) {
...@@ -277,26 +276,26 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, ...@@ -277,26 +276,26 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][7]; rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][7];
for (i = 0; i < 14; i++) for (i = 0; i < 14; i++)
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF-A Ht20 to HT40 Diff[%d] = 0x%x\n", i, "RF-A Ht20 to HT40 Diff[%d] = 0x%x\n",
rtlefuse->txpwr_ht20diff[RF90_PATH_A][i])); i, rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]);
for (i = 0; i < 14; i++) for (i = 0; i < 14; i++)
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF-A Legacy to Ht40 Diff[%d] = 0x%x\n", i, "RF-A Legacy to Ht40 Diff[%d] = 0x%x\n",
rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i])); i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]);
for (i = 0; i < 14; i++) for (i = 0; i < 14; i++)
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF-B Ht20 to HT40 Diff[%d] = 0x%x\n", i, "RF-B Ht20 to HT40 Diff[%d] = 0x%x\n",
rtlefuse->txpwr_ht20diff[RF90_PATH_B][i])); i, rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]);
for (i = 0; i < 14; i++) for (i = 0; i < 14; i++)
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF-B Legacy to HT40 Diff[%d] = 0x%x\n", i, "RF-B Legacy to HT40 Diff[%d] = 0x%x\n",
rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i])); i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]);
if (!autoload_fail) if (!autoload_fail)
rtlefuse->eeprom_regulatory = (hwinfo[RF_OPTION1] & 0x7); rtlefuse->eeprom_regulatory = (hwinfo[RF_OPTION1] & 0x7);
else else
rtlefuse->eeprom_regulatory = 0; rtlefuse->eeprom_regulatory = 0;
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory)); "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
if (!autoload_fail) { if (!autoload_fail) {
rtlefuse->eeprom_tssi[RF90_PATH_A] = hwinfo[EEPROM_TSSI_A]; rtlefuse->eeprom_tssi[RF90_PATH_A] = hwinfo[EEPROM_TSSI_A];
rtlefuse->eeprom_tssi[RF90_PATH_B] = hwinfo[EEPROM_TSSI_B]; rtlefuse->eeprom_tssi[RF90_PATH_B] = hwinfo[EEPROM_TSSI_B];
...@@ -305,9 +304,9 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, ...@@ -305,9 +304,9 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
rtlefuse->eeprom_tssi[RF90_PATH_B] = EEPROM_DEFAULT_TSSI; rtlefuse->eeprom_tssi[RF90_PATH_B] = EEPROM_DEFAULT_TSSI;
} }
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("TSSI_A = 0x%x, TSSI_B = 0x%x\n", "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
rtlefuse->eeprom_tssi[RF90_PATH_A], rtlefuse->eeprom_tssi[RF90_PATH_A],
rtlefuse->eeprom_tssi[RF90_PATH_B])); rtlefuse->eeprom_tssi[RF90_PATH_B]);
if (!autoload_fail) if (!autoload_fail)
tempval = hwinfo[EEPROM_THERMAL_METER]; tempval = hwinfo[EEPROM_THERMAL_METER];
else else
...@@ -320,7 +319,7 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw, ...@@ -320,7 +319,7 @@ static void _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
rtlefuse->apk_thermalmeterignore = true; rtlefuse->apk_thermalmeterignore = true;
rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter; rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter;
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter)); "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
} }
static void _rtl92cu_read_board_type(struct ieee80211_hw *hw, u8 *contents) static void _rtl92cu_read_board_type(struct ieee80211_hw *hw, u8 *contents)
......
drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
View file @ 4c48869f
...@@ -140,26 +140,26 @@ void rtl92cu_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw, ...@@ -140,26 +140,26 @@ void rtl92cu_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
rtl_set_bbreg(hw, RTXAGC_A_CCK1_MCS32, MASKBYTE1, tmpval); rtl_set_bbreg(hw, RTXAGC_A_CCK1_MCS32, MASKBYTE1, tmpval);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n", tmpval, "CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n",
RTXAGC_A_CCK1_MCS32)); tmpval, RTXAGC_A_CCK1_MCS32);
tmpval = tx_agc[RF90_PATH_A] >> 8; tmpval = tx_agc[RF90_PATH_A] >> 8;
if (mac->mode == WIRELESS_MODE_B) if (mac->mode == WIRELESS_MODE_B)
tmpval = tmpval & 0xff00ffff; tmpval = tmpval & 0xff00ffff;
rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, 0xffffff00, tmpval); rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, 0xffffff00, tmpval);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n", tmpval, "CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n",
RTXAGC_B_CCK11_A_CCK2_11)); tmpval, RTXAGC_B_CCK11_A_CCK2_11);
tmpval = tx_agc[RF90_PATH_B] >> 24; tmpval = tx_agc[RF90_PATH_B] >> 24;
rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, MASKBYTE0, tmpval); rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, MASKBYTE0, tmpval);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n", tmpval, "CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n",
RTXAGC_B_CCK11_A_CCK2_11)); tmpval, RTXAGC_B_CCK11_A_CCK2_11);
tmpval = tx_agc[RF90_PATH_B] & 0x00ffffff; tmpval = tx_agc[RF90_PATH_B] & 0x00ffffff;
rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, 0xffffff00, tmpval); rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, 0xffffff00, tmpval);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n", tmpval, "CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n",
RTXAGC_B_CCK1_55_MCS32)); tmpval, RTXAGC_B_CCK1_55_MCS32);
} }
static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw, static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
...@@ -181,8 +181,8 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw, ...@@ -181,8 +181,8 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
(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));
} }
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20) { if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20) {
...@@ -194,8 +194,8 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw, ...@@ -194,8 +194,8 @@ static void rtl92c_phy_get_power_base(struct ieee80211_hw *hw,
(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));
} }
} }
...@@ -219,8 +219,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, ...@@ -219,8 +219,8 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
[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)
...@@ -244,32 +244,31 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, ...@@ -244,32 +244,31 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
((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, " "Realtek regulatory, 20MHz, writeVal(%c) = 0x%x\n",
"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;
if (rtlphy->current_chan_bw == if (rtlphy->current_chan_bw ==
HT_CHANNEL_WIDTH_20_40) { HT_CHANNEL_WIDTH_20_40) {
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("customer's limit, 40MHzrf(%c) = " "customer's limit, 40MHzrf(%c) = 0x%x\n",
"0x%x\n", ((rf == 0) ? 'A' : 'B'), rf == 0 ? 'A' : 'B',
rtlefuse->pwrgroup_ht40[rf] rtlefuse->pwrgroup_ht40[rf]
[channel - 1])); [channel - 1]);
} else { } else {
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("customer's limit, 20MHz rf(%c) = " "customer's limit, 20MHz rf(%c) = 0x%x\n",
"0x%x\n", ((rf == 0) ? 'A' : 'B'), rf == 0 ? 'A' : 'B',
rtlefuse->pwrgroup_ht20[rf] rtlefuse->pwrgroup_ht20[rf]
[channel - 1])); [channel - 1]);
} }
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
pwr_diff_limit[i] = pwr_diff_limit[i] =
...@@ -297,22 +296,22 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, ...@@ -297,22 +296,22 @@ static void _rtl92c_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
(pwr_diff_limit[2] << 16) | (pwr_diff_limit[2] << 16) |
(pwr_diff_limit[1] << 8) | (pwr_diff_limit[0]); (pwr_diff_limit[1] << 8) | (pwr_diff_limit[0]);
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_txpwrlevel_origoffset[chnlgroup] writeVal = rtlphy->mcs_txpwrlevel_origoffset[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, ("RTK better " RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
"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 ==
...@@ -365,7 +364,7 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw, ...@@ -365,7 +364,7 @@ static void _rtl92c_write_ofdm_power_reg(struct ieee80211_hw *hw,
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)) ||
......
drivers/net/wireless/rtlwifi/rtl8192de/rf.c
View file @ 4c48869f
...@@ -127,23 +127,23 @@ void rtl92d_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw, ...@@ -127,23 +127,23 @@ void rtl92d_phy_rf6052_set_cck_txpower(struct ieee80211_hw *hw,
tmpval = tx_agc[RF90_PATH_A] & 0xff; tmpval = tx_agc[RF90_PATH_A] & 0xff;
rtl_set_bbreg(hw, RTXAGC_A_CCK1_MCS32, BMASKBYTE1, tmpval); rtl_set_bbreg(hw, RTXAGC_A_CCK1_MCS32, BMASKBYTE1, tmpval);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n", tmpval, "CCK PWR 1M (rf-A) = 0x%x (reg 0x%x)\n",
RTXAGC_A_CCK1_MCS32)); tmpval, RTXAGC_A_CCK1_MCS32);
tmpval = tx_agc[RF90_PATH_A] >> 8; tmpval = tx_agc[RF90_PATH_A] >> 8;
rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, 0xffffff00, tmpval); rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, 0xffffff00, tmpval);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n", tmpval, "CCK PWR 2~11M (rf-A) = 0x%x (reg 0x%x)\n",
RTXAGC_B_CCK11_A_CCK2_11)); tmpval, RTXAGC_B_CCK11_A_CCK2_11);
tmpval = tx_agc[RF90_PATH_B] >> 24; tmpval = tx_agc[RF90_PATH_B] >> 24;
rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, BMASKBYTE0, tmpval); rtl_set_bbreg(hw, RTXAGC_B_CCK11_A_CCK2_11, BMASKBYTE0, tmpval);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n", tmpval, "CCK PWR 11M (rf-B) = 0x%x (reg 0x%x)\n",
RTXAGC_B_CCK11_A_CCK2_11)); tmpval, RTXAGC_B_CCK11_A_CCK2_11);
tmpval = tx_agc[RF90_PATH_B] & 0x00ffffff; tmpval = tx_agc[RF90_PATH_B] & 0x00ffffff;
rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, 0xffffff00, tmpval); rtl_set_bbreg(hw, RTXAGC_B_CCK1_55_MCS32, 0xffffff00, tmpval);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n", tmpval, "CCK PWR 1~5.5M (rf-B) = 0x%x (reg 0x%x)\n",
RTXAGC_B_CCK1_55_MCS32)); tmpval, RTXAGC_B_CCK1_55_MCS32);
} }
static void _rtl92d_phy_get_power_base(struct ieee80211_hw *hw, static void _rtl92d_phy_get_power_base(struct ieee80211_hw *hw,
...@@ -165,8 +165,8 @@ static void _rtl92d_phy_get_power_base(struct ieee80211_hw *hw, ...@@ -165,8 +165,8 @@ static void _rtl92d_phy_get_power_base(struct ieee80211_hw *hw,
(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));
} }
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
...@@ -179,8 +179,8 @@ static void _rtl92d_phy_get_power_base(struct ieee80211_hw *hw, ...@@ -179,8 +179,8 @@ static void _rtl92d_phy_get_power_base(struct ieee80211_hw *hw,
(powerbase1 << 8) | powerbase1; (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));
} }
} }
...@@ -232,9 +232,9 @@ static void _rtl92d_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, ...@@ -232,9 +232,9 @@ static void _rtl92d_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
(rf ? 8 : 0)] + ((index < 2) ? (rf ? 8 : 0)] + ((index < 2) ?
powerbase0[rf] : powerbase0[rf] :
powerbase1[rf]); powerbase1[rf]);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, ("RTK better " RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
"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)
...@@ -253,33 +253,31 @@ static void _rtl92d_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, ...@@ -253,33 +253,31 @@ static void _rtl92d_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
powerbase0[rf] : powerbase0[rf] :
powerbase1[rf]); powerbase1[rf]);
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("Realtek regulatory, " "Realtek regulatory, 20MHz, writeval(%c) = 0x%x\n",
"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, ("Better regulatory, " RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
"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;
if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) { if (rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20_40) {
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("customer's limit, 40MHz rf(%c) = " "customer's limit, 40MHz rf(%c) = 0x%x\n",
"0x%x\n", ((rf == 0) ? 'A' : 'B'), rf == 0 ? 'A' : 'B',
rtlefuse->pwrgroup_ht40[rf] rtlefuse->pwrgroup_ht40[rf]
[channel - 1])); [channel - 1]);
} else { } else {
RTPRINT(rtlpriv, FPHY, PHY_TXPWR, RTPRINT(rtlpriv, FPHY, PHY_TXPWR,
("customer's limit, 20MHz rf(%c) = " "customer's limit, 20MHz rf(%c) = 0x%x\n",
"0x%x\n", ((rf == 0) ? 'A' : 'B'), rf == 0 ? 'A' : 'B',
rtlefuse->pwrgroup_ht20[rf] rtlefuse->pwrgroup_ht20[rf]
[channel - 1])); [channel - 1]);
} }
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
pwr_diff_limit[i] = pwr_diff_limit[i] =
...@@ -308,13 +306,13 @@ static void _rtl92d_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, ...@@ -308,13 +306,13 @@ static void _rtl92d_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
(pwr_diff_limit[1] << 8) | (pwr_diff_limit[1] << 8) |
(pwr_diff_limit[0]); (pwr_diff_limit[0]);
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;
...@@ -323,9 +321,8 @@ static void _rtl92d_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw, ...@@ -323,9 +321,8 @@ static void _rtl92d_get_txpower_writeval_by_regulatory(struct ieee80211_hw *hw,
(rf ? 8 : 0)] + ((index < 2) ? (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, writeval " "RTK better performance, writeval rf(%c) = 0x%x\n",
"rf(%c) = 0x%x\n", rf == 0 ? 'A' : 'B', writeval);
((rf == 0) ? 'A' : 'B'), writeval));
break; break;
} }
*(p_outwriteval + rf) = writeval; *(p_outwriteval + rf) = writeval;
...@@ -367,7 +364,7 @@ static void _rtl92d_write_ofdm_power_reg(struct ieee80211_hw *hw, ...@@ -367,7 +364,7 @@ static void _rtl92d_write_ofdm_power_reg(struct ieee80211_hw *hw,
regoffset = regoffset_b[index]; regoffset = regoffset_b[index];
rtl_set_bbreg(hw, regoffset, BMASKDWORD, writeval); rtl_set_bbreg(hw, regoffset, BMASKDWORD, 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)) ||
......
drivers/net/wireless/rtlwifi/rtl8192se/hw.c
View file @ 4c48869f
...@@ -1704,23 +1704,24 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw) ...@@ -1704,23 +1704,24 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
for (rf_path = 0; rf_path < 2; rf_path++) for (rf_path = 0; rf_path < 2; rf_path++)
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
RTPRINT(rtlpriv, FINIT, INIT_EEPROM, RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
("RF(%d) EEPROM CCK Area(%d) = 0x%x\n", rf_path, "RF(%d) EEPROM CCK Area(%d) = 0x%x\n",
i, rtlefuse->eeprom_chnlarea_txpwr_cck rf_path, i,
[rf_path][i])); rtlefuse->eeprom_chnlarea_txpwr_cck
[rf_path][i]);
for (rf_path = 0; rf_path < 2; rf_path++) for (rf_path = 0; rf_path < 2; rf_path++)
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
RTPRINT(rtlpriv, FINIT, INIT_EEPROM, RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
("RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n", "RF(%d) EEPROM HT40 1S Area(%d) = 0x%x\n",
rf_path, i, rf_path, i,
rtlefuse->eeprom_chnlarea_txpwr_ht40_1s rtlefuse->eeprom_chnlarea_txpwr_ht40_1s
[rf_path][i])); [rf_path][i]);
for (rf_path = 0; rf_path < 2; rf_path++) for (rf_path = 0; rf_path < 2; rf_path++)
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
RTPRINT(rtlpriv, FINIT, INIT_EEPROM, RTPRINT(rtlpriv, FINIT, INIT_EEPROM,
("RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n", "RF(%d) EEPROM HT40 2S Diff Area(%d) = 0x%x\n",
rf_path, i, rf_path, i,
rtlefuse->eeprom_chnlarea_txpwr_ht40_2sdiif rtlefuse->eeprom_chnlarea_txpwr_ht40_2sdiif
[rf_path][i])); [rf_path][i]);
for (rf_path = 0; rf_path < 2; rf_path++) { for (rf_path = 0; rf_path < 2; rf_path++) {
...@@ -1751,11 +1752,11 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw) ...@@ -1751,11 +1752,11 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
for (i = 0; i < 14; i++) { for (i = 0; i < 14; i++) {
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = " "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = [0x%x / 0x%x / 0x%x]\n",
"[0x%x / 0x%x / 0x%x]\n", rf_path, i, rf_path, i,
rtlefuse->txpwrlevel_cck[rf_path][i], rtlefuse->txpwrlevel_cck[rf_path][i],
rtlefuse->txpwrlevel_ht40_1s[rf_path][i], rtlefuse->txpwrlevel_ht40_1s[rf_path][i],
rtlefuse->txpwrlevel_ht40_2s[rf_path][i])); rtlefuse->txpwrlevel_ht40_2s[rf_path][i]);
} }
} }
...@@ -1788,13 +1789,13 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw) ...@@ -1788,13 +1789,13 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
0xf0) >> 4); 0xf0) >> 4);
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF-%d pwrgroup_ht20[%d] = 0x%x\n", "RF-%d pwrgroup_ht20[%d] = 0x%x\n",
rf_path, i, rf_path, i,
rtlefuse->pwrgroup_ht20[rf_path][i])); rtlefuse->pwrgroup_ht20[rf_path][i]);
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF-%d pwrgroup_ht40[%d] = 0x%x\n", "RF-%d pwrgroup_ht40[%d] = 0x%x\n",
rf_path, i, rf_path, i,
rtlefuse->pwrgroup_ht40[rf_path][i])); rtlefuse->pwrgroup_ht40[rf_path][i]);
} }
} }
...@@ -1849,27 +1850,27 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw) ...@@ -1849,27 +1850,27 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
(hwinfo[EEPROM_REGULATORY] & 0x1); (hwinfo[EEPROM_REGULATORY] & 0x1);
} }
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory)); "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
for (i = 0; i < 14; i++) for (i = 0; i < 14; i++)
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF-A Ht20 to HT40 Diff[%d] = 0x%x\n", i, "RF-A Ht20 to HT40 Diff[%d] = 0x%x\n",
rtlefuse->txpwr_ht20diff[RF90_PATH_A][i])); i, rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]);
for (i = 0; i < 14; i++) for (i = 0; i < 14; i++)
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF-A Legacy to Ht40 Diff[%d] = 0x%x\n", i, "RF-A Legacy to Ht40 Diff[%d] = 0x%x\n",
rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i])); i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]);
for (i = 0; i < 14; i++) for (i = 0; i < 14; i++)
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF-B Ht20 to HT40 Diff[%d] = 0x%x\n", i, "RF-B Ht20 to HT40 Diff[%d] = 0x%x\n",
rtlefuse->txpwr_ht20diff[RF90_PATH_B][i])); i, rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]);
for (i = 0; i < 14; i++) for (i = 0; i < 14; i++)
RTPRINT(rtlpriv, FINIT, INIT_TxPower, RTPRINT(rtlpriv, FINIT, INIT_TxPower,
("RF-B Legacy to HT40 Diff[%d] = 0x%x\n", i, "RF-B Legacy to HT40 Diff[%d] = 0x%x\n",
rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i])); i, rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]);
RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("TxPwrSafetyFlag = %d\n", RTPRINT(rtlpriv, FINIT, INIT_TxPower,
rtlefuse->txpwr_safetyflag)); "TxPwrSafetyFlag = %d\n", rtlefuse->txpwr_safetyflag);
/* Read RF-indication and Tx Power gain /* Read RF-indication and Tx Power gain
* index diff of legacy to HT OFDM rate. */ * index diff of legacy to HT OFDM rate. */
...@@ -1878,8 +1879,8 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw) ...@@ -1878,8 +1879,8 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
rtlefuse->legacy_httxpowerdiff = rtlefuse->legacy_httxpowerdiff =
rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][0]; rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][0];
RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("TxPowerDiff = %#x\n", RTPRINT(rtlpriv, FINIT, INIT_TxPower,
rtlefuse->eeprom_txpowerdiff)); "TxPowerDiff = %#x\n", rtlefuse->eeprom_txpowerdiff);
/* Get TSSI value for each path. */ /* Get TSSI value for each path. */
usvalue = *(u16 *)&hwinfo[EEPROM_TSSI_A]; usvalue = *(u16 *)&hwinfo[EEPROM_TSSI_A];
...@@ -1887,16 +1888,16 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw) ...@@ -1887,16 +1888,16 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
usvalue = *(u8 *)&hwinfo[EEPROM_TSSI_B]; usvalue = *(u8 *)&hwinfo[EEPROM_TSSI_B];
rtlefuse->eeprom_tssi[RF90_PATH_B] = (u8)(usvalue & 0xff); rtlefuse->eeprom_tssi[RF90_PATH_B] = (u8)(usvalue & 0xff);
RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("TSSI_A = 0x%x, TSSI_B = 0x%x\n", RTPRINT(rtlpriv, FINIT, INIT_TxPower, "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
rtlefuse->eeprom_tssi[RF90_PATH_A], rtlefuse->eeprom_tssi[RF90_PATH_A],
rtlefuse->eeprom_tssi[RF90_PATH_B])); rtlefuse->eeprom_tssi[RF90_PATH_B]);
/* Read antenna tx power offset of B/C/D to A from EEPROM */ /* Read antenna tx power offset of B/C/D to A from EEPROM */
/* and read ThermalMeter from EEPROM */ /* and read ThermalMeter from EEPROM */
tempval = *(u8 *)&hwinfo[EEPROM_THERMALMETER]; tempval = *(u8 *)&hwinfo[EEPROM_THERMALMETER];
rtlefuse->eeprom_thermalmeter = tempval; rtlefuse->eeprom_thermalmeter = tempval;
RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("thermalmeter = 0x%x\n", RTPRINT(rtlpriv, FINIT, INIT_TxPower,
rtlefuse->eeprom_thermalmeter)); "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
/* ThermalMeter, BIT(0)~3 for RFIC1, BIT(4)~7 for RFIC2 */ /* ThermalMeter, BIT(0)~3 for RFIC1, BIT(4)~7 for RFIC2 */
rtlefuse->thermalmeter[0] = (rtlefuse->eeprom_thermalmeter & 0x1f); rtlefuse->thermalmeter[0] = (rtlefuse->eeprom_thermalmeter & 0x1f);
...@@ -1912,8 +1913,8 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw) ...@@ -1912,8 +1913,8 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
/* Version ID, Channel plan */ /* Version ID, Channel plan */
rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN]; rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];
rtlefuse->txpwr_fromeprom = true; rtlefuse->txpwr_fromeprom = true;
RTPRINT(rtlpriv, FINIT, INIT_TxPower, ("EEPROM ChannelPlan = 0x%4x\n", RTPRINT(rtlpriv, FINIT, INIT_TxPower,
rtlefuse->eeprom_channelplan)); "EEPROM ChannelPlan = 0x%4x\n", rtlefuse->eeprom_channelplan);
/* Read Customer ID or Board Type!!! */ /* Read Customer ID or Board Type!!! */
tempval = *(u8 *)&hwinfo[EEPROM_BOARDTYPE]; tempval = *(u8 *)&hwinfo[EEPROM_BOARDTYPE];
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7