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

Commit 9f087a92 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: rtl8192ce: rtl8192common: Update for latest version of Realtek drivers 



Realtek released new drivers on 06/28/2014. These changes implement all their
changes into the kernel version of the driver. In addition, these modifications
are part of the process of unifying the Realtek and kernel code bases.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5c99f04f

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

+1 −1
Original line number Diff line number Diff line
@@ -1771,7 +1771,7 @@ static void rtl92c_check_bt_change(struct ieee80211_hw *hw) 
	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));

	u8 tmp1byte = 0;



	if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version) &&

	if (IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version) &&

	    rtlpcipriv->bt_coexist.bt_coexistence)

		tmp1byte |= BIT(5);

	if (rtlpcipriv->bt_coexist.bt_cur_state) {

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

+204 −217

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h

+27 −0
Original line number Diff line number Diff line
@@ -36,11 +36,38 @@ 
#define FW_8192C_PAGE_SIZE			4096

#define FW_8192C_POLLING_DELAY			5

#define FW_8192C_POLLING_TIMEOUT_COUNT		100

#define NORMAL_CHIP				BIT(4)



#define IS_FW_HEADER_EXIST(_pfwhdr)	\

	((le16_to_cpu(_pfwhdr->signature)&0xFFF0) == 0x92C0 ||\

	(le16_to_cpu(_pfwhdr->signature)&0xFFF0) == 0x88C0)



#define CUT_VERSION_MASK		(BIT(6)|BIT(7))

#define CHIP_VENDOR_UMC			BIT(5)

#define CHIP_VENDOR_UMC_B_CUT		BIT(6) /* Chip version for ECO */

#define IS_CHIP_VER_B(version)  ((version & CHIP_VER_B) ? true : false)

#define RF_TYPE_MASK			(BIT(0)|BIT(1))

#define GET_CVID_RF_TYPE(version)	\

	((version) & RF_TYPE_MASK)

#define GET_CVID_CUT_VERSION(version) \

	((version) & CUT_VERSION_MASK)

#define IS_NORMAL_CHIP(version)	\

	((version & NORMAL_CHIP) ? true : false)

#define IS_2T2R(version) \

	(((GET_CVID_RF_TYPE(version)) == \

	CHIP_92C_BITMASK) ? true : false)

#define IS_92C_SERIAL(version) \

	((IS_2T2R(version)) ? true : false)

#define IS_CHIP_VENDOR_UMC(version)	\

	((version & CHIP_VENDOR_UMC) ? true : false)

#define IS_VENDOR_UMC_A_CUT(version) \

	((IS_CHIP_VENDOR_UMC(version)) ? \

	((GET_CVID_CUT_VERSION(version)) ? false : true) : false)

#define IS_81XXC_VENDOR_UMC_B_CUT(version)	\

	((IS_CHIP_VENDOR_UMC(version)) ? \

	((GET_CVID_CUT_VERSION(version) == \

		CHIP_VENDOR_UMC_B_CUT) ? true : false) : false)



struct rtl92c_firmware_header {

	__le16 signature;

	u8 category;

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

+267 −548

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ u32 _rtl92c_phy_calculate_bit_shift(u32 bitmask); 
long _rtl92c_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,

				  enum wireless_mode wirelessmode,

				  u8 txpwridx);

u8 _rtl92c_phy_dbm_to_txpwr_Idx(struct ieee80211_hw *hw,

u8 _rtl92c_phy_dbm_to_txpwr_idx(struct ieee80211_hw *hw,

				enum wireless_mode wirelessmode,

				long power_indbm);

void _rtl92c_phy_init_bb_rf_register_definition(struct ieee80211_hw *hw);