Commit 86f0bea7 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: make odm_FalseAlarmCounterStatistics() static 



Function odm_FalseAlarmCounterStatistics() is only used in odm.c.
Make it static.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20211229205108.26373-23-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e6b5ad5e

drivers/staging/r8188eu/hal/odm.c

+56 −60
Original line number Diff line number Diff line
@@ -373,6 +373,62 @@ static void odm_DynamicBBPowerSavingInit(struct odm_dm_struct *pDM_Odm) 
	pDM_PSTable->initialize = 0;

}



static void odm_FalseAlarmCounterStatistics(struct odm_dm_struct *pDM_Odm)

{

	u32 ret_value;

	struct false_alarm_stats *FalseAlmCnt = &pDM_Odm->FalseAlmCnt;

	struct adapter *adapter = pDM_Odm->Adapter;



	if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT))

		return;



	/* hold ofdm counter */

	rtl8188e_PHY_SetBBReg(adapter, ODM_REG_OFDM_FA_HOLDC_11N, BIT(31), 1); /* hold page C counter */

	rtl8188e_PHY_SetBBReg(adapter, ODM_REG_OFDM_FA_RSTD_11N, BIT(31), 1); /* hold page D counter */



	ret_value = rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_OFDM_FA_TYPE1_11N, bMaskDWord);

	FalseAlmCnt->Cnt_Fast_Fsync = (ret_value & 0xffff);

	FalseAlmCnt->Cnt_SB_Search_fail = ((ret_value & 0xffff0000) >> 16);

	ret_value = rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_OFDM_FA_TYPE2_11N, bMaskDWord);

	FalseAlmCnt->Cnt_OFDM_CCA = (ret_value & 0xffff);

	FalseAlmCnt->Cnt_Parity_Fail = ((ret_value & 0xffff0000) >> 16);

	ret_value = rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_OFDM_FA_TYPE3_11N, bMaskDWord);

	FalseAlmCnt->Cnt_Rate_Illegal = (ret_value & 0xffff);

	FalseAlmCnt->Cnt_Crc8_fail = ((ret_value & 0xffff0000) >> 16);

	ret_value = rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_OFDM_FA_TYPE4_11N, bMaskDWord);

	FalseAlmCnt->Cnt_Mcs_fail = (ret_value & 0xffff);



	FalseAlmCnt->Cnt_Ofdm_fail = FalseAlmCnt->Cnt_Parity_Fail + FalseAlmCnt->Cnt_Rate_Illegal +

				     FalseAlmCnt->Cnt_Crc8_fail + FalseAlmCnt->Cnt_Mcs_fail +

				     FalseAlmCnt->Cnt_Fast_Fsync + FalseAlmCnt->Cnt_SB_Search_fail;



	ret_value = rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_SC_CNT_11N, bMaskDWord);

	FalseAlmCnt->Cnt_BW_LSC = (ret_value & 0xffff);

	FalseAlmCnt->Cnt_BW_USC = ((ret_value & 0xffff0000) >> 16);



	/* hold cck counter */

	rtl8188e_PHY_SetBBReg(adapter, ODM_REG_CCK_FA_RST_11N, BIT(12), 1);

	rtl8188e_PHY_SetBBReg(adapter, ODM_REG_CCK_FA_RST_11N, BIT(14), 1);



	ret_value = rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_CCK_FA_LSB_11N, bMaskByte0);

	FalseAlmCnt->Cnt_Cck_fail = ret_value;

	ret_value = rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_CCK_FA_MSB_11N, bMaskByte3);

	FalseAlmCnt->Cnt_Cck_fail +=  (ret_value & 0xff) << 8;



	ret_value = rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_CCK_CCA_CNT_11N, bMaskDWord);

	FalseAlmCnt->Cnt_CCK_CCA = ((ret_value & 0xFF) << 8) | ((ret_value & 0xFF00) >> 8);



	FalseAlmCnt->Cnt_all = (FalseAlmCnt->Cnt_Fast_Fsync +

				FalseAlmCnt->Cnt_SB_Search_fail +

				FalseAlmCnt->Cnt_Parity_Fail +

				FalseAlmCnt->Cnt_Rate_Illegal +

				FalseAlmCnt->Cnt_Crc8_fail +

				FalseAlmCnt->Cnt_Mcs_fail +

				FalseAlmCnt->Cnt_Cck_fail);



	FalseAlmCnt->Cnt_CCA_all = FalseAlmCnt->Cnt_OFDM_CCA + FalseAlmCnt->Cnt_CCK_CCA;

}



/* 3 Export Interface */



/*  2011/09/21 MH Add to describe different team necessary resource allocate?? */
@@ -507,66 +563,6 @@ void ODM_Write_DIG(struct odm_dm_struct *pDM_Odm, u8 CurrentIGI) 
	}

}



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

