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

Commit 8f4ece93 authored by navin patidar's avatar navin patidar Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: Rework function ODM_AntennaDiversity_88E() 



Rename CamelCase function name.
Remove unnecessary comments.

Signed-off-by: default avatarnavin patidar <navin.patidar@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d2f44b7c

drivers/staging/rtl8188eu/hal/odm.c

+1 −1
Original line number Diff line number Diff line
@@ -1275,7 +1275,7 @@ void odm_HwAntDiv(struct odm_dm_struct *pDM_Odm) 
		return;

	}



	ODM_AntennaDiversity_88E(pDM_Odm);

	rtl88eu_dm_antenna_diversity(pDM_Odm);

}



/* EDCA Turbo */

drivers/staging/rtl8188eu/hal/odm_RTL8188E.c

+19 −12
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static void rtl88eu_dm_hw_ant_div(struct odm_dm_struct *dm_odm) 
	dig_table->RSSI_max = max_rssi;

}



void ODM_AntennaDiversity_88E(struct odm_dm_struct *dm_odm)

void rtl88eu_dm_antenna_diversity(struct odm_dm_struct *dm_odm)

{

	struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable;

	struct adapter *adapter = dm_odm->Adapter;
@@ -339,28 +339,35 @@ void ODM_AntennaDiversity_88E(struct odm_dm_struct *dm_odm) 
	if (!(dm_odm->SupportAbility & ODM_BB_ANT_DIV))

		return;

	if (!dm_odm->bLinked) {

		ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("ODM_AntennaDiversity_88E(): No Link.\n"));

		ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD,

			     ("ODM_AntennaDiversity_88E(): No Link.\n"));

		if (dm_fat_tbl->bBecomeLinked) {

			ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Need to Turn off HW AntDiv\n"));

			phy_set_bb_reg(adapter, ODM_REG_IGI_A_11N, BIT7, 0);	/* RegC50[7]=1'b1		enable HW AntDiv */

			phy_set_bb_reg(adapter, ODM_REG_CCK_ANTDIV_PARA1_11N, BIT15, 0); /* Enable CCK AntDiv */

			ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD,

				     ("Need to Turn off HW AntDiv\n"));

			phy_set_bb_reg(adapter, ODM_REG_IGI_A_11N, BIT7, 0);

			phy_set_bb_reg(adapter, ODM_REG_CCK_ANTDIV_PARA1_11N,

				       BIT15, 0);

			if (dm_odm->AntDivType == CG_TRX_HW_ANTDIV)

				phy_set_bb_reg(adapter, ODM_REG_TX_ANT_CTRL_11N, BIT21, 0); /* Reg80c[21]=1'b0		from TX Reg */

				phy_set_bb_reg(adapter, ODM_REG_TX_ANT_CTRL_11N,

					       BIT21, 0);

			dm_fat_tbl->bBecomeLinked = dm_odm->bLinked;

		}

		return;

	} else {

		if (!dm_fat_tbl->bBecomeLinked) {

			ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Need to Turn on HW AntDiv\n"));

			/* Because HW AntDiv is disabled before Link, we enable HW AntDiv after link */

			phy_set_bb_reg(adapter, ODM_REG_IGI_A_11N, BIT7, 1);	/* RegC50[7]=1'b1		enable HW AntDiv */

			phy_set_bb_reg(adapter, ODM_REG_CCK_ANTDIV_PARA1_11N, BIT15, 1); /* Enable CCK AntDiv */

			ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD,

				     ("Need to Turn on HW AntDiv\n"));

			phy_set_bb_reg(adapter, ODM_REG_IGI_A_11N, BIT7, 1);

			phy_set_bb_reg(adapter, ODM_REG_CCK_ANTDIV_PARA1_11N,

				       BIT15, 1);

			if (dm_odm->AntDivType == CG_TRX_HW_ANTDIV)

				phy_set_bb_reg(adapter, ODM_REG_TX_ANT_CTRL_11N, BIT21, 1); /* Reg80c[21]=1'b1		from TX Info */

				phy_set_bb_reg(adapter, ODM_REG_TX_ANT_CTRL_11N,

					       BIT21, 1);

			dm_fat_tbl->bBecomeLinked = dm_odm->bLinked;

		}

	}

	if ((dm_odm->AntDivType == CG_TRX_HW_ANTDIV) || (dm_odm->AntDivType == CGCS_RX_HW_ANTDIV))

	if ((dm_odm->AntDivType == CG_TRX_HW_ANTDIV) ||

	    (dm_odm->AntDivType == CGCS_RX_HW_ANTDIV))

		rtl88eu_dm_hw_ant_div(dm_odm);

}

drivers/staging/rtl8188eu/include/odm_RTL8188E.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ void ODM_DIG_LowerBound_88E(struct odm_dm_struct *pDM_Odm); 


void rtl88eu_dm_antenna_div_init(struct odm_dm_struct *dm_odm);



void ODM_AntennaDiversity_88E(struct odm_dm_struct *pDM_Odm);

void rtl88eu_dm_antenna_diversity(struct odm_dm_struct *dm_odm);



void rtl88eu_dm_set_tx_ant_by_tx_info(struct odm_dm_struct *dm_odm, u8 *desc,

				      u8 mac_id);