Commit a7645558 authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove ODM_RT_TRACE logs 



remove all ODM_RT_TRACE logs.

ODM_RT_TRACE macro default behaviour
is _trace nothing_. To enable it a hand code
edit is needed in hal/odm_debug.c.
So just remove it.

Applied the semantic patch:

@@
@@

-	ODM_RT_TRACE(...);

Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/23e21c100ba4f0753c6f03a1bb28d9bd7729b64b.1619794331.git.fabioaiuto83@gmail.com


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

drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c

+0 −62
Original line number Diff line number Diff line
@@ -33,47 +33,6 @@ static bool CheckPositive( 
		pDM_Odm->TypeALNA << 16 |

		pDM_Odm->TypeAPA << 24;



	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_TRACE,

		(

			"===> [8812A] CheckPositive (cond1, cond2) = (0x%X 0x%X)\n",

			cond1,

			cond2

		)

	);

	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_TRACE,

		(

			"===> [8812A] CheckPositive (driver1, driver2) = (0x%X 0x%X)\n",

			driver1,

			driver2

		)

	);



	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_TRACE,

		("	(Platform, Interface) = (0x%X, 0x%X)\n",

			pDM_Odm->SupportPlatform,

			pDM_Odm->SupportInterface

		)

	);

	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_TRACE,

		(

			"	(Board, Package) = (0x%X, 0x%X)\n",

			pDM_Odm->BoardType,

			pDM_Odm->PackageType

		)

	);





	/*  Value Defined Check =============== */

	/* QFN Type [15:12] and Cut Version [27:24] need to do value check */
@@ -263,13 +222,6 @@ void ODM_ReadAndConfig_MP_8723B_AGC_TAB(struct dm_odm_t *pDM_Odm) 
	u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_AGC_TAB);

	u32 *Array = Array_MP_8723B_AGC_TAB;



	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_LOUD,

		("===> ODM_ReadAndConfig_MP_8723B_AGC_TAB\n")

	);



	for (i = 0; i < ArrayLen; i += 2) {

		u32 v1 = Array[i];

		u32 v2 = Array[i+1];
@@ -532,13 +484,6 @@ void ODM_ReadAndConfig_MP_8723B_PHY_REG(struct dm_odm_t *pDM_Odm) 
	u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_PHY_REG);

	u32 *Array = Array_MP_8723B_PHY_REG;



	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_LOUD,

		("===> ODM_ReadAndConfig_MP_8723B_PHY_REG\n")

	);



	for (i = 0; i < ArrayLen; i += 2) {

		u32 v1 = Array[i];

		u32 v2 = Array[i+1];
@@ -611,13 +556,6 @@ void ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(struct dm_odm_t *pDM_Odm) 
	u32 i = 0;

	u32 *Array = Array_MP_8723B_PHY_REG_PG;



	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_LOUD,

		("===> ODM_ReadAndConfig_MP_8723B_PHY_REG_PG\n")

	);



	pDM_Odm->PhyRegPgVersion = 1;

	pDM_Odm->PhyRegPgValueType = PHY_REG_PG_EXACT_VALUE;

drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c

+0 −49
Original line number Diff line number Diff line
@@ -33,48 +33,6 @@ static bool CheckPositive( 
		pDM_Odm->TypeALNA << 16 |

		pDM_Odm->TypeAPA  << 24;



	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_TRACE,

		(

			"===> [8812A] CheckPositive (cond1, cond2) = (0x%X 0x%X)\n",

			cond1,

			cond2

		)

	);

	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_TRACE,

		(

			"===> [8812A] CheckPositive (driver1, driver2) = (0x%X 0x%X)\n",

			driver1,

			driver2

		)

	);



	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_TRACE,

		(

			"	(Platform, Interface) = (0x%X, 0x%X)\n",

			pDM_Odm->SupportPlatform,

			pDM_Odm->SupportInterface

		)

	);

	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_TRACE,

		(

			"	(Board, Package) = (0x%X, 0x%X)\n",

			pDM_Odm->BoardType,

			pDM_Odm->PackageType

		)

	);





	/*  Value Defined Check =============== */

	/* QFN Type [15:12] and Cut Version [27:24] need to do value check */
