diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192ce/phy.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 113 | 
1 files changed, 52 insertions, 61 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c index 3b585aadabf..88deae67cc1 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c @@ -1,6 +1,6 @@  /******************************************************************************   * - * Copyright(c) 2009-2010  Realtek Corporation. + * Copyright(c) 2009-2012  Realtek Corporation.   *   * This program is free software; you can redistribute it and/or modify it   * under the terms of version 2 of the GNU General Public License as @@ -47,9 +47,9 @@ u32 rtl92c_phy_query_rf_reg(struct ieee80211_hw *hw,  	u32 original_value, readback_value, bitshift;  	struct rtl_phy *rtlphy = &(rtlpriv->phy); -	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), " -					       "rfpath(%#x), bitmask(%#x)\n", -					       regaddr, rfpath, bitmask)); +	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, +		 "regaddr(%#x), rfpath(%#x), bitmask(%#x)\n", +		 regaddr, rfpath, bitmask);  	spin_lock(&rtlpriv->locks.rf_lock); @@ -67,9 +67,8 @@ u32 rtl92c_phy_query_rf_reg(struct ieee80211_hw *hw,  	spin_unlock(&rtlpriv->locks.rf_lock);  	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, -		 ("regaddr(%#x), rfpath(%#x), " -		  "bitmask(%#x), original_value(%#x)\n", -		  regaddr, rfpath, bitmask, original_value)); +		 "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n", +		 regaddr, rfpath, bitmask, original_value);  	return readback_value;  } @@ -121,8 +120,8 @@ void rtl92ce_phy_set_rf_reg(struct ieee80211_hw *hw,  	u32 original_value, bitshift;  	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, -		 ("regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n", -		  regaddr, bitmask, data, rfpath)); +		 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n", +		 regaddr, bitmask, data, rfpath);  	spin_lock(&rtlpriv->locks.rf_lock); @@ -153,10 +152,9 @@ void rtl92ce_phy_set_rf_reg(struct ieee80211_hw *hw,  	spin_unlock(&rtlpriv->locks.rf_lock); -	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, ("regaddr(%#x), " -					       "bitmask(%#x), data(%#x), " -					       "rfpath(%#x)\n", regaddr, -					       bitmask, data, rfpath)); +	RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, +		 "regaddr(%#x), bitmask(%#x), data(%#x), rfpath(%#x)\n", +		 regaddr, bitmask, data, rfpath);  }  static bool _rtl92c_phy_config_mac_with_headerfile(struct ieee80211_hw *hw) @@ -166,11 +164,10 @@ static bool _rtl92c_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)  	u32 arraylength;  	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 = MAC_2T_ARRAYLENGTH;  	ptrarray = RTL8192CEMAC_2T_ARRAY; -	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, -		 ("Img:RTL8192CEMAC_2T_ARRAY\n")); +	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Img:RTL8192CEMAC_2T_ARRAY\n");  	for (i = 0; i < arraylength; i = i + 2)  		rtl_write_byte(rtlpriv, ptrarray[i], (u8) ptrarray[i + 1]);  	return true; @@ -215,10 +212,9 @@ bool _rtl92ce_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,  				      phy_regarray_table[i + 1]);  			udelay(1);  			RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, -				 ("The phy_regarray_table[0] is %x" -				  " Rtl819XPHY_REGArray[1] is %x\n", -				  phy_regarray_table[i], -				  phy_regarray_table[i + 1])); +				 "The phy_regarray_table[0] is %x Rtl819XPHY_REGArray[1] is %x\n", +				 phy_regarray_table[i], +				 phy_regarray_table[i + 1]);  		}  	} else if (configtype == BASEBAND_CONFIG_AGC_TAB) {  		for (i = 0; i < agctab_arraylen; i = i + 2) { @@ -226,10 +222,9 @@ bool _rtl92ce_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,  				      agctab_array_table[i + 1]);  			udelay(1);  			RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, -				 ("The agctab_array_table[0] is " -				  "%x Rtl819XPHY_REGArray[1] is %x\n", -				  agctab_array_table[i], -				  agctab_array_table[i + 1])); +				 "The agctab_array_table[0] is %x Rtl819XPHY_REGArray[1] is %x\n", +				 agctab_array_table[i], +				 agctab_array_table[i + 1]);  		}  	}  	return true; @@ -269,7 +264,7 @@ bool _rtl92ce_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,  	} else {  		RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, -			 ("configtype != BaseBand_Config_PHY_REG\n")); +			 "configtype != BaseBand_Config_PHY_REG\n");  	}  	return true;  } @@ -291,20 +286,20 @@ bool rtl92c_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,  		radiob_arraylen = RADIOB_2TARRAYLENGTH;  		radiob_array_table = RTL8192CE_RADIOB_2TARRAY;  		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, -			 ("Radio_A:RTL8192CERADIOA_2TARRAY\n")); +			 "Radio_A:RTL8192CERADIOA_2TARRAY\n");  		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, -			 ("Radio_B:RTL8192CE_RADIOB_2TARRAY\n")); +			 "Radio_B:RTL8192CE_RADIOB_2TARRAY\n");  	} else {  		radioa_arraylen = RADIOA_1TARRAYLENGTH;  		radioa_array_table = RTL8192CE_RADIOA_1TARRAY;  		radiob_arraylen = RADIOB_1TARRAYLENGTH;  		radiob_array_table = RTL8192CE_RADIOB_1TARRAY;  		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, -			 ("Radio_A:RTL8192CE_RADIOA_1TARRAY\n")); +			 "Radio_A:RTL8192CE_RADIOA_1TARRAY\n");  		RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, -			 ("Radio_B:RTL8192CE_RADIOB_1TARRAY\n")); +			 "Radio_B:RTL8192CE_RADIOB_1TARRAY\n");  	} -	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, ("Radio No %x\n", rfpath)); +	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Radio No %x\n", rfpath);  	switch (rfpath) {  	case RF90_PATH_A:  		for (i = 0; i < radioa_arraylen; i = i + 2) { @@ -352,11 +347,11 @@ bool rtl92c_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,  		break;  	case RF90_PATH_C:  		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, -			 ("switch case not process\n")); +			 "switch case not processed\n");  		break;  	case RF90_PATH_D:  		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, -			 ("switch case not process\n")); +			 "switch case not processed\n");  		break;  	}  	return true; @@ -371,10 +366,9 @@ void rtl92ce_phy_set_bw_mode_callback(struct ieee80211_hw *hw)  	u8 reg_bw_opmode;  	u8 reg_prsr_rsc; -	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, -		 ("Switch to %s bandwidth\n", -		  rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ? -		  "20MHz" : "40MHz")) +	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "Switch to %s bandwidth\n", +		 rtlphy->current_chan_bw == HT_CHANNEL_WIDTH_20 ? +		 "20MHz" : "40MHz");  	if (is_hal_stop(rtlhal)) {  		rtlphy->set_bwmode_inprogress = false; @@ -398,7 +392,7 @@ void rtl92ce_phy_set_bw_mode_callback(struct ieee80211_hw *hw)  		break;  	default:  		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, -			 ("unknown bandwidth: %#X\n", rtlphy->current_chan_bw)); +			 "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);  		break;  	} @@ -423,12 +417,12 @@ void rtl92ce_phy_set_bw_mode_callback(struct ieee80211_hw *hw)  		break;  	default:  		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, -			 ("unknown bandwidth: %#X\n", rtlphy->current_chan_bw)); +			 "unknown bandwidth: %#X\n", rtlphy->current_chan_bw);  		break;  	}  	rtl92ce_phy_rf6052_set_bandwidth(hw, rtlphy->current_chan_bw);  	rtlphy->set_bwmode_inprogress = false; -	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, ("<==\n")); +	RT_TRACE(rtlpriv, COMP_SCAN, DBG_TRACE, "<==\n");  }  void _rtl92ce_phy_lc_calibrate(struct ieee80211_hw *hw, bool is2t) @@ -499,7 +493,7 @@ static void _rtl92ce_phy_set_rf_sleep(struct ieee80211_hw *hw)  		rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE3);  		rtl_write_byte(rtlpriv, REG_TXPAUSE, 0x00);  		RT_TRACE(rtlpriv, COMP_POWER, DBG_TRACE, -			 ("Switch RF timeout !!!.\n")); +			 "Switch RF timeout !!!\n");  		return;  	}  	rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2); @@ -526,18 +520,17 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,  				do {  					InitializeCount++;  					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); -				} while ((rtstatus != true) -					 && (InitializeCount < 10)); +				} while (!rtstatus && (InitializeCount < 10));  				RT_CLEAR_PS_LEVEL(ppsc,  						  RT_RF_OFF_LEVL_HALT_NIC);  			} else {  				RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, -					 ("Set ERFON sleeped:%d ms\n", -					  jiffies_to_msecs(jiffies - -						   ppsc-> -						   last_sleep_jiffies))); +					 "Set ERFON sleeped:%d ms\n", +					 jiffies_to_msecs(jiffies - +							  ppsc-> +							  last_sleep_jiffies));  				ppsc->last_awake_jiffies = jiffies;  				rtl92ce_phy_set_rf_on(hw);  			} @@ -553,7 +546,7 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,  	case ERFOFF:{  			if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_HALT_NIC) {  				RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, -					 ("IPS Set eRf nic disable\n")); +					 "IPS Set eRf nic disable\n");  				rtl_ps_disable_nic(hw);  				RT_SET_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);  			} else { @@ -578,35 +571,33 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,  					continue;  				} else {  					RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, -						 ("eRf Off/Sleep: %d times " -						  "TcbBusyQueue[%d] =%d before " -						  "doze!\n", (i + 1), queue_id, -						  skb_queue_len(&ring->queue))); +						 "eRf Off/Sleep: %d times TcbBusyQueue[%d] =%d before doze!\n", +						 i + 1, queue_id, +						 skb_queue_len(&ring->queue));  					udelay(10);  					i++;  				}  				if (i >= MAX_DOZE_WAITING_TIMES_9x) {  					RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, -						 ("\n ERFSLEEP: %d times " -						  "TcbBusyQueue[%d] = %d !\n", -						  MAX_DOZE_WAITING_TIMES_9x, -						  queue_id, -						  skb_queue_len(&ring->queue))); +						 "ERFSLEEP: %d times TcbBusyQueue[%d] = %d !\n", +						 MAX_DOZE_WAITING_TIMES_9x, +						 queue_id, +						 skb_queue_len(&ring->queue));  					break;  				}  			}  			RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, -				 ("Set ERFSLEEP awaked:%d ms\n", -				  jiffies_to_msecs(jiffies - -						   ppsc->last_awake_jiffies))); +				 "Set ERFSLEEP awaked:%d ms\n", +				 jiffies_to_msecs(jiffies - +						  ppsc->last_awake_jiffies));  			ppsc->last_sleep_jiffies = jiffies;  			_rtl92ce_phy_set_rf_sleep(hw);  			break;  		}  	default:  		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, -			 ("switch case not process\n")); +			 "switch case not processed\n");  		bresult = false;  		break;  	}  |