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

Commit ad74e91d authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: replace typedef enum tagCMD_STATE with enum vnt_cmd_state 



Replacing variables.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 80f0d092

drivers/staging/vt6656/device.h

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ struct vnt_private { 
	/* Beacon releated */

	u16 wSeqCounter;



	CMD_STATE eCommandState;

	enum vnt_cmd_state command_state;



	enum vnt_cmd command;

drivers/staging/vt6656/wcmd.c

+9 −9
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ void vRunCommand(struct work_struct *work) 
	if (priv->bCmdRunning != true)

		return;



	switch (priv->eCommandState) {

	switch (priv->command_state) {

	case WLAN_CMD_INIT_MAC80211_START:

		if (priv->mac_hw)

			break;
@@ -139,7 +139,7 @@ void vRunCommand(struct work_struct *work) 
static int s_bCommandComplete(struct vnt_private *priv)

{



	priv->eCommandState = WLAN_CMD_IDLE;

	priv->command_state = WLAN_CMD_IDLE;

	if (priv->cbFreeCmdQueue == CMD_Q_SIZE) {

		/* Command Queue Empty */

		priv->bCmdRunning = false;
@@ -154,27 +154,27 @@ static int s_bCommandComplete(struct vnt_private *priv) 


	switch (priv->command) {

	case WLAN_CMD_INIT_MAC80211:

		priv->eCommandState = WLAN_CMD_INIT_MAC80211_START;

		priv->command_state = WLAN_CMD_INIT_MAC80211_START;

		break;



	case WLAN_CMD_TBTT_WAKEUP:

		priv->eCommandState = WLAN_CMD_TBTT_WAKEUP_START;

		priv->command_state = WLAN_CMD_TBTT_WAKEUP_START;

		break;



	case WLAN_CMD_BECON_SEND:

		priv->eCommandState = WLAN_CMD_BECON_SEND_START;

		priv->command_state = WLAN_CMD_BECON_SEND_START;

		break;



	case WLAN_CMD_SETPOWER:

		priv->eCommandState = WLAN_CMD_SETPOWER_START;

		priv->command_state = WLAN_CMD_SETPOWER_START;

		break;



	case WLAN_CMD_CHANGE_ANTENNA:

		priv->eCommandState = WLAN_CMD_CHANGE_ANTENNA_START;

		priv->command_state = WLAN_CMD_CHANGE_ANTENNA_START;

		break;



	case WLAN_CMD_11H_CHSW:

		priv->eCommandState = WLAN_CMD_11H_CHSW_START;

		priv->command_state = WLAN_CMD_11H_CHSW_START;

		break;



	default:
@@ -209,7 +209,7 @@ void vResetCommandTimer(struct vnt_private *priv) 
	priv->cbFreeCmdQueue = CMD_Q_SIZE;

	priv->uCmdDequeueIdx = 0;

	priv->uCmdEnqueueIdx = 0;

	priv->eCommandState = WLAN_CMD_IDLE;

	priv->command_state = WLAN_CMD_IDLE;

	priv->bCmdRunning = false;

	priv->bCmdClear = false;

}

drivers/staging/vt6656/wcmd.h

+10 −10
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ typedef struct tagCMD_ITEM { 
	enum vnt_cmd cmd;

} CMD_ITEM, *PCMD_ITEM;



// Command state

typedef enum tagCMD_STATE {

/* Command state */

enum vnt_cmd_state {

	WLAN_CMD_INIT_MAC80211_START,

	WLAN_CMD_SETPOWER_START,

	WLAN_CMD_TBTT_WAKEUP_START,
@@ -69,7 +69,7 @@ typedef enum tagCMD_STATE { 
	WLAN_CMD_CHANGE_ANTENNA_START,

	WLAN_CMD_11H_CHSW_START,

	WLAN_CMD_IDLE

} CMD_STATE, *PCMD_STATE;

};



struct vnt_private;