Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b8359f8 authored by Chaoming_Li's avatar Chaoming_Li Committed by John W. Linville
Browse files

rtlwifi: rtl8192ce: Change sw and LED routines for addition of rtl8192se and rtl8192de 



Change rtl8192ce sw and LED routines for addition of RTL8192SE and
RTL8192DE.

Signed-off-by: default avatarChaoming_Li <chaoming_li@realsil.com.cn>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f73b279c

drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c

+7 −5
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static void rtl92c_dm_ctrl_initgain_by_rssi(struct ieee80211_hw *hw) 


static void rtl92c_dm_initial_gain_multi_sta(struct ieee80211_hw *hw)

{

	static u8 binitialized; /* initialized to false */

	static u8 initialized; /* initialized to false */

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));

	long rssi_strength = rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
@@ -331,11 +331,11 @@ static void rtl92c_dm_initial_gain_multi_sta(struct ieee80211_hw *hw) 


	if ((multi_sta == false) || (dm_digtable.cursta_connectctate !=

				     DIG_STA_DISCONNECT)) {

		binitialized = false;

		initialized = false;

		dm_digtable.dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX;

		return;

	} else if (binitialized == false) {

		binitialized = true;

	} else if (initialized == false) {

		initialized = true;

		dm_digtable.dig_ext_port_stage = DIG_EXT_PORT_STAGE_0;

		dm_digtable.cur_igvalue = 0x20;

		rtl92c_dm_write_dig(hw);
@@ -1513,7 +1513,7 @@ void rtl92c_dm_watchdog(struct ieee80211_hw *hw) 
}

EXPORT_SYMBOL(rtl92c_dm_watchdog);



static u8 rtl92c_bt_rssi_state_change(struct ieee80211_hw *hw)

u8 rtl92c_bt_rssi_state_change(struct ieee80211_hw *hw)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
@@ -1570,6 +1570,7 @@ static u8 rtl92c_bt_rssi_state_change(struct ieee80211_hw *hw) 
		return false;

	}

}

EXPORT_SYMBOL(rtl92c_bt_rssi_state_change);



static bool rtl92c_bt_state_change(struct ieee80211_hw *hw)

{
@@ -1820,3 +1821,4 @@ void rtl92c_dm_bt_coexist(struct ieee80211_hw *hw) 
			rtl92c_check_bt_change(hw);

	}

}

EXPORT_SYMBOL(rtl92c_dm_bt_coexist);

drivers/net/wireless/rtlwifi/rtl8192ce/dm.c

+2 −0
Original line number Diff line number Diff line
@@ -29,10 +29,12 @@ 


#include "../wifi.h"

#include "../base.h"

#include "../pci.h"

#include "reg.h"

#include "def.h"

#include "phy.h"

#include "dm.h"

#include "../rtl8192c/fw_common.h"



void rtl92ce_dm_dynamic_txpower(struct ieee80211_hw *hw)

{

drivers/net/wireless/rtlwifi/rtl8192ce/dm.h

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ void rtl92c_dm_init_edca_turbo(struct ieee80211_hw *hw); 
void rtl92c_dm_check_txpower_tracking(struct ieee80211_hw *hw);

void rtl92c_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw);

void rtl92c_dm_rf_saving(struct ieee80211_hw *hw, u8 bforce_in_normal);

void rtl92c_dm_bt_coexist(struct ieee80211_hw *hw);

void rtl92ce_dm_dynamic_txpower(struct ieee80211_hw *hw);



#endif

drivers/net/wireless/rtlwifi/rtl8192ce/led.c

+2 −3
Original line number Diff line number Diff line
@@ -106,12 +106,11 @@ void rtl92ce_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled) 
void rtl92ce_init_sw_leds(struct ieee80211_hw *hw)

{

	struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);



	_rtl92ce_init_led(hw, &(pcipriv->ledctl.sw_led0), LED_PIN_LED0);

	_rtl92ce_init_led(hw, &(pcipriv->ledctl.sw_led1), LED_PIN_LED1);

}



void _rtl92ce_sw_led_control(struct ieee80211_hw *hw,

static void _rtl92ce_sw_led_control(struct ieee80211_hw *hw,

				    enum led_ctl_mode ledaction)

{

	struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
@@ -146,7 +145,7 @@ void rtl92ce_led_control(struct ieee80211_hw *hw, 
	     ledaction == LED_CTL_POWER_ON)) {

		return;

	}

	RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, ("ledaction %d,\n",

	RT_TRACE(rtlpriv, COMP_LED, DBG_LOUD, ("ledaction %d.\n",

				ledaction));

	_rtl92ce_sw_led_control(hw, ledaction);

}

drivers/net/wireless/rtlwifi/rtl8192ce/led.h

+0 −2
Original line number Diff line number Diff line
@@ -34,7 +34,5 @@ void rtl92ce_init_sw_leds(struct ieee80211_hw *hw); 
void rtl92ce_sw_led_on(struct ieee80211_hw *hw, struct rtl_led *pled);

void rtl92ce_sw_led_off(struct ieee80211_hw *hw, struct rtl_led *pled);

void rtl92ce_led_control(struct ieee80211_hw *hw, enum led_ctl_mode ledaction);

void _rtl92ce_sw_led_control(struct ieee80211_hw *hw,

				    enum led_ctl_mode ledaction);



#endif