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

Commit cc25137f authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: Eliminate enum ODM_RADIO_PATH in favor of rf_radio_path 



There are two different enum statements that have been combined.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5fd5ca57

drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c

+2 −2
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *pDM_Odm) 
				else if (v1 == 0xf9)

					rtw_IOL_append_DELAY_US_cmd(pxmit_frame, 1);

				else

					rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A, (u16)v1, v2, bRFRegOffsetMask);

					rtw_IOL_append_WRF_cmd(pxmit_frame, RF_PATH_A, (u16)v1, v2, bRFRegOffsetMask);

			} else {

				odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2);

			}
@@ -247,7 +247,7 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *pDM_Odm) 
						else if (v1 == 0xf9)

							rtw_IOL_append_DELAY_US_cmd(pxmit_frame, 1);

						else

							rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A, (u16)v1, v2, bRFRegOffsetMask);

							rtw_IOL_append_WRF_cmd(pxmit_frame, RF_PATH_A, (u16)v1, v2, bRFRegOffsetMask);

					} else {

						odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2);

					}

drivers/staging/rtl8188eu/hal/odm_HWConfig.c

+16 −16
Original line number Diff line number Diff line
@@ -106,8 +106,8 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm, 


	isCCKrate = ((pPktinfo->Rate >= DESC92C_RATE1M) && (pPktinfo->Rate <= DESC92C_RATE11M)) ? true : false;



	pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_A] = -1;

	pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_B] = -1;

	pPhyInfo->RxMIMOSignalQuality[RF_PATH_A] = -1;

	pPhyInfo->RxMIMOSignalQuality[RF_PATH_B] = -1;



	if (isCCKrate) {

		u8 cck_agc_rpt;
@@ -190,15 +190,15 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm, 
					SQ = ((64-SQ_rpt) * 100) / 44;

			}

			pPhyInfo->SignalQuality = SQ;

			pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_A] = SQ;

			pPhyInfo->RxMIMOSignalQuality[ODM_RF_PATH_B] = -1;

			pPhyInfo->RxMIMOSignalQuality[RF_PATH_A] = SQ;

			pPhyInfo->RxMIMOSignalQuality[RF_PATH_B] = -1;

		}

	} else { /* is OFDM rate */

		dm_odm->PhyDbgInfo.NumQryPhyStatusOFDM++;



		/*  (1)Get RSSI for HT rate */



		 for (i = ODM_RF_PATH_A; i < ODM_RF_PATH_MAX; i++) {

		 for (i = RF_PATH_A; i < RF_PATH_MAX; i++) {

			/*  2008/01/30 MH we will judge RF RX path now. */

			if (dm_odm->RFPathRxEnable & BIT(i))

				rf_rx_num++;
@@ -252,7 +252,7 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm, 
			EVM = odm_EVMdbToPercentage((pPhyStaRpt->stream_rxevm[i]));	/* dbm */



			if (pPktinfo->bPacketMatchBSSID) {

				if (i == ODM_RF_PATH_A) /*  Fill value in RFD, Get the first spatial stream only */

				if (i == RF_PATH_A) /*  Fill value in RFD, Get the first spatial stream only */

					pPhyInfo->SignalQuality = (u8)(EVM & 0xff);

				pPhyInfo->RxMIMOSignalQuality[i] = (u8)(EVM & 0xff);

			}
@@ -330,15 +330,15 @@ static void odm_Process_RSSIForDM(struct odm_dm_struct *dm_odm, 


	if (pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon) {

		if (!isCCKrate) { /* ofdm rate */

			if (pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B] == 0) {

				RSSI_Ave = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A];

			if (pPhyInfo->RxMIMOSignalStrength[RF_PATH_B] == 0) {

				RSSI_Ave = pPhyInfo->RxMIMOSignalStrength[RF_PATH_A];

			} else {

				if (pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A] > pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B]) {

					RSSI_max = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A];

					RSSI_min = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B];

				if (pPhyInfo->RxMIMOSignalStrength[RF_PATH_A] > pPhyInfo->RxMIMOSignalStrength[RF_PATH_B]) {

					RSSI_max = pPhyInfo->RxMIMOSignalStrength[RF_PATH_A];

					RSSI_min = pPhyInfo->RxMIMOSignalStrength[RF_PATH_B];

				} else {

					RSSI_max = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_B];

					RSSI_min = pPhyInfo->RxMIMOSignalStrength[ODM_RF_PATH_A];

					RSSI_max = pPhyInfo->RxMIMOSignalStrength[RF_PATH_B];

					RSSI_min = pPhyInfo->RxMIMOSignalStrength[RF_PATH_A];

				}

				if ((RSSI_max - RSSI_min) < 3)

					RSSI_Ave = RSSI_max;
@@ -445,11 +445,11 @@ void ODM_MacStatusQuery(struct odm_dm_struct *dm_odm, u8 *mac_stat, 
}



enum HAL_STATUS ODM_ConfigRFWithHeaderFile(struct odm_dm_struct *dm_odm,

					   enum ODM_RF_RADIO_PATH content,

					   enum ODM_RF_RADIO_PATH rfpath)

					   enum rf_radio_path content,

					   enum rf_radio_path rfpath)

{

	ODM_RT_TRACE(dm_odm, ODM_COMP_INIT, ODM_DBG_LOUD, ("===>ODM_ConfigRFWithHeaderFile\n"));

	if (rfpath == ODM_RF_PATH_A)

	if (rfpath == RF_PATH_A)

		READ_AND_CONFIG(8188E, _RadioA_1T_);

	ODM_RT_TRACE(dm_odm, ODM_COMP_INIT, ODM_DBG_LOUD, (" ===> ODM_ConfigRFWithHeaderFile() Radio_A:Rtl8188ERadioA_1TArray\n"));

	ODM_RT_TRACE(dm_odm, ODM_COMP_INIT, ODM_DBG_LOUD, (" ===> ODM_ConfigRFWithHeaderFile() Radio_B:Rtl8188ERadioB_1TArray\n"));

drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include "odm_precomp.h"



void odm_ConfigRFReg_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr,

			   u32 Data, enum ODM_RF_RADIO_PATH RF_PATH,

			   u32 Data, enum rf_radio_path RF_PATH,

			   u32 RegAddr)

{

	struct adapter *adapter = pDM_Odm->Adapter;
@@ -50,7 +50,7 @@ void odm_ConfigRF_RadioA_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 Data 
	u32  content = 0x1000; /*  RF_Content: radioa_txt */

	u32 maskforPhySet = (u32)(content&0xE000);



	odm_ConfigRFReg_8188E(pDM_Odm, Addr, Data, ODM_RF_PATH_A, Addr|maskforPhySet);

	odm_ConfigRFReg_8188E(pDM_Odm, Addr, Data, RF_PATH_A, Addr|maskforPhySet);

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_TRACE, ("===> ODM_ConfigRFWithHeaderFile: [RadioA] %08X %08X\n", Addr, Data));

}
@@ -59,7 +59,7 @@ void odm_ConfigRF_RadioB_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 Data 
	u32  content = 0x1001; /*  RF_Content: radiob_txt */

	u32 maskforPhySet = (u32)(content&0xE000);



	odm_ConfigRFReg_8188E(pDM_Odm, Addr, Data, ODM_RF_PATH_B, Addr|maskforPhySet);

	odm_ConfigRFReg_8188E(pDM_Odm, Addr, Data, RF_PATH_B, Addr|maskforPhySet);



	ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_TRACE, ("===> ODM_ConfigRFWithHeaderFile: [RadioB] %08X %08X\n", Addr, Data));

}

drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c

+2 −2
Original line number Diff line number Diff line
@@ -518,11 +518,11 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter) 
		/*----Initialize RF fom connfiguration file----*/

		switch (eRFPath) {

		case RF_PATH_A:

			if (HAL_STATUS_FAILURE == ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, (enum ODM_RF_RADIO_PATH)eRFPath, (enum ODM_RF_RADIO_PATH)eRFPath))

			if (HAL_STATUS_FAILURE == ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, (enum rf_radio_path)eRFPath, (enum rf_radio_path)eRFPath))

				rtStatus = _FAIL;

			break;

		case RF_PATH_B:

		if (HAL_STATUS_FAILURE == ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, (enum ODM_RF_RADIO_PATH)eRFPath, (enum ODM_RF_RADIO_PATH)eRFPath))

		if (HAL_STATUS_FAILURE == ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, (enum rf_radio_path)eRFPath, (enum rf_radio_path)eRFPath))

				rtStatus = _FAIL;

			break;

		case RF_PATH_C:

drivers/staging/rtl8188eu/include/odm.h

+0 −7
Original line number Diff line number Diff line
@@ -928,13 +928,6 @@ struct odm_dm_struct { 


#define ODM_RF_PATH_MAX 3



enum ODM_RF_RADIO_PATH {

	ODM_RF_PATH_A = 0,   /* Radio Path A */

	ODM_RF_PATH_B = 1,   /* Radio Path B */

	ODM_RF_PATH_C = 2,   /* Radio Path C */

	ODM_RF_PATH_D = 3,   /* Radio Path D */

};



enum ODM_RF_CONTENT {

	odm_radioa_txt = 0x1000,

	odm_radiob_txt = 0x1001,