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

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
...@@ -398,7 +398,7 @@ struct vnt_private { ...@@ -398,7 +398,7 @@ struct vnt_private {
/* Beacon releated */ /* Beacon releated */
u16 wSeqCounter; u16 wSeqCounter;
CMD_STATE eCommandState; enum vnt_cmd_state command_state;
enum vnt_cmd command; enum vnt_cmd command;
......
...@@ -67,7 +67,7 @@ void vRunCommand(struct work_struct *work) ...@@ -67,7 +67,7 @@ void vRunCommand(struct work_struct *work)
if (priv->bCmdRunning != true) if (priv->bCmdRunning != true)
return; return;
switch (priv->eCommandState) { switch (priv->command_state) {
case WLAN_CMD_INIT_MAC80211_START: case WLAN_CMD_INIT_MAC80211_START:
if (priv->mac_hw) if (priv->mac_hw)
break; break;
...@@ -139,7 +139,7 @@ void vRunCommand(struct work_struct *work) ...@@ -139,7 +139,7 @@ void vRunCommand(struct work_struct *work)
static int s_bCommandComplete(struct vnt_private *priv) 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) { if (priv->cbFreeCmdQueue == CMD_Q_SIZE) {
/* Command Queue Empty */ /* Command Queue Empty */
priv->bCmdRunning = false; priv->bCmdRunning = false;
...@@ -154,27 +154,27 @@ static int s_bCommandComplete(struct vnt_private *priv) ...@@ -154,27 +154,27 @@ static int s_bCommandComplete(struct vnt_private *priv)
switch (priv->command) { switch (priv->command) {
case WLAN_CMD_INIT_MAC80211: case WLAN_CMD_INIT_MAC80211:
priv->eCommandState = WLAN_CMD_INIT_MAC80211_START; priv->command_state = WLAN_CMD_INIT_MAC80211_START;
break; break;
case WLAN_CMD_TBTT_WAKEUP: case WLAN_CMD_TBTT_WAKEUP:
priv->eCommandState = WLAN_CMD_TBTT_WAKEUP_START; priv->command_state = WLAN_CMD_TBTT_WAKEUP_START;
break; break;
case WLAN_CMD_BECON_SEND: case WLAN_CMD_BECON_SEND:
priv->eCommandState = WLAN_CMD_BECON_SEND_START; priv->command_state = WLAN_CMD_BECON_SEND_START;
break; break;
case WLAN_CMD_SETPOWER: case WLAN_CMD_SETPOWER:
priv->eCommandState = WLAN_CMD_SETPOWER_START; priv->command_state = WLAN_CMD_SETPOWER_START;
break; break;
case WLAN_CMD_CHANGE_ANTENNA: case WLAN_CMD_CHANGE_ANTENNA:
priv->eCommandState = WLAN_CMD_CHANGE_ANTENNA_START; priv->command_state = WLAN_CMD_CHANGE_ANTENNA_START;
break; break;
case WLAN_CMD_11H_CHSW: case WLAN_CMD_11H_CHSW:
priv->eCommandState = WLAN_CMD_11H_CHSW_START; priv->command_state = WLAN_CMD_11H_CHSW_START;
break; break;
default: default:
...@@ -209,7 +209,7 @@ void vResetCommandTimer(struct vnt_private *priv) ...@@ -209,7 +209,7 @@ void vResetCommandTimer(struct vnt_private *priv)
priv->cbFreeCmdQueue = CMD_Q_SIZE; priv->cbFreeCmdQueue = CMD_Q_SIZE;
priv->uCmdDequeueIdx = 0; priv->uCmdDequeueIdx = 0;
priv->uCmdEnqueueIdx = 0; priv->uCmdEnqueueIdx = 0;
priv->eCommandState = WLAN_CMD_IDLE; priv->command_state = WLAN_CMD_IDLE;
priv->bCmdRunning = false; priv->bCmdRunning = false;
priv->bCmdClear = false; priv->bCmdClear = false;
} }
...@@ -60,16 +60,16 @@ typedef struct tagCMD_ITEM { ...@@ -60,16 +60,16 @@ typedef struct tagCMD_ITEM {
enum vnt_cmd cmd; enum vnt_cmd cmd;
} CMD_ITEM, *PCMD_ITEM; } CMD_ITEM, *PCMD_ITEM;
// Command state /* Command state */
typedef enum tagCMD_STATE { enum vnt_cmd_state {
WLAN_CMD_INIT_MAC80211_START, WLAN_CMD_INIT_MAC80211_START,
WLAN_CMD_SETPOWER_START, WLAN_CMD_SETPOWER_START,
WLAN_CMD_TBTT_WAKEUP_START, WLAN_CMD_TBTT_WAKEUP_START,
WLAN_CMD_BECON_SEND_START, WLAN_CMD_BECON_SEND_START,
WLAN_CMD_CHANGE_ANTENNA_START, WLAN_CMD_CHANGE_ANTENNA_START,
WLAN_CMD_11H_CHSW_START, WLAN_CMD_11H_CHSW_START,
WLAN_CMD_IDLE WLAN_CMD_IDLE
} CMD_STATE, *PCMD_STATE; };
struct vnt_private; struct vnt_private;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment