staging: vt6655: change typedef enum _VIA_PKT_TYPE to macro

Replacing for u8 type and removing cast for byBBType.

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:08 +00:00 committed by Greg Kroah-Hartman
parent ff8d9f0806
commit bf8918de79
2 changed files with 11 additions and 14 deletions

View file

@ -152,14 +152,11 @@
#define BB_TYPE_11B 1
#define BB_TYPE_11G 2
/* 0:11a,1:11b,2:11gb(only CCK in BasicRate),3:11ga(OFDM in Basic Rate) */
typedef enum _VIA_PKT_TYPE
{
PK_TYPE_11A = 0,
PK_TYPE_11B,
PK_TYPE_11GB,
PK_TYPE_11GA
} VIA_PKT_TYPE, *PVIA_PKT_TYPE;
/* 0:11a, 1:11b, 2:11gb (only CCK in BasicRate), 3:11ga (OFDM in BasicRate) */
#define PK_TYPE_11A 0
#define PK_TYPE_11B 1
#define PK_TYPE_11GB 2
#define PK_TYPE_11GA 3
typedef struct __chip_info_tbl {
CHIP_TYPE chip_id;
@ -319,11 +316,11 @@ struct vnt_private {
unsigned char byCWMaxMin;
u8 byBBType; /* 0:11A, 1:11B, 2:11G */
VIA_PKT_TYPE byPacketType; /*
* 0:11a,1:11b,2:11gb (only CCK
* in BasicRate), 3:11ga (OFDM in
* Basic Rate)
*/
u8 byPacketType; /*
* 0:11a,1:11b,2:11gb (only CCK
* in BasicRate), 3:11ga (OFDM in
* Basic Rate)
*/
unsigned short wBasicRate;
unsigned char byACKRate;
unsigned char byTopOFDMBasicRate;

View file

@ -226,7 +226,7 @@ device_set_options(struct vnt_private *pDevice)
pDevice->byLongRetryLimit = pDevice->sOpts.long_retry;
pDevice->bDiversityRegCtlON = (pDevice->sOpts.flags & DEVICE_FLAGS_DiversityANT) ? 1 : 0;
pDevice->byBBType = pDevice->sOpts.bbp_type;
pDevice->byPacketType = (VIA_PKT_TYPE)pDevice->byBBType;
pDevice->byPacketType = pDevice->byBBType;
pDevice->byAutoFBCtrl = AUTO_FB_0;
pDevice->bUpdateBBVGA = true;
pDevice->byPreambleType = 0;