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

staging: rtl8188eu: Rework function odm_HWAntDiv() 



 Rename CamelCase function name and local variables.
 Remove unnecessary debugging messages.

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

drivers/staging/rtl8188eu/hal/odm_RTL8188E.c

+38 −40
Original line number Original line Diff line number Diff line
@@ -272,53 +272,51 @@ void rtl88eu_dm_ant_sel_statistics(struct odm_dm_struct *dm_odm, 
	}

	}

}

}





static void odm_HWAntDiv(struct odm_dm_struct *dm_odm)

static void rtl88eu_dm_hw_ant_div(struct odm_dm_struct *dm_odm)

{

{

	u32	i, MinRSSI = 0xFF, AntDivMaxRSSI = 0, MaxRSSI = 0, LocalMinRSSI, LocalMaxRSSI;

	u32	Main_RSSI, Aux_RSSI;

	u8	RxIdleAnt = 0, TargetAnt = 7;

	struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable;

	struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable;

	struct rtw_dig *pDM_DigTable = &dm_odm->DM_DigTable;

	struct rtw_dig *dig_table = &dm_odm->DM_DigTable;

	struct sta_info *pEntry;

	struct sta_info *entry;

	u32 i, min_rssi = 0xFF, ant_div_max_rssi = 0, max_rssi = 0;

	u32 local_min_rssi,local_max_rssi;

	u32 main_rssi, aux_rssi;

	u8 RxIdleAnt = 0, target_ant = 7;





	for (i = 0; i < ODM_ASSOCIATE_ENTRY_NUM; i++) {

	for (i = 0; i < ODM_ASSOCIATE_ENTRY_NUM; i++) {

		pEntry = dm_odm->pODM_StaInfo[i];

		entry = dm_odm->pODM_StaInfo[i];

		if (IS_STA_VALID(pEntry)) {

		if (IS_STA_VALID(entry)) {

			/* 2 Caculate RSSI per Antenna */

			/* 2 Caculate RSSI per Antenna */

			Main_RSSI = (dm_fat_tbl->MainAnt_Cnt[i] != 0) ? (dm_fat_tbl->MainAnt_Sum[i]/dm_fat_tbl->MainAnt_Cnt[i]) : 0;

			main_rssi = (dm_fat_tbl->MainAnt_Cnt[i] != 0) ?

			Aux_RSSI = (dm_fat_tbl->AuxAnt_Cnt[i] != 0) ? (dm_fat_tbl->AuxAnt_Sum[i]/dm_fat_tbl->AuxAnt_Cnt[i]) : 0;

				     (dm_fat_tbl->MainAnt_Sum[i]/dm_fat_tbl->MainAnt_Cnt[i]) : 0;

			TargetAnt = (Main_RSSI >= Aux_RSSI) ? MAIN_ANT : AUX_ANT;

			aux_rssi = (dm_fat_tbl->AuxAnt_Cnt[i] != 0) ?

			ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD,

				    (dm_fat_tbl->AuxAnt_Sum[i]/dm_fat_tbl->AuxAnt_Cnt[i]) : 0;

				     ("MacID=%d, MainAnt_Sum=%d, MainAnt_Cnt=%d\n",

			target_ant = (main_rssi >= aux_rssi) ? MAIN_ANT : AUX_ANT;

				     i, dm_fat_tbl->MainAnt_Sum[i],

			/* 2 Select max_rssi for DIG */

				     dm_fat_tbl->MainAnt_Cnt[i]));

			local_max_rssi = (main_rssi > aux_rssi) ?

			ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD,

					  main_rssi : aux_rssi;

				     ("MacID=%d, AuxAnt_Sum=%d, AuxAnt_Cnt=%d\n",

			if ((local_max_rssi > ant_div_max_rssi) &&

				     i, dm_fat_tbl->AuxAnt_Sum[i], dm_fat_tbl->AuxAnt_Cnt[i]));

			    (local_max_rssi < 40))

			ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD,

				ant_div_max_rssi = local_max_rssi;

				     ("MacID=%d, Main_RSSI= %d, Aux_RSSI= %d\n",

			if (local_max_rssi > max_rssi)

				     i, Main_RSSI, Aux_RSSI));

				max_rssi = local_max_rssi;

			/* 2 Select MaxRSSI for DIG */

			LocalMaxRSSI = (Main_RSSI > Aux_RSSI) ? Main_RSSI : Aux_RSSI;

			if ((LocalMaxRSSI > AntDivMaxRSSI) && (LocalMaxRSSI < 40))

				AntDivMaxRSSI = LocalMaxRSSI;

			if (LocalMaxRSSI > MaxRSSI)

				MaxRSSI = LocalMaxRSSI;





			/* 2 Select RX Idle Antenna */

			/* 2 Select RX Idle Antenna */

			if ((dm_fat_tbl->RxIdleAnt == MAIN_ANT) && (Main_RSSI == 0))

			if ((dm_fat_tbl->RxIdleAnt == MAIN_ANT) &&

				Main_RSSI = Aux_RSSI;

			    (main_rssi == 0))

			else if ((dm_fat_tbl->RxIdleAnt == AUX_ANT) && (Aux_RSSI == 0))

				main_rssi = aux_rssi;

				Aux_RSSI = Main_RSSI;

			else if ((dm_fat_tbl->RxIdleAnt == AUX_ANT) &&



				 (aux_rssi == 0))

			LocalMinRSSI = (Main_RSSI > Aux_RSSI) ? Aux_RSSI : Main_RSSI;

				aux_rssi = main_rssi;

			if (LocalMinRSSI < MinRSSI) {



				MinRSSI = LocalMinRSSI;

			local_min_rssi = (main_rssi > aux_rssi) ?

				RxIdleAnt = TargetAnt;

					  aux_rssi : main_rssi;

			if (local_min_rssi < min_rssi) {

				min_rssi = local_min_rssi;

				RxIdleAnt = target_ant;

			}

			}

			/* 2 Select TRX Antenna */

			/* 2 Select TRX Antenna */

			if (dm_odm->AntDivType == CG_TRX_HW_ANTDIV)

			if (dm_odm->AntDivType == CG_TRX_HW_ANTDIV)

				update_tx_ant_88eu(dm_odm, TargetAnt, i);

				update_tx_ant_88eu(dm_odm, target_ant, i);

		}

		}

		dm_fat_tbl->MainAnt_Sum[i] = 0;

		dm_fat_tbl->MainAnt_Sum[i] = 0;

		dm_fat_tbl->AuxAnt_Sum[i] = 0;

		dm_fat_tbl->AuxAnt_Sum[i] = 0;
@@ -329,8 +327,8 @@ static void odm_HWAntDiv(struct odm_dm_struct *dm_odm) 
	/* 2 Set RX Idle Antenna */

	/* 2 Set RX Idle Antenna */

	rtl88eu_dm_update_rx_idle_ant(dm_odm, RxIdleAnt);

	rtl88eu_dm_update_rx_idle_ant(dm_odm, RxIdleAnt);





	pDM_DigTable->AntDiv_RSSI_max = AntDivMaxRSSI;

	dig_table->AntDiv_RSSI_max = ant_div_max_rssi;

	pDM_DigTable->RSSI_max = MaxRSSI;

	dig_table->RSSI_max = max_rssi;

}

}





void ODM_AntennaDiversity_88E(struct odm_dm_struct *dm_odm)

void ODM_AntennaDiversity_88E(struct odm_dm_struct *dm_odm)
@@ -363,7 +361,7 @@ void ODM_AntennaDiversity_88E(struct odm_dm_struct *dm_odm) 
		}

		}

	}

	}

	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))

		odm_HWAntDiv(dm_odm);

		rtl88eu_dm_hw_ant_div(dm_odm);

}

}





/* 3============================================================ */

/* 3============================================================ */