Skip to content

L
linux
Commit 77b6a6a3 authored by Veronika Kabatova's avatar Veronika Kabatova Committed by Greg Kroah-Hartman
Browse files
Options

staging: vt6655: card.c: Comments fixes 

Replace C99 "//" comments by "/* */", remove not needed
comments (year of adding code, commented code)
Signed-off-by: default avatarVeronika Kabatova <veronicca114@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 81a4e959
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 170 deletions
drivers/staging/vt6655/card.c
View file @ 77b6a6a3
...@@ -59,28 +59,28 @@ ...@@ -59,28 +59,28 @@
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/
#define C_SIFS_A 16 // micro sec. #define C_SIFS_A 16 /* micro sec. */
#define C_SIFS_BG 10 #define C_SIFS_BG 10
#define C_EIFS 80 // micro sec. #define C_EIFS 80 /* micro sec. */
#define C_SLOT_SHORT 9 // micro sec. #define C_SLOT_SHORT 9 /* micro sec. */
#define C_SLOT_LONG 20 #define C_SLOT_LONG 20
#define C_CWMIN_A 15 // slot time #define C_CWMIN_A 15 /* slot time */
#define C_CWMIN_B 31 #define C_CWMIN_B 31
#define C_CWMAX 1023 // slot time #define C_CWMAX 1023 /* slot time */
#define WAIT_BEACON_TX_DOWN_TMO 3 // Times #define WAIT_BEACON_TX_DOWN_TMO 3 /* Times */
//1M, 2M, 5M, 11M, 18M, 24M, 36M, 54M /* 1M, 2M, 5M, 11M, 18M, 24M, 36M, 54M */
static unsigned char abyDefaultSuppRatesG[] = {WLAN_EID_SUPP_RATES, 8, 0x02, 0x04, 0x0B, 0x16, 0x24, 0x30, 0x48, 0x6C}; static unsigned char abyDefaultSuppRatesG[] = {WLAN_EID_SUPP_RATES, 8, 0x02, 0x04, 0x0B, 0x16, 0x24, 0x30, 0x48, 0x6C};
//6M, 9M, 12M, 48M /* 6M, 9M, 12M, 48M */
static unsigned char abyDefaultExtSuppRatesG[] = {WLAN_EID_EXTSUPP_RATES, 4, 0x0C, 0x12, 0x18, 0x60}; static unsigned char abyDefaultExtSuppRatesG[] = {WLAN_EID_EXTSUPP_RATES, 4, 0x0C, 0x12, 0x18, 0x60};
//6M, 9M, 12M, 18M, 24M, 36M, 48M, 54M /* 6M, 9M, 12M, 18M, 24M, 36M, 48M, 54M */
static unsigned char abyDefaultSuppRatesA[] = {WLAN_EID_SUPP_RATES, 8, 0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C}; static unsigned char abyDefaultSuppRatesA[] = {WLAN_EID_SUPP_RATES, 8, 0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C};
//1M, 2M, 5M, 11M, /* 1M, 2M, 5M, 11M, */
static unsigned char abyDefaultSuppRatesB[] = {WLAN_EID_SUPP_RATES, 4, 0x02, 0x04, 0x0B, 0x16}; static unsigned char abyDefaultSuppRatesB[] = {WLAN_EID_SUPP_RATES, 4, 0x02, 0x04, 0x0B, 0x16};
/*--------------------- Static Variables --------------------------*/ /*--------------------- Static Variables --------------------------*/
...@@ -113,7 +113,6 @@ s_vCalculateOFDMRParameter( ...@@ -113,7 +113,6 @@ s_vCalculateOFDMRParameter(
* pbyRsvTime - pointer to RSPINF RsvTime field * pbyRsvTime - pointer to RSPINF RsvTime field
* *
* Return Value: none * Return Value: none
*
*/ */
static static
void void
...@@ -126,7 +125,7 @@ s_vCalculateOFDMRParameter( ...@@ -126,7 +125,7 @@ s_vCalculateOFDMRParameter(
{ {
switch (byRate) { switch (byRate) {
case RATE_6M: case RATE_6M:
if (ePHYType == PHY_TYPE_11A) {//5GHZ if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x9B; *pbyTxRate = 0x9B;
*pbyRsvTime = 44; *pbyRsvTime = 44;
} else { } else {
...@@ -136,7 +135,7 @@ s_vCalculateOFDMRParameter( ...@@ -136,7 +135,7 @@ s_vCalculateOFDMRParameter(
break; break;
case RATE_9M: case RATE_9M:
if (ePHYType == PHY_TYPE_11A) {//5GHZ if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x9F; *pbyTxRate = 0x9F;
*pbyRsvTime = 36; *pbyRsvTime = 36;
} else { } else {
...@@ -146,7 +145,7 @@ s_vCalculateOFDMRParameter( ...@@ -146,7 +145,7 @@ s_vCalculateOFDMRParameter(
break; break;
case RATE_12M: case RATE_12M:
if (ePHYType == PHY_TYPE_11A) {//5GHZ if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x9A; *pbyTxRate = 0x9A;
*pbyRsvTime = 32; *pbyRsvTime = 32;
} else { } else {
...@@ -156,7 +155,7 @@ s_vCalculateOFDMRParameter( ...@@ -156,7 +155,7 @@ s_vCalculateOFDMRParameter(
break; break;
case RATE_18M: case RATE_18M:
if (ePHYType == PHY_TYPE_11A) {//5GHZ if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x9E; *pbyTxRate = 0x9E;
*pbyRsvTime = 28; *pbyRsvTime = 28;
} else { } else {
...@@ -166,7 +165,7 @@ s_vCalculateOFDMRParameter( ...@@ -166,7 +165,7 @@ s_vCalculateOFDMRParameter(
break; break;
case RATE_36M: case RATE_36M:
if (ePHYType == PHY_TYPE_11A) {//5GHZ if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x9D; *pbyTxRate = 0x9D;
*pbyRsvTime = 24; *pbyRsvTime = 24;
} else { } else {
...@@ -176,7 +175,7 @@ s_vCalculateOFDMRParameter( ...@@ -176,7 +175,7 @@ s_vCalculateOFDMRParameter(
break; break;
case RATE_48M: case RATE_48M:
if (ePHYType == PHY_TYPE_11A) {//5GHZ if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x98; *pbyTxRate = 0x98;
*pbyRsvTime = 24; *pbyRsvTime = 24;
} else { } else {
...@@ -186,7 +185,7 @@ s_vCalculateOFDMRParameter( ...@@ -186,7 +185,7 @@ s_vCalculateOFDMRParameter(
break; break;
case RATE_54M: case RATE_54M:
if (ePHYType == PHY_TYPE_11A) {//5GHZ if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x9C; *pbyTxRate = 0x9C;
*pbyRsvTime = 24; *pbyRsvTime = 24;
} else { } else {
...@@ -197,7 +196,7 @@ s_vCalculateOFDMRParameter( ...@@ -197,7 +196,7 @@ s_vCalculateOFDMRParameter(
case RATE_24M: case RATE_24M:
default: default:
if (ePHYType == PHY_TYPE_11A) {//5GHZ if (ePHYType == PHY_TYPE_11A) { /* 5GHZ */
*pbyTxRate = 0x99; *pbyTxRate = 0x99;
*pbyRsvTime = 28; *pbyRsvTime = 28;
} else { } else {
...@@ -218,7 +217,6 @@ s_vCalculateOFDMRParameter( ...@@ -218,7 +217,6 @@ s_vCalculateOFDMRParameter(
* none * none
* *
* Return Value: None. * Return Value: None.
*
*/ */
static static
void void
...@@ -226,9 +224,9 @@ s_vSetRSPINF(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType, ...@@ -226,9 +224,9 @@ s_vSetRSPINF(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
void *pvSupportRateIEs, void *pvExtSupportRateIEs) void *pvSupportRateIEs, void *pvExtSupportRateIEs)
{ {
union vnt_phy_field_swap phy; union vnt_phy_field_swap phy;
unsigned char byTxRate = 0, byRsvTime = 0; // For OFDM unsigned char byTxRate = 0, byRsvTime = 0; /* For OFDM */
//Set to Page1 /* Set to Page1 */
MACvSelectPage1(pDevice->PortOffset); MACvSelectPage1(pDevice->PortOffset);
/* RSPINF_b_1 */ /* RSPINF_b_1 */
...@@ -270,60 +268,60 @@ s_vSetRSPINF(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType, ...@@ -270,60 +268,60 @@ s_vSetRSPINF(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
VNSvOutPortD(pDevice->PortOffset + MAC_REG_RSPINF_B_11, phy.field_write); VNSvOutPortD(pDevice->PortOffset + MAC_REG_RSPINF_B_11, phy.field_write);
//RSPINF_a_6 /* RSPINF_a_6 */
s_vCalculateOFDMRParameter(RATE_6M, s_vCalculateOFDMRParameter(RATE_6M,
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_6, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_6, MAKEWORD(byTxRate, byRsvTime));
//RSPINF_a_9 /* RSPINF_a_9 */
s_vCalculateOFDMRParameter(RATE_9M, s_vCalculateOFDMRParameter(RATE_9M,
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_9, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_9, MAKEWORD(byTxRate, byRsvTime));
//RSPINF_a_12 /* RSPINF_a_12 */
s_vCalculateOFDMRParameter(RATE_12M, s_vCalculateOFDMRParameter(RATE_12M,
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_12, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_12, MAKEWORD(byTxRate, byRsvTime));
//RSPINF_a_18 /* RSPINF_a_18 */
s_vCalculateOFDMRParameter(RATE_18M, s_vCalculateOFDMRParameter(RATE_18M,
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_18, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_18, MAKEWORD(byTxRate, byRsvTime));
//RSPINF_a_24 /* RSPINF_a_24 */
s_vCalculateOFDMRParameter(RATE_24M, s_vCalculateOFDMRParameter(RATE_24M,
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_24, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_24, MAKEWORD(byTxRate, byRsvTime));
//RSPINF_a_36 /* RSPINF_a_36 */
s_vCalculateOFDMRParameter( s_vCalculateOFDMRParameter(
VNTWIFIbyGetACKTxRate(RATE_36M, pvSupportRateIEs, pvExtSupportRateIEs), VNTWIFIbyGetACKTxRate(RATE_36M, pvSupportRateIEs, pvExtSupportRateIEs),
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_36, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_36, MAKEWORD(byTxRate, byRsvTime));
//RSPINF_a_48 /* RSPINF_a_48 */
s_vCalculateOFDMRParameter( s_vCalculateOFDMRParameter(
VNTWIFIbyGetACKTxRate(RATE_48M, pvSupportRateIEs, pvExtSupportRateIEs), VNTWIFIbyGetACKTxRate(RATE_48M, pvSupportRateIEs, pvExtSupportRateIEs),
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_48, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_48, MAKEWORD(byTxRate, byRsvTime));
//RSPINF_a_54 /* RSPINF_a_54 */
s_vCalculateOFDMRParameter( s_vCalculateOFDMRParameter(
VNTWIFIbyGetACKTxRate(RATE_54M, pvSupportRateIEs, pvExtSupportRateIEs), VNTWIFIbyGetACKTxRate(RATE_54M, pvSupportRateIEs, pvExtSupportRateIEs),
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_54, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_54, MAKEWORD(byTxRate, byRsvTime));
//RSPINF_a_72 /* RSPINF_a_72 */
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_72, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_72, MAKEWORD(byTxRate, byRsvTime));
//Set to Page0 /* Set to Page0 */
MACvSelectPage0(pDevice->PortOffset); MACvSelectPage0(pDevice->PortOffset);
} }
...@@ -339,7 +337,6 @@ s_vSetRSPINF(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType, ...@@ -339,7 +337,6 @@ s_vSetRSPINF(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
* none * none
* *
* Return Value: true if short preamble; otherwise false * Return Value: true if short preamble; otherwise false
*
*/ */
bool CARDbIsShortPreamble(struct vnt_private *pDevice) bool CARDbIsShortPreamble(struct vnt_private *pDevice)
{ {
...@@ -360,7 +357,6 @@ bool CARDbIsShortPreamble(struct vnt_private *pDevice) ...@@ -360,7 +357,6 @@ bool CARDbIsShortPreamble(struct vnt_private *pDevice)
* none * none
* *
* Return Value: true if short slot time; otherwise false * Return Value: true if short slot time; otherwise false
*
*/ */
bool CARDbIsShorSlotTime(struct vnt_private *pDevice) bool CARDbIsShorSlotTime(struct vnt_private *pDevice)
{ {
...@@ -378,7 +374,6 @@ bool CARDbIsShorSlotTime(struct vnt_private *pDevice) ...@@ -378,7 +374,6 @@ bool CARDbIsShorSlotTime(struct vnt_private *pDevice)
* none * none
* *
* Return Value: None. * Return Value: None.
*
*/ */
bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType, bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
unsigned short wCapInfo, unsigned char byERPField, unsigned short wCapInfo, unsigned char byERPField,
...@@ -392,13 +387,13 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType, ...@@ -392,13 +387,13 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
PWLAN_IE_SUPP_RATES pSupportRates = (PWLAN_IE_SUPP_RATES) pvSupportRateIEs; PWLAN_IE_SUPP_RATES pSupportRates = (PWLAN_IE_SUPP_RATES) pvSupportRateIEs;
PWLAN_IE_SUPP_RATES pExtSupportRates = (PWLAN_IE_SUPP_RATES) pvExtSupportRateIEs; PWLAN_IE_SUPP_RATES pExtSupportRates = (PWLAN_IE_SUPP_RATES) pvExtSupportRateIEs;
//Set SIFS, DIFS, EIFS, SlotTime, CwMin /* Set SIFS, DIFS, EIFS, SlotTime, CwMin */
if (ePHYType == PHY_TYPE_11A) { if (ePHYType == PHY_TYPE_11A) {
if (pSupportRates == NULL) if (pSupportRates == NULL)
pSupportRates = (PWLAN_IE_SUPP_RATES) abyDefaultSuppRatesA; pSupportRates = (PWLAN_IE_SUPP_RATES) abyDefaultSuppRatesA;
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);
pDevice->abyBBVGA[0] = 0x20; pDevice->abyBBVGA[0] = 0x20;
pDevice->abyBBVGA[2] = 0x10; pDevice->abyBBVGA[2] = 0x10;
...@@ -449,7 +444,7 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType, ...@@ -449,7 +444,7 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
bySIFS = C_SIFS_BG; bySIFS = C_SIFS_BG;
byDIFS = C_SIFS_BG + 2*C_SLOT_LONG; byDIFS = C_SIFS_BG + 2*C_SLOT_LONG;
byCWMaxMin = 0xA5; byCWMaxMin = 0xA5;
} else {// PK_TYPE_11GA & PK_TYPE_11GB } else { /* PK_TYPE_11GA & PK_TYPE_11GB */
if (pSupportRates == NULL) { if (pSupportRates == NULL) {
pSupportRates = (PWLAN_IE_SUPP_RATES) abyDefaultSuppRatesG; pSupportRates = (PWLAN_IE_SUPP_RATES) abyDefaultSuppRatesG;
pExtSupportRates = (PWLAN_IE_SUPP_RATES) abyDefaultExtSuppRatesG; pExtSupportRates = (PWLAN_IE_SUPP_RATES) abyDefaultExtSuppRatesG;
...@@ -503,13 +498,17 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType, ...@@ -503,13 +498,17 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
} }
if (pDevice->byRFType == RF_RFMD2959) { if (pDevice->byRFType == RF_RFMD2959) {
// bcs TX_PE will reserve 3 us /*
// hardware's processing time here is 2 us. * bcs TX_PE will reserve 3 us hardware's processing
* time here is 2 us.
*/
bySIFS -= 3; bySIFS -= 3;
byDIFS -= 3; byDIFS -= 3;
//{{ RobertYu: 20041202 /*
//// TX_PE will reserve 3 us for MAX2829 A mode only, it is for better TX throughput * TX_PE will reserve 3 us for MAX2829 A mode only, it is for
//// MAC will need 2 us to process, so the SIFS, DIFS can be shorter by 2 us. * better TX throughput; MAC will need 2 us to process, so the
* SIFS, DIFS can be shorter by 2 us.
*/
} }
if (pDevice->bySIFS != bySIFS) { if (pDevice->bySIFS != bySIFS) {
...@@ -545,7 +544,7 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType, ...@@ -545,7 +544,7 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
s_vSetRSPINF(pDevice, ePHYType, pSupportRates, pExtSupportRates); s_vSetRSPINF(pDevice, ePHYType, pSupportRates, pExtSupportRates);
pDevice->eCurrentPHYType = ePHYType; pDevice->eCurrentPHYType = ePHYType;
// set for NDIS OID_802_11SUPPORTED_RATES /* set for NDIS OID_802_11SUPPORTED_RATES */
return true; return true;
} }
...@@ -563,7 +562,6 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType, ...@@ -563,7 +562,6 @@ bool CARDbSetPhyParameter(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType,
* none * none
* *
* Return Value: none * Return Value: none
*
*/ */
bool CARDbUpdateTSF(struct vnt_private *pDevice, unsigned char byRxRate, bool CARDbUpdateTSF(struct vnt_private *pDevice, unsigned char byRxRate,
u64 qwBSSTimestamp, u64 qwLocalTSF) u64 qwBSSTimestamp, u64 qwLocalTSF)
...@@ -572,8 +570,7 @@ bool CARDbUpdateTSF(struct vnt_private *pDevice, unsigned char byRxRate, ...@@ -572,8 +570,7 @@ bool CARDbUpdateTSF(struct vnt_private *pDevice, unsigned char byRxRate,
if (qwBSSTimestamp != qwLocalTSF) { if (qwBSSTimestamp != qwLocalTSF) {
qwTSFOffset = CARDqGetTSFOffset(byRxRate, qwBSSTimestamp, qwLocalTSF); qwTSFOffset = CARDqGetTSFOffset(byRxRate, qwBSSTimestamp, qwLocalTSF);
// adjust TSF /* adjust TSF, HW's TSF add TSF Offset reg */
// HW's TSF add TSF Offset reg
VNSvOutPortD(pDevice->PortOffset + MAC_REG_TSFOFST, (u32)qwTSFOffset); VNSvOutPortD(pDevice->PortOffset + MAC_REG_TSFOFST, (u32)qwTSFOffset);
VNSvOutPortD(pDevice->PortOffset + MAC_REG_TSFOFST + 4, (u32)(qwTSFOffset >> 32)); VNSvOutPortD(pDevice->PortOffset + MAC_REG_TSFOFST + 4, (u32)(qwTSFOffset >> 32));
MACvRegBitsOn(pDevice->PortOffset, MAC_REG_TFTCTL, TFTCTL_TSFSYNCEN); MACvRegBitsOn(pDevice->PortOffset, MAC_REG_TFTCTL, TFTCTL_TSFSYNCEN);
...@@ -593,21 +590,20 @@ bool CARDbUpdateTSF(struct vnt_private *pDevice, unsigned char byRxRate, ...@@ -593,21 +590,20 @@ bool CARDbUpdateTSF(struct vnt_private *pDevice, unsigned char byRxRate,
* none * none
* *
* Return Value: true if succeed; otherwise false * Return Value: true if succeed; otherwise false
*
*/ */
bool CARDbSetBeaconPeriod(struct vnt_private *pDevice, bool CARDbSetBeaconPeriod(struct vnt_private *pDevice,
unsigned short wBeaconInterval) unsigned short wBeaconInterval)
{ {
u64 qwNextTBTT = 0; u64 qwNextTBTT = 0;
CARDbGetCurrentTSF(pDevice->PortOffset, &qwNextTBTT); //Get Local TSF counter CARDbGetCurrentTSF(pDevice->PortOffset, &qwNextTBTT); /* Get Local TSF counter */
qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval); qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval);
// set HW beacon interval /* set HW beacon interval */
VNSvOutPortW(pDevice->PortOffset + MAC_REG_BI, wBeaconInterval); VNSvOutPortW(pDevice->PortOffset + MAC_REG_BI, wBeaconInterval);
pDevice->wBeaconInterval = wBeaconInterval; pDevice->wBeaconInterval = wBeaconInterval;
// Set NextTBTT /* Set NextTBTT */
VNSvOutPortD(pDevice->PortOffset + MAC_REG_NEXTTBTT, (u32)qwNextTBTT); VNSvOutPortD(pDevice->PortOffset + MAC_REG_NEXTTBTT, (u32)qwNextTBTT);
VNSvOutPortD(pDevice->PortOffset + MAC_REG_NEXTTBTT + 4, (u32)(qwNextTBTT >> 32)); VNSvOutPortD(pDevice->PortOffset + MAC_REG_NEXTTBTT + 4, (u32)(qwNextTBTT >> 32));
MACvRegBitsOn(pDevice->PortOffset, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); MACvRegBitsOn(pDevice->PortOffset, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN);
...@@ -626,7 +622,6 @@ bool CARDbSetBeaconPeriod(struct vnt_private *pDevice, ...@@ -626,7 +622,6 @@ bool CARDbSetBeaconPeriod(struct vnt_private *pDevice,
* none * none
* *
* Return Value: true if all data packet complete; otherwise false. * Return Value: true if all data packet complete; otherwise false.
*
*/ */
bool CARDbStopTxPacket(struct vnt_private *pDevice, CARD_PKT_TYPE ePktType) bool CARDbStopTxPacket(struct vnt_private *pDevice, CARD_PKT_TYPE ePktType)
{ {
...@@ -654,12 +649,12 @@ bool CARDbStopTxPacket(struct vnt_private *pDevice, CARD_PKT_TYPE ePktType) ...@@ -654,12 +649,12 @@ bool CARDbStopTxPacket(struct vnt_private *pDevice, CARD_PKT_TYPE ePktType)
pDevice->cbBeaconBufReadySetCnt = 0; pDevice->cbBeaconBufReadySetCnt = 0;
MACvRegBitsOff(pDevice->PortOffset, MAC_REG_TCR, TCR_AUTOBCNTX); MACvRegBitsOff(pDevice->PortOffset, MAC_REG_TCR, TCR_AUTOBCNTX);
} }
// wait all TD0 complete /* wait all TD0 complete */
if (pDevice->bStopTx0Pkt == true) { if (pDevice->bStopTx0Pkt == true) {
if (pDevice->iTDUsed[TYPE_TXDMA0] != 0) if (pDevice->iTDUsed[TYPE_TXDMA0] != 0)
return false; return false;
} }
// wait all Data TD complete /* wait all Data TD complete */
if (pDevice->bStopDataPkt == true) { if (pDevice->bStopDataPkt == true) {
if (pDevice->iTDUsed[TYPE_AC0DMA] != 0) if (pDevice->iTDUsed[TYPE_AC0DMA] != 0)
return false; return false;
...@@ -679,7 +674,6 @@ bool CARDbStopTxPacket(struct vnt_private *pDevice, CARD_PKT_TYPE ePktType) ...@@ -679,7 +674,6 @@ bool CARDbStopTxPacket(struct vnt_private *pDevice, CARD_PKT_TYPE ePktType)
* none * none
* *
* Return Value: true if success; false if failed. * Return Value: true if success; false if failed.
*
*/ */
bool CARDbStartTxPacket(struct vnt_private *pDevice, CARD_PKT_TYPE ePktType) bool CARDbStartTxPacket(struct vnt_private *pDevice, CARD_PKT_TYPE ePktType)
{ {
...@@ -717,7 +711,6 @@ bool CARDbStartTxPacket(struct vnt_private *pDevice, CARD_PKT_TYPE ePktType) ...@@ -717,7 +711,6 @@ bool CARDbStartTxPacket(struct vnt_private *pDevice, CARD_PKT_TYPE ePktType)
* none * none
* *
* Return Value: true if success; false if failed. * Return Value: true if success; false if failed.
*
*/ */
bool CARDbSetBSSID(struct vnt_private *pDevice, bool CARDbSetBSSID(struct vnt_private *pDevice,
unsigned char *pbyBSSID, enum nl80211_iftype op_mode) unsigned char *pbyBSSID, enum nl80211_iftype op_mode)
...@@ -748,7 +741,7 @@ bool CARDbSetBSSID(struct vnt_private *pDevice, ...@@ -748,7 +741,7 @@ bool CARDbSetBSSID(struct vnt_private *pDevice,
} }
pr_debug("wmgr: rx_mode = %x\n", pDevice->byRxMode); pr_debug("wmgr: rx_mode = %x\n", pDevice->byRxMode);
} }
// Adopt BSS state in Adapter Device Object /* Adopt BSS state in Adapter Device Object */
pDevice->op_mode = op_mode; pDevice->op_mode = op_mode;
return true; return true;
} }
...@@ -764,7 +757,6 @@ bool CARDbSetBSSID(struct vnt_private *pDevice, ...@@ -764,7 +757,6 @@ bool CARDbSetBSSID(struct vnt_private *pDevice,
* none * none
* *
* Return Value: true if success; false if failed. * Return Value: true if success; false if failed.
*
*/ */
/* /*
...@@ -782,7 +774,6 @@ bool CARDbSetBSSID(struct vnt_private *pDevice, ...@@ -782,7 +774,6 @@ bool CARDbSetBSSID(struct vnt_private *pDevice,
* none * none
* *
* Return Value: true if succeed; otherwise false * Return Value: true if succeed; otherwise false
*
*/ */
bool CARDbSetTxDataRate( bool CARDbSetTxDataRate(
struct vnt_private *pDevice, struct vnt_private *pDevice,
...@@ -794,8 +785,7 @@ bool CARDbSetTxDataRate( ...@@ -794,8 +785,7 @@ bool CARDbSetTxDataRate(
return true; return true;
} }
/*+ /*
*
* Routine Description: * Routine Description:
* Consider to power down when no more packets to tx or rx. * Consider to power down when no more packets to tx or rx.
* *
...@@ -806,8 +796,7 @@ bool CARDbSetTxDataRate( ...@@ -806,8 +796,7 @@ bool CARDbSetTxDataRate(
* none * none
* *
* Return Value: true if power down success; otherwise false * Return Value: true if power down success; otherwise false
* */
-*/
bool bool
CARDbPowerDown( CARDbPowerDown(
struct vnt_private *pDevice struct vnt_private *pDevice
...@@ -815,14 +804,14 @@ CARDbPowerDown( ...@@ -815,14 +804,14 @@ CARDbPowerDown(
{ {
unsigned int uIdx; unsigned int uIdx;
// check if already in Doze mode /* check if already in Doze mode */
if (MACbIsRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_PS)) if (MACbIsRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_PS))
return true; return true;
// Froce PSEN on /* Froce PSEN on */
MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_PSEN); MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_PSEN);
// check if all TD are empty, /* check if all TD are empty */
for (uIdx = 0; uIdx < TYPE_MAXTD; uIdx++) { for (uIdx = 0; uIdx < TYPE_MAXTD; uIdx++) {
if (pDevice->iTDUsed[uIdx] != 0) if (pDevice->iTDUsed[uIdx] != 0)
...@@ -844,7 +833,6 @@ CARDbPowerDown( ...@@ -844,7 +833,6 @@ CARDbPowerDown(
* none * none
* *
* Return Value: true if success; otherwise false * Return Value: true if success; otherwise false
*
*/ */
bool CARDbRadioPowerOff(struct vnt_private *pDevice) bool CARDbRadioPowerOff(struct vnt_private *pDevice)
{ {
...@@ -861,7 +849,7 @@ bool CARDbRadioPowerOff(struct vnt_private *pDevice) ...@@ -861,7 +849,7 @@ bool CARDbRadioPowerOff(struct vnt_private *pDevice)
case RF_AIROHA: case RF_AIROHA:
case RF_AL2230S: case RF_AL2230S:
case RF_AIROHA7230: //RobertYu:20050104 case RF_AIROHA7230:
MACvWordRegBitsOff(pDevice->PortOffset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE2); MACvWordRegBitsOff(pDevice->PortOffset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE2);
MACvWordRegBitsOff(pDevice->PortOffset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3); MACvWordRegBitsOff(pDevice->PortOffset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3);
break; break;
...@@ -873,9 +861,8 @@ bool CARDbRadioPowerOff(struct vnt_private *pDevice) ...@@ -873,9 +861,8 @@ bool CARDbRadioPowerOff(struct vnt_private *pDevice)
BBvSetDeepSleep(pDevice->PortOffset, pDevice->byLocalID); BBvSetDeepSleep(pDevice->PortOffset, pDevice->byLocalID);
pDevice->bRadioOff = true; pDevice->bRadioOff = true;
//2007-0409-03,<Add> by chester
pr_debug("chester power off\n"); pr_debug("chester power off\n");
MACvRegBitsOn(pDevice->PortOffset, MAC_REG_GPIOCTL0, LED_ACTSET); //LED issue MACvRegBitsOn(pDevice->PortOffset, MAC_REG_GPIOCTL0, LED_ACTSET); /* LED issue */
return bResult; return bResult;
} }
...@@ -889,7 +876,6 @@ bool CARDbRadioPowerOff(struct vnt_private *pDevice) ...@@ -889,7 +876,6 @@ bool CARDbRadioPowerOff(struct vnt_private *pDevice)
* none * none
* *
* Return Value: true if success; otherwise false * Return Value: true if success; otherwise false
*
*/ */
bool CARDbRadioPowerOn(struct vnt_private *pDevice) bool CARDbRadioPowerOn(struct vnt_private *pDevice)
{ {
...@@ -919,7 +905,7 @@ bool CARDbRadioPowerOn(struct vnt_private *pDevice) ...@@ -919,7 +905,7 @@ bool CARDbRadioPowerOn(struct vnt_private *pDevice)
case RF_AIROHA: case RF_AIROHA:
case RF_AL2230S: case RF_AL2230S:
case RF_AIROHA7230: //RobertYu:20050104 case RF_AIROHA7230:
MACvWordRegBitsOn(pDevice->PortOffset, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE2 | MACvWordRegBitsOn(pDevice->PortOffset, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE2 |
SOFTPWRCTL_SWPE3)); SOFTPWRCTL_SWPE3));
break; break;
...@@ -927,9 +913,8 @@ bool CARDbRadioPowerOn(struct vnt_private *pDevice) ...@@ -927,9 +913,8 @@ bool CARDbRadioPowerOn(struct vnt_private *pDevice)
} }
pDevice->bRadioOff = false; pDevice->bRadioOff = false;
// 2007-0409-03,<Add> by chester
pr_debug("chester power on\n"); pr_debug("chester power on\n");
MACvRegBitsOff(pDevice->PortOffset, MAC_REG_GPIOCTL0, LED_ACTSET); //LED issue MACvRegBitsOff(pDevice->PortOffset, MAC_REG_GPIOCTL0, LED_ACTSET); /* LED issue */
return bResult; return bResult;
} }
...@@ -941,7 +926,6 @@ bool CARDbRemoveKey(struct vnt_private *pDevice, unsigned char *pbyBSSID) ...@@ -941,7 +926,6 @@ bool CARDbRemoveKey(struct vnt_private *pDevice, unsigned char *pbyBSSID)
} }
/* /*
*
* Description: * Description:
* Add BSSID in PMKID Candidate list. * Add BSSID in PMKID Candidate list.
* *
...@@ -954,8 +938,7 @@ bool CARDbRemoveKey(struct vnt_private *pDevice, unsigned char *pbyBSSID) ...@@ -954,8 +938,7 @@ bool CARDbRemoveKey(struct vnt_private *pDevice, unsigned char *pbyBSSID)
* none * none
* *
* Return Value: none. * Return Value: none.
* */
-*/
bool bool
CARDbAdd_PMKID_Candidate( CARDbAdd_PMKID_Candidate(
struct vnt_private *pDevice, struct vnt_private *pDevice,
...@@ -980,7 +963,7 @@ CARDbAdd_PMKID_Candidate( ...@@ -980,7 +963,7 @@ CARDbAdd_PMKID_Candidate(
pr_debug("\n"); pr_debug("\n");
// Update Old Candidate /* Update Old Candidate */
for (ii = 0; ii < pDevice->gsPMKIDCandidate.NumCandidates; ii++) { for (ii = 0; ii < pDevice->gsPMKIDCandidate.NumCandidates; ii++) {
pCandidateList = &pDevice->gsPMKIDCandidate.CandidateList[ii]; pCandidateList = &pDevice->gsPMKIDCandidate.CandidateList[ii];
if (!memcmp(pCandidateList->BSSID, pbyBSSID, ETH_ALEN)) { if (!memcmp(pCandidateList->BSSID, pbyBSSID, ETH_ALEN)) {
...@@ -993,7 +976,7 @@ CARDbAdd_PMKID_Candidate( ...@@ -993,7 +976,7 @@ CARDbAdd_PMKID_Candidate(
} }
} }
// New Candidate /* New Candidate */
pCandidateList = &pDevice->gsPMKIDCandidate.CandidateList[pDevice->gsPMKIDCandidate.NumCandidates]; pCandidateList = &pDevice->gsPMKIDCandidate.CandidateList[pDevice->gsPMKIDCandidate.NumCandidates];
if (bRSNCapExist && (wRSNCap & BIT0)) if (bRSNCapExist && (wRSNCap & BIT0))
pCandidateList->Flags |= NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED; pCandidateList->Flags |= NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED;
...@@ -1017,7 +1000,6 @@ CARDpGetCurrentAddress( ...@@ -1017,7 +1000,6 @@ CARDpGetCurrentAddress(
} }
/* /*
*
* Description: * Description:
* Start Spectrum Measure defined in 802.11h * Start Spectrum Measure defined in 802.11h
* *
...@@ -1028,8 +1010,7 @@ CARDpGetCurrentAddress( ...@@ -1028,8 +1010,7 @@ CARDpGetCurrentAddress(
* none * none
* *
* Return Value: none. * Return Value: none.
* */
-*/
bool bool
CARDbStartMeasure( CARDbStartMeasure(
struct vnt_private *pDevice, struct vnt_private *pDevice,
...@@ -1054,7 +1035,7 @@ CARDbStartMeasure( ...@@ -1054,7 +1035,7 @@ CARDbStartMeasure(
MACvSelectPage1(pDevice->PortOffset); MACvSelectPage1(pDevice->PortOffset);
VNSvOutPortD(pDevice->PortOffset + MAC_REG_MAR0, pDevice->dwOrgMAR0); VNSvOutPortD(pDevice->PortOffset + MAC_REG_MAR0, pDevice->dwOrgMAR0);
VNSvOutPortD(pDevice->PortOffset + MAC_REG_MAR4, pDevice->dwOrgMAR4); VNSvOutPortD(pDevice->PortOffset + MAC_REG_MAR4, pDevice->dwOrgMAR4);
// clear measure control /* clear measure control */
MACvRegBitsOff(pDevice->PortOffset, MAC_REG_MSRCTL, MSRCTL_EN); MACvRegBitsOff(pDevice->PortOffset, MAC_REG_MSRCTL, MSRCTL_EN);
MACvSelectPage0(pDevice->PortOffset); MACvSelectPage0(pDevice->PortOffset);
set_channel(pDevice, pDevice->byOrgChannel); set_channel(pDevice, pDevice->byOrgChannel);
...@@ -1072,16 +1053,16 @@ CARDbStartMeasure( ...@@ -1072,16 +1053,16 @@ CARDbStartMeasure(
if (pDevice->byLocalID > REV_ID_VT3253_B1) { if (pDevice->byLocalID > REV_ID_VT3253_B1) {
qwStartTSF = *((u64 *)(pDevice->pCurrMeasureEID->sReq.abyStartTime)); qwStartTSF = *((u64 *)(pDevice->pCurrMeasureEID->sReq.abyStartTime));
wDuration = *((unsigned short *)(pDevice->pCurrMeasureEID->sReq.abyDuration)); wDuration = *((unsigned short *)(pDevice->pCurrMeasureEID->sReq.abyDuration));
wDuration += 1; // 1 TU for channel switching wDuration += 1; /* 1 TU for channel switching */
if (qwStartTSF == 0) { if (qwStartTSF == 0) {
// start immediately by setting start TSF == current TSF + 2 TU /* start immediately by setting start TSF == current TSF + 2 TU */
qwStartTSF = qwCurrTSF + 2048; qwStartTSF = qwCurrTSF + 2048;
bExpired = false; bExpired = false;
break; break;
} else { } else {
// start at setting start TSF - 1TU(for channel switching) /* start at setting start TSF - 1TU(for channel switching) */
qwStartTSF -= 1024; qwStartTSF -= 1024;
} }
...@@ -1098,7 +1079,7 @@ CARDbStartMeasure( ...@@ -1098,7 +1079,7 @@ CARDbStartMeasure(
pDevice->abyRPIs pDevice->abyRPIs
); );
} else { } else {
// hardware do not support measure /* hardware do not support measure */
VNTWIFIbMeasureReport(pDevice->pMgmt, VNTWIFIbMeasureReport(pDevice->pMgmt,
false, false,
pDevice->pCurrMeasureEID, pDevice->pCurrMeasureEID,
...@@ -1118,7 +1099,7 @@ CARDbStartMeasure( ...@@ -1118,7 +1099,7 @@ CARDbStartMeasure(
MACvRegBitsOn(pDevice->PortOffset, MAC_REG_MSRCTL, MSRCTL_EN); MACvRegBitsOn(pDevice->PortOffset, MAC_REG_MSRCTL, MSRCTL_EN);
MACvSelectPage0(pDevice->PortOffset); MACvSelectPage0(pDevice->PortOffset);
} else { } else {
// all measure start time expired we should complete action /* all measure start time expired we should complete action */
VNTWIFIbMeasureReport(pDevice->pMgmt, VNTWIFIbMeasureReport(pDevice->pMgmt,
true, true,
NULL, NULL,
...@@ -1132,7 +1113,6 @@ CARDbStartMeasure( ...@@ -1132,7 +1113,6 @@ CARDbStartMeasure(
} }
/* /*
*
* Description: * Description:
* Do Channel Switch defined in 802.11h * Do Channel Switch defined in 802.11h
* *
...@@ -1143,8 +1123,7 @@ CARDbStartMeasure( ...@@ -1143,8 +1123,7 @@ CARDbStartMeasure(
* none * none
* *
* Return Value: none. * Return Value: none.
* */
-*/
bool bool
CARDbChannelSwitch( CARDbChannelSwitch(
struct vnt_private *pDevice, struct vnt_private *pDevice,
...@@ -1173,7 +1152,6 @@ CARDbChannelSwitch( ...@@ -1173,7 +1152,6 @@ CARDbChannelSwitch(
} }
/* /*
*
* Description: * Description:
* Handle Quiet EID defined in 802.11h * Handle Quiet EID defined in 802.11h
* *
...@@ -1184,8 +1162,7 @@ CARDbChannelSwitch( ...@@ -1184,8 +1162,7 @@ CARDbChannelSwitch(
* none * none
* *
* Return Value: none. * Return Value: none.
* */
-*/
bool bool
CARDbSetQuiet( CARDbSetQuiet(
struct vnt_private *pDevice, struct vnt_private *pDevice,
...@@ -1224,7 +1201,6 @@ CARDbSetQuiet( ...@@ -1224,7 +1201,6 @@ CARDbSetQuiet(
} }
/* /*
*
* Description: * Description:
* Do Quiet, It will be called by either ISR(after start) * Do Quiet, It will be called by either ISR(after start)
* or VNTWIFI(before start) so we do not need a SPINLOCK * or VNTWIFI(before start) so we do not need a SPINLOCK
...@@ -1236,8 +1212,7 @@ CARDbSetQuiet( ...@@ -1236,8 +1212,7 @@ CARDbSetQuiet(
* none * none
* *
* Return Value: none. * Return Value: none.
* */
-*/
bool bool
CARDbStartQuiet( CARDbStartQuiet(
struct vnt_private *pDevice struct vnt_private *pDevice
...@@ -1258,12 +1233,12 @@ CARDbStartQuiet( ...@@ -1258,12 +1233,12 @@ CARDbStartQuiet(
} }
} }
if (dwStartTime == 0xFFFFFFFF) { if (dwStartTime == 0xFFFFFFFF) {
// no more quiet /* no more quiet */
pDevice->bQuietEnable = false; pDevice->bQuietEnable = false;
MACvRegBitsOff(pDevice->PortOffset, MAC_REG_MSRCTL, (MSRCTL_QUIETTXCHK | MSRCTL_QUIETEN)); MACvRegBitsOff(pDevice->PortOffset, MAC_REG_MSRCTL, (MSRCTL_QUIETTXCHK | MSRCTL_QUIETEN));
} else { } else {
if (pDevice->bQuietEnable == false) { if (pDevice->bQuietEnable == false) {
// first quiet /* first quiet */
pDevice->byQuietStartCount--; pDevice->byQuietStartCount--;
dwNextTime = pDevice->sQuiet[uCurrentQuietIndex].dwStartTime; dwNextTime = pDevice->sQuiet[uCurrentQuietIndex].dwStartTime;
dwNextTime %= pDevice->wBeaconInterval; dwNextTime %= pDevice->wBeaconInterval;
...@@ -1279,10 +1254,14 @@ CARDbStartQuiet( ...@@ -1279,10 +1254,14 @@ CARDbStartQuiet(
MACvSelectPage0(pDevice->PortOffset); MACvSelectPage0(pDevice->PortOffset);
} else { } else {
if (pDevice->dwCurrentQuietEndTime > pDevice->sQuiet[uCurrentQuietIndex].dwStartTime) { if (pDevice->dwCurrentQuietEndTime > pDevice->sQuiet[uCurrentQuietIndex].dwStartTime) {
// overlap with previous Quiet /* overlap with previous Quiet */
dwGap = pDevice->dwCurrentQuietEndTime - pDevice->sQuiet[uCurrentQuietIndex].dwStartTime; dwGap = pDevice->dwCurrentQuietEndTime - pDevice->sQuiet[uCurrentQuietIndex].dwStartTime;
if (dwGap >= pDevice->sQuiet[uCurrentQuietIndex].wDuration) { if (dwGap >= pDevice->sQuiet[uCurrentQuietIndex].wDuration) {
// return false to indicate next quiet expired, should call this function again /*
* return false to indicate next quiet
* expired, should call this function
* again
*/
return false; return false;
} }
dwDuration = pDevice->sQuiet[uCurrentQuietIndex].wDuration - dwGap; dwDuration = pDevice->sQuiet[uCurrentQuietIndex].wDuration - dwGap;
...@@ -1291,7 +1270,7 @@ CARDbStartQuiet( ...@@ -1291,7 +1270,7 @@ CARDbStartQuiet(
dwGap = pDevice->sQuiet[uCurrentQuietIndex].dwStartTime - pDevice->dwCurrentQuietEndTime; dwGap = pDevice->sQuiet[uCurrentQuietIndex].dwStartTime - pDevice->dwCurrentQuietEndTime;
dwDuration = pDevice->sQuiet[uCurrentQuietIndex].wDuration; dwDuration = pDevice->sQuiet[uCurrentQuietIndex].wDuration;
} }
// set GAP and Next duration /* set GAP and Next duration */
MACvSelectPage1(pDevice->PortOffset); MACvSelectPage1(pDevice->PortOffset);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_QUIETGAP, (unsigned short) dwGap); VNSvOutPortW(pDevice->PortOffset + MAC_REG_QUIETGAP, (unsigned short) dwGap);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_QUIETDUR, (unsigned short) dwDuration); VNSvOutPortW(pDevice->PortOffset + MAC_REG_QUIETDUR, (unsigned short) dwDuration);
...@@ -1302,16 +1281,16 @@ CARDbStartQuiet( ...@@ -1302,16 +1281,16 @@ CARDbStartQuiet(
pDevice->dwCurrentQuietEndTime = pDevice->sQuiet[uCurrentQuietIndex].dwStartTime; pDevice->dwCurrentQuietEndTime = pDevice->sQuiet[uCurrentQuietIndex].dwStartTime;
pDevice->dwCurrentQuietEndTime += pDevice->sQuiet[uCurrentQuietIndex].wDuration; pDevice->dwCurrentQuietEndTime += pDevice->sQuiet[uCurrentQuietIndex].wDuration;
if (pDevice->sQuiet[uCurrentQuietIndex].byPeriod == 0) { if (pDevice->sQuiet[uCurrentQuietIndex].byPeriod == 0) {
// not period disable current quiet element /* not period disable current quiet element */
pDevice->sQuiet[uCurrentQuietIndex].bEnable = false; pDevice->sQuiet[uCurrentQuietIndex].bEnable = false;
} else { } else {
// set next period start time /* set next period start time */
dwNextTime = (unsigned long) pDevice->sQuiet[uCurrentQuietIndex].byPeriod; dwNextTime = (unsigned long) pDevice->sQuiet[uCurrentQuietIndex].byPeriod;
dwNextTime *= pDevice->wBeaconInterval; dwNextTime *= pDevice->wBeaconInterval;
pDevice->sQuiet[uCurrentQuietIndex].dwStartTime = dwNextTime; pDevice->sQuiet[uCurrentQuietIndex].dwStartTime = dwNextTime;
} }
if (pDevice->dwCurrentQuietEndTime > 0x80010000) { if (pDevice->dwCurrentQuietEndTime > 0x80010000) {
// decreament all time to avoid wrap around /* decreament all time to avoid wrap around */
for (ii = 0; ii < MAX_QUIET_COUNT; ii++) { for (ii = 0; ii < MAX_QUIET_COUNT; ii++) {
if (pDevice->sQuiet[ii].bEnable == true) if (pDevice->sQuiet[ii].bEnable == true)
pDevice->sQuiet[ii].dwStartTime -= 0x80000000; pDevice->sQuiet[ii].dwStartTime -= 0x80000000;
...@@ -1324,7 +1303,6 @@ CARDbStartQuiet( ...@@ -1324,7 +1303,6 @@ CARDbStartQuiet(
} }
/* /*
*
* Description: * Description:
* Set Local Power Constraint * Set Local Power Constraint
* *
...@@ -1335,8 +1313,7 @@ CARDbStartQuiet( ...@@ -1335,8 +1313,7 @@ CARDbStartQuiet(
* none * none
* *
* Return Value: none. * Return Value: none.
* */
-*/
void void
CARDvSetPowerConstraint( CARDvSetPowerConstraint(
struct vnt_private *pDevice, struct vnt_private *pDevice,
...@@ -1357,7 +1334,6 @@ CARDvSetPowerConstraint( ...@@ -1357,7 +1334,6 @@ CARDvSetPowerConstraint(
} }
/* /*
*
* Description: * Description:
* Set Local Power Constraint * Set Local Power Constraint
* *
...@@ -1368,8 +1344,7 @@ CARDvSetPowerConstraint( ...@@ -1368,8 +1344,7 @@ CARDvSetPowerConstraint(
* none * none
* *
* Return Value: none. * Return Value: none.
* */
-*/
void void
CARDvGetPowerCapability( CARDvGetPowerCapability(
struct vnt_private *pDevice, struct vnt_private *pDevice,
...@@ -1391,7 +1366,6 @@ CARDvGetPowerCapability( ...@@ -1391,7 +1366,6 @@ CARDvGetPowerCapability(
} }
/* /*
*
* Description: * Description:
* Get Current Tx Power * Get Current Tx Power
* *
...@@ -1402,7 +1376,6 @@ CARDvGetPowerCapability( ...@@ -1402,7 +1376,6 @@ CARDvGetPowerCapability(
* none * none
* *
* Return Value: none. * Return Value: none.
*
*/ */
char char
CARDbyGetTransmitPower( CARDbyGetTransmitPower(
...@@ -1413,7 +1386,6 @@ CARDbyGetTransmitPower( ...@@ -1413,7 +1386,6 @@ CARDbyGetTransmitPower(
return pDevice->byCurPwrdBm; return pDevice->byCurPwrdBm;
} }
//xxx
void void
CARDvSafeResetTx( CARDvSafeResetTx(
struct vnt_private *pDevice struct vnt_private *pDevice
...@@ -1422,7 +1394,7 @@ CARDvSafeResetTx( ...@@ -1422,7 +1394,7 @@ CARDvSafeResetTx(
unsigned int uu; unsigned int uu;
PSTxDesc pCurrTD; PSTxDesc pCurrTD;
// initialize TD index /* initialize TD index */
pDevice->apTailTD[0] = pDevice->apCurrTD[0] = &(pDevice->apTD0Rings[0]); pDevice->apTailTD[0] = pDevice->apCurrTD[0] = &(pDevice->apTD0Rings[0]);
pDevice->apTailTD[1] = pDevice->apCurrTD[1] = &(pDevice->apTD1Rings[0]); pDevice->apTailTD[1] = pDevice->apCurrTD[1] = &(pDevice->apTD1Rings[0]);
...@@ -1432,28 +1404,27 @@ CARDvSafeResetTx( ...@@ -1432,28 +1404,27 @@ CARDvSafeResetTx(
for (uu = 0; uu < pDevice->sOpts.nTxDescs[0]; uu++) { for (uu = 0; uu < pDevice->sOpts.nTxDescs[0]; uu++) {
pCurrTD = &(pDevice->apTD0Rings[uu]); pCurrTD = &(pDevice->apTD0Rings[uu]);
pCurrTD->m_td0TD0.f1Owner = OWNED_BY_HOST; pCurrTD->m_td0TD0.f1Owner = OWNED_BY_HOST;
// init all Tx Packet pointer to NULL /* init all Tx Packet pointer to NULL */
} }
for (uu = 0; uu < pDevice->sOpts.nTxDescs[1]; uu++) { for (uu = 0; uu < pDevice->sOpts.nTxDescs[1]; uu++) {
pCurrTD = &(pDevice->apTD1Rings[uu]); pCurrTD = &(pDevice->apTD1Rings[uu]);
pCurrTD->m_td0TD0.f1Owner = OWNED_BY_HOST; pCurrTD->m_td0TD0.f1Owner = OWNED_BY_HOST;
// init all Tx Packet pointer to NULL /* init all Tx Packet pointer to NULL */
} }
// set MAC TD pointer /* set MAC TD pointer */
MACvSetCurrTXDescAddr(TYPE_TXDMA0, pDevice->PortOffset, MACvSetCurrTXDescAddr(TYPE_TXDMA0, pDevice->PortOffset,
(pDevice->td0_pool_dma)); (pDevice->td0_pool_dma));
MACvSetCurrTXDescAddr(TYPE_AC0DMA, pDevice->PortOffset, MACvSetCurrTXDescAddr(TYPE_AC0DMA, pDevice->PortOffset,
(pDevice->td1_pool_dma)); (pDevice->td1_pool_dma));
// set MAC Beacon TX pointer /* set MAC Beacon TX pointer */
MACvSetCurrBCNTxDescAddr(pDevice->PortOffset, MACvSetCurrBCNTxDescAddr(pDevice->PortOffset,
(pDevice->tx_beacon_dma)); (pDevice->tx_beacon_dma));
} }
/*+ /*
*
* Description: * Description:
* Reset Rx * Reset Rx
* *
...@@ -1464,8 +1435,7 @@ CARDvSafeResetTx( ...@@ -1464,8 +1435,7 @@ CARDvSafeResetTx(
* none * none
* *
* Return Value: none * Return Value: none
* */
-*/
void void
CARDvSafeResetRx( CARDvSafeResetRx(
struct vnt_private *pDevice struct vnt_private *pDevice
...@@ -1474,11 +1444,11 @@ CARDvSafeResetRx( ...@@ -1474,11 +1444,11 @@ CARDvSafeResetRx(
unsigned int uu; unsigned int uu;
PSRxDesc pDesc; PSRxDesc pDesc;
// initialize RD index /* initialize RD index */
pDevice->pCurrRD[0] = &(pDevice->aRD0Ring[0]); pDevice->pCurrRD[0] = &(pDevice->aRD0Ring[0]);
pDevice->pCurrRD[1] = &(pDevice->aRD1Ring[0]); pDevice->pCurrRD[1] = &(pDevice->aRD1Ring[0]);
// init state, all RD is chip's /* init state, all RD is chip's */
for (uu = 0; uu < pDevice->sOpts.nRxDescs0; uu++) { for (uu = 0; uu < pDevice->sOpts.nRxDescs0; uu++) {
pDesc = &(pDevice->aRD0Ring[uu]); pDesc = &(pDevice->aRD0Ring[uu]);
pDesc->m_rd0RD0.wResCount = (unsigned short)(pDevice->rx_buf_sz); pDesc->m_rd0RD0.wResCount = (unsigned short)(pDevice->rx_buf_sz);
...@@ -1486,7 +1456,7 @@ CARDvSafeResetRx( ...@@ -1486,7 +1456,7 @@ CARDvSafeResetRx(
pDesc->m_rd1RD1.wReqCount = (unsigned short)(pDevice->rx_buf_sz); pDesc->m_rd1RD1.wReqCount = (unsigned short)(pDevice->rx_buf_sz);
} }
// init state, all RD is chip's /* init state, all RD is chip's */
for (uu = 0; uu < pDevice->sOpts.nRxDescs1; uu++) { for (uu = 0; uu < pDevice->sOpts.nRxDescs1; uu++) {
pDesc = &(pDevice->aRD1Ring[uu]); pDesc = &(pDevice->aRD1Ring[uu]);
pDesc->m_rd0RD0.wResCount = (unsigned short)(pDevice->rx_buf_sz); pDesc->m_rd0RD0.wResCount = (unsigned short)(pDevice->rx_buf_sz);
...@@ -1497,10 +1467,10 @@ CARDvSafeResetRx( ...@@ -1497,10 +1467,10 @@ CARDvSafeResetRx(
pDevice->cbDFCB = CB_MAX_RX_FRAG; pDevice->cbDFCB = CB_MAX_RX_FRAG;
pDevice->cbFreeDFCB = pDevice->cbDFCB; pDevice->cbFreeDFCB = pDevice->cbDFCB;
// set perPkt mode /* set perPkt mode */
MACvRx0PerPktMode(pDevice->PortOffset); MACvRx0PerPktMode(pDevice->PortOffset);
MACvRx1PerPktMode(pDevice->PortOffset); MACvRx1PerPktMode(pDevice->PortOffset);
// set MAC RD pointer /* set MAC RD pointer */
MACvSetCurrRx0DescAddr(pDevice->PortOffset, MACvSetCurrRx0DescAddr(pDevice->PortOffset,
pDevice->rd0_pool_dma); pDevice->rd0_pool_dma);
...@@ -1519,7 +1489,6 @@ CARDvSafeResetRx( ...@@ -1519,7 +1489,6 @@ CARDvSafeResetRx(
* none * none
* *
* Return Value: response Control frame rate * Return Value: response Control frame rate
*
*/ */
static unsigned short CARDwGetCCKControlRate(struct vnt_private *pDevice, static unsigned short CARDwGetCCKControlRate(struct vnt_private *pDevice,
unsigned short wRateIdx) unsigned short wRateIdx)
...@@ -1546,7 +1515,6 @@ static unsigned short CARDwGetCCKControlRate(struct vnt_private *pDevice, ...@@ -1546,7 +1515,6 @@ static unsigned short CARDwGetCCKControlRate(struct vnt_private *pDevice,
* none * none
* *
* Return Value: response Control frame rate * Return Value: response Control frame rate
*
*/ */
static unsigned short CARDwGetOFDMControlRate(struct vnt_private *pDevice, static unsigned short CARDwGetOFDMControlRate(struct vnt_private *pDevice,
unsigned short wRateIdx) unsigned short wRateIdx)
...@@ -1582,14 +1550,13 @@ static unsigned short CARDwGetOFDMControlRate(struct vnt_private *pDevice, ...@@ -1582,14 +1550,13 @@ static unsigned short CARDwGetOFDMControlRate(struct vnt_private *pDevice,
* none * none
* *
* Return Value: None. * Return Value: None.
*
*/ */
void CARDvSetRSPINF(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType) void CARDvSetRSPINF(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType)
{ {
union vnt_phy_field_swap phy; union vnt_phy_field_swap phy;
unsigned char byTxRate, byRsvTime; //For OFDM unsigned char byTxRate, byRsvTime; /* For OFDM */
//Set to Page1 /* Set to Page1 */
MACvSelectPage1(pDevice->PortOffset); MACvSelectPage1(pDevice->PortOffset);
/* RSPINF_b_1 */ /* RSPINF_b_1 */
...@@ -1629,62 +1596,61 @@ void CARDvSetRSPINF(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType) ...@@ -1629,62 +1596,61 @@ void CARDvSetRSPINF(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType)
VNSvOutPortD(pDevice->PortOffset + MAC_REG_RSPINF_B_11, phy.field_write); VNSvOutPortD(pDevice->PortOffset + MAC_REG_RSPINF_B_11, phy.field_write);
//RSPINF_a_6 /* RSPINF_a_6 */
s_vCalculateOFDMRParameter(RATE_6M, s_vCalculateOFDMRParameter(RATE_6M,
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_6, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_6, MAKEWORD(byTxRate, byRsvTime));
//RSPINF_a_9 /* RSPINF_a_9 */
s_vCalculateOFDMRParameter(RATE_9M, s_vCalculateOFDMRParameter(RATE_9M,
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_9, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_9, MAKEWORD(byTxRate, byRsvTime));
//RSPINF_a_12 /* RSPINF_a_12 */
s_vCalculateOFDMRParameter(RATE_12M, s_vCalculateOFDMRParameter(RATE_12M,
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_12, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_12, MAKEWORD(byTxRate, byRsvTime));
//RSPINF_a_18 /* RSPINF_a_18 */
s_vCalculateOFDMRParameter(RATE_18M, s_vCalculateOFDMRParameter(RATE_18M,
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_18, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_18, MAKEWORD(byTxRate, byRsvTime));
//RSPINF_a_24 /* RSPINF_a_24 */
s_vCalculateOFDMRParameter(RATE_24M, s_vCalculateOFDMRParameter(RATE_24M,
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_24, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_24, MAKEWORD(byTxRate, byRsvTime));
//RSPINF_a_36 /* RSPINF_a_36 */
s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)pDevice, RATE_36M), s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)pDevice, RATE_36M),
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_36, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_36, MAKEWORD(byTxRate, byRsvTime));
//RSPINF_a_48 /* RSPINF_a_48 */
s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)pDevice, RATE_48M), s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)pDevice, RATE_48M),
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_48, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_48, MAKEWORD(byTxRate, byRsvTime));
//RSPINF_a_54 /* RSPINF_a_54 */
s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)pDevice, RATE_54M), s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)pDevice, RATE_54M),
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_54, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_54, MAKEWORD(byTxRate, byRsvTime));
/* RSPINF_a_72 */
//RSPINF_a_72
s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)pDevice, RATE_54M), s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)pDevice, RATE_54M),
ePHYType, ePHYType,
&byTxRate, &byTxRate,
&byRsvTime); &byRsvTime);
VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_72, MAKEWORD(byTxRate, byRsvTime)); VNSvOutPortW(pDevice->PortOffset + MAC_REG_RSPINF_A_72, MAKEWORD(byTxRate, byRsvTime));
//Set to Page0 /* Set to Page0 */
MACvSelectPage0(pDevice->PortOffset); MACvSelectPage0(pDevice->PortOffset);
} }
...@@ -1698,7 +1664,6 @@ void CARDvSetRSPINF(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType) ...@@ -1698,7 +1664,6 @@ void CARDvSetRSPINF(struct vnt_private *pDevice, CARD_PHY_TYPE ePHYType)
* none * none
* *
* Return Value: None. * Return Value: None.
*
*/ */
void vUpdateIFS(struct vnt_private *pDevice) void vUpdateIFS(struct vnt_private *pDevice)
{ {
...@@ -1706,19 +1671,20 @@ void vUpdateIFS(struct vnt_private *pDevice) ...@@ -1706,19 +1671,20 @@ void vUpdateIFS(struct vnt_private *pDevice)
unsigned char byMaxMin = 0; unsigned char byMaxMin = 0;
if (pDevice->byPacketType == PK_TYPE_11A) {//0000 0000 0000 0000,11a if (pDevice->byPacketType == PK_TYPE_11A) { /*0000 0000 0000 0000,11a*/
pDevice->uSlot = C_SLOT_SHORT; pDevice->uSlot = C_SLOT_SHORT;
pDevice->uSIFS = C_SIFS_A; pDevice->uSIFS = C_SIFS_A;
pDevice->uDIFS = C_SIFS_A + 2*C_SLOT_SHORT; pDevice->uDIFS = C_SIFS_A + 2*C_SLOT_SHORT;
pDevice->uCwMin = C_CWMIN_A; pDevice->uCwMin = C_CWMIN_A;
byMaxMin = 4; byMaxMin = 4;
} else if (pDevice->byPacketType == PK_TYPE_11B) {//0000 0001 0000 0000,11b } else if (pDevice->byPacketType == PK_TYPE_11B) {
/* 0000 0001 0000 0000,11b */
pDevice->uSlot = C_SLOT_LONG; pDevice->uSlot = C_SLOT_LONG;
pDevice->uSIFS = C_SIFS_BG; pDevice->uSIFS = C_SIFS_BG;
pDevice->uDIFS = C_SIFS_BG + 2*C_SLOT_LONG; pDevice->uDIFS = C_SIFS_BG + 2*C_SLOT_LONG;
pDevice->uCwMin = C_CWMIN_B; pDevice->uCwMin = C_CWMIN_B;
byMaxMin = 5; byMaxMin = 5;
} else { // PK_TYPE_11GA & PK_TYPE_11GB } else { /* PK_TYPE_11GA & PK_TYPE_11GB */
pDevice->uSIFS = C_SIFS_BG; pDevice->uSIFS = C_SIFS_BG;
if (pDevice->bShortSlotTime) if (pDevice->bShortSlotTime)
pDevice->uSlot = C_SLOT_SHORT; pDevice->uSlot = C_SLOT_SHORT;
...@@ -1726,7 +1692,8 @@ void vUpdateIFS(struct vnt_private *pDevice) ...@@ -1726,7 +1692,8 @@ void vUpdateIFS(struct vnt_private *pDevice)
pDevice->uSlot = C_SLOT_LONG; pDevice->uSlot = C_SLOT_LONG;
pDevice->uDIFS = C_SIFS_BG + 2*pDevice->uSlot; pDevice->uDIFS = C_SIFS_BG + 2*pDevice->uSlot;
if (pDevice->wBasicRate & 0x0150) { //0000 0001 0101 0000,24M,12M,6M if (pDevice->wBasicRate & 0x0150) {
/* 0000 0001 0101 0000,24M,12M,6M */
pDevice->uCwMin = C_CWMIN_A; pDevice->uCwMin = C_CWMIN_A;
byMaxMin = 4; byMaxMin = 4;
} else { } else {
...@@ -1738,7 +1705,7 @@ void vUpdateIFS(struct vnt_private *pDevice) ...@@ -1738,7 +1705,7 @@ void vUpdateIFS(struct vnt_private *pDevice)
pDevice->uCwMax = C_CWMAX; pDevice->uCwMax = C_CWMAX;
pDevice->uEIFS = C_EIFS; pDevice->uEIFS = C_EIFS;
if (pDevice->byRFType == RF_RFMD2959) { if (pDevice->byRFType == RF_RFMD2959) {
// bcs TX_PE will reserve 3 us /* bcs TX_PE will reserve 3 us */
VNSvOutPortB(pDevice->PortOffset + MAC_REG_SIFS, (unsigned char)(pDevice->uSIFS - 3)); VNSvOutPortB(pDevice->PortOffset + MAC_REG_SIFS, (unsigned char)(pDevice->uSIFS - 3));
VNSvOutPortB(pDevice->PortOffset + MAC_REG_DIFS, (unsigned char)(pDevice->uDIFS - 3)); VNSvOutPortB(pDevice->PortOffset + MAC_REG_DIFS, (unsigned char)(pDevice->uDIFS - 3));
} else { } else {
...@@ -1747,7 +1714,7 @@ void vUpdateIFS(struct vnt_private *pDevice) ...@@ -1747,7 +1714,7 @@ void vUpdateIFS(struct vnt_private *pDevice)
} }
VNSvOutPortB(pDevice->PortOffset + MAC_REG_EIFS, (unsigned char)pDevice->uEIFS); VNSvOutPortB(pDevice->PortOffset + MAC_REG_EIFS, (unsigned char)pDevice->uEIFS);
VNSvOutPortB(pDevice->PortOffset + MAC_REG_SLOT, (unsigned char)pDevice->uSlot); VNSvOutPortB(pDevice->PortOffset + MAC_REG_SLOT, (unsigned char)pDevice->uSlot);
byMaxMin |= 0xA0;//1010 1111,C_CWMAX = 1023 byMaxMin |= 0xA0; /* 1010 1111,C_CWMAX = 1023 */
VNSvOutPortB(pDevice->PortOffset + MAC_REG_CWMAXMIN0, (unsigned char)byMaxMin); VNSvOutPortB(pDevice->PortOffset + MAC_REG_CWMAXMIN0, (unsigned char)byMaxMin);
} }
...@@ -1756,7 +1723,7 @@ void CARDvUpdateBasicTopRate(struct vnt_private *pDevice) ...@@ -1756,7 +1723,7 @@ void CARDvUpdateBasicTopRate(struct vnt_private *pDevice)
unsigned char byTopOFDM = RATE_24M, byTopCCK = RATE_1M; unsigned char byTopOFDM = RATE_24M, byTopCCK = RATE_1M;
unsigned char ii; unsigned char ii;
//Determines the highest basic rate. /* Determines the highest basic rate. */
for (ii = RATE_54M; ii >= RATE_6M; ii--) { for (ii = RATE_54M; ii >= RATE_6M; ii--) {
if ((pDevice->wBasicRate) & ((unsigned short)(1<<ii))) { if ((pDevice->wBasicRate) & ((unsigned short)(1<<ii))) {
byTopOFDM = ii; byTopOFDM = ii;
...@@ -1782,7 +1749,7 @@ bool CARDbAddBasicRate(struct vnt_private *pDevice, unsigned short wRateIdx) ...@@ -1782,7 +1749,7 @@ bool CARDbAddBasicRate(struct vnt_private *pDevice, unsigned short wRateIdx)
pDevice->wBasicRate |= wRate; pDevice->wBasicRate |= wRate;
//Determines the highest basic rate. /* Determines the highest basic rate. */
CARDvUpdateBasicTopRate((void *)pDevice); CARDvUpdateBasicTopRate((void *)pDevice);
return true; return true;
...@@ -1821,7 +1788,6 @@ unsigned char CARDbyGetPktType(struct vnt_private *pDevice) ...@@ -1821,7 +1788,6 @@ unsigned char CARDbyGetPktType(struct vnt_private *pDevice)
* none * none
* *
* Return Value: none * Return Value: none
*
*/ */
void CARDvSetLoopbackMode(void __iomem *dwIoBase, unsigned short wLoopbackMode) void CARDvSetLoopbackMode(void __iomem *dwIoBase, unsigned short wLoopbackMode)
{ {
...@@ -1834,9 +1800,9 @@ void CARDvSetLoopbackMode(void __iomem *dwIoBase, unsigned short wLoopbackMode) ...@@ -1834,9 +1800,9 @@ void CARDvSetLoopbackMode(void __iomem *dwIoBase, unsigned short wLoopbackMode)
ASSERT(false); ASSERT(false);
break; break;
} }
// set MAC loopback /* set MAC loopback */
MACvSetLoopbackMode(dwIoBase, LOBYTE(wLoopbackMode)); MACvSetLoopbackMode(dwIoBase, LOBYTE(wLoopbackMode));
// set Baseband loopback /* set Baseband loopback */
} }
/* /*
...@@ -1849,12 +1815,11 @@ void CARDvSetLoopbackMode(void __iomem *dwIoBase, unsigned short wLoopbackMode) ...@@ -1849,12 +1815,11 @@ void CARDvSetLoopbackMode(void __iomem *dwIoBase, unsigned short wLoopbackMode)
* none * none
* *
* Return Value: none * Return Value: none
*
*/ */
bool CARDbSoftwareReset(struct vnt_private *pDevice) bool CARDbSoftwareReset(struct vnt_private *pDevice)
{ {
// reset MAC /* reset MAC */
if (!MACbSafeSoftwareReset(pDevice->PortOffset)) if (!MACbSafeSoftwareReset(pDevice->PortOffset))
return false; return false;
...@@ -1874,7 +1839,6 @@ bool CARDbSoftwareReset(struct vnt_private *pDevice) ...@@ -1874,7 +1839,6 @@ bool CARDbSoftwareReset(struct vnt_private *pDevice)
* none * none
* *
* Return Value: TSF Offset value * Return Value: TSF Offset value
*
*/ */
u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2) u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2)
{ {
...@@ -1901,7 +1865,6 @@ u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2) ...@@ -1901,7 +1865,6 @@ u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2)
* qwCurrTSF - Current TSF counter * qwCurrTSF - Current TSF counter
* *
* Return Value: true if success; otherwise false * Return Value: true if success; otherwise false
*
*/ */
bool CARDbGetCurrentTSF(void __iomem *dwIoBase, u64 *pqwCurrTSF) bool CARDbGetCurrentTSF(void __iomem *dwIoBase, u64 *pqwCurrTSF)
{ {
...@@ -1934,17 +1897,12 @@ bool CARDbGetCurrentTSF(void __iomem *dwIoBase, u64 *pqwCurrTSF) ...@@ -1934,17 +1897,12 @@ bool CARDbGetCurrentTSF(void __iomem *dwIoBase, u64 *pqwCurrTSF)
* qwCurrTSF - Current TSF counter * qwCurrTSF - Current TSF counter
* *
* Return Value: TSF value of next Beacon * Return Value: TSF value of next Beacon
*
*/ */
u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval) u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval)
{ {
u32 beacon_int; u32 beacon_int;
beacon_int = wBeaconInterval * 1024; beacon_int = wBeaconInterval * 1024;
/* Next TBTT =
* ((local_current_TSF / beacon_interval) + 1) * beacon_interval
*/
if (beacon_int) { if (beacon_int) {
do_div(qwTSF, beacon_int); do_div(qwTSF, beacon_int);
qwTSF += 1; qwTSF += 1;
...@@ -1966,16 +1924,15 @@ u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval) ...@@ -1966,16 +1924,15 @@ u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval)
* none * none
* *
* Return Value: none * Return Value: none
*
*/ */
void CARDvSetFirstNextTBTT(void __iomem *dwIoBase, unsigned short wBeaconInterval) void CARDvSetFirstNextTBTT(void __iomem *dwIoBase, unsigned short wBeaconInterval)
{ {
u64 qwNextTBTT = 0; u64 qwNextTBTT = 0;
CARDbGetCurrentTSF(dwIoBase, &qwNextTBTT); //Get Local TSF counter CARDbGetCurrentTSF(dwIoBase, &qwNextTBTT); /* Get Local TSF counter */
qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval); qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval);
// Set NextTBTT /* Set NextTBTT */
VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT, (u32)qwNextTBTT); VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT, (u32)qwNextTBTT);
VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT + 4, (u32)(qwNextTBTT >> 32)); VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT + 4, (u32)(qwNextTBTT >> 32));
MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN);
...@@ -1994,12 +1951,11 @@ void CARDvSetFirstNextTBTT(void __iomem *dwIoBase, unsigned short wBeaconInterva ...@@ -1994,12 +1951,11 @@ void CARDvSetFirstNextTBTT(void __iomem *dwIoBase, unsigned short wBeaconInterva
* none * none
* *
* Return Value: none * Return Value: none
*
*/ */
void CARDvUpdateNextTBTT(void __iomem *dwIoBase, u64 qwTSF, unsigned short wBeaconInterval) void CARDvUpdateNextTBTT(void __iomem *dwIoBase, u64 qwTSF, unsigned short wBeaconInterval)
{ {
qwTSF = CARDqGetNextTBTT(qwTSF, wBeaconInterval); qwTSF = CARDqGetNextTBTT(qwTSF, wBeaconInterval);
// Set NextTBTT /* Set NextTBTT */
VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT, (u32)qwTSF); VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT, (u32)qwTSF);
VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT + 4, (u32)(qwTSF >> 32)); VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT + 4, (u32)(qwTSF >> 32));
MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7