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

staging: vt6656: replace typedef enum tagCMD_CODE with enum vnt_cmd 



Replacing the variables.

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

drivers/staging/vt6656/device.h

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ struct vnt_private { 


	CMD_STATE eCommandState;



	CMD_CODE eCommand;

	enum vnt_cmd command;



	int bStopDataPkt;

drivers/staging/vt6656/wcmd.c

+4 −4
Original line number Diff line number Diff line
@@ -146,13 +146,13 @@ static int s_bCommandComplete(struct vnt_private *priv) 
		return true;

	}



	priv->eCommand = priv->eCmdQueue[priv->uCmdDequeueIdx].eCmd;

	priv->command = priv->eCmdQueue[priv->uCmdDequeueIdx].cmd;



	ADD_ONE_WITH_WRAP_AROUND(priv->uCmdDequeueIdx, CMD_Q_SIZE);

	priv->cbFreeCmdQueue++;

	priv->bCmdRunning = true;



	switch (priv->eCommand) {

	switch (priv->command) {

	case WLAN_CMD_INIT_MAC80211:

		priv->eCommandState = WLAN_CMD_INIT_MAC80211_START;

		break;
@@ -186,13 +186,13 @@ static int s_bCommandComplete(struct vnt_private *priv) 
	return true;

}



int bScheduleCommand(struct vnt_private *priv, CMD_CODE command, u8 *item0)

int bScheduleCommand(struct vnt_private *priv, enum vnt_cmd command, u8 *item0)

{



	if (priv->cbFreeCmdQueue == 0)

		return false;



	priv->eCmdQueue[priv->uCmdEnqueueIdx].eCmd = command;

	priv->eCmdQueue[priv->uCmdEnqueueIdx].cmd = command;



	ADD_ONE_WITH_WRAP_AROUND(priv->uCmdEnqueueIdx, CMD_Q_SIZE);

	priv->cbFreeCmdQueue--;

drivers/staging/vt6656/wcmd.h

+11 −11
Original line number Diff line number Diff line
@@ -34,15 +34,15 @@ 
#define AUTHENTICATE_TIMEOUT   1000 //ms

#define ASSOCIATE_TIMEOUT      1000 //ms



// Command code

typedef enum tagCMD_CODE {

/* Command code */

enum vnt_cmd {

	WLAN_CMD_INIT_MAC80211,

	WLAN_CMD_SETPOWER,

	WLAN_CMD_TBTT_WAKEUP,

	WLAN_CMD_BECON_SEND,

	WLAN_CMD_CHANGE_ANTENNA,

	WLAN_CMD_11H_CHSW,

} CMD_CODE, *PCMD_CODE;

};



#define CMD_Q_SIZE              32
@@ -57,7 +57,7 @@ typedef enum tagCMD_STATUS { 
} CMD_STATUS, *PCMD_STATUS;



typedef struct tagCMD_ITEM {

    CMD_CODE eCmd;

	enum vnt_cmd cmd;

} CMD_ITEM, *PCMD_ITEM;



// Command state
@@ -75,7 +75,7 @@ struct vnt_private; 


void vResetCommandTimer(struct vnt_private *);



int bScheduleCommand(struct vnt_private *, CMD_CODE eCommand, u8 *pbyItem0);

int bScheduleCommand(struct vnt_private *, enum vnt_cmd, u8 *);



void vRunCommand(struct work_struct *work);