Commit d1ab5201 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6655: s_vCalculateOFDMRParameter use bb_type for CARD_PHY_TYPE

using u8 for bb_type and replacing PHY_TYPE_11A with BB_TYPE_11A
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6e1d14a5
...@@ -78,7 +78,7 @@ static ...@@ -78,7 +78,7 @@ static
void void
s_vCalculateOFDMRParameter( s_vCalculateOFDMRParameter(
unsigned char byRate, unsigned char byRate,
CARD_PHY_TYPE ePHYType, u8 bb_type,
unsigned char *pbyTxRate, unsigned char *pbyTxRate,
unsigned char *pbyRsvTime unsigned char *pbyRsvTime
); );
...@@ -102,14 +102,14 @@ static ...@@ -102,14 +102,14 @@ static
void void
s_vCalculateOFDMRParameter( s_vCalculateOFDMRParameter(
unsigned char byRate, unsigned char byRate,
CARD_PHY_TYPE ePHYType, u8 bb_type,
unsigned char *pbyTxRate, unsigned char *pbyTxRate,
unsigned char *pbyRsvTime unsigned char *pbyRsvTime
) )
{ {
switch (byRate) { switch (byRate) {
case RATE_6M: case RATE_6M:
if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */ if (bb_type == BB_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x9B; *pbyTxRate = 0x9B;
*pbyRsvTime = 44; *pbyRsvTime = 44;
} else { } else {
...@@ -119,7 +119,7 @@ s_vCalculateOFDMRParameter( ...@@ -119,7 +119,7 @@ s_vCalculateOFDMRParameter(
break; break;
case RATE_9M: case RATE_9M:
if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */ if (bb_type == BB_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x9F; *pbyTxRate = 0x9F;
*pbyRsvTime = 36; *pbyRsvTime = 36;
} else { } else {
...@@ -129,7 +129,7 @@ s_vCalculateOFDMRParameter( ...@@ -129,7 +129,7 @@ s_vCalculateOFDMRParameter(
break; break;
case RATE_12M: case RATE_12M:
if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */ if (bb_type == BB_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x9A; *pbyTxRate = 0x9A;
*pbyRsvTime = 32; *pbyRsvTime = 32;
} else { } else {
...@@ -139,7 +139,7 @@ s_vCalculateOFDMRParameter( ...@@ -139,7 +139,7 @@ s_vCalculateOFDMRParameter(
break; break;
case RATE_18M: case RATE_18M:
if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */ if (bb_type == BB_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x9E; *pbyTxRate = 0x9E;
*pbyRsvTime = 28; *pbyRsvTime = 28;
} else { } else {
...@@ -149,7 +149,7 @@ s_vCalculateOFDMRParameter( ...@@ -149,7 +149,7 @@ s_vCalculateOFDMRParameter(
break; break;
case RATE_36M: case RATE_36M:
if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */ if (bb_type == BB_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x9D; *pbyTxRate = 0x9D;
*pbyRsvTime = 24; *pbyRsvTime = 24;
} else { } else {
...@@ -159,7 +159,7 @@ s_vCalculateOFDMRParameter( ...@@ -159,7 +159,7 @@ s_vCalculateOFDMRParameter(
break; break;
case RATE_48M: case RATE_48M:
if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */ if (bb_type == BB_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x98; *pbyTxRate = 0x98;
*pbyRsvTime = 24; *pbyRsvTime = 24;
} else { } else {
...@@ -169,7 +169,7 @@ s_vCalculateOFDMRParameter( ...@@ -169,7 +169,7 @@ s_vCalculateOFDMRParameter(
break; break;
case RATE_54M: case RATE_54M:
if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */ if (bb_type == BB_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x9C; *pbyTxRate = 0x9C;
*pbyRsvTime = 24; *pbyRsvTime = 24;
} else { } else {
...@@ -180,7 +180,7 @@ s_vCalculateOFDMRParameter( ...@@ -180,7 +180,7 @@ s_vCalculateOFDMRParameter(
case RATE_24M: case RATE_24M:
default: default:
if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */ if (bb_type == BB_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x99; *pbyTxRate = 0x99;
*pbyRsvTime = 28; *pbyRsvTime = 28;
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment