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

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

staging: rtl8188eu: Rework function PHY_SetBWMode8188E() 



Rename CamelCase variables and function name.

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

drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) 


	pHalFunc->read_chip_version = &rtl8188e_read_chip_version;



	pHalFunc->set_bwmode_handler = &PHY_SetBWMode8188E;

	pHalFunc->set_bwmode_handler = &phy_set_bw_mode;

	pHalFunc->set_channel_handler = &PHY_SwChnl8188E;



	pHalFunc->hal_dm_watchdog = &rtl8188e_HalDmWatchDog;

drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c

+9 −24
Original line number Diff line number Diff line
@@ -319,34 +319,19 @@ static void phy_set_bw_mode_callback(struct adapter *adapt) 
	}

}



 /*-----------------------------------------------------------------------------

 * Function:   SetBWMode8190Pci()

 *

 * Overview:  This function is export to "HalCommon" moudule

 *

 * Input:		struct adapter *Adapter

 *			enum ht_channel_width Bandwidth	20M or 40M

 *

 * Output:      NONE

 *

 * Return:      NONE

 *

 * Note:		We do not take j mode into consideration now

 *---------------------------------------------------------------------------*/

void PHY_SetBWMode8188E(struct adapter *Adapter, enum ht_channel_width Bandwidth,	/*  20M or 40M */

			unsigned char	Offset)		/*  Upper, Lower, or Don't care */

void phy_set_bw_mode(struct adapter *adapt, enum ht_channel_width bandwidth,

		     unsigned char offset)

{

	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);

	enum ht_channel_width tmpBW = pHalData->CurrentChannelBW;



	pHalData->CurrentChannelBW = Bandwidth;

	struct hal_data_8188e	*hal_data = GET_HAL_DATA(adapt);

	enum ht_channel_width tmp_bw = hal_data->CurrentChannelBW;



	pHalData->nCur40MhzPrimeSC = Offset;

	hal_data->CurrentChannelBW = bandwidth;

	hal_data->nCur40MhzPrimeSC = offset;



	if ((!Adapter->bDriverStopped) && (!Adapter->bSurpriseRemoved))

		phy_set_bw_mode_callback(Adapter);

	if ((!adapt->bDriverStopped) && (!adapt->bSurpriseRemoved))

		phy_set_bw_mode_callback(adapt);

	else

		pHalData->CurrentChannelBW = tmpBW;

		hal_data->CurrentChannelBW = tmp_bw;

}



static void phy_sw_chnl_callback(struct adapter *adapt, u8 channel)

drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h

+0 −4
Original line number Diff line number Diff line
@@ -207,10 +207,6 @@ void PHY_GetTxPowerLevel8188E(struct adapter *adapter, u32 *powerlevel); 


void PHY_ScanOperationBackup8188E(struct adapter *Adapter, u8 Operation);



/*  Switch bandwidth for 8192S */

void PHY_SetBWMode8188E(struct adapter *adapter,

			enum ht_channel_width chnlwidth, unsigned char offset);



/*  channel switch related funciton */

void PHY_SwChnl8188E(struct adapter *adapter, u8 channel);

/*  Call after initialization */

drivers/staging/rtl8188eu/include/phy.h

+3 −0
Original line number Diff line number Diff line
@@ -10,3 +10,6 @@ void phy_set_rf_reg(struct adapter *adapt, enum rf_radio_path rf_path, 
		    u32 reg_addr, u32 bit_mask, u32 data);



void phy_set_tx_power_level(struct adapter *adapt, u8 channel);



void phy_set_bw_mode(struct adapter *adapt, enum ht_channel_width bandwidth,

		     unsigned char offset);