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

Commit 6b26b75d authored by navin patidar's avatar navin patidar Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: Rework function ODM_SetTxAntByTxInfo_88E() 



Rename CamelCase function name and local variables.

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

drivers/staging/rtl8188eu/hal/odm_RTL8188E.c

+7 −5
Original line number Diff line number Diff line
@@ -236,14 +236,16 @@ static void update_tx_ant_88eu(struct odm_dm_struct *dm_odm, u8 ant, u32 mac_id) 
	dm_fat_tbl->antsel_c[mac_id] = (target_ant&BIT2)>>2;

}



void ODM_SetTxAntByTxInfo_88E(struct odm_dm_struct *dm_odm, u8 *pDesc, u8 macId)

void rtl88eu_dm_set_tx_ant_by_tx_info(struct odm_dm_struct *dm_odm,

				      u8 *desc, u8 mac_id)

{

	struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable;



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

		SET_TX_DESC_ANTSEL_A_88E(pDesc, dm_fat_tbl->antsel_a[macId]);

		SET_TX_DESC_ANTSEL_B_88E(pDesc, dm_fat_tbl->antsel_b[macId]);

		SET_TX_DESC_ANTSEL_C_88E(pDesc, dm_fat_tbl->antsel_c[macId]);

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

	    (dm_odm->AntDivType == CG_TRX_SMART_ANTDIV)) {

		SET_TX_DESC_ANTSEL_A_88E(desc, dm_fat_tbl->antsel_a[mac_id]);

		SET_TX_DESC_ANTSEL_B_88E(desc, dm_fat_tbl->antsel_b[mac_id]);

		SET_TX_DESC_ANTSEL_C_88E(desc, dm_fat_tbl->antsel_c[mac_id]);

	}

}

drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c

+2 −1
Original line number Diff line number Diff line
@@ -336,7 +336,8 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bag 
		ptxdesc->txdw4 |= cpu_to_le32(HW_SSN);	/*  Hw set sequence number */

	}



	ODM_SetTxAntByTxInfo_88E(&haldata->odmpriv, pmem, pattrib->mac_id);

	rtl88eu_dm_set_tx_ant_by_tx_info(&haldata->odmpriv, pmem,

					 pattrib->mac_id);



	rtl8188eu_cal_txdesc_chksum(ptxdesc);

	_dbg_dump_tx_info(adapt, pxmitframe->frame_tag, ptxdesc);

drivers/staging/rtl8188eu/include/odm_RTL8188E.h

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ void rtl88eu_dm_antenna_div_init(struct odm_dm_struct *dm_odm); 


void ODM_AntennaDiversity_88E(struct odm_dm_struct *pDM_Odm);



void ODM_SetTxAntByTxInfo_88E(struct odm_dm_struct *pDM_Odm, u8 *pDesc,

			      u8 macId);

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

				      u8 mac_id);



void rtl88eu_dm_update_rx_idle_ant(struct odm_dm_struct *dm_odm, u8 ant);