openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: vt6656: replace typedef enum tagCMD_STATE with enum vnt_cmd_state 

Replacing variables.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2014-07-13 10:42:42 +01:00 committed by Greg Kroah-Hartman
parent 80f0d0923f
commit ad74e91d06
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/vt6656/device.h
View File

@ -398,7 +398,7 @@ struct vnt_private {
/* Beacon releated */
u16 wSeqCounter;
CMD_STATE eCommandState;
enum vnt_cmd_state command_state;
enum vnt_cmd command;

18
drivers/staging/vt6656/wcmd.c
View File

@ -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;
}

20
drivers/staging/vt6656/wcmd.h
View File

@ -60,16 +60,16 @@ typedef struct tagCMD_ITEM {
enum vnt_cmd cmd;
} CMD_ITEM, *PCMD_ITEM;
// Command state
typedef enum tagCMD_STATE {
WLAN_CMD_INIT_MAC80211_START,
WLAN_CMD_SETPOWER_START,
WLAN_CMD_TBTT_WAKEUP_START,
WLAN_CMD_BECON_SEND_START,
WLAN_CMD_CHANGE_ANTENNA_START,
WLAN_CMD_11H_CHSW_START,
WLAN_CMD_IDLE
} CMD_STATE, *PCMD_STATE;
/* Command state */
enum vnt_cmd_state {
WLAN_CMD_INIT_MAC80211_START,
WLAN_CMD_SETPOWER_START,
WLAN_CMD_TBTT_WAKEUP_START,
WLAN_CMD_BECON_SEND_START,
WLAN_CMD_CHANGE_ANTENNA_START,
WLAN_CMD_11H_CHSW_START,
WLAN_CMD_IDLE
};
struct vnt_private;