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

staging: vt6655: CARDvSetRSPINF us bb_type for CARD_PHY_TYPE 



Using u8 for bb_type

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

drivers/staging/vt6655/card.c

+10 −10
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ static unsigned short CARDwGetOFDMControlRate(struct vnt_private *pDevice, 
 *

 * Return Value: None.

 */

void CARDvSetRSPINF(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType)

void CARDvSetRSPINF(struct vnt_private *pDevice, u8 bb_type)

{

	union vnt_phy_field_swap phy;

	unsigned char byTxRate, byRsvTime;      /* For OFDM */
@@ -716,55 +716,55 @@ void CARDvSetRSPINF(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType) 


	/* RSPINF_a_6 */

	s_vCalculateOFDMRParameter(RATE_6M,

				   ePHYType,

				   bb_type,

				   &byTxRate,

				   &byRsvTime);

	VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_6, MAKEWORD(byTxRate, byRsvTime));

	/* RSPINF_a_9 */

	s_vCalculateOFDMRParameter(RATE_9M,

				   ePHYType,

				   bb_type,

				   &byTxRate,

				   &byRsvTime);

	VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_9, MAKEWORD(byTxRate, byRsvTime));

	/* RSPINF_a_12 */

	s_vCalculateOFDMRParameter(RATE_12M,

				   ePHYType,

				   bb_type,

				   &byTxRate,

				   &byRsvTime);

	VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_12, MAKEWORD(byTxRate, byRsvTime));

	/* RSPINF_a_18 */

	s_vCalculateOFDMRParameter(RATE_18M,

				   ePHYType,

				   bb_type,

				   &byTxRate,

				   &byRsvTime);

	VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_18, MAKEWORD(byTxRate, byRsvTime));

	/* RSPINF_a_24 */

	s_vCalculateOFDMRParameter(RATE_24M,

				   ePHYType,

				   bb_type,

				   &byTxRate,

				   &byRsvTime);

	VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_24, MAKEWORD(byTxRate, byRsvTime));

	/* RSPINF_a_36 */

	s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)pDevice, RATE_36M),

				   ePHYType,

				   bb_type,

				   &byTxRate,

				   &byRsvTime);

	VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_36, MAKEWORD(byTxRate, byRsvTime));

	/* RSPINF_a_48 */

	s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)pDevice, RATE_48M),

				   ePHYType,

				   bb_type,

				   &byTxRate,

				   &byRsvTime);

	VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_48, MAKEWORD(byTxRate, byRsvTime));

	/* RSPINF_a_54 */

	s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)pDevice, RATE_54M),

				   ePHYType,

				   bb_type,

				   &byTxRate,

				   &byRsvTime);

	VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_54, MAKEWORD(byTxRate, byRsvTime));

	/* RSPINF_a_72 */

	s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)pDevice, RATE_54M),

				   ePHYType,

				   bb_type,

				   &byTxRate,

				   &byRsvTime);

	VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_72, MAKEWORD(byTxRate, byRsvTime));

drivers/staging/vt6655/card.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ typedef enum _CARD_STATUS_TYPE { 


struct vnt_private;



void CARDvSetRSPINF(struct vnt_private *, CARD_PHY_TYPE ePHYType);

void CARDvSetRSPINF(struct vnt_private *, u8);

void vUpdateIFS(struct vnt_private *);

void CARDvUpdateBasicTopRate(struct vnt_private *);

bool CARDbIsOFDMinBasicRate(struct vnt_private *);