Skip to content

K
Kernel

openeuler / Kernel
接近 2 年 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 66cd8d6e 编写于 作者: B Bartlomiej Zolnierkiewicz 提交者： Greg Kroah-Hartman
浏览文件
操作

Staging: rt28x0: run *.c files through Lindent 

Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 460bb8df
展开全部 隐藏空白更改
内联 并排
Showing with 5933 addition and 5653 deletion
drivers/staging/rt2860/chips/rt3070.c
浏览文件 @ 66cd8d6e
...@@ -39,12 +39,10 @@ ...@@ -39,12 +39,10 @@
#include "../rt_config.h" #include "../rt_config.h"
#ifndef RTMP_RF_RW_SUPPORT #ifndef RTMP_RF_RW_SUPPORT
#error "You Should Enable compile flag RTMP_RF_RW_SUPPORT for this chip" #error "You Should Enable compile flag RTMP_RF_RW_SUPPORT for this chip"
#endif // RTMP_RF_RW_SUPPORT // #endif // RTMP_RF_RW_SUPPORT //
VOID NICInitRT3070RFRegisters(IN PRTMP_ADAPTER pAd) VOID NICInitRT3070RFRegisters(IN PRTMP_ADAPTER pAd)
{ {
INT i; INT i;
...@@ -52,61 +50,55 @@ VOID NICInitRT3070RFRegisters(IN PRTMP_ADAPTER pAd) ...@@ -52,61 +50,55 @@ VOID NICInitRT3070RFRegisters(IN PRTMP_ADAPTER pAd)
// Driver must read EEPROM to get RfIcType before initial RF registers // Driver must read EEPROM to get RfIcType before initial RF registers
// Initialize RF register to default value // Initialize RF register to default value
if (IS_RT3070(pAd) || IS_RT3071(pAd)) if (IS_RT3070(pAd) || IS_RT3071(pAd)) {
{
// Init RF calibration // Init RF calibration
// Driver should toggle RF R30 bit7 before init RF registers // Driver should toggle RF R30 bit7 before init RF registers
UINT32 RfReg = 0; UINT32 RfReg = 0;
UINT32 data; UINT32 data;
RT30xxReadRFRegister(pAd, RF_R30, (PUCHAR)&RfReg); RT30xxReadRFRegister(pAd, RF_R30, (PUCHAR) & RfReg);
RfReg |= 0x80; RfReg |= 0x80;
RT30xxWriteRFRegister(pAd, RF_R30, (UCHAR)RfReg); RT30xxWriteRFRegister(pAd, RF_R30, (UCHAR) RfReg);
RTMPusecDelay(1000); RTMPusecDelay(1000);
RfReg &= 0x7F; RfReg &= 0x7F;
RT30xxWriteRFRegister(pAd, RF_R30, (UCHAR)RfReg); RT30xxWriteRFRegister(pAd, RF_R30, (UCHAR) RfReg);
// Initialize RF register to default value // Initialize RF register to default value
for (i = 0; i < NUM_RF_REG_PARMS; i++) for (i = 0; i < NUM_RF_REG_PARMS; i++) {
{ RT30xxWriteRFRegister(pAd,
RT30xxWriteRFRegister(pAd, RT30xx_RFRegTable[i].Register, RT30xx_RFRegTable[i].Value); RT30xx_RFRegTable[i].Register,
RT30xx_RFRegTable[i].Value);
} }
// add by johnli // add by johnli
if (IS_RT3070(pAd)) if (IS_RT3070(pAd)) {
{
// //
// The DAC issue(LDO_CFG0) has been fixed in RT3070(F). // The DAC issue(LDO_CFG0) has been fixed in RT3070(F).
// The voltage raising patch is no longer needed for RT3070(F) // The voltage raising patch is no longer needed for RT3070(F)
// //
if ((pAd->MACVersion & 0xffff) < 0x0201) if ((pAd->MACVersion & 0xffff) < 0x0201) {
{
// Update MAC 0x05D4 from 01xxxxxx to 0Dxxxxxx (voltage 1.2V to 1.35V) for RT3070 to improve yield rate // Update MAC 0x05D4 from 01xxxxxx to 0Dxxxxxx (voltage 1.2V to 1.35V) for RT3070 to improve yield rate
RTUSBReadMACRegister(pAd, LDO_CFG0, &data); RTUSBReadMACRegister(pAd, LDO_CFG0, &data);
data = ((data & 0xF0FFFFFF) | 0x0D000000); data = ((data & 0xF0FFFFFF) | 0x0D000000);
RTUSBWriteMACRegister(pAd, LDO_CFG0, data); RTUSBWriteMACRegister(pAd, LDO_CFG0, data);
} }
} } else if (IS_RT3071(pAd)) {
else if (IS_RT3071(pAd))
{
// Driver should set RF R6 bit6 on before init RF registers // Driver should set RF R6 bit6 on before init RF registers
RT30xxReadRFRegister(pAd, RF_R06, (PUCHAR)&RfReg); RT30xxReadRFRegister(pAd, RF_R06, (PUCHAR) & RfReg);
RfReg |= 0x40; RfReg |= 0x40;
RT30xxWriteRFRegister(pAd, RF_R06, (UCHAR)RfReg); RT30xxWriteRFRegister(pAd, RF_R06, (UCHAR) RfReg);
// init R31 // init R31
RT30xxWriteRFRegister(pAd, RF_R31, 0x14); RT30xxWriteRFRegister(pAd, RF_R31, 0x14);
// RT3071 version E has fixed this issue // RT3071 version E has fixed this issue
if ((pAd->NicConfig2.field.DACTestBit == 1) && ((pAd->MACVersion & 0xffff) < 0x0211)) if ((pAd->NicConfig2.field.DACTestBit == 1)
{ && ((pAd->MACVersion & 0xffff) < 0x0211)) {
// patch tx EVM issue temporarily // patch tx EVM issue temporarily
RTUSBReadMACRegister(pAd, LDO_CFG0, &data); RTUSBReadMACRegister(pAd, LDO_CFG0, &data);
data = ((data & 0xE0FFFFFF) | 0x0D000000); data = ((data & 0xE0FFFFFF) | 0x0D000000);
RTUSBWriteMACRegister(pAd, LDO_CFG0, data); RTUSBWriteMACRegister(pAd, LDO_CFG0, data);
} } else {
else
{
RTMP_IO_READ32(pAd, LDO_CFG0, &data); RTMP_IO_READ32(pAd, LDO_CFG0, &data);
data = ((data & 0xE0FFFFFF) | 0x01000000); data = ((data & 0xE0FFFFFF) | 0x01000000);
RTMP_IO_WRITE32(pAd, LDO_CFG0, data); RTMP_IO_WRITE32(pAd, LDO_CFG0, data);
...@@ -117,8 +109,7 @@ VOID NICInitRT3070RFRegisters(IN PRTMP_ADAPTER pAd) ...@@ -117,8 +109,7 @@ VOID NICInitRT3070RFRegisters(IN PRTMP_ADAPTER pAd)
data &= ~(0x20); data &= ~(0x20);
RTUSBWriteMACRegister(pAd, GPIO_SWITCH, data); RTUSBWriteMACRegister(pAd, GPIO_SWITCH, data);
} }
//For RF filter Calibration
//For RF filter Calibration
RTMPFilterCalibration(pAd); RTMPFilterCalibration(pAd);
// Initialize RF R27 register, set RF R27 must be behind RTMPFilterCalibration() // Initialize RF R27 register, set RF R27 must be behind RTMPFilterCalibration()
...@@ -126,15 +117,12 @@ VOID NICInitRT3070RFRegisters(IN PRTMP_ADAPTER pAd) ...@@ -126,15 +117,12 @@ VOID NICInitRT3070RFRegisters(IN PRTMP_ADAPTER pAd)
// TX to RX IQ glitch(RF_R27) has been fixed in RT3070(F). // TX to RX IQ glitch(RF_R27) has been fixed in RT3070(F).
// Raising RF voltage is no longer needed for RT3070(F) // Raising RF voltage is no longer needed for RT3070(F)
// //
if ((IS_RT3070(pAd)) && ((pAd->MACVersion & 0xffff) < 0x0201)) if ((IS_RT3070(pAd)) && ((pAd->MACVersion & 0xffff) < 0x0201)) {
{
RT30xxWriteRFRegister(pAd, RF_R27, 0x3); RT30xxWriteRFRegister(pAd, RF_R27, 0x3);
} } else if ((IS_RT3071(pAd))
else if ((IS_RT3071(pAd)) && ((pAd->MACVersion & 0xffff) < 0x0211)) && ((pAd->MACVersion & 0xffff) < 0x0211)) {
{
RT30xxWriteRFRegister(pAd, RF_R27, 0x3); RT30xxWriteRFRegister(pAd, RF_R27, 0x3);
} }
// set led open drain enable // set led open drain enable
RTUSBReadMACRegister(pAd, OPT_14, &data); RTUSBReadMACRegister(pAd, OPT_14, &data);
data |= 0x01; data |= 0x01;
...@@ -145,29 +133,25 @@ VOID NICInitRT3070RFRegisters(IN PRTMP_ADAPTER pAd) ...@@ -145,29 +133,25 @@ VOID NICInitRT3070RFRegisters(IN PRTMP_ADAPTER pAd)
RT30xxReadRFRegister(pAd, RF_R17, &RFValue); RT30xxReadRFRegister(pAd, RF_R17, &RFValue);
RFValue &= (~0x08); RFValue &= (~0x08);
// to fix rx long range issue // to fix rx long range issue
if (pAd->NicConfig2.field.ExternalLNAForG == 0) if (pAd->NicConfig2.field.ExternalLNAForG == 0) {
{ if ((IS_RT3071(pAd)
if ((IS_RT3071(pAd) && ((pAd->MACVersion & 0xffff) >= 0x0211)) || IS_RT3070(pAd)) && ((pAd->MACVersion & 0xffff) >= 0x0211))
{ || IS_RT3070(pAd)) {
RFValue |= 0x20; RFValue |= 0x20;
} }
} }
// set RF_R17_bit[2:0] equal to EEPROM setting at 0x48h // set RF_R17_bit[2:0] equal to EEPROM setting at 0x48h
if (pAd->TxMixerGain24G >= 1) if (pAd->TxMixerGain24G >= 1) {
{ RFValue &= (~0x7); // clean bit [2:0]
RFValue &= (~0x7); // clean bit [2:0]
RFValue |= pAd->TxMixerGain24G; RFValue |= pAd->TxMixerGain24G;
} }
RT30xxWriteRFRegister(pAd, RF_R17, RFValue); RT30xxWriteRFRegister(pAd, RF_R17, RFValue);
if (IS_RT3071(pAd)) if (IS_RT3071(pAd)) {
{
// add by johnli, RF power sequence setup, load RF normal operation-mode setup // add by johnli, RF power sequence setup, load RF normal operation-mode setup
RT30xxLoadRFNormalModeSetup(pAd); RT30xxLoadRFNormalModeSetup(pAd);
} } else if (IS_RT3070(pAd)) {
else if (IS_RT3070(pAd)) /* add by johnli, reset RF_R27 when interface down & up to fix throughput problem */
{
/* add by johnli, reset RF_R27 when interface down & up to fix throughput problem*/
// LDORF_VC, RF R27 register Bit 2 to 0 // LDORF_VC, RF R27 register Bit 2 to 0
RT30xxReadRFRegister(pAd, RF_R27, &RFValue); RT30xxReadRFRegister(pAd, RF_R27, &RFValue);
// TX to RX IQ glitch(RF_R27) has been fixed in RT3070(F). // TX to RX IQ glitch(RF_R27) has been fixed in RT3070(F).
......
drivers/staging/rt2860/chips/rt3090.c
浏览文件 @ 66cd8d6e
...@@ -39,44 +39,39 @@ ...@@ -39,44 +39,39 @@
#include "../rt_config.h" #include "../rt_config.h"
#ifndef RTMP_RF_RW_SUPPORT #ifndef RTMP_RF_RW_SUPPORT
#error "You Should Enable compile flag RTMP_RF_RW_SUPPORT for this chip" #error "You Should Enable compile flag RTMP_RF_RW_SUPPORT for this chip"
#endif // RTMP_RF_RW_SUPPORT // #endif // RTMP_RF_RW_SUPPORT //
VOID NICInitRT3090RFRegisters(IN PRTMP_ADAPTER pAd) VOID NICInitRT3090RFRegisters(IN PRTMP_ADAPTER pAd)
{ {
INT i; INT i;
// Driver must read EEPROM to get RfIcType before initial RF registers // Driver must read EEPROM to get RfIcType before initial RF registers
// Initialize RF register to default value // Initialize RF register to default value
if (IS_RT3090(pAd)) if (IS_RT3090(pAd)) {
{
// Init RF calibration // Init RF calibration
// Driver should toggle RF R30 bit7 before init RF registers // Driver should toggle RF R30 bit7 before init RF registers
UINT32 RfReg = 0, data; UINT32 RfReg = 0, data;
RT30xxReadRFRegister(pAd, RF_R30, (PUCHAR)&RfReg); RT30xxReadRFRegister(pAd, RF_R30, (PUCHAR) & RfReg);
RfReg |= 0x80; RfReg |= 0x80;
RT30xxWriteRFRegister(pAd, RF_R30, (UCHAR)RfReg); RT30xxWriteRFRegister(pAd, RF_R30, (UCHAR) RfReg);
RTMPusecDelay(1000); RTMPusecDelay(1000);
RfReg &= 0x7F; RfReg &= 0x7F;
RT30xxWriteRFRegister(pAd, RF_R30, (UCHAR)RfReg); RT30xxWriteRFRegister(pAd, RF_R30, (UCHAR) RfReg);
// init R24, R31 // init R24, R31
RT30xxWriteRFRegister(pAd, RF_R24, 0x0F); RT30xxWriteRFRegister(pAd, RF_R24, 0x0F);
RT30xxWriteRFRegister(pAd, RF_R31, 0x0F); RT30xxWriteRFRegister(pAd, RF_R31, 0x0F);
// RT309x version E has fixed this issue // RT309x version E has fixed this issue
if ((pAd->NicConfig2.field.DACTestBit == 1) && ((pAd->MACVersion & 0xffff) < 0x0211)) if ((pAd->NicConfig2.field.DACTestBit == 1)
{ && ((pAd->MACVersion & 0xffff) < 0x0211)) {
// patch tx EVM issue temporarily // patch tx EVM issue temporarily
RTMP_IO_READ32(pAd, LDO_CFG0, &data); RTMP_IO_READ32(pAd, LDO_CFG0, &data);
data = ((data & 0xE0FFFFFF) | 0x0D000000); data = ((data & 0xE0FFFFFF) | 0x0D000000);
RTMP_IO_WRITE32(pAd, LDO_CFG0, data); RTMP_IO_WRITE32(pAd, LDO_CFG0, data);
} } else {
else
{
RTMP_IO_READ32(pAd, LDO_CFG0, &data); RTMP_IO_READ32(pAd, LDO_CFG0, &data);
data = ((data & 0xE0FFFFFF) | 0x01000000); data = ((data & 0xE0FFFFFF) | 0x01000000);
RTMP_IO_WRITE32(pAd, LDO_CFG0, data); RTMP_IO_WRITE32(pAd, LDO_CFG0, data);
...@@ -88,15 +83,16 @@ VOID NICInitRT3090RFRegisters(IN PRTMP_ADAPTER pAd) ...@@ -88,15 +83,16 @@ VOID NICInitRT3090RFRegisters(IN PRTMP_ADAPTER pAd)
RTMP_IO_WRITE32(pAd, GPIO_SWITCH, data); RTMP_IO_WRITE32(pAd, GPIO_SWITCH, data);
// Initialize RF register to default value // Initialize RF register to default value
for (i = 0; i < NUM_RF_REG_PARMS; i++) for (i = 0; i < NUM_RF_REG_PARMS; i++) {
{ RT30xxWriteRFRegister(pAd,
RT30xxWriteRFRegister(pAd, RT30xx_RFRegTable[i].Register, RT30xx_RFRegTable[i].Value); RT30xx_RFRegTable[i].Register,
RT30xx_RFRegTable[i].Value);
} }
// Driver should set RF R6 bit6 on before calibration // Driver should set RF R6 bit6 on before calibration
RT30xxReadRFRegister(pAd, RF_R06, (PUCHAR)&RfReg); RT30xxReadRFRegister(pAd, RF_R06, (PUCHAR) & RfReg);
RfReg |= 0x40; RfReg |= 0x40;
RT30xxWriteRFRegister(pAd, RF_R06, (UCHAR)RfReg); RT30xxWriteRFRegister(pAd, RF_R06, (UCHAR) RfReg);
//For RF filter Calibration //For RF filter Calibration
RTMPFilterCalibration(pAd); RTMPFilterCalibration(pAd);
......
drivers/staging/rt2860/chips/rt30xx.c
浏览文件 @ 66cd8d6e
...@@ -35,73 +35,82 @@ ...@@ -35,73 +35,82 @@
-------- ---------- ---------------------------------------------- -------- ---------- ----------------------------------------------
*/ */
#ifdef RT30xx #ifdef RT30xx
#ifndef RTMP_RF_RW_SUPPORT #ifndef RTMP_RF_RW_SUPPORT
#error "You Should Enable compile flag RTMP_RF_RW_SUPPORT for this chip" #error "You Should Enable compile flag RTMP_RF_RW_SUPPORT for this chip"
#endif // RTMP_RF_RW_SUPPORT // #endif // RTMP_RF_RW_SUPPORT //
#include "../rt_config.h" #include "../rt_config.h"
// //
// RF register initialization set // RF register initialization set
// //
REG_PAIR RT30xx_RFRegTable[] = { REG_PAIR RT30xx_RFRegTable[] = {
{RF_R04, 0x40}, {RF_R04, 0x40}
{RF_R05, 0x03}, ,
{RF_R06, 0x02}, {RF_R05, 0x03}
{RF_R07, 0x70}, ,
{RF_R09, 0x0F}, {RF_R06, 0x02}
{RF_R10, 0x41}, ,
{RF_R11, 0x21}, {RF_R07, 0x70}
{RF_R12, 0x7B}, ,
{RF_R14, 0x90}, {RF_R09, 0x0F}
{RF_R15, 0x58}, ,
{RF_R16, 0xB3}, {RF_R10, 0x41}
{RF_R17, 0x92}, ,
{RF_R18, 0x2C}, {RF_R11, 0x21}
{RF_R19, 0x02}, ,
{RF_R20, 0xBA}, {RF_R12, 0x7B}
{RF_R21, 0xDB}, ,
{RF_R24, 0x16}, {RF_R14, 0x90}
{RF_R25, 0x01}, ,
{RF_R29, 0x1F}, {RF_R15, 0x58}
,
{RF_R16, 0xB3}
,
{RF_R17, 0x92}
,
{RF_R18, 0x2C}
,
{RF_R19, 0x02}
,
{RF_R20, 0xBA}
,
{RF_R21, 0xDB}
,
{RF_R24, 0x16}
,
{RF_R25, 0x01}
,
{RF_R29, 0x1F}
,
}; };
UCHAR NUM_RF_REG_PARMS = (sizeof(RT30xx_RFRegTable) / sizeof(REG_PAIR)); UCHAR NUM_RF_REG_PARMS = (sizeof(RT30xx_RFRegTable) / sizeof(REG_PAIR));
// Antenna divesity use GPIO3 and EESK pin for control // Antenna divesity use GPIO3 and EESK pin for control
// Antenna and EEPROM access are both using EESK pin, // Antenna and EEPROM access are both using EESK pin,
// Therefor we should avoid accessing EESK at the same time // Therefor we should avoid accessing EESK at the same time
// Then restore antenna after EEPROM access // Then restore antenna after EEPROM access
// The original name of this function is AsicSetRxAnt(), now change to // The original name of this function is AsicSetRxAnt(), now change to
//VOID AsicSetRxAnt( //VOID AsicSetRxAnt(
VOID RT30xxSetRxAnt( VOID RT30xxSetRxAnt(IN PRTMP_ADAPTER pAd, IN UCHAR Ant)
IN PRTMP_ADAPTER pAd,
IN UCHAR Ant)
{ {
UINT32 Value; UINT32 Value;
#ifdef RTMP_MAC_PCI #ifdef RTMP_MAC_PCI
UINT32 x; UINT32 x;
#endif #endif
if ((pAd->EepromAccess) || if ((pAd->EepromAccess) ||
(RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS)) || (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS)) ||
(RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS)) || (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS)) ||
(RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF)) || (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF)) ||
(RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST))) (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST))) {
{
return; return;
} }
// the antenna selection is through firmware and MAC register(GPIO3) // the antenna selection is through firmware and MAC register(GPIO3)
if (Ant == 0) if (Ant == 0) {
{
// Main antenna // Main antenna
#ifdef RTMP_MAC_PCI #ifdef RTMP_MAC_PCI
RTMP_IO_READ32(pAd, E2PROM_CSR, &x); RTMP_IO_READ32(pAd, E2PROM_CSR, &x);
...@@ -114,10 +123,9 @@ VOID RT30xxSetRxAnt( ...@@ -114,10 +123,9 @@ VOID RT30xxSetRxAnt(
RTMP_IO_READ32(pAd, GPIO_CTRL_CFG, &Value); RTMP_IO_READ32(pAd, GPIO_CTRL_CFG, &Value);
Value &= ~(0x0808); Value &= ~(0x0808);
RTMP_IO_WRITE32(pAd, GPIO_CTRL_CFG, Value); RTMP_IO_WRITE32(pAd, GPIO_CTRL_CFG, Value);
DBGPRINT_RAW(RT_DEBUG_TRACE, ("AsicSetRxAnt, switch to main antenna\n")); DBGPRINT_RAW(RT_DEBUG_TRACE,
} ("AsicSetRxAnt, switch to main antenna\n"));
else } else {
{
// Aux antenna // Aux antenna
#ifdef RTMP_MAC_PCI #ifdef RTMP_MAC_PCI
RTMP_IO_READ32(pAd, E2PROM_CSR, &x); RTMP_IO_READ32(pAd, E2PROM_CSR, &x);
...@@ -130,11 +138,11 @@ VOID RT30xxSetRxAnt( ...@@ -130,11 +138,11 @@ VOID RT30xxSetRxAnt(
Value &= ~(0x0808); Value &= ~(0x0808);
Value |= 0x08; Value |= 0x08;
RTMP_IO_WRITE32(pAd, GPIO_CTRL_CFG, Value); RTMP_IO_WRITE32(pAd, GPIO_CTRL_CFG, Value);
DBGPRINT_RAW(RT_DEBUG_TRACE, ("AsicSetRxAnt, switch to aux antenna\n")); DBGPRINT_RAW(RT_DEBUG_TRACE,
("AsicSetRxAnt, switch to aux antenna\n"));
} }
} }
/* /*
======================================================================== ========================================================================
...@@ -151,46 +159,43 @@ VOID RT30xxSetRxAnt( ...@@ -151,46 +159,43 @@ VOID RT30xxSetRxAnt(
======================================================================== ========================================================================
*/ */
VOID RTMPFilterCalibration( VOID RTMPFilterCalibration(IN PRTMP_ADAPTER pAd)
IN PRTMP_ADAPTER pAd)
{ {
UCHAR R55x = 0, value, FilterTarget = 0x1E, BBPValue=0; UCHAR R55x = 0, value, FilterTarget = 0x1E, BBPValue = 0;
UINT loop = 0, count = 0, loopcnt = 0, ReTry = 0; UINT loop = 0, count = 0, loopcnt = 0, ReTry = 0;
UCHAR RF_R24_Value = 0; UCHAR RF_R24_Value = 0;
// Give bbp filter initial value // Give bbp filter initial value
pAd->Mlme.CaliBW20RfR24 = 0x1F; pAd->Mlme.CaliBW20RfR24 = 0x1F;
pAd->Mlme.CaliBW40RfR24 = 0x2F; //Bit[5] must be 1 for BW 40 pAd->Mlme.CaliBW40RfR24 = 0x2F; //Bit[5] must be 1 for BW 40
do do {
{
if (loop == 1) //BandWidth = 40 MHz if (loop == 1) //BandWidth = 40 MHz
{ {
// Write 0x27 to RF_R24 to program filter // Write 0x27 to RF_R24 to program filter
RF_R24_Value = 0x27; RF_R24_Value = 0x27;
RT30xxWriteRFRegister(pAd, RF_R24, RF_R24_Value); RT30xxWriteRFRegister(pAd, RF_R24, RF_R24_Value);
if (IS_RT3090(pAd) || IS_RT3572(pAd)|| IS_RT3390(pAd)) if (IS_RT3090(pAd) || IS_RT3572(pAd) || IS_RT3390(pAd))
FilterTarget = 0x15; FilterTarget = 0x15;
else else
FilterTarget = 0x19; FilterTarget = 0x19;
// when calibrate BW40, BBP mask must set to BW40. // when calibrate BW40, BBP mask must set to BW40.
RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R4, &BBPValue); RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R4, &BBPValue);
BBPValue&= (~0x18); BBPValue &= (~0x18);
BBPValue|= (0x10); BBPValue |= (0x10);
RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R4, BBPValue); RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R4, BBPValue);
// set to BW40 // set to BW40
RT30xxReadRFRegister(pAd, RF_R31, &value); RT30xxReadRFRegister(pAd, RF_R31, &value);
value |= 0x20; value |= 0x20;
RT30xxWriteRFRegister(pAd, RF_R31, value); RT30xxWriteRFRegister(pAd, RF_R31, value);
} } else //BandWidth = 20 MHz
else //BandWidth = 20 MHz
{ {
// Write 0x07 to RF_R24 to program filter // Write 0x07 to RF_R24 to program filter
RF_R24_Value = 0x07; RF_R24_Value = 0x07;
RT30xxWriteRFRegister(pAd, RF_R24, RF_R24_Value); RT30xxWriteRFRegister(pAd, RF_R24, RF_R24_Value);
if (IS_RT3090(pAd) || IS_RT3572(pAd)|| IS_RT3390(pAd)) if (IS_RT3090(pAd) || IS_RT3572(pAd) || IS_RT3390(pAd))
FilterTarget = 0x13; FilterTarget = 0x13;
else else
FilterTarget = 0x16; FilterTarget = 0x16;
...@@ -209,8 +214,7 @@ VOID RTMPFilterCalibration( ...@@ -209,8 +214,7 @@ VOID RTMPFilterCalibration(
// Write 0x00 to BBP_R24 to set power & frequency of passband test tone // Write 0x00 to BBP_R24 to set power & frequency of passband test tone
RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R24, 0); RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R24, 0);
do do {
{
// Write 0x90 to BBP_R25 to transmit test tone // Write 0x90 to BBP_R25 to transmit test tone
RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R25, 0x90); RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R25, 0x90);
...@@ -224,8 +228,7 @@ VOID RTMPFilterCalibration( ...@@ -224,8 +228,7 @@ VOID RTMPFilterCalibration(
// Write 0x06 to BBP_R24 to set power & frequency of stopband test tone // Write 0x06 to BBP_R24 to set power & frequency of stopband test tone
RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R24, 0x06); RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R24, 0x06);
while(TRUE) while (TRUE) {
{
// Write 0x90 to BBP_R25 to transmit test tone // Write 0x90 to BBP_R25 to transmit test tone
RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R25, 0x90); RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R25, 0x90);
...@@ -233,59 +236,47 @@ VOID RTMPFilterCalibration( ...@@ -233,59 +236,47 @@ VOID RTMPFilterCalibration(
RTMPusecDelay(1000); RTMPusecDelay(1000);
RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R55, &value); RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R55, &value);
value &= 0xFF; value &= 0xFF;
if ((R55x - value) < FilterTarget) if ((R55x - value) < FilterTarget) {
{ RF_R24_Value++;
RF_R24_Value ++; } else if ((R55x - value) == FilterTarget) {
} RF_R24_Value++;
else if ((R55x - value) == FilterTarget) count++;
{ } else {
RF_R24_Value ++;
count ++;
}
else
{
break; break;
} }
// prevent infinite loop cause driver hang. // prevent infinite loop cause driver hang.
if (loopcnt++ > 100) if (loopcnt++ > 100) {
{ DBGPRINT(RT_DEBUG_ERROR,
DBGPRINT(RT_DEBUG_ERROR, ("RTMPFilterCalibration - can't find a valid value, loopcnt=%d stop calibrating", loopcnt)); ("RTMPFilterCalibration - can't find a valid value, loopcnt=%d stop calibrating",
loopcnt));
break; break;
} }
// Write RF_R24 to program filter // Write RF_R24 to program filter
RT30xxWriteRFRegister(pAd, RF_R24, RF_R24_Value); RT30xxWriteRFRegister(pAd, RF_R24, RF_R24_Value);
} }
if (count > 0) if (count > 0) {
{
RF_R24_Value = RF_R24_Value - ((count) ? (1) : (0)); RF_R24_Value = RF_R24_Value - ((count) ? (1) : (0));
} }
// Store for future usage // Store for future usage
if (loopcnt < 100) if (loopcnt < 100) {
{ if (loop++ == 0) {
if (loop++ == 0)
{
//BandWidth = 20 MHz //BandWidth = 20 MHz
pAd->Mlme.CaliBW20RfR24 = (UCHAR)RF_R24_Value; pAd->Mlme.CaliBW20RfR24 = (UCHAR) RF_R24_Value;
} } else {
else
{
//BandWidth = 40 MHz //BandWidth = 40 MHz
pAd->Mlme.CaliBW40RfR24 = (UCHAR)RF_R24_Value; pAd->Mlme.CaliBW40RfR24 = (UCHAR) RF_R24_Value;
break; break;
} }
} } else
else
break; break;
RT30xxWriteRFRegister(pAd, RF_R24, RF_R24_Value); RT30xxWriteRFRegister(pAd, RF_R24, RF_R24_Value);
// reset count // reset count
count = 0; count = 0;
} while(TRUE); } while (TRUE);
// //
// Set back to initial state // Set back to initial state
...@@ -298,13 +289,14 @@ VOID RTMPFilterCalibration( ...@@ -298,13 +289,14 @@ VOID RTMPFilterCalibration(
// set BBP back to BW20 // set BBP back to BW20
RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R4, &BBPValue); RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R4, &BBPValue);
BBPValue&= (~0x18); BBPValue &= (~0x18);
RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R4, BBPValue); RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R4, BBPValue);
DBGPRINT(RT_DEBUG_TRACE, ("RTMPFilterCalibration - CaliBW20RfR24=0x%x, CaliBW40RfR24=0x%x\n", pAd->Mlme.CaliBW20RfR24, pAd->Mlme.CaliBW40RfR24)); DBGPRINT(RT_DEBUG_TRACE,
("RTMPFilterCalibration - CaliBW20RfR24=0x%x, CaliBW40RfR24=0x%x\n",
pAd->Mlme.CaliBW20RfR24, pAd->Mlme.CaliBW40RfR24));
} }
// add by johnli, RF power sequence setup // add by johnli, RF power sequence setup
/* /*
========================================================================== ==========================================================================
...@@ -314,8 +306,7 @@ VOID RTMPFilterCalibration( ...@@ -314,8 +306,7 @@ VOID RTMPFilterCalibration(
========================================================================== ==========================================================================
*/ */
VOID RT30xxLoadRFNormalModeSetup( VOID RT30xxLoadRFNormalModeSetup(IN PRTMP_ADAPTER pAd)
IN PRTMP_ADAPTER pAd)
{ {
UCHAR RFValue; UCHAR RFValue;
...@@ -330,22 +321,22 @@ VOID RT30xxLoadRFNormalModeSetup( ...@@ -330,22 +321,22 @@ VOID RT30xxLoadRFNormalModeSetup(
RT30xxWriteRFRegister(pAd, RF_R15, RFValue); RT30xxWriteRFRegister(pAd, RF_R15, RFValue);
/* move to NICInitRT30xxRFRegisters /* move to NICInitRT30xxRFRegisters
// TX_LO1_en, RF R17 register Bit 3 to 0 // TX_LO1_en, RF R17 register Bit 3 to 0
RT30xxReadRFRegister(pAd, RF_R17, &RFValue); RT30xxReadRFRegister(pAd, RF_R17, &RFValue);
RFValue &= (~0x08); RFValue &= (~0x08);
// to fix rx long range issue // to fix rx long range issue
if (((pAd->MACVersion & 0xffff) >= 0x0211) && (pAd->NicConfig2.field.ExternalLNAForG == 0)) if (((pAd->MACVersion & 0xffff) >= 0x0211) && (pAd->NicConfig2.field.ExternalLNAForG == 0))
{ {
RFValue |= 0x20; RFValue |= 0x20;
} }
// set RF_R17_bit[2:0] equal to EEPROM setting at 0x48h // set RF_R17_bit[2:0] equal to EEPROM setting at 0x48h
if (pAd->TxMixerGain24G >= 2) if (pAd->TxMixerGain24G >= 2)
{ {
RFValue &= (~0x7); // clean bit [2:0] RFValue &= (~0x7); // clean bit [2:0]
RFValue |= pAd->TxMixerGain24G; RFValue |= pAd->TxMixerGain24G;
} }
RT30xxWriteRFRegister(pAd, RF_R17, RFValue); RT30xxWriteRFRegister(pAd, RF_R17, RFValue);
*/ */
// RX_LO1_en, RF R20 register Bit 3 to 0 // RX_LO1_en, RF R20 register Bit 3 to 0
RT30xxReadRFRegister(pAd, RF_R20, &RFValue); RT30xxReadRFRegister(pAd, RF_R20, &RFValue);
...@@ -357,7 +348,7 @@ VOID RT30xxLoadRFNormalModeSetup( ...@@ -357,7 +348,7 @@ VOID RT30xxLoadRFNormalModeSetup(
RFValue &= (~0x08); RFValue &= (~0x08);
RT30xxWriteRFRegister(pAd, RF_R21, RFValue); RT30xxWriteRFRegister(pAd, RF_R21, RFValue);
/* add by johnli, reset RF_R27 when interface down & up to fix throughput problem*/ /* add by johnli, reset RF_R27 when interface down & up to fix throughput problem */
// LDORF_VC, RF R27 register Bit 2 to 0 // LDORF_VC, RF R27 register Bit 2 to 0
RT30xxReadRFRegister(pAd, RF_R27, &RFValue); RT30xxReadRFRegister(pAd, RF_R27, &RFValue);
// TX to RX IQ glitch(RF_R27) has been fixed in RT3070(F). // TX to RX IQ glitch(RF_R27) has been fixed in RT3070(F).
...@@ -381,15 +372,13 @@ VOID RT30xxLoadRFNormalModeSetup( ...@@ -381,15 +372,13 @@ VOID RT30xxLoadRFNormalModeSetup(
========================================================================== ==========================================================================
*/ */
VOID RT30xxLoadRFSleepModeSetup( VOID RT30xxLoadRFSleepModeSetup(IN PRTMP_ADAPTER pAd)
IN PRTMP_ADAPTER pAd)
{ {
UCHAR RFValue; UCHAR RFValue;
UINT32 MACValue; UINT32 MACValue;
#ifdef RTMP_MAC_USB #ifdef RTMP_MAC_USB
if(!IS_RT3572(pAd)) if (!IS_RT3572(pAd))
#endif // RTMP_MAC_USB // #endif // RTMP_MAC_USB //
{ {
// RF_BLOCK_en. RF R1 register Bit 0 to 0 // RF_BLOCK_en. RF R1 register Bit 0 to 0
...@@ -414,9 +403,8 @@ VOID RT30xxLoadRFSleepModeSetup( ...@@ -414,9 +403,8 @@ VOID RT30xxLoadRFSleepModeSetup(
} }
if (IS_RT3090(pAd) || // IS_RT3090 including RT309x and RT3071/72 if (IS_RT3090(pAd) || // IS_RT3090 including RT309x and RT3071/72
IS_RT3572(pAd) || IS_RT3572(pAd) ||
(IS_RT3070(pAd) && ((pAd->MACVersion & 0xffff) < 0x0201))) (IS_RT3070(pAd) && ((pAd->MACVersion & 0xffff) < 0x0201))) {
{
#ifdef RTMP_MAC_USB #ifdef RTMP_MAC_USB
if (!IS_RT3572(pAd)) if (!IS_RT3572(pAd))
#endif // RTMP_MAC_USB // #endif // RTMP_MAC_USB //
...@@ -440,14 +428,13 @@ VOID RT30xxLoadRFSleepModeSetup( ...@@ -440,14 +428,13 @@ VOID RT30xxLoadRFSleepModeSetup(
========================================================================== ==========================================================================
*/ */
VOID RT30xxReverseRFSleepModeSetup( VOID RT30xxReverseRFSleepModeSetup(IN PRTMP_ADAPTER pAd)
IN PRTMP_ADAPTER pAd)
{ {
UCHAR RFValue; UCHAR RFValue;
UINT32 MACValue; UINT32 MACValue;
#ifdef RTMP_MAC_USB #ifdef RTMP_MAC_USB
if(!IS_RT3572(pAd)) if (!IS_RT3572(pAd))
#endif // RTMP_MAC_USB // #endif // RTMP_MAC_USB //
{ {
// RF_BLOCK_en, RF R1 register Bit 0 to 1 // RF_BLOCK_en, RF R1 register Bit 0 to 1
...@@ -472,10 +459,9 @@ VOID RT30xxReverseRFSleepModeSetup( ...@@ -472,10 +459,9 @@ VOID RT30xxReverseRFSleepModeSetup(
} }
if (IS_RT3090(pAd) || // IS_RT3090 including RT309x and RT3071/72 if (IS_RT3090(pAd) || // IS_RT3090 including RT309x and RT3071/72
IS_RT3572(pAd) || IS_RT3572(pAd) ||
IS_RT3390(pAd) || IS_RT3390(pAd) ||
(IS_RT3070(pAd) && ((pAd->MACVersion & 0xffff) < 0x0201))) (IS_RT3070(pAd) && ((pAd->MACVersion & 0xffff) < 0x0201))) {
{
#ifdef RTMP_MAC_USB #ifdef RTMP_MAC_USB
if (!IS_RT3572(pAd)) if (!IS_RT3572(pAd))
#endif // RTMP_MAC_USB // #endif // RTMP_MAC_USB //
...@@ -487,48 +473,41 @@ VOID RT30xxReverseRFSleepModeSetup( ...@@ -487,48 +473,41 @@ VOID RT30xxReverseRFSleepModeSetup(
RFValue = (RFValue & (~0x77)); RFValue = (RFValue & (~0x77));
RT30xxWriteRFRegister(pAd, RF_R27, RFValue); RT30xxWriteRFRegister(pAd, RF_R27, RFValue);
} }
// RT3071 version E has fixed this issue // RT3071 version E has fixed this issue
if ((pAd->NicConfig2.field.DACTestBit == 1) && ((pAd->MACVersion & 0xffff) < 0x0211)) if ((pAd->NicConfig2.field.DACTestBit == 1)
{ && ((pAd->MACVersion & 0xffff) < 0x0211)) {
// patch tx EVM issue temporarily // patch tx EVM issue temporarily
RTMP_IO_READ32(pAd, LDO_CFG0, &MACValue); RTMP_IO_READ32(pAd, LDO_CFG0, &MACValue);
MACValue = ((MACValue & 0xE0FFFFFF) | 0x0D000000); MACValue = ((MACValue & 0xE0FFFFFF) | 0x0D000000);
RTMP_IO_WRITE32(pAd, LDO_CFG0, MACValue); RTMP_IO_WRITE32(pAd, LDO_CFG0, MACValue);
} } else {
else
{
RTMP_IO_READ32(pAd, LDO_CFG0, &MACValue); RTMP_IO_READ32(pAd, LDO_CFG0, &MACValue);
MACValue = ((MACValue & 0xE0FFFFFF) | 0x01000000); MACValue = ((MACValue & 0xE0FFFFFF) | 0x01000000);
RTMP_IO_WRITE32(pAd, LDO_CFG0, MACValue); RTMP_IO_WRITE32(pAd, LDO_CFG0, MACValue);
} }
} }
if(IS_RT3572(pAd)) if (IS_RT3572(pAd))
RT30xxWriteRFRegister(pAd, RF_R08, 0x80); RT30xxWriteRFRegister(pAd, RF_R08, 0x80);
} }
// end johnli // end johnli
VOID RT30xxHaltAction( VOID RT30xxHaltAction(IN PRTMP_ADAPTER pAd)
IN PRTMP_ADAPTER pAd)
{ {
UINT32 TxPinCfg = 0x00050F0F; UINT32 TxPinCfg = 0x00050F0F;
// //
// Turn off LNA_PE or TRSW_POL // Turn off LNA_PE or TRSW_POL
// //
if (IS_RT3070(pAd) || IS_RT3071(pAd) || IS_RT3572(pAd)) if (IS_RT3070(pAd) || IS_RT3071(pAd) || IS_RT3572(pAd)) {
{
if ((IS_RT3071(pAd) || IS_RT3572(pAd)) if ((IS_RT3071(pAd) || IS_RT3572(pAd))
#ifdef RTMP_EFUSE_SUPPORT #ifdef RTMP_EFUSE_SUPPORT
&& (pAd->bUseEfuse) && (pAd->bUseEfuse)
#endif // RTMP_EFUSE_SUPPORT // #endif // RTMP_EFUSE_SUPPORT //
) ) {
{ TxPinCfg &= 0xFFFBF0F0; // bit18 off
TxPinCfg &= 0xFFFBF0F0; // bit18 off } else {
}
else
{
TxPinCfg &= 0xFFFFF0F0; TxPinCfg &= 0xFFFFF0F0;
} }
......
drivers/staging/rt2860/rt_linux.c
浏览文件 @ 66cd8d6e
此差异已折叠。
drivers/staging/rt2860/rt_usb.c
浏览文件 @ 66cd8d6e
此差异已折叠。
drivers/staging/rt2860/sta_ioctl.c
浏览文件 @ 66cd8d6e
此差异已折叠。
drivers/staging/rt2870/common/rtusb_data.c
浏览文件 @ 66cd8d6e
...@@ -39,40 +39,33 @@ ...@@ -39,40 +39,33 @@
#ifdef RTMP_MAC_USB #ifdef RTMP_MAC_USB
#include "../rt_config.h" #include "../rt_config.h"
extern UCHAR Phy11BGNextRateUpward[]; // defined in mlme.c extern UCHAR Phy11BGNextRateUpward[]; // defined in mlme.c
extern UCHAR EpToQueue[]; extern UCHAR EpToQueue[];
VOID REPORT_AMSDU_FRAMES_TO_LLC( VOID REPORT_AMSDU_FRAMES_TO_LLC(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd, IN PUCHAR pData, IN ULONG DataSize)
IN PUCHAR pData,
IN ULONG DataSize)
{ {
PNDIS_PACKET pPacket; PNDIS_PACKET pPacket;
UINT nMSDU; UINT nMSDU;
struct sk_buff *pSkb; struct sk_buff *pSkb;
nMSDU = 0; nMSDU = 0;
/* allocate a rx packet */ /* allocate a rx packet */
pSkb = dev_alloc_skb(RX_BUFFER_AGGRESIZE); pSkb = dev_alloc_skb(RX_BUFFER_AGGRESIZE);
pPacket = (PNDIS_PACKET)OSPKT_TO_RTPKT(pSkb); pPacket = (PNDIS_PACKET) OSPKT_TO_RTPKT(pSkb);
if (pSkb) if (pSkb) {
{
/* convert 802.11 to 802.3 packet */ /* convert 802.11 to 802.3 packet */
pSkb->dev = get_netdev_from_bssid(pAd, BSS0); pSkb->dev = get_netdev_from_bssid(pAd, BSS0);
RTMP_SET_PACKET_SOURCE(pPacket, PKTSRC_NDIS); RTMP_SET_PACKET_SOURCE(pPacket, PKTSRC_NDIS);
deaggregate_AMSDU_announce(pAd, pPacket, pData, DataSize); deaggregate_AMSDU_announce(pAd, pPacket, pData, DataSize);
} } else {
else DBGPRINT(RT_DEBUG_ERROR, ("Can't allocate skb\n"));
{
DBGPRINT(RT_DEBUG_ERROR,("Can't allocate skb\n"));
} }
} }
/* /*
======================================================================== ========================================================================
...@@ -92,50 +85,53 @@ VOID REPORT_AMSDU_FRAMES_TO_LLC( ...@@ -92,50 +85,53 @@ VOID REPORT_AMSDU_FRAMES_TO_LLC(
======================================================================== ========================================================================
*/ */
NDIS_STATUS RTUSBFreeDescriptorRequest( NDIS_STATUS RTUSBFreeDescriptorRequest(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd, IN UCHAR BulkOutPipeId,
IN UCHAR BulkOutPipeId, IN UINT32 NumberRequired)
IN UINT32 NumberRequired)
{ {
// UCHAR FreeNumber = 0; // UCHAR FreeNumber = 0;
// UINT Index; // UINT Index;
NDIS_STATUS Status = NDIS_STATUS_FAILURE; NDIS_STATUS Status = NDIS_STATUS_FAILURE;
unsigned long IrqFlags; unsigned long IrqFlags;
HT_TX_CONTEXT *pHTTXContext; HT_TX_CONTEXT *pHTTXContext;
pHTTXContext = &pAd->TxContext[BulkOutPipeId]; pHTTXContext = &pAd->TxContext[BulkOutPipeId];
RTMP_IRQ_LOCK(&pAd->TxContextQueueLock[BulkOutPipeId], IrqFlags); RTMP_IRQ_LOCK(&pAd->TxContextQueueLock[BulkOutPipeId], IrqFlags);
if ((pHTTXContext->CurWritePosition < pHTTXContext->NextBulkOutPosition) && ((pHTTXContext->CurWritePosition + NumberRequired + LOCAL_TXBUF_SIZE) > pHTTXContext->NextBulkOutPosition)) if ((pHTTXContext->CurWritePosition < pHTTXContext->NextBulkOutPosition)
{ &&
((pHTTXContext->CurWritePosition + NumberRequired +
RTUSB_SET_BULK_FLAG(pAd, (fRTUSB_BULK_OUT_DATA_NORMAL << BulkOutPipeId)); LOCAL_TXBUF_SIZE) > pHTTXContext->NextBulkOutPosition)) {
}
else if ((pHTTXContext->CurWritePosition == 8) && (pHTTXContext->NextBulkOutPosition < (NumberRequired + LOCAL_TXBUF_SIZE))) RTUSB_SET_BULK_FLAG(pAd,
{ (fRTUSB_BULK_OUT_DATA_NORMAL <<
RTUSB_SET_BULK_FLAG(pAd, (fRTUSB_BULK_OUT_DATA_NORMAL << BulkOutPipeId)); BulkOutPipeId));
} } else if ((pHTTXContext->CurWritePosition == 8)
else if (pHTTXContext->bCurWriting == TRUE) && (pHTTXContext->NextBulkOutPosition <
{ (NumberRequired + LOCAL_TXBUF_SIZE))) {
DBGPRINT(RT_DEBUG_TRACE,("RTUSBFreeD c3 --> QueIdx=%d, CWPos=%ld, NBOutPos=%ld!\n", BulkOutPipeId, pHTTXContext->CurWritePosition, pHTTXContext->NextBulkOutPosition)); RTUSB_SET_BULK_FLAG(pAd,
RTUSB_SET_BULK_FLAG(pAd, (fRTUSB_BULK_OUT_DATA_NORMAL << BulkOutPipeId)); (fRTUSB_BULK_OUT_DATA_NORMAL <<
} BulkOutPipeId));
else } else if (pHTTXContext->bCurWriting == TRUE) {
{ DBGPRINT(RT_DEBUG_TRACE,
("RTUSBFreeD c3 --> QueIdx=%d, CWPos=%ld, NBOutPos=%ld!\n",
BulkOutPipeId, pHTTXContext->CurWritePosition,
pHTTXContext->NextBulkOutPosition));
RTUSB_SET_BULK_FLAG(pAd,
(fRTUSB_BULK_OUT_DATA_NORMAL <<
BulkOutPipeId));
} else {
Status = NDIS_STATUS_SUCCESS; Status = NDIS_STATUS_SUCCESS;
} }
RTMP_IRQ_UNLOCK(&pAd->TxContextQueueLock[BulkOutPipeId], IrqFlags); RTMP_IRQ_UNLOCK(&pAd->TxContextQueueLock[BulkOutPipeId], IrqFlags);
return (Status); return (Status);
} }
NDIS_STATUS RTUSBFreeDescriptorRelease( NDIS_STATUS RTUSBFreeDescriptorRelease(IN RTMP_ADAPTER * pAd,
IN RTMP_ADAPTER *pAd, IN UCHAR BulkOutPipeId)
IN UCHAR BulkOutPipeId)
{ {
unsigned long IrqFlags; unsigned long IrqFlags;
HT_TX_CONTEXT *pHTTXContext; HT_TX_CONTEXT *pHTTXContext;
pHTTXContext = &pAd->TxContext[BulkOutPipeId]; pHTTXContext = &pAd->TxContext[BulkOutPipeId];
RTMP_IRQ_LOCK(&pAd->TxContextQueueLock[BulkOutPipeId], IrqFlags); RTMP_IRQ_LOCK(&pAd->TxContextQueueLock[BulkOutPipeId], IrqFlags);
...@@ -145,28 +141,32 @@ NDIS_STATUS RTUSBFreeDescriptorRelease( ...@@ -145,28 +141,32 @@ NDIS_STATUS RTUSBFreeDescriptorRelease(
return (NDIS_STATUS_SUCCESS); return (NDIS_STATUS_SUCCESS);
} }
BOOLEAN RTUSBNeedQueueBackForAgg(IN RTMP_ADAPTER * pAd, IN UCHAR BulkOutPipeId)
BOOLEAN RTUSBNeedQueueBackForAgg(
IN RTMP_ADAPTER *pAd,
IN UCHAR BulkOutPipeId)
{ {
unsigned long IrqFlags; unsigned long IrqFlags;
HT_TX_CONTEXT *pHTTXContext; HT_TX_CONTEXT *pHTTXContext;
BOOLEAN needQueBack = FALSE; BOOLEAN needQueBack = FALSE;
pHTTXContext = &pAd->TxContext[BulkOutPipeId]; pHTTXContext = &pAd->TxContext[BulkOutPipeId];
RTMP_IRQ_LOCK(&pAd->TxContextQueueLock[BulkOutPipeId], IrqFlags); RTMP_IRQ_LOCK(&pAd->TxContextQueueLock[BulkOutPipeId], IrqFlags);
if ((pHTTXContext->IRPPending == TRUE) /*&& (pAd->TxSwQueue[BulkOutPipeId].Number == 0) */) if ((pHTTXContext->IRPPending ==
{ TRUE) /*&& (pAd->TxSwQueue[BulkOutPipeId].Number == 0) */ ) {
if ((pHTTXContext->CurWritePosition < pHTTXContext->ENextBulkOutPosition) && if ((pHTTXContext->CurWritePosition <
(((pHTTXContext->ENextBulkOutPosition+MAX_AGGREGATION_SIZE) < MAX_TXBULK_LIMIT) || (pHTTXContext->CurWritePosition > MAX_AGGREGATION_SIZE))) pHTTXContext->ENextBulkOutPosition)
{ &&
(((pHTTXContext->ENextBulkOutPosition +
MAX_AGGREGATION_SIZE) < MAX_TXBULK_LIMIT)
|| (pHTTXContext->CurWritePosition >
MAX_AGGREGATION_SIZE))) {
needQueBack = TRUE; needQueBack = TRUE;
} } else
else if ((pHTTXContext->CurWritePosition > pHTTXContext->ENextBulkOutPosition) && if ((pHTTXContext->CurWritePosition >
((pHTTXContext->ENextBulkOutPosition + MAX_AGGREGATION_SIZE) < pHTTXContext->CurWritePosition)) pHTTXContext->ENextBulkOutPosition)
{ &&
((pHTTXContext->ENextBulkOutPosition +
MAX_AGGREGATION_SIZE) <
pHTTXContext->CurWritePosition)) {
needQueBack = TRUE; needQueBack = TRUE;
} }
} }
...@@ -176,7 +176,6 @@ BOOLEAN RTUSBNeedQueueBackForAgg( ...@@ -176,7 +176,6 @@ BOOLEAN RTUSBNeedQueueBackForAgg(
} }
/* /*
======================================================================== ========================================================================
...@@ -192,21 +191,17 @@ BOOLEAN RTUSBNeedQueueBackForAgg( ...@@ -192,21 +191,17 @@ BOOLEAN RTUSBNeedQueueBackForAgg(
======================================================================== ========================================================================
*/ */
VOID RTUSBRejectPendingPackets( VOID RTUSBRejectPendingPackets(IN PRTMP_ADAPTER pAd)
IN PRTMP_ADAPTER pAd)
{ {
UCHAR Index; UCHAR Index;
PQUEUE_ENTRY pEntry; PQUEUE_ENTRY pEntry;
PNDIS_PACKET pPacket; PNDIS_PACKET pPacket;
PQUEUE_HEADER pQueue; PQUEUE_HEADER pQueue;
for (Index = 0; Index < 4; Index++) {
for (Index = 0; Index < 4; Index++)
{
NdisAcquireSpinLock(&pAd->TxSwQueueLock[Index]); NdisAcquireSpinLock(&pAd->TxSwQueueLock[Index]);
while (pAd->TxSwQueue[Index].Head != NULL) while (pAd->TxSwQueue[Index].Head != NULL) {
{ pQueue = (PQUEUE_HEADER) & (pAd->TxSwQueue[Index]);
pQueue = (PQUEUE_HEADER) &(pAd->TxSwQueue[Index]);
pEntry = RemoveHeadQueue(pQueue); pEntry = RemoveHeadQueue(pQueue);
pPacket = QUEUE_ENTRY_TO_PACKET(pEntry); pPacket = QUEUE_ENTRY_TO_PACKET(pEntry);
RELEASE_NDIS_PACKET(pAd, pPacket, NDIS_STATUS_FAILURE); RELEASE_NDIS_PACKET(pAd, pPacket, NDIS_STATUS_FAILURE);
...@@ -217,7 +212,6 @@ VOID RTUSBRejectPendingPackets( ...@@ -217,7 +212,6 @@ VOID RTUSBRejectPendingPackets(
} }
/* /*
======================================================================== ========================================================================
...@@ -246,21 +240,18 @@ VOID RTUSBRejectPendingPackets( ...@@ -246,21 +240,18 @@ VOID RTUSBRejectPendingPackets(
======================================================================== ========================================================================
*/ */
VOID RTMPWriteTxInfo(IN PRTMP_ADAPTER pAd,
VOID RTMPWriteTxInfo( IN PTXINFO_STRUC pTxInfo,
IN PRTMP_ADAPTER pAd, IN USHORT USBDMApktLen,
IN PTXINFO_STRUC pTxInfo, IN BOOLEAN bWiv,
IN USHORT USBDMApktLen, IN UCHAR QueueSel, IN UCHAR NextValid, IN UCHAR TxBurst)
IN BOOLEAN bWiv,
IN UCHAR QueueSel,
IN UCHAR NextValid,
IN UCHAR TxBurst)
{ {
pTxInfo->USBDMATxPktLen = USBDMApktLen; pTxInfo->USBDMATxPktLen = USBDMApktLen;
pTxInfo->QSEL = QueueSel; pTxInfo->QSEL = QueueSel;
if (QueueSel != FIFO_EDCA) if (QueueSel != FIFO_EDCA)
DBGPRINT(RT_DEBUG_TRACE, ("====> QueueSel != FIFO_EDCA<============\n")); DBGPRINT(RT_DEBUG_TRACE,
pTxInfo->USBDMANextVLD = FALSE; //NextValid; // Need to check with Jan about this. ("====> QueueSel != FIFO_EDCA<============\n"));
pTxInfo->USBDMANextVLD = FALSE; //NextValid; // Need to check with Jan about this.
pTxInfo->USBDMATxburst = TxBurst; pTxInfo->USBDMATxburst = TxBurst;
pTxInfo->WIV = bWiv; pTxInfo->WIV = bWiv;
pTxInfo->SwUseLastRound = 0; pTxInfo->SwUseLastRound = 0;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或