/* 3 FASLE ALARM CHECK */

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



void odm_FalseAlarmCounterStatistics(struct odm_dm_struct *pDM_Odm)

{

	u32 ret_value;

	struct false_alarm_stats *FalseAlmCnt = &pDM_Odm->FalseAlmCnt;

	struct adapter *adapter = pDM_Odm->Adapter;



	if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT))

		return;



	/* hold ofdm counter */

	rtl8188e_PHY_SetBBReg(adapter, ODM_REG_OFDM_FA_HOLDC_11N, BIT(31), 1); /* hold page C counter */

	rtl8188e_PHY_SetBBReg(adapter, ODM_REG_OFDM_FA_RSTD_11N, BIT(31), 1); /* hold page D counter */



	ret_value = rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_OFDM_FA_TYPE1_11N, bMaskDWord);

	FalseAlmCnt->Cnt_Fast_Fsync = (ret_value & 0xffff);

	FalseAlmCnt->Cnt_SB_Search_fail = ((ret_value & 0xffff0000) >> 16);

	ret_value = rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_OFDM_FA_TYPE2_11N, bMaskDWord);

	FalseAlmCnt->Cnt_OFDM_CCA = (ret_value & 0xffff);

	FalseAlmCnt->Cnt_Parity_Fail = ((ret_value & 0xffff0000) >> 16);

	ret_value = rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_OFDM_FA_TYPE3_11N, bMaskDWord);

	FalseAlmCnt->Cnt_Rate_Illegal = (ret_value & 0xffff);

	FalseAlmCnt->Cnt_Crc8_fail = ((ret_value & 0xffff0000) >> 16);

	ret_value = rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_OFDM_FA_TYPE4_11N, bMaskDWord);

	FalseAlmCnt->Cnt_Mcs_fail = (ret_value & 0xffff);



	FalseAlmCnt->Cnt_Ofdm_fail = FalseAlmCnt->Cnt_Parity_Fail + FalseAlmCnt->Cnt_Rate_Illegal +

				     FalseAlmCnt->Cnt_Crc8_fail + FalseAlmCnt->Cnt_Mcs_fail +

				     FalseAlmCnt->Cnt_Fast_Fsync + FalseAlmCnt->Cnt_SB_Search_fail;



	ret_value = rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_SC_CNT_11N, bMaskDWord);

	FalseAlmCnt->Cnt_BW_LSC = (ret_value & 0xffff);

	FalseAlmCnt->Cnt_BW_USC = ((ret_value & 0xffff0000) >> 16);



	/* hold cck counter */

	rtl8188e_PHY_SetBBReg(adapter, ODM_REG_CCK_FA_RST_11N, BIT(12), 1);

	rtl8188e_PHY_SetBBReg(adapter, ODM_REG_CCK_FA_RST_11N, BIT(14), 1);



	ret_value = rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_CCK_FA_LSB_11N, bMaskByte0);

	FalseAlmCnt->Cnt_Cck_fail = ret_value;

	ret_value = rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_CCK_FA_MSB_11N, bMaskByte3);

	FalseAlmCnt->Cnt_Cck_fail +=  (ret_value & 0xff) << 8;



	ret_value = rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_CCK_CCA_CNT_11N, bMaskDWord);

	FalseAlmCnt->Cnt_CCK_CCA = ((ret_value & 0xFF) << 8) | ((ret_value & 0xFF00) >> 8);



	FalseAlmCnt->Cnt_all = (FalseAlmCnt->Cnt_Fast_Fsync +

				FalseAlmCnt->Cnt_SB_Search_fail +

				FalseAlmCnt->Cnt_Parity_Fail +

				FalseAlmCnt->Cnt_Rate_Illegal +

				FalseAlmCnt->Cnt_Crc8_fail +

				FalseAlmCnt->Cnt_Mcs_fail +

				FalseAlmCnt->Cnt_Cck_fail);



	FalseAlmCnt->Cnt_CCA_all = FalseAlmCnt->Cnt_OFDM_CCA + FalseAlmCnt->Cnt_CCK_CCA;

}



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

/* 3 CCK Packet Detect Threshold */

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

drivers/staging/r8188eu/include/odm_precomp.h

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 


void odm_TXPowerTrackingInit(struct odm_dm_struct *pDM_Odm);

void ODM_EdcaTurboInit(struct odm_dm_struct *pDM_Odm);

void odm_FalseAlarmCounterStatistics(struct odm_dm_struct *pDM_Odm);

void odm_CCKPacketDetectionThresh(struct odm_dm_struct *pDM_Odm);

void odm_EdcaTurboCheck(struct odm_dm_struct *pDM_Odm);

void odm_RSSIMonitorCheck(struct odm_dm_struct *pDM_Odm);