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

staging: vt6656: create vnt_control_in_u8 to replace ControlvReadByte 



ControlvReadByte will be removed in next patch

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

drivers/staging/vt6656/baseband.c

+1 −1
Original line number Diff line number Diff line
@@ -1076,7 +1076,7 @@ void BBvSetShortSlotTime(struct vnt_private *priv) 
	else

		priv->byBBRxConf |= 0x20;



	ControlvReadByte(priv, MESSAGE_REQUEST_BBREG, 0xe7, &bb_vga);

	vnt_control_in_u8(priv, MESSAGE_REQUEST_BBREG, 0xe7, &bb_vga);



	if (bb_vga == priv->abyBBVGA[0])

		priv->byBBRxConf |= 0x20;

drivers/staging/vt6656/power.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ int PSbConsiderPowerDown(struct vnt_private *pDevice, int bCheckRxDMA, 
	u8 byData;



	/* check if already in Doze mode */

	ControlvReadByte(pDevice, MESSAGE_REQUEST_MACREG,

	vnt_control_in_u8(pDevice, MESSAGE_REQUEST_MACREG,

					MAC_REG_PSCTL, &byData);



	if ((byData & PSCTL_PS) != 0)

drivers/staging/vt6656/usbpipe.c

+7 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
 *	vnt_control_out - Write variable length bytes to MEM/BB/MAC/EEPROM

 *	vnt_control_in - Read variable length bytes from MEM/BB/MAC/EEPROM

 *	vnt_control_out_u8 - Write one byte to MEM/BB/MAC/EEPROM

 *      ControlvReadByte - Read one byte from MEM/BB/MAC/EEPROM

 *	vnt_control_in_u8 - Read one byte from MEM/BB/MAC/EEPROM

 *      ControlvMaskByte - Read one byte from MEM/BB/MAC/EEPROM and clear/set some bits in the same address

 *

 * Revision History:
@@ -41,7 +41,6 @@ 
#include "int.h"

#include "rxtx.h"

#include "dpc.h"

#include "control.h"

#include "desc.h"

#include "device.h"
@@ -111,6 +110,12 @@ int vnt_control_in(struct vnt_private *priv, u8 request, u16 value, 
	return STATUS_SUCCESS;

}



void vnt_control_in_u8(struct vnt_private *priv, u8 reg, u8 reg_off, u8 *data)

{

	vnt_control_in(priv, MESSAGE_TYPE_READ,

			reg_off, reg, sizeof(u8), data);

}



/*

 * Description:

 *      Allocates an usb interrupt in irp and calls USBD.

drivers/staging/vt6656/usbpipe.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ int vnt_control_out(struct vnt_private *, u8, u16, u16, u16, u8 *); 
int vnt_control_in(struct vnt_private *, u8, u16, u16, u16,  u8 *);



void vnt_control_out_u8(struct vnt_private *, u8, u8, u8);

void vnt_control_in_u8(struct vnt_private *, u8, u8, u8 *);



int PIPEnsInterruptRead(struct vnt_private *);

int PIPEnsBulkInUsbRead(struct vnt_private *, struct vnt_rcb *pRCB);

drivers/staging/vt6656/wcmd.c

+1 −1
Original line number Diff line number Diff line
@@ -861,7 +861,7 @@ void vRunCommand(struct work_struct *work) 
		break;



	case WLAN_CMD_MAC_DISPOWERSAVING_START:

		ControlvReadByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PSCTL, &byData);

		vnt_control_in_u8(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PSCTL, &byData);

		if ((byData & PSCTL_PS) != 0) {

			// disable power saving hw function

			vnt_control_out(pDevice,

CRA Git | Maintained and supported by SUSTech CRA and CCSE