leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: vt6655: CARDbSetPhyParameter change CARD_PHY_TYPE to bb_type

Browse Source 
using u8 for bb_type

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2014-11-07 19:06:02 +00:00 committed by Greg Kroah-Hartman
parent b930eb56e3
commit a558e3dcc3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/vt6655/card.c
View File

@ -204,7 +204,7 @@ s_vCalculateOFDMRParameter(
* *
* Return Value: None. * Return Value: None.
*/ */
bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType, bool CARDbSetPhyParameter(struct vnt_private *pDevice, u8 bb_type,
unsigned short wCapInfo, unsigned char byERPField, unsigned short wCapInfo, unsigned char byERPField,
void *pvSupportRateIEs, void *pvExtSupportRateIEs) void *pvSupportRateIEs, void *pvExtSupportRateIEs)
{ {
@ -216,7 +216,7 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
int i; int i;
/* Set SIFS, DIFS, EIFS, SlotTime, CwMin */ /* Set SIFS, DIFS, EIFS, SlotTime, CwMin */
if (ePHYType == PHY_TYPE_11A) { if (bb_type == BB_TYPE_11A) {
if (pDevice->byRFType == RF_AIROHA7230) { if (pDevice->byRFType == RF_AIROHA7230) {
/* AL7230 use single PAPE and connect to PAPE_2.4G */ /* AL7230 use single PAPE and connect to PAPE_2.4G */
MACvSetBBType(pDevice->PortOffset, BB_TYPE_11G); MACvSetBBType(pDevice->PortOffset, BB_TYPE_11G);
@ -243,7 +243,7 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
bySIFS = C_SIFS_A; bySIFS = C_SIFS_A;
byDIFS = C_SIFS_A + 2*C_SLOT_SHORT; byDIFS = C_SIFS_A + 2*C_SLOT_SHORT;
byCWMaxMin = 0xA4; byCWMaxMin = 0xA4;
} else if (ePHYType == PHY_TYPE_11B) { } else if (bb_type == BB_TYPE_11B) {
MACvSetBBType(pDevice->PortOffset, BB_TYPE_11B); MACvSetBBType(pDevice->PortOffset, BB_TYPE_11B);
if (pDevice->byRFType == RF_AIROHA7230) { if (pDevice->byRFType == RF_AIROHA7230) {
pDevice->abyBBVGA[0] = 0x1C; pDevice->abyBBVGA[0] = 0x1C;
@ -344,7 +344,7 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
pDevice->byPacketType = CARDbyGetPktType(pDevice); pDevice->byPacketType = CARDbyGetPktType(pDevice);
CARDvSetRSPINF(pDevice, ePHYType); CARDvSetRSPINF(pDevice, bb_type);
return true; return true;
} }

2
drivers/staging/vt6655/card.h
View File

@ -89,7 +89,7 @@ void CARDvSafeResetTx(struct vnt_private *);
void CARDvSafeResetRx(struct vnt_private *); void CARDvSafeResetRx(struct vnt_private *);
bool CARDbRadioPowerOff(struct vnt_private *); bool CARDbRadioPowerOff(struct vnt_private *);
bool CARDbRadioPowerOn(struct vnt_private *); bool CARDbRadioPowerOn(struct vnt_private *);
bool CARDbSetPhyParameter(struct vnt_private *, CARD_PHY_TYPE ePHYType, bool CARDbSetPhyParameter(struct vnt_private *, u8,
unsigned short wCapInfo, unsigned char byERPField, unsigned short wCapInfo, unsigned char byERPField,
void *pvSupportRateIEs, void *pvExtSupportRateIEs); void *pvSupportRateIEs, void *pvExtSupportRateIEs);
bool CARDbUpdateTSF(struct vnt_private *, unsigned char byRxRate, bool CARDbUpdateTSF(struct vnt_private *, unsigned char byRxRate,