Commit 4c8692d4 authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

rtlwifi: rtl8192ce: rtl8192c_com: Remove usage of private bit manipulation macros 



Besides the previously changes macros for the RX and TX descriptors.
the local macros are used in other places. These are replaced with
standard bit manipulation macros.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 5ea5c93d

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

+9 −10
Original line number Diff line number Diff line
@@ -8,11 +8,11 @@ 
#include "../base.h"

#include "../core.h"



#define BT_RSSI_STATE_NORMAL_POWER	BIT_OFFSET_LEN_MASK_32(0, 1)

#define BT_RSSI_STATE_AMDPU_OFF		BIT_OFFSET_LEN_MASK_32(1, 1)

#define BT_RSSI_STATE_SPECIAL_LOW	BIT_OFFSET_LEN_MASK_32(2, 1)

#define BT_RSSI_STATE_BG_EDCA_LOW	BIT_OFFSET_LEN_MASK_32(3, 1)

#define BT_RSSI_STATE_TXPOWER_LOW	BIT_OFFSET_LEN_MASK_32(4, 1)

#define BT_RSSI_STATE_NORMAL_POWER	BIT(0)

#define BT_RSSI_STATE_AMDPU_OFF		BIT(1)

#define BT_RSSI_STATE_SPECIAL_LOW	BIT(2)

#define BT_RSSI_STATE_BG_EDCA_LOW	BIT(3)

#define BT_RSSI_STATE_TXPOWER_LOW	BIT(4)

#define BT_MASK				0x00ffffff



#define RTLPRIV			(struct rtl_priv *)
@@ -1515,7 +1515,7 @@ static bool rtl92c_bt_state_change(struct ieee80211_hw *hw) 
	    polling == 0xffffffff && bt_state == 0xff)

		return false;



	bt_state &= BIT_OFFSET_LEN_MASK_32(0, 1);

	bt_state &= BIT(0);

	if (bt_state != rtlpriv->btcoexist.bt_cur_state) {

		rtlpriv->btcoexist.bt_cur_state = bt_state;
@@ -1524,8 +1524,7 @@ static bool rtl92c_bt_state_change(struct ieee80211_hw *hw) 


			bt_state = bt_state |

			  ((rtlpriv->btcoexist.bt_ant_isolation == 1) ?

			  0 : BIT_OFFSET_LEN_MASK_32(1, 1)) |

			  BIT_OFFSET_LEN_MASK_32(2, 1);

			  0 : BIT(1)) | BIT(2);

			rtl_write_byte(rtlpriv, 0x4fd, bt_state);

		}

		return true;
@@ -1555,9 +1554,9 @@ static bool rtl92c_bt_state_change(struct ieee80211_hw *hw) 
			rtlpriv->btcoexist.bt_service = cur_service_type;

			bt_state = bt_state |

			   ((rtlpriv->btcoexist.bt_ant_isolation == 1) ?

			   0 : BIT_OFFSET_LEN_MASK_32(1, 1)) |

			   0 : BIT(1)) |

			   ((rtlpriv->btcoexist.bt_service != BT_IDLE) ?

			   0 : BIT_OFFSET_LEN_MASK_32(2, 1));

			   0 : BIT(2));



			/* Add interrupt migration when bt is not ini

			 * idle state (no traffic). */

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

+7 −7
Original line number Diff line number Diff line
@@ -46,19 +46,19 @@ 
#define pagenum_128(_len)	(u32)(((_len)>>7) + ((_len)&0x7F ? 1 : 0))



#define SET_H2CCMD_PWRMODE_PARM_MODE(__ph2ccmd, __val)			\

	SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val)

	*(u8 *)(__ph2ccmd) = __val

#define SET_H2CCMD_PWRMODE_PARM_SMART_PS(__ph2ccmd, __val)		\

	SET_BITS_TO_LE_1BYTE((__ph2ccmd)+1, 0, 8, __val)

	*(u8 *)(__ph2ccmd + 1) = __val

#define SET_H2CCMD_PWRMODE_PARM_BCN_PASS_TIME(__ph2ccmd, __val)	\

	SET_BITS_TO_LE_1BYTE((__ph2ccmd)+2, 0, 8, __val)

	*(u8 *)(__ph2ccmd + 2) = __val

#define SET_H2CCMD_JOINBSSRPT_PARM_OPMODE(__ph2ccmd, __val)		\

	SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val)

	*(u8 *)(__ph2ccmd) = __val

#define SET_H2CCMD_RSVDPAGE_LOC_PROBE_RSP(__ph2ccmd, __val)		\

	SET_BITS_TO_LE_1BYTE(__ph2ccmd, 0, 8, __val)

	*(u8 *)(__ph2ccmd) = __val

#define SET_H2CCMD_RSVDPAGE_LOC_PSPOLL(__ph2ccmd, __val)		\

	SET_BITS_TO_LE_1BYTE((__ph2ccmd)+1, 0, 8, __val)

	*(u8 *)(__ph2ccmd + 1) = __val

#define SET_H2CCMD_RSVDPAGE_LOC_NULL_DATA(__ph2ccmd, __val)		\

	SET_BITS_TO_LE_1BYTE((__ph2ccmd)+2, 0, 8, __val)

	*(u8 *)(__ph2ccmd + 2) = __val



int rtl92c_download_fw(struct ieee80211_hw *hw);

void rtl92c_fill_h2c_cmd(struct ieee80211_hw *hw, u8 element_id,

drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c

+5 −6
Original line number Diff line number Diff line
@@ -2299,13 +2299,12 @@ void rtl8192ce_bt_hw_init(struct ieee80211_hw *hw) 
		if (rtlpriv->btcoexist.bt_ant_isolation)

			rtl_write_byte(rtlpriv, REG_GPIO_MUXCFG, 0xa0);



		u1_tmp = rtl_read_byte(rtlpriv, 0x4fd) &

			 BIT_OFFSET_LEN_MASK_32(0, 1);

		u1_tmp = rtl_read_byte(rtlpriv, 0x4fd) & BIT(0);

		u1_tmp = u1_tmp |

			 ((rtlpriv->btcoexist.bt_ant_isolation == 1) ?

			 0 : BIT_OFFSET_LEN_MASK_32(1, 1)) |

			 0 : BIT(1)) |

			 ((rtlpriv->btcoexist.bt_service == BT_SCO) ?

			 0 : BIT_OFFSET_LEN_MASK_32(2, 1));

			 0 : BIT(2));

		rtl_write_byte(rtlpriv, 0x4fd, u1_tmp);



		rtl_write_dword(rtlpriv, REG_BT_COEX_TABLE+4, 0xaaaa9aaa);
@@ -2315,11 +2314,11 @@ void rtl8192ce_bt_hw_init(struct ieee80211_hw *hw) 
		/* Config to 1T1R. */

		if (rtlphy->rf_type == RF_1T1R) {

			u1_tmp = rtl_read_byte(rtlpriv, ROFDM0_TRXPATHENABLE);

			u1_tmp &= ~(BIT_OFFSET_LEN_MASK_32(1, 1));

			u1_tmp &= ~(BIT(1));

			rtl_write_byte(rtlpriv, ROFDM0_TRXPATHENABLE, u1_tmp);



			u1_tmp = rtl_read_byte(rtlpriv, ROFDM1_TRXPATHENABLE);

			u1_tmp &= ~(BIT_OFFSET_LEN_MASK_32(1, 1));

			u1_tmp &= ~(BIT(1));

			rtl_write_byte(rtlpriv, ROFDM1_TRXPATHENABLE, u1_tmp);

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE