Commit c0cfe01f authored by Ana Rey's avatar Ana Rey Committed by Peter P Waskiewicz Jr
Browse files

staging: rtl8187se: Convert _RT_RF_POWER_STATE typedef into an enum 



The Documentation/CodingStyle doesn't recommend the use of typedef,
convert this to an enum.

While at it, I have also renamed the variable names that were used in
this typedef not to use Hungarian notation.

Signed-off-by: default avatarAna Rey <anarey@gmail.com>
Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
parent 8a8ec806

drivers/staging/rtl8187se/r8180.h

+8 −8
Original line number Diff line number Diff line
@@ -250,11 +250,11 @@ typedef enum _LED_CTL_MODE { 
	LED_CTL_POWER_OFF = 7

} LED_CTL_MODE;



typedef enum _RT_RF_POWER_STATE {

	eRfOn,

	eRfSleep,

	eRfOff

} RT_RF_POWER_STATE;

enum rt_rf_power_state {

	RF_ON,

	RF_SLEEP,

	RF_OFF

};



enum _ReasonCode {

	unspec_reason = 0x1,
@@ -467,8 +467,8 @@ struct r8180_priv { 
	struct timer_list watch_dog_timer;

	bool bInactivePs;

	bool bSwRfProcessing;

	RT_RF_POWER_STATE eInactivePowerState;

	RT_RF_POWER_STATE eRFPowerState;

	enum rt_rf_power_state eInactivePowerState;

	enum rt_rf_power_state eRFPowerState;

	u32 RfOffReason;

	bool RFChangeInProgress;

	bool SetRFPowerStateInProgress;
@@ -694,7 +694,7 @@ void fix_tx_fifo(struct net_device *dev); 
void rtl8225z2_SetTXPowerLevel(struct net_device *dev, short ch);

void rtl8180_rate_adapter(struct work_struct *work);

/* #endif */

bool MgntActSet_RF_State(struct net_device *dev, RT_RF_POWER_STATE StateToSet,

bool MgntActSet_RF_State(struct net_device *dev, enum rt_rf_power_state StateToSet,

			 u32 ChangeSource);



#endif

drivers/staging/rtl8187se/r8180_core.c

+8 −8
Original line number Diff line number Diff line
@@ -2439,7 +2439,7 @@ static short rtl8180_init(struct net_device *dev) 
	priv->bInactivePs = true; /* false; */

	priv->ieee80211->bInactivePs = priv->bInactivePs;

	priv->bSwRfProcessing = false;

	priv->eRFPowerState = eRfOff;

	priv->eRFPowerState = RF_OFF;

	priv->RfOffReason = 0;

	priv->led_strategy = SW_LED_MODE0;

	priv->TxPollingTimes = 0; /* lzm add 080826 */
@@ -2967,7 +2967,7 @@ void rtl8180_watch_dog(struct net_device *dev) 
		if ((priv->ieee80211->iw_mode != IW_MODE_ADHOC) &&

		    (priv->ieee80211->state == IEEE80211_NOLINK) &&

		    (priv->ieee80211->beinretry == false) &&

		    (priv->eRFPowerState == eRfOn))

		    (priv->eRFPowerState == RF_ON))

			IPSEnter(dev);

	}

	/* YJ,add,080828,for link state check */
@@ -3101,7 +3101,7 @@ int rtl8180_down(struct net_device *dev) 
	cancel_delayed_work(&priv->ieee80211->hw_dig_wq);

	cancel_delayed_work(&priv->ieee80211->tx_pw_wq);

	del_timer_sync(&priv->SwAntennaDiversityTimer);

	SetZebraRFPowerState8185(dev, eRfOff);

	SetZebraRFPowerState8185(dev, RF_OFF);

	memset(&priv->ieee80211->current_network,

		0, sizeof(struct ieee80211_network));

	priv->ieee80211->state = IEEE80211_NOLINK;
@@ -3752,7 +3752,7 @@ void GPIOChangeRFWorkItemCallBack(struct work_struct *work) 
	struct r8180_priv *priv = ieee80211_priv(dev);

	u8 btPSR;

	u8 btConfig0;

	RT_RF_POWER_STATE	eRfPowerStateToSet;

	enum rt_rf_power_state eRfPowerStateToSet;

	bool bActuallySet = false;



	char *argv[3];
@@ -3774,18 +3774,18 @@ void GPIOChangeRFWorkItemCallBack(struct work_struct *work) 
	/* HW radio On/Off according to the value of FF51[4](config0) */

	btConfig0 = btPSR = read_nic_byte(dev, CONFIG0);



	eRfPowerStateToSet = (btConfig0 & BIT4) ?  eRfOn : eRfOff;

	eRfPowerStateToSet = (btConfig0 & BIT4) ?  RF_ON : RF_OFF;



	/* Turn LED back on when radio enabled */

	if (eRfPowerStateToSet == eRfOn)

	if (eRfPowerStateToSet == RF_ON)

		write_nic_byte(dev, PSR, btPSR | BIT3);



	if ((priv->ieee80211->bHwRadioOff == true) &&

	   (eRfPowerStateToSet == eRfOn)) {

	   (eRfPowerStateToSet == RF_ON)) {

		priv->ieee80211->bHwRadioOff = false;

		bActuallySet = true;

	} else if ((priv->ieee80211->bHwRadioOff == false) &&

		  (eRfPowerStateToSet == eRfOff)) {

		  (eRfPowerStateToSet == RF_OFF)) {

		priv->ieee80211->bHwRadioOff = true;

		bActuallySet = true;

	}

drivers/staging/rtl8187se/r8180_dm.c

+3 −3
Original line number Diff line number Diff line
@@ -1116,14 +1116,14 @@ bool CheckTxPwrTracking(struct net_device *dev) 
void SwAntennaDiversityTimerCallback(struct net_device *dev)

{

	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);

	RT_RF_POWER_STATE rtState;

	enum rt_rf_power_state rtState;



	 /* We do NOT need to switch antenna while RF is off. */

	rtState = priv->eRFPowerState;

	do {

		if (rtState == eRfOff) {

		if (rtState == RF_OFF) {

			break;

		} else if (rtState == eRfSleep) {

		} else if (rtState == RF_SLEEP) {

			/* Don't access BB/RF under Disable PLL situation. */

			break;

		}

drivers/staging/rtl8187se/r8180_rtl8225.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ u16 RF_ReadReg(struct net_device *dev, u8 offset); 
void rtl8180_set_mode(struct net_device *dev, int mode);

void rtl8180_set_mode(struct net_device *dev, int mode);

bool SetZebraRFPowerState8185(struct net_device *dev,

			      RT_RF_POWER_STATE eRFPowerState);

			      enum rt_rf_power_state eRFPowerState);

void rtl8225z4_rf_sleep(struct net_device *dev);

void rtl8225z4_rf_wakeup(struct net_device *dev);

drivers/staging/rtl8187se/r8180_rtl8225z2.c

+6 −6
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ void rtl8225z2_rf_set_mode(struct net_device *dev) 
#define LPS_MAX_SLEEP_WAITING_TIMES_87SE	5



bool SetZebraRFPowerState8185(struct net_device *dev,

			      RT_RF_POWER_STATE eRFPowerState)

			      enum rt_rf_power_state eRFPowerState)

{

	struct r8180_priv *priv = ieee80211_priv(dev);

	u8			btCR9346, btConfig3;
@@ -672,7 +672,7 @@ bool SetZebraRFPowerState8185(struct net_device *dev, 
	write_nic_byte(dev, CONFIG3, (btConfig3 | CONFIG3_PARM_En));



	switch (eRFPowerState) {

	case eRfOn:

	case RF_ON:

		write_nic_word(dev, 0x37C, 0x00EC);



		/* turn on AFE */
@@ -697,7 +697,7 @@ bool SetZebraRFPowerState8185(struct net_device *dev, 
		u1bTmp = read_nic_byte(dev, 0x24E);

		write_nic_byte(dev, 0x24E, (u1bTmp & (~(BIT5 | BIT6))));

		break;

	case eRfSleep:

	case RF_SLEEP:

		for (QueueID = 0, i = 0; QueueID < 6;) {

			if (get_curr_tx_free_desc(dev, QueueID) ==

							priv->txringcount) {
@@ -764,7 +764,7 @@ bool SetZebraRFPowerState8185(struct net_device *dev, 
			}

		}

		break;

	case eRfOff:

	case RF_OFF:

		for (QueueID = 0, i = 0; QueueID < 6;) {

			if (get_curr_tx_free_desc(dev, QueueID) ==

					priv->txringcount) {
@@ -841,10 +841,10 @@ bool SetZebraRFPowerState8185(struct net_device *dev, 


void rtl8225z4_rf_sleep(struct net_device *dev)

{

	MgntActSet_RF_State(dev, eRfSleep, RF_CHANGE_BY_PS);

	MgntActSet_RF_State(dev, RF_SLEEP, RF_CHANGE_BY_PS);

}



void rtl8225z4_rf_wakeup(struct net_device *dev)

{

	MgntActSet_RF_State(dev, eRfOn, RF_CHANGE_BY_PS);

	MgntActSet_RF_State(dev, RF_ON, RF_CHANGE_BY_PS);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE