Skip to content

L
linux
Commit 66cd8d6e authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files
Options

Staging: rt28x0: run *.c files through Lindent 

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 460bb8df
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5933 additions and 5653 deletions
drivers/staging/rt2860/chips/rt3070.c
View file @ 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
View file @ 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
View file @ 66cd8d6e
This diff is collapsed.
drivers/staging/rt2860/pci_main_dev.c
View file @ 66cd8d6e
This diff is collapsed.
drivers/staging/rt2860/rt_linux.c
View file @ 66cd8d6e
This diff is collapsed.
drivers/staging/rt2860/rt_main_dev.c
View file @ 66cd8d6e
This diff is collapsed.
drivers/staging/rt2860/rt_pci_rbus.c
View file @ 66cd8d6e
This diff is collapsed.
drivers/staging/rt2860/rt_usb.c
View file @ 66cd8d6e
This diff is collapsed.
drivers/staging/rt2860/sta_ioctl.c
View file @ 66cd8d6e
This diff is collapsed.
drivers/staging/rt2860/usb_main_dev.c
View file @ 66cd8d6e
This diff is collapsed.
drivers/staging/rt2870/common/rtusb_bulk.c
View file @ 66cd8d6e
This diff is collapsed.
drivers/staging/rt2870/common/rtusb_data.c
View file @ 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;
......
drivers/staging/rt2870/common/rtusb_io.c
View file @ 66cd8d6e
This diff is collapsed.
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