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

staging: vt6656: rename MACvRegBitsOff to vnt_mac_reg_bits_off 



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

drivers/staging/vt6656/baseband.c

+4 −4
Original line number Diff line number Diff line
@@ -994,7 +994,7 @@ int BBbVT3184Init(struct vnt_private *priv) 
		priv->ldBmThreshold[2] = 0;

		priv->ldBmThreshold[3] = 0;

		/* Fix VT3226 DFC system timing issue */

		MACvRegBitsOn(priv, MAC_REG_SOFTPWRCTL2, SOFTPWRCTL_RFLEOPT);

		vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL2, SOFTPWRCTL_RFLEOPT);

	} else if ((priv->byRFType == RF_VT3342A0)) {

		priv->byBBRxConf = abyVT3184_VT3226D0[10];

		length = sizeof(abyVT3184_VT3226D0);
@@ -1011,7 +1011,7 @@ int BBbVT3184Init(struct vnt_private *priv) 
		priv->ldBmThreshold[2] = 0;

		priv->ldBmThreshold[3] = 0;

		/* Fix VT3226 DFC system timing issue */

		MACvRegBitsOn(priv, MAC_REG_SOFTPWRCTL2, SOFTPWRCTL_RFLEOPT);

		vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL2, SOFTPWRCTL_RFLEOPT);

	} else {

		return true;

	}
@@ -1030,11 +1030,11 @@ int BBbVT3184Init(struct vnt_private *priv) 
		(priv->byRFType == RF_VT3342A0)) {

		vnt_control_out_u8(priv, MESSAGE_REQUEST_MACREG,

						MAC_REG_ITRTMSET, 0x23);

		MACvRegBitsOn(priv, MAC_REG_PAPEDELAY, 0x01);

		vnt_mac_reg_bits_on(priv, MAC_REG_PAPEDELAY, 0x01);

	} else if (priv->byRFType == RF_VT3226D0) {

		vnt_control_out_u8(priv, MESSAGE_REQUEST_MACREG,

						MAC_REG_ITRTMSET, 0x11);

		MACvRegBitsOn(priv, MAC_REG_PAPEDELAY, 0x01);

		vnt_mac_reg_bits_on(priv, MAC_REG_PAPEDELAY, 0x01);

	}



	vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG, 0x04, 0x7f);

drivers/staging/vt6656/card.c

+4 −4
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ void vnt_set_channel(struct vnt_private *priv, u32 connection_channel) 
	}



	/* clear NAV */

	MACvRegBitsOn(priv, MAC_REG_MACCR, MACCR_CLRNAV);

	vnt_mac_reg_bits_on(priv, MAC_REG_MACCR, MACCR_CLRNAV);



	/* Set Channel[7] = 0 to tell H/W channel is changing now. */

	vnt_mac_reg_bits_off(priv, MAC_REG_CHANNEL, 0xb0);
@@ -636,7 +636,7 @@ bool vnt_get_current_tsf(struct vnt_private *priv, u64 *current_tsf) 
bool vnt_clear_current_tsf(struct vnt_private *priv)

{



	MACvRegBitsOn(priv, MAC_REG_TFTCTL, TFTCTL_TSFCNTRST);

	vnt_mac_reg_bits_on(priv, MAC_REG_TFTCTL, TFTCTL_TSFCNTRST);



	priv->qwCurrTSF = 0;
@@ -812,7 +812,7 @@ int vnt_radio_power_on(struct vnt_private *priv) 


	BBvExitDeepSleep(priv);



	MACvRegBitsOn(priv, MAC_REG_HOSTCR, HOSTCR_RXON);

	vnt_mac_reg_bits_on(priv, MAC_REG_HOSTCR, HOSTCR_RXON);



	switch (priv->byRFType) {

	case RF_AL2230:
@@ -821,7 +821,7 @@ int vnt_radio_power_on(struct vnt_private *priv) 
	case RF_VT3226:

	case RF_VT3226D0:

	case RF_VT3342A0:

		MACvRegBitsOn(priv, MAC_REG_SOFTPWRCTL,

		vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL,

			(SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3));

		break;

	}

drivers/staging/vt6656/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ void vnt_mac_reg_bits_off(struct vnt_private *priv, u8 reg_ofs, u8 bits) 
		reg_ofs, MESSAGE_REQUEST_MACREG, ARRAY_SIZE(data), data);

}



void MACvRegBitsOn(struct vnt_private *priv, u8 reg_ofs, u8 bits)

void vnt_mac_reg_bits_on(struct vnt_private *priv, u8 reg_ofs, u8 bits)

{

	u8 data[2];

drivers/staging/vt6656/mac.h

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ void vnt_mac_set_bb_type(struct vnt_private *, u8); 
void vnt_mac_disable_keyentry(struct vnt_private *, u8);

void vnt_mac_set_keyentry(struct vnt_private *, u16, u32, u32, u8 *, u8 *);

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

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

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

void MACvWriteWord(struct vnt_private *, u8, u16);

void MACvWriteBSSIDAddress(struct vnt_private *, u8 *);

void MACvEnableProtectMD(struct vnt_private *);

drivers/staging/vt6656/main_usb.c

+3 −2
Original line number Diff line number Diff line
@@ -544,7 +544,8 @@ static int device_init_registers(struct vnt_private *pDevice) 


		if ((byTmp & GPIO3_DATA) == 0) {

			pDevice->bHWRadioOff = true;

			MACvRegBitsOn(pDevice, MAC_REG_GPIOCTL1, GPIO3_INTMD);

			vnt_mac_reg_bits_on(pDevice, MAC_REG_GPIOCTL1,

								GPIO3_INTMD);

		} else {

			vnt_mac_reg_bits_off(pDevice, MAC_REG_GPIOCTL1,

								GPIO3_INTMD);
@@ -557,7 +558,7 @@ static int device_init_registers(struct vnt_private *pDevice) 


	vnt_mac_set_led(pDevice, LEDSTS_STS, LEDSTS_SLOW);



	MACvRegBitsOn(pDevice, MAC_REG_GPIOCTL0, 0x01);

	vnt_mac_reg_bits_on(pDevice, MAC_REG_GPIOCTL0, 0x01);



	if ((pDevice->bHWRadioOff == true) ||

				(pDevice->bRadioControlOff == true)) {