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

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

staging: vt6656: replace camel case from command variables 



camel case changes
uCmdDequeueIdx -> cmd_dequeue_idx
uCmdEnqueueIdx -> cmd_enqueue_idx
cbFreeCmdQueue -> free_cmd_queue
bCmdRunning -> cmd_running

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

drivers/staging/vt6656/device.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -407,10 +407,10 @@ struct vnt_private { 
	/* 802.11 counter */

	/* 802.11 counter */





	enum vnt_cmd cmd_queue[CMD_Q_SIZE];

	enum vnt_cmd cmd_queue[CMD_Q_SIZE];

	u32 uCmdDequeueIdx;

	u32 cmd_dequeue_idx;

	u32 uCmdEnqueueIdx;

	u32 cmd_enqueue_idx;

	u32 cbFreeCmdQueue;

	u32 free_cmd_queue;

	int bCmdRunning;

	int cmd_running;





	unsigned long key_entry_inuse;

	unsigned long key_entry_inuse;

drivers/staging/vt6656/main_usb.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -708,7 +708,7 @@ static void vnt_stop(struct ieee80211_hw *hw) 




	cancel_delayed_work_sync(&priv->run_command_work);

	cancel_delayed_work_sync(&priv->run_command_work);





	priv->bCmdRunning = false;

	priv->cmd_running = false;





	priv->flags &= ~DEVICE_FLAGS_OPENED;

	priv->flags &= ~DEVICE_FLAGS_OPENED;

drivers/staging/vt6656/wcmd.c

+16 −16
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ void vRunCommand(struct work_struct *work) 
	if (priv->Flags & fMP_DISCONNECTED)

	if (priv->Flags & fMP_DISCONNECTED)

		return;

		return;





	if (priv->bCmdRunning != true)

	if (priv->cmd_running != true)

		return;

		return;





	switch (priv->command_state) {

	switch (priv->command_state) {
@@ -140,17 +140,17 @@ static int s_bCommandComplete(struct vnt_private *priv) 
{

{





	priv->command_state = WLAN_CMD_IDLE;

	priv->command_state = WLAN_CMD_IDLE;

	if (priv->cbFreeCmdQueue == CMD_Q_SIZE) {

	if (priv->free_cmd_queue == CMD_Q_SIZE) {

		/* Command Queue Empty */

		/* Command Queue Empty */

		priv->bCmdRunning = false;

		priv->cmd_running = false;

		return true;

		return true;

	}

	}





	priv->command = priv->cmd_queue[priv->uCmdDequeueIdx];

	priv->command = priv->cmd_queue[priv->cmd_dequeue_idx];





	ADD_ONE_WITH_WRAP_AROUND(priv->uCmdDequeueIdx, CMD_Q_SIZE);

	ADD_ONE_WITH_WRAP_AROUND(priv->cmd_dequeue_idx, CMD_Q_SIZE);

	priv->cbFreeCmdQueue++;

	priv->free_cmd_queue++;

	priv->bCmdRunning = true;

	priv->cmd_running = true;





	switch (priv->command) {

	switch (priv->command) {

	case WLAN_CMD_INIT_MAC80211:

	case WLAN_CMD_INIT_MAC80211:
@@ -189,15 +189,15 @@ static int s_bCommandComplete(struct vnt_private *priv) 
int bScheduleCommand(struct vnt_private *priv, enum vnt_cmd command, u8 *item0)

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

{

{





	if (priv->cbFreeCmdQueue == 0)

	if (priv->free_cmd_queue == 0)

		return false;

		return false;





	priv->cmd_queue[priv->uCmdEnqueueIdx] = command;

	priv->cmd_queue[priv->cmd_enqueue_idx] = command;





	ADD_ONE_WITH_WRAP_AROUND(priv->uCmdEnqueueIdx, CMD_Q_SIZE);

	ADD_ONE_WITH_WRAP_AROUND(priv->cmd_enqueue_idx, CMD_Q_SIZE);

	priv->cbFreeCmdQueue--;

	priv->free_cmd_queue--;





	if (priv->bCmdRunning == false)

	if (priv->cmd_running == false)

		s_bCommandComplete(priv);

		s_bCommandComplete(priv);





	return true;

	return true;
@@ -206,9 +206,9 @@ int bScheduleCommand(struct vnt_private *priv, enum vnt_cmd command, u8 *item0) 




void vResetCommandTimer(struct vnt_private *priv)

void vResetCommandTimer(struct vnt_private *priv)

{

{

	priv->cbFreeCmdQueue = CMD_Q_SIZE;

	priv->free_cmd_queue = CMD_Q_SIZE;

	priv->uCmdDequeueIdx = 0;

	priv->cmd_dequeue_idx = 0;

	priv->uCmdEnqueueIdx = 0;

	priv->cmd_enqueue_idx = 0;

	priv->command_state = WLAN_CMD_IDLE;

	priv->command_state = WLAN_CMD_IDLE;

	priv->bCmdRunning = false;

	priv->cmd_running = false;

}
 
}