@@ -234,13 +192,6 @@ void ODM_ReadAndConfig_MP_8723B_MAC_REG(struct dm_odm_t *pDM_Odm) 
	u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_MAC_REG);

	u32 *Array = Array_MP_8723B_MAC_REG;



	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_LOUD,

		("===> ODM_ReadAndConfig_MP_8723B_MAC_REG\n")

	);



	for (i = 0; i < ArrayLen; i += 2) {

		u32 v1 = Array[i];

		u32 v2 = Array[i+1];

drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c

+0 −63
Original line number Diff line number Diff line
@@ -33,48 +33,6 @@ static bool CheckPositive( 
		pDM_Odm->TypeALNA << 16 |

		pDM_Odm->TypeAPA  << 24;



	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_TRACE,

		(

			"===> [8812A] CheckPositive (cond1, cond2) = (0x%X 0x%X)\n",

			cond1,

			cond2

		)

	);

	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_TRACE,

		(

			"===> [8812A] CheckPositive (driver1, driver2) = (0x%X 0x%X)\n",

			driver1,

			driver2

		)

	);



	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_TRACE,

		(

			"	(Platform, Interface) = (0x%X, 0x%X)\n",

			pDM_Odm->SupportPlatform,

			pDM_Odm->SupportInterface

		)

	);

	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_TRACE,

		(

			"	(Board, Package) = (0x%X, 0x%X)\n",

			pDM_Odm->BoardType,

			pDM_Odm->PackageType

		)

	);



	/*  Value Defined Check =============== */

	/* QFN Type [15:12] and Cut Version [27:24] need to do value check */
@@ -265,13 +223,6 @@ void ODM_ReadAndConfig_MP_8723B_RadioA(struct dm_odm_t *pDM_Odm) 
	u32 ArrayLen = ARRAY_SIZE(Array_MP_8723B_RadioA);

	u32 *Array = Array_MP_8723B_RadioA;



	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_LOUD,

		("===> ODM_ReadAndConfig_MP_8723B_RadioA\n")

	);



	for (i = 0; i < ArrayLen; i += 2) {

		u32 v1 = Array[i];

		u32 v2 = Array[i+1];
@@ -424,13 +375,6 @@ void ODM_ReadAndConfig_MP_8723B_TxPowerTrack_SDIO(struct dm_odm_t *pDM_Odm) 
{

	struct odm_rf_cal_t *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo;



	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_LOUD,

		("===> ODM_ReadAndConfig_MP_MP_8723B\n")

	);





	memcpy(

		pRFCalibrateInfo->DeltaSwingTableIdx_2GA_P,
@@ -760,13 +704,6 @@ void ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(struct dm_odm_t *pDM_Odm) 
	u32 i = 0;

	u8 **Array = Array_MP_8723B_TXPWR_LMT;



	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_INIT,

		ODM_DBG_LOUD,

		("===> ODM_ReadAndConfig_MP_8723B_TXPWR_LMT\n")

	);



	for (i = 0; i < ARRAY_SIZE(Array_MP_8723B_TXPWR_LMT); i += 7) {

		u8 *regulation = Array[i];

		u8 *band = Array[i+1];

drivers/staging/rtl8723bs/hal/HalPhyRf.c

+3 −322
Original line number Diff line number Diff line
@@ -108,18 +108,6 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) 
	pDM_Odm->RFCalibrateInfo.TXPowerTrackingCallbackCnt++;

	pDM_Odm->RFCalibrateInfo.bTXPowerTrackingInit = true;



	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_TX_PWR_TRACK,

		ODM_DBG_LOUD,

		(

			"===>ODM_TXPowerTrackingCallback_ThermalMeter,\npDM_Odm->BbSwingIdxCckBase: %d, pDM_Odm->BbSwingIdxOfdmBase[A]: %d, pDM_Odm->DefaultOfdmIndex: %d\n",

			pDM_Odm->BbSwingIdxCckBase,

			pDM_Odm->BbSwingIdxOfdmBase[ODM_RF_PATH_A],

			pDM_Odm->DefaultOfdmIndex

		)

	);



	ThermalValue = (u8)PHY_QueryRFReg(pDM_Odm->Adapter, ODM_RF_PATH_A, c.ThermalRegAddr, 0xfc00);	/* 0x42: RF Reg[15:10] 88E */

	if (

		!pDM_Odm->RFCalibrateInfo.TxPowerTrackControl ||
@@ -131,11 +119,7 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) 
	/* 4 3. Initialize ThermalValues of RFCalibrateInfo */



	if (pDM_Odm->RFCalibrateInfo.bReloadtxpowerindex)

		ODM_RT_TRACE(

			pDM_Odm,

			ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD,

			("reload ofdm index for band switch\n")

		);

		{}



	/* 4 4. Calculate average thermal meter */
@@ -154,16 +138,6 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) 
	/* Calculate Average ThermalValue after average enough times */

	if (ThermalValue_AVG_count) {

		ThermalValue = (u8)(ThermalValue_AVG / ThermalValue_AVG_count);

		ODM_RT_TRACE(

			pDM_Odm,

			ODM_COMP_TX_PWR_TRACK,

			ODM_DBG_LOUD,

			(

				"AVG Thermal Meter = 0x%X, EFUSE Thermal Base = 0x%X\n",

				ThermalValue,

				pHalData->EEPROMThermalMeter

			)

		);

	}



	/* 4 5. Calculate delta, delta_LCK, delta_IQK. */
@@ -181,31 +155,9 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) 
		(ThermalValue - pDM_Odm->RFCalibrateInfo.ThermalValue_IQK) :

		(pDM_Odm->RFCalibrateInfo.ThermalValue_IQK - ThermalValue);



	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_TX_PWR_TRACK,

		ODM_DBG_LOUD,

		(

			"(delta, delta_LCK, delta_IQK) = (%d, %d, %d)\n",

			delta,

			delta_LCK,

			delta_IQK

		)

	);



	/* 4 6. If necessary, do LCK. */

	/*  Delta temperature is equal to or larger than 20 centigrade. */

	if (delta_LCK >= c.Threshold_IQK) {

		ODM_RT_TRACE(

			pDM_Odm,

			ODM_COMP_TX_PWR_TRACK,

			ODM_DBG_LOUD,

			(

				"delta_LCK(%d) >= Threshold_IQK(%d)\n",

				delta_LCK,

				c.Threshold_IQK

			)

		);

		pDM_Odm->RFCalibrateInfo.ThermalValue_LCK = ThermalValue;

		if (c.PHY_LCCalibrate)

			(*c.PHY_LCCalibrate)(pDM_Odm);
@@ -224,16 +176,6 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) 


		/* 4 7.1 The Final Power Index = BaseIndex + PowerIndexOffset */

		if (ThermalValue > pHalData->EEPROMThermalMeter) {

			ODM_RT_TRACE(

				pDM_Odm,

				ODM_COMP_TX_PWR_TRACK,

				ODM_DBG_LOUD,

				(

					"deltaSwingTableIdx_TUP_A[%d] = %d\n",

					delta,

					deltaSwingTableIdx_TUP_A[delta]

				)

			);

			pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast[ODM_RF_PATH_A] =

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[ODM_RF_PATH_A];

			pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[ODM_RF_PATH_A] =
@@ -243,27 +185,7 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) 
			pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_A] =

				deltaSwingTableIdx_TUP_A[delta];



			ODM_RT_TRACE(

				pDM_Odm,

				ODM_COMP_TX_PWR_TRACK,

				ODM_DBG_LOUD,

				(

					"******Temp is higher and pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_A] = %d\n",

					pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_A]

				)

			);



			if (c.RfPathCount > 1) {

				ODM_RT_TRACE(

					pDM_Odm,

					ODM_COMP_TX_PWR_TRACK,

					ODM_DBG_LOUD,

					(

						"deltaSwingTableIdx_TUP_B[%d] = %d\n",

						delta,

						deltaSwingTableIdx_TUP_B[delta]

					)

				);

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast[ODM_RF_PATH_B] =

					pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[ODM_RF_PATH_B];

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[ODM_RF_PATH_B] =
@@ -272,29 +194,9 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) 
				/*  Record delta swing for mix mode power tracking */

				pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_B] =

					deltaSwingTableIdx_TUP_B[delta];

				ODM_RT_TRACE(

					pDM_Odm,

					ODM_COMP_TX_PWR_TRACK,

					ODM_DBG_LOUD,

					(

						"******Temp is higher and pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_B] = %d\n",

						pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_B]

					)

				);

			}



		} else {

			ODM_RT_TRACE(

				pDM_Odm,

				ODM_COMP_TX_PWR_TRACK,

				ODM_DBG_LOUD,

				(

					"deltaSwingTableIdx_TDOWN_A[%d] = %d\n",

					delta,

					deltaSwingTableIdx_TDOWN_A[delta]

				)

			);



			pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast[ODM_RF_PATH_A] =

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[ODM_RF_PATH_A];

			pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[ODM_RF_PATH_A] =
@@ -304,28 +206,7 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) 
			pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_A] =

				-1 * deltaSwingTableIdx_TDOWN_A[delta];



			ODM_RT_TRACE(

				pDM_Odm,

				ODM_COMP_TX_PWR_TRACK,

				ODM_DBG_LOUD,

				(

					"******Temp is lower and pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_A] = %d\n",

					pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_A]

				)

			);



			if (c.RfPathCount > 1) {

				ODM_RT_TRACE(

					pDM_Odm,

					ODM_COMP_TX_PWR_TRACK,

					ODM_DBG_LOUD,

					(

						"deltaSwingTableIdx_TDOWN_B[%d] = %d\n",

						delta,

						deltaSwingTableIdx_TDOWN_B[delta]

					)

				);



				pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast[ODM_RF_PATH_B] =

					pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[ODM_RF_PATH_B];

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[ODM_RF_PATH_B] =
@@ -334,30 +215,10 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) 
				 /*  Record delta swing for mix mode power tracking */

				pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_B] =

					-1 * deltaSwingTableIdx_TDOWN_B[delta];



				ODM_RT_TRACE(

					pDM_Odm,

					ODM_COMP_TX_PWR_TRACK,

					ODM_DBG_LOUD,

					(

						"******Temp is lower and pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_B] = %d\n",

						pDM_Odm->Absolute_OFDMSwingIdx[ODM_RF_PATH_B]

					)

				);

			}

		}



		for (p = ODM_RF_PATH_A; p < c.RfPathCount; p++) {

			ODM_RT_TRACE(

				pDM_Odm,

				ODM_COMP_TX_PWR_TRACK,

				ODM_DBG_LOUD,

				(

					"\n\n ================================ [Path-%c] Calculating PowerIndexOffset ================================\n",

					(p == ODM_RF_PATH_A ? 'A' : 'B')

				)

			);



			if (

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[p] ==

				pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast[p]
@@ -366,20 +227,6 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) 
			else

				pDM_Odm->RFCalibrateInfo.PowerIndexOffset[p] = pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[p] - pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast[p];      /*  Power Index Diff between 2 times Power Tracking */



			ODM_RT_TRACE(

				pDM_Odm,

				ODM_COMP_TX_PWR_TRACK,

				ODM_DBG_LOUD,

				(

					"[Path-%c] PowerIndexOffset(%d) = DeltaPowerIndex(%d) - DeltaPowerIndexLast(%d)\n",

					(

						p == ODM_RF_PATH_A ? 'A' : 'B'),

						pDM_Odm->RFCalibrateInfo.PowerIndexOffset[p],

						pDM_Odm->RFCalibrateInfo.DeltaPowerIndex[p],

						pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast[p]

					)

				);



			pDM_Odm->RFCalibrateInfo.OFDM_index[p] =

				pDM_Odm->BbSwingIdxOfdmBase[p] +

				pDM_Odm->RFCalibrateInfo.PowerIndexOffset[p];
@@ -394,87 +241,23 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) 
			pDM_Odm->BbSwingIdxOfdm[p] =

				pDM_Odm->RFCalibrateInfo.OFDM_index[p];



			/*  *************Print BB Swing Base and Index Offset************* */

			ODM_RT_TRACE(

				pDM_Odm,

				ODM_COMP_TX_PWR_TRACK,

				ODM_DBG_LOUD,

				(

					"The 'CCK' final index(%d) = BaseIndex(%d) + PowerIndexOffset(%d)\n",

					pDM_Odm->BbSwingIdxCck,

					pDM_Odm->BbSwingIdxCckBase,

					pDM_Odm->RFCalibrateInfo.PowerIndexOffset[p]

				)

			);

			ODM_RT_TRACE(

				pDM_Odm,

				ODM_COMP_TX_PWR_TRACK,

				ODM_DBG_LOUD,

				(

					"The 'OFDM' final index(%d) = BaseIndex[%c](%d) + PowerIndexOffset(%d)\n",

					pDM_Odm->BbSwingIdxOfdm[p],

					(p == ODM_RF_PATH_A ? 'A' : 'B'),

					pDM_Odm->BbSwingIdxOfdmBase[p],

					pDM_Odm->RFCalibrateInfo.PowerIndexOffset[p]

				)

			);



			/* 4 7.1 Handle boundary conditions of index. */

			if (pDM_Odm->RFCalibrateInfo.OFDM_index[p] > c.SwingTableSize_OFDM-1)

				pDM_Odm->RFCalibrateInfo.OFDM_index[p] = c.SwingTableSize_OFDM-1;

			else if (pDM_Odm->RFCalibrateInfo.OFDM_index[p] < OFDM_min_index)

				pDM_Odm->RFCalibrateInfo.OFDM_index[p] = OFDM_min_index;

		}

		ODM_RT_TRACE(

			pDM_Odm,

			ODM_COMP_TX_PWR_TRACK,

			ODM_DBG_LOUD,

			("\n\n ========================================================================================================\n")

		);

		if (pDM_Odm->RFCalibrateInfo.CCK_index > c.SwingTableSize_CCK-1)

			pDM_Odm->RFCalibrateInfo.CCK_index = c.SwingTableSize_CCK-1;

		/* else if (pDM_Odm->RFCalibrateInfo.CCK_index < 0) */

			/* pDM_Odm->RFCalibrateInfo.CCK_index = 0; */

	} else {

		ODM_RT_TRACE(

			pDM_Odm,

			ODM_COMP_TX_PWR_TRACK,

			ODM_DBG_LOUD,

			(

				"The thermal meter is unchanged or TxPowerTracking OFF(%d): ThermalValue: %d , pDM_Odm->RFCalibrateInfo.ThermalValue: %d\n",

				pDM_Odm->RFCalibrateInfo.TxPowerTrackControl,

				ThermalValue,

				pDM_Odm->RFCalibrateInfo.ThermalValue

			)

		);



			for (p = ODM_RF_PATH_A; p < c.RfPathCount; p++)

				pDM_Odm->RFCalibrateInfo.PowerIndexOffset[p] = 0;

	}

	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_TX_PWR_TRACK,

		ODM_DBG_LOUD,

		(

			"TxPowerTracking: [CCK] Swing Current Index: %d, Swing Base Index: %d\n",

			pDM_Odm->RFCalibrateInfo.CCK_index,

			pDM_Odm->BbSwingIdxCckBase

		)

	);



	/* Print Swing base & current */

	for (p = ODM_RF_PATH_A; p < c.RfPathCount; p++) {

		ODM_RT_TRACE(

			pDM_Odm,

			ODM_COMP_TX_PWR_TRACK,

			ODM_DBG_LOUD,

			(

				"TxPowerTracking: [OFDM] Swing Current Index: %d, Swing Base Index[%c]: %d\n",

				pDM_Odm->RFCalibrateInfo.OFDM_index[p],

				(p == ODM_RF_PATH_A ? 'A' : 'B'),

				pDM_Odm->BbSwingIdxOfdmBase[p]

			)

		);

	}



	if (
@@ -491,105 +274,20 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) 
		/*  */

		/*  2012/04/25 MH Add for tx power tracking to set tx power in tx agc for 88E. */

		if (ThermalValue > pDM_Odm->RFCalibrateInfo.ThermalValue) {

			ODM_RT_TRACE(

				pDM_Odm,

				ODM_COMP_TX_PWR_TRACK,

				ODM_DBG_LOUD,

				(

					"Temperature Increasing(A): delta_pi: %d , delta_t: %d, Now_t: %d, EFUSE_t: %d, Last_t: %d\n",

					pDM_Odm->RFCalibrateInfo.PowerIndexOffset[ODM_RF_PATH_A],

					delta,

					ThermalValue,

					pHalData->EEPROMThermalMeter,

					pDM_Odm->RFCalibrateInfo.ThermalValue

				)

			);



			if (c.RfPathCount > 1)

				ODM_RT_TRACE(

					pDM_Odm,

					ODM_COMP_TX_PWR_TRACK,

					ODM_DBG_LOUD,

					(

						"Temperature Increasing(B): delta_pi: %d , delta_t: %d, Now_t: %d, EFUSE_t: %d, Last_t: %d\n",

						pDM_Odm->RFCalibrateInfo.PowerIndexOffset[ODM_RF_PATH_B],

						delta,

						ThermalValue,

						pHalData->EEPROMThermalMeter,

						pDM_Odm->RFCalibrateInfo.ThermalValue

					)

				);

				{}



		} else if (ThermalValue < pDM_Odm->RFCalibrateInfo.ThermalValue) { /*  Low temperature */

			ODM_RT_TRACE(

				pDM_Odm,

				ODM_COMP_TX_PWR_TRACK,

				ODM_DBG_LOUD,

				(

					"Temperature Decreasing(A): delta_pi: %d , delta_t: %d, Now_t: %d, EFUSE_t: %d, Last_t: %d\n",

					pDM_Odm->RFCalibrateInfo.PowerIndexOffset[ODM_RF_PATH_A],

					delta,

					ThermalValue,

					pHalData->EEPROMThermalMeter,

					pDM_Odm->RFCalibrateInfo.ThermalValue

				)

			);



			if (c.RfPathCount > 1)

				ODM_RT_TRACE(

					pDM_Odm,

					ODM_COMP_TX_PWR_TRACK,

					ODM_DBG_LOUD,

					(

						"Temperature Decreasing(B): delta_pi: %d , delta_t: %d, Now_t: %d, EFUSE_t: %d, Last_t: %d\n",

						pDM_Odm->RFCalibrateInfo.PowerIndexOffset[ODM_RF_PATH_B],

						delta,

						ThermalValue,

						pHalData->EEPROMThermalMeter,

						pDM_Odm->RFCalibrateInfo.ThermalValue

					)

				);

				{}



		}



		if (ThermalValue > pHalData->EEPROMThermalMeter) {

			ODM_RT_TRACE(

				pDM_Odm,

				ODM_COMP_TX_PWR_TRACK,

				ODM_DBG_LOUD,

				(

					"Temperature(%d) higher than PG value(%d)\n",

					ThermalValue,

					pHalData->EEPROMThermalMeter

				)

			);



			ODM_RT_TRACE(

				pDM_Odm,

				ODM_COMP_TX_PWR_TRACK,

				ODM_DBG_LOUD,

				("**********Enter POWER Tracking MIX_MODE**********\n")

			);

			for (p = ODM_RF_PATH_A; p < c.RfPathCount; p++)

					(*c.ODM_TxPwrTrackSetPwr)(pDM_Odm, MIX_MODE, p, 0);

		} else {

			ODM_RT_TRACE(

				pDM_Odm,

				ODM_COMP_TX_PWR_TRACK,

				ODM_DBG_LOUD,

				(

					"Temperature(%d) lower than PG value(%d)\n",

					ThermalValue,

					pHalData->EEPROMThermalMeter

				)

			);



			ODM_RT_TRACE(

				pDM_Odm,

				ODM_COMP_TX_PWR_TRACK,

				ODM_DBG_LOUD,

				("**********Enter POWER Tracking MIX_MODE**********\n")

			);

			for (p = ODM_RF_PATH_A; p < c.RfPathCount; p++)

				(*c.ODM_TxPwrTrackSetPwr)(pDM_Odm, MIX_MODE, p, Indexforchannel);

		}
@@ -599,26 +297,9 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) 
		for (p = ODM_RF_PATH_A; p < c.RfPathCount; p++)

			pDM_Odm->BbSwingIdxOfdmBase[p] = pDM_Odm->BbSwingIdxOfdm[p];



		ODM_RT_TRACE(

			pDM_Odm,

			ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD,

			(

				"pDM_Odm->RFCalibrateInfo.ThermalValue = %d ThermalValue = %d\n",

				pDM_Odm->RFCalibrateInfo.ThermalValue,

				ThermalValue

			)

		);



		/* Record last Power Tracking Thermal Value */

		pDM_Odm->RFCalibrateInfo.ThermalValue = ThermalValue;

	}



	ODM_RT_TRACE(

		pDM_Odm,

		ODM_COMP_TX_PWR_TRACK,

		ODM_DBG_LOUD,

		("<===ODM_TXPowerTrackingCallback_ThermalMeter\n")

	);



	pDM_Odm->RFCalibrateInfo.TXPowercount = 0;

}

drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c

+2 −138

File changed.

Preview size limit exceeded, changes collapsed.