staging: vt6655: mac remove dead variable TxRate_iwconfig
PATCH 1/11 staging: vt6655: mac remove dead variable TxRate_iwconfig
--- drivers/staging/vt6655/mac.c | 1 - drivers/staging/vt6655/mac.h | 1 - 2 files changed, 2 deletions(-)
drivers/staging/vt6655/mac.c +0 -1
@@ -71,7 +71,6 @@#include "tmacro.h" #include "mac.h" -unsigned short TxRate_iwconfig;//2008-5-8 <add> by chester /*--------------------- Static Classes ----------------------------*/ /*--------------------- Static Variables --------------------------*/
drivers/staging/vt6655/mac.h +0 -1
@@ -970,7 +970,6 @@ do { \/*--------------------- Export Functions --------------------------*/ -extern unsigned short TxRate_iwconfig;//2008-5-8 <add> by chester void MACvReadAllRegs (void __iomem *dwIoBase,unsigned char *pbyMacRegs);bool MACbIsRegBitsOn (void __iomem *dwIoBase,unsigned char byRegOfs,unsigned char byTestBits);
Signature · 1 line
2.1.0
PATCH 2/11 staging: vt6655: mac.c/h remove member type comments
--- drivers/staging/vt6655/mac.c | 10 ---------- drivers/staging/vt6655/mac.h | 6 ------ 2 files changed, 16 deletions(-)
drivers/staging/vt6655/mac.c +0 -10
@@ -71,16 +71,6 @@#include "tmacro.h" #include "mac.h" -/*--------------------- Static Classes ----------------------------*/ - -/*--------------------- Static Variables --------------------------*/ - -/*--------------------- Static Functions --------------------------*/ - -/*--------------------- Export Variables --------------------------*/ - -/*--------------------- Export Functions --------------------------*/ -/* * Description: * Read All MAC Registers to buffer
drivers/staging/vt6655/mac.h +0 -6
@@ -964,12 +964,6 @@ do { \#define MACvSetRFLE_LatchBase (dwIoBase) \ MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT) -/*--------------------- Export Classes ----------------------------*/ - -/*--------------------- Export Variables --------------------------*/ - -/*--------------------- Export Functions --------------------------*/ -void MACvReadAllRegs (void __iomem *dwIoBase,unsigned char *pbyMacRegs);bool MACbIsRegBitsOn (void __iomem *dwIoBase,unsigned char byRegOfs,unsigned char byTestBits);
Signature · 1 line
2.1.0
PATCH 3/11 staging: vt6655: mac.c and mac.h remove dead functions.
In reply to Malcolm PriestleyMACvReadAllRegs
MACbyReadMultiAddr
MACvWriteMultiAddr
MACvSetMultiAddrByHash
MACvResetMultiAddrByHash
MACvSetRxThreshold
MACvGetRxThreshold
MACvSetTxThreshold
MACvGetTxThreshold
MACvSetDmaLength
MACvGetDmaLength
MACvGetLongRetryLimit
MACbIsInLoopbackMode
MACbCompareContext
MACvOneShotTimer0MicroSec
MACbTxDMAOff
MACvClearBusSusInd
MACvEnableBusSusEn
MACbFlushSYNCFifo
MACvSetDefaultKeyEntry
MACvEnableDefaultKey
MACvDisableDefaultKey
MACvSetDefaultTKIPKeyEntry
MACvSetDefaultKeyCtl
--- drivers/staging/vt6655/mac.c | 702 ------------------------------------------- drivers/staging/vt6655/mac.h | 32 -- 2 files changed, 734 deletions(-)
drivers/staging/vt6655/mac.c +0 -702
@@ -26,30 +26,16 @@* Date: May 21, 1996 * * Functions: -* MACvReadAllRegs - Read All MAC Registers to buffer * MACbIsRegBitsOn - Test if All test Bits On * MACbIsRegBitsOff - Test if All test Bits Off * MACbIsIntDisable - Test if MAC interrupt disable -* MACbyReadMultiAddr - Read Multicast Address Mask Pattern -* MACvWriteMultiAddr - Write Multicast Address Mask Pattern -* MACvSetMultiAddrByHash - Set Multicast Address Mask by Hash value -* MACvResetMultiAddrByHash - Clear Multicast Address Mask by Hash value -* MACvSetRxThreshold - Set Rx Threshold value -* MACvGetRxThreshold - Get Rx Threshold value -* MACvSetTxThreshold - Set Tx Threshold value -* MACvGetTxThreshold - Get Tx Threshold value -* MACvSetDmaLength - Set Dma Length value -* MACvGetDmaLength - Get Dma Length value * MACvSetShortRetryLimit - Set 802.11 Short Retry limit * MACvGetShortRetryLimit - Get 802.11 Short Retry limit * MACvSetLongRetryLimit - Set 802.11 Long Retry limit -* MACvGetLongRetryLimit - Get 802.11 Long Retry limit * MACvSetLoopbackMode - Set MAC Loopback Mode -* MACbIsInLoopbackMode - Test if MAC in Loopback mode * MACvSetPacketFilter - Set MAC Address Filter * MACvSaveContext - Save Context of MAC Registers * MACvRestoreContext - Restore Context of MAC Registers -* MACbCompareContext - Compare if values of MAC Registers same as Context * MACbSoftwareReset - Software Reset MAC * MACbSafeRxOff - Turn Off MAC Rx * MACbSafeTxOff - Turn Off MAC Tx
@@ -73,40 +59,6 @@/* * Description: -* Read All MAC Registers to buffer -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* Out: -* pbyMacRegs - buffer to read -* -* Return Value: none -* -*/ -void MACvReadAllRegs (void __iomem *dwIoBase,unsigned char *pbyMacRegs) -{ -int ii; - -// read page0 register -for (ii =0 ; ii <MAC_MAX_CONTEXT_SIZE_PAGE0 ; ii++) { -VNSvInPortB (dwIoBase + ii, pbyMacRegs); - pbyMacRegs++; - } - -MACvSelectPage1 (dwIoBase); - -// read page1 register -for (ii =0 ; ii <MAC_MAX_CONTEXT_SIZE_PAGE1 ; ii++) { -VNSvInPortB (dwIoBase + ii, pbyMacRegs); - pbyMacRegs++; - } - -MACvSelectPage0 (dwIoBase); -} - -/* -* Description: * Test if all test bits on * * Parameters:
@@ -177,252 +129,6 @@ bool MACbIsIntDisable(void __iomem *dwIoBase)/* * Description: -* Read MAC Multicast Address Mask -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* uByteidx - Index of Mask -* Out: -* none -* -* Return Value: Mask Value read -* -*/ -unsigned char MACbyReadMultiAddr (void __iomem *dwIoBase,unsigned int uByteIdx) -{ -unsigned char byData; - -MACvSelectPage1 (dwIoBase); -VNSvInPortB (dwIoBase +MAC_REG_MAR0 + uByteIdx, &byData); -MACvSelectPage0 (dwIoBase); -return byData; -} - -/* -* Description: -* Write MAC Multicast Address Mask -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* uByteidx - Index of Mask -* byData - Mask Value to write -* Out: -* none -* -* Return Value: none -* -*/ -void MACvWriteMultiAddr (void __iomem *dwIoBase,unsigned int uByteIdx,unsigned char byData) -{ -MACvSelectPage1 (dwIoBase); -VNSvOutPortB (dwIoBase +MAC_REG_MAR0 + uByteIdx, byData); -MACvSelectPage0 (dwIoBase); -} - -/* -* Description: -* Set this hash index into multicast address register bit -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* byHashIdx - Hash index to set -* Out: -* none -* -* Return Value: none -* -*/ -void MACvSetMultiAddrByHash (void __iomem *dwIoBase,unsigned char byHashIdx) -{ -unsigned int uByteIdx; -unsigned char byBitMask; -unsigned char byOrgValue; - -// calculate byte position - uByteIdx = byHashIdx /8 ; -ASSERT (uByteIdx <8 ); -// calculate bit position - byBitMask =1 ; - byBitMask <<= (byHashIdx %8 ); -// turn on the bit - byOrgValue =MACbyReadMultiAddr (dwIoBase, uByteIdx); -MACvWriteMultiAddr (dwIoBase, uByteIdx, (unsigned char )(byOrgValue | byBitMask)); -} - -/* -* Description: -* Reset this hash index into multicast address register bit -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* byHashIdx - Hash index to clear -* Out: -* none -* -* Return Value: none -* -*/ -void MACvResetMultiAddrByHash (void __iomem *dwIoBase,unsigned char byHashIdx) -{ -unsigned int uByteIdx; -unsigned char byBitMask; -unsigned char byOrgValue; - -// calculate byte position - uByteIdx = byHashIdx /8 ; -ASSERT (uByteIdx <8 ); -// calculate bit position - byBitMask =1 ; - byBitMask <<= (byHashIdx %8 ); -// turn off the bit - byOrgValue =MACbyReadMultiAddr (dwIoBase, uByteIdx); -MACvWriteMultiAddr (dwIoBase, uByteIdx, (unsigned char )(byOrgValue & (~byBitMask))); -} - -/* -* Description: -* Set Rx Threshold -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* byThreshold - Threshold Value -* Out: -* none -* -* Return Value: none -* -*/ -void MACvSetRxThreshold (void __iomem *dwIoBase,unsigned char byThreshold) -{ -unsigned char byOrgValue; - -ASSERT (byThreshold <4 ); - -// set FCR0 -VNSvInPortB (dwIoBase +MAC_REG_FCR0 , &byOrgValue); - byOrgValue = (byOrgValue &0xCF ) | (byThreshold <<4 ); -VNSvOutPortB (dwIoBase +MAC_REG_FCR0 , byOrgValue); -} - -/* -* Description: -* Get Rx Threshold -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* Out: -* pbyThreshold- Threshold Value Get -* -* Return Value: none -* -*/ -void MACvGetRxThreshold (void __iomem *dwIoBase,unsigned char *pbyThreshold) -{ -// get FCR0 -VNSvInPortB (dwIoBase +MAC_REG_FCR0 , pbyThreshold); - *pbyThreshold = (*pbyThreshold >>4 ) &0x03 ; -} - -/* -* Description: -* Set Tx Threshold -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* byThreshold - Threshold Value -* Out: -* none -* -* Return Value: none -* -*/ -void MACvSetTxThreshold (void __iomem *dwIoBase,unsigned char byThreshold) -{ -unsigned char byOrgValue; - -ASSERT (byThreshold <4 ); - -// set FCR0 -VNSvInPortB (dwIoBase +MAC_REG_FCR0 , &byOrgValue); - byOrgValue = (byOrgValue &0xF3 ) | (byThreshold <<2 ); -VNSvOutPortB (dwIoBase +MAC_REG_FCR0 , byOrgValue); -} - -/* -* Description: -* Get Tx Threshold -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* Out: -* pbyThreshold- Threshold Value Get -* -* Return Value: none -* -*/ -void MACvGetTxThreshold (void __iomem *dwIoBase,unsigned char *pbyThreshold) -{ -// get FCR0 -VNSvInPortB (dwIoBase +MAC_REG_FCR0 , pbyThreshold); - *pbyThreshold = (*pbyThreshold >>2 ) &0x03 ; -} - -/* -* Description: -* Set Dma Length -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* byDmaLength - Dma Length Value -* Out: -* none -* -* Return Value: none -* -*/ -void MACvSetDmaLength (void __iomem *dwIoBase,unsigned char byDmaLength) -{ -unsigned char byOrgValue; - -ASSERT (byDmaLength <4 ); - -// set FCR0 -VNSvInPortB (dwIoBase +MAC_REG_FCR0 , &byOrgValue); - byOrgValue = (byOrgValue &0xFC ) | byDmaLength; -VNSvOutPortB (dwIoBase +MAC_REG_FCR0 , byOrgValue); -} - -/* -* Description: -* Get Dma Length -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* Out: -* pbyDmaLength- Dma Length Value Get -* -* Return Value: none -* -*/ -void MACvGetDmaLength (void __iomem *dwIoBase,unsigned char *pbyDmaLength) -{ -// get FCR0 -VNSvInPortB (dwIoBase +MAC_REG_FCR0 , pbyDmaLength); - *pbyDmaLength &=0x03 ; -} - -/* -* Description: * Set 802.11 Short Retry Limit * * Parameters:
@@ -482,25 +188,6 @@ void MACvSetLongRetryLimit(void __iomem *dwIoBase, unsigned char byRetryLimit)/* * Description: -* Get 802.11 Long Retry Limit -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* Out: -* pbyRetryLimit - Retry Limit Get -* -* Return Value: none -* -*/ -void MACvGetLongRetryLimit (void __iomem *dwIoBase,unsigned char *pbyRetryLimit) -{ -// get LRT -VNSvInPortB (dwIoBase +MAC_REG_LRT , pbyRetryLimit); -} - -/* -* Description: * Set MAC Loopback mode * * Parameters:
@@ -528,29 +215,6 @@ void MACvSetLoopbackMode(void __iomem *dwIoBase, unsigned char byLoopbackMode)/* * Description: -* Test if MAC in Loopback mode -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* Out: -* none -* -* Return Value: true if in Loopback mode; otherwise false -* -*/ -bool MACbIsInLoopbackMode (void __iomem *dwIoBase) -{ -unsigned char byOrgValue; - -VNSvInPortB (dwIoBase +MAC_REG_TEST , &byOrgValue); -if (byOrgValue & (TEST_LBINT |TEST_LBEXT )) -return true; -return false; -} - -/* -* Description: * Set MAC Address filter * * Parameters:
@@ -690,47 +354,6 @@ void MACvRestoreContext(void __iomem *dwIoBase, unsigned char *pbyCxtBuf)/* * Description: -* Compare if MAC registers same as context buffer -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* pbyCxtBuf - Context buffer -* Out: -* none -* -* Return Value: true if all values are the same; otherwise false -* -*/ -bool MACbCompareContext (void __iomem *dwIoBase,unsigned char *pbyCxtBuf) -{ -unsigned long dwData; - -// compare MAC context to determine if this is a power lost init, -// return true for power remaining init, return false for power lost init - -// compare CURR_RX_DESC_ADDR, CURR_TX_DESC_ADDR -VNSvInPortD (dwIoBase +MAC_REG_TXDMAPTR0 , &dwData); -if (dwData != *(unsigned long *)(pbyCxtBuf +MAC_REG_TXDMAPTR0 )) -return false; - -VNSvInPortD (dwIoBase +MAC_REG_AC0DMAPTR , &dwData); -if (dwData != *(unsigned long *)(pbyCxtBuf +MAC_REG_AC0DMAPTR )) -return false; - -VNSvInPortD (dwIoBase +MAC_REG_RXDMAPTR0 , &dwData); -if (dwData != *(unsigned long *)(pbyCxtBuf +MAC_REG_RXDMAPTR0 )) -return false; - -VNSvInPortD (dwIoBase +MAC_REG_RXDMAPTR1 , &dwData); -if (dwData != *(unsigned long *)(pbyCxtBuf +MAC_REG_RXDMAPTR1 )) -return false; - -return true; -} - -/* -* Description: * Software Reset MAC * * Parameters:
@@ -1222,27 +845,6 @@ void MACvTimer0MicroSDelay(void __iomem *dwIoBase, unsigned int uDelay)* Return Value: none * */ -void MACvOneShotTimer0MicroSec (void __iomem *dwIoBase,unsigned int uDelayTime) -{ -VNSvOutPortB (dwIoBase +MAC_REG_TMCTL0 ,0 ); -VNSvOutPortD (dwIoBase +MAC_REG_TMDATA0 , uDelayTime); -VNSvOutPortB (dwIoBase +MAC_REG_TMCTL0 , (TMCTL_TMD |TMCTL_TE )); -} - -/* -* Description: -* Micro Second One shot timer via MAC -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* uDelay - Delay time -* Out: -* none -* -* Return Value: none -* -*/ void MACvOneShotTimer1MicroSec (void __iomem *dwIoBase,unsigned int uDelayTime) {VNSvOutPortB (dwIoBase +MAC_REG_TMCTL1 ,0 );
@@ -1259,102 +861,6 @@ void MACvSetMISCFifo(void __iomem *dwIoBase, unsigned short wOffset, unsigned loVNSvOutPortW (dwIoBase +MAC_REG_MISCFFCTL ,MISCFFCTL_WRITE ); } -bool MACbTxDMAOff (void __iomem *dwIoBase,unsigned int idx) -{ -unsigned char byData; -unsigned int ww =0 ; - -if (idx ==TYPE_TXDMA0 ) { -VNSvOutPortB (dwIoBase +MAC_REG_TXDMACTL0 +2 ,DMACTL_RUN ); -for (ww =0 ; ww <W_MAX_TIMEOUT ; ww++) { -VNSvInPortB (dwIoBase +MAC_REG_TXDMACTL0 , &byData); -if (!(byData &DMACTL_RUN )) -break ; - } - }else if (idx ==TYPE_AC0DMA ) { -VNSvOutPortB (dwIoBase +MAC_REG_AC0DMACTL +2 ,DMACTL_RUN ); -for (ww =0 ; ww <W_MAX_TIMEOUT ; ww++) { -VNSvInPortB (dwIoBase +MAC_REG_AC0DMACTL , &byData); -if (!(byData &DMACTL_RUN )) -break ; - } - } -if (ww ==W_MAX_TIMEOUT ) { -DBG_PORT80 (0x29 ); -pr_debug (" DBG_PORT80(0x29)\n" ); -return false; - } -return true; -} - -void MACvClearBusSusInd (void __iomem *dwIoBase) -{ -unsigned long dwOrgValue; -unsigned int ww; -// check if BcnSusInd enabled -VNSvInPortD (dwIoBase +MAC_REG_ENCFG , &dwOrgValue); -if (!(dwOrgValue & EnCFG_BcnSusInd)) -return ; -//Set BcnSusClr - dwOrgValue = dwOrgValue | EnCFG_BcnSusClr; -VNSvOutPortD (dwIoBase +MAC_REG_ENCFG , dwOrgValue); -for (ww =0 ; ww <W_MAX_TIMEOUT ; ww++) { -VNSvInPortD (dwIoBase +MAC_REG_ENCFG , &dwOrgValue); -if (!(dwOrgValue & EnCFG_BcnSusInd)) -break ; - } -if (ww ==W_MAX_TIMEOUT ) { -DBG_PORT80 (0x33 ); -pr_debug (" DBG_PORT80(0x33)\n" ); - } -} - -void MACvEnableBusSusEn (void __iomem *dwIoBase) -{ -unsigned char byOrgValue; -unsigned long dwOrgValue; -unsigned int ww; -// check if BcnSusInd enabled -VNSvInPortB (dwIoBase +MAC_REG_CFG , &byOrgValue); - -//Set BcnSusEn - byOrgValue = byOrgValue |CFG_BCNSUSEN ; -VNSvOutPortB (dwIoBase +MAC_REG_ENCFG , byOrgValue); -for (ww =0 ; ww <W_MAX_TIMEOUT ; ww++) { -VNSvInPortD (dwIoBase +MAC_REG_ENCFG , &dwOrgValue); -if (dwOrgValue & EnCFG_BcnSusInd) -break ; - } -if (ww ==W_MAX_TIMEOUT ) { -DBG_PORT80 (0x34 ); -pr_debug (" DBG_PORT80(0x34)\n" ); - } -} - -bool MACbFlushSYNCFifo (void __iomem *dwIoBase) -{ -unsigned char byOrgValue; -unsigned int ww; -// Read MACCR -VNSvInPortB (dwIoBase +MAC_REG_MACCR , &byOrgValue); - -// Set SYNCFLUSH - byOrgValue = byOrgValue |MACCR_SYNCFLUSH ; -VNSvOutPortB (dwIoBase +MAC_REG_MACCR , byOrgValue); - -// Check if SyncFlushOK -for (ww =0 ; ww <W_MAX_TIMEOUT ; ww++) { -VNSvInPortB (dwIoBase +MAC_REG_MACCR , &byOrgValue); -if (byOrgValue &MACCR_SYNCFLUSHOK ) -break ; - } -if (ww ==W_MAX_TIMEOUT ) { -DBG_PORT80 (0x35 ); -pr_debug (" DBG_PORT80(0x33)\n" ); - } -return true; -} -bool MACbPSWakeup (void __iomem *dwIoBase) {unsigned char byOrgValue;
@@ -1472,211 +978,3 @@ void MACvDisableKeyEntry(void __iomem *dwIoBase, unsigned int uEntryIdx)VNSvOutPortD (dwIoBase +MAC_REG_MISCFFDATA ,0 );VNSvOutPortW (dwIoBase +MAC_REG_MISCFFCTL ,MISCFFCTL_WRITE ); } - -/* -* Description: -* Set the default Key (KeyEntry[10]) by MISCFIFO -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* -* Out: -* none -* -* Return Value: none -* -*/ - -void MACvSetDefaultKeyEntry (void __iomem *dwIoBase,unsigned int uKeyLen, -unsigned int uKeyIdx,unsigned long *pdwKey,unsigned char byLocalID) -{ -unsigned short wOffset; -unsigned long dwData; -int ii; - -if (byLocalID <=1 ) -return ; - -pr_debug ("MACvSetDefaultKeyEntry\n" ); - wOffset =MISCFIFO_KEYETRY0 ; - wOffset += (10 *MISCFIFO_KEYENTRYSIZE ); - - wOffset++; - wOffset++; - wOffset += (uKeyIdx *4 ); -// always push 128 bits -for (ii =0 ; ii <3 ; ii++) { -pr_debug ("(%d) wOffset: %d, Data: %lX\n" , - ii, wOffset+ii, *pdwKey); -VNSvOutPortW (dwIoBase +MAC_REG_MISCFFNDEX , wOffset+ii); -VNSvOutPortD (dwIoBase +MAC_REG_MISCFFDATA , *pdwKey++); -VNSvOutPortW (dwIoBase +MAC_REG_MISCFFCTL ,MISCFFCTL_WRITE ); - } - dwData = *pdwKey; -if (uKeyLen ==WLAN_KEY_LEN_WEP40 ) - dwData |=0x80000000 ; - -VNSvOutPortW (dwIoBase +MAC_REG_MISCFFNDEX , wOffset+3 ); -VNSvOutPortD (dwIoBase +MAC_REG_MISCFFDATA , dwData); -VNSvOutPortW (dwIoBase +MAC_REG_MISCFFCTL ,MISCFFCTL_WRITE ); -pr_debug ("End. wOffset: %d, Data: %lX\n" , wOffset+3 , dwData); -} - -/* -* Description: -* Enable default Key (KeyEntry[10]) by MISCFIFO -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* -* Out: -* none -* -* Return Value: none -* -*/ -/* -void MACvEnableDefaultKey(void __iomem *dwIoBase, unsigned char byLocalID) -{ -unsigned short wOffset; -unsigned long dwData; - -if (byLocalID <= 1) -return; - -wOffset = MISCFIFO_KEYETRY0; -wOffset += (10 * MISCFIFO_KEYENTRYSIZE); - -dwData = 0xC0440000; -VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset); -VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData); -VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE); -pr_debug("MACvEnableDefaultKey: wOffset: %d, Data: %lX\n", wOffset, dwData); - -} -*/ - -/* -* Description: -* Disable default Key (KeyEntry[10]) by MISCFIFO -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* -* Out: -* none -* -* Return Value: none -* -*/ -void MACvDisableDefaultKey (void __iomem *dwIoBase) -{ -unsigned short wOffset; -unsigned long dwData; - - wOffset =MISCFIFO_KEYETRY0 ; - wOffset += (10 *MISCFIFO_KEYENTRYSIZE ); - - dwData =0x0 ; -VNSvOutPortW (dwIoBase +MAC_REG_MISCFFNDEX , wOffset); -VNSvOutPortD (dwIoBase +MAC_REG_MISCFFDATA , dwData); -VNSvOutPortW (dwIoBase +MAC_REG_MISCFFCTL ,MISCFFCTL_WRITE ); -pr_debug ("MACvDisableDefaultKey: wOffset: %d, Data: %lX\n" , - wOffset, dwData); -} - -/* -* Description: -* Set the default TKIP Group Key (KeyEntry[10]) by MISCFIFO -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* -* Out: -* none -* -* Return Value: none -* -*/ -void MACvSetDefaultTKIPKeyEntry (void __iomem *dwIoBase,unsigned int uKeyLen, -unsigned int uKeyIdx,unsigned long *pdwKey,unsigned char byLocalID) -{ -unsigned short wOffset; -unsigned long dwData; -int ii; - -if (byLocalID <=1 ) -return ; - -pr_debug ("MACvSetDefaultTKIPKeyEntry\n" ); - wOffset =MISCFIFO_KEYETRY0 ; -// Kyle test : change offset from 10 -> 0 - wOffset += (10 *MISCFIFO_KEYENTRYSIZE ); - - dwData =0xC0660000 ; -VNSvOutPortW (dwIoBase +MAC_REG_MISCFFNDEX , wOffset); -VNSvOutPortD (dwIoBase +MAC_REG_MISCFFDATA , dwData); -VNSvOutPortW (dwIoBase +MAC_REG_MISCFFCTL ,MISCFFCTL_WRITE ); - wOffset++; - - dwData =0 ; -VNSvOutPortW (dwIoBase +MAC_REG_MISCFFNDEX , wOffset); -VNSvOutPortD (dwIoBase +MAC_REG_MISCFFDATA , dwData); -VNSvOutPortW (dwIoBase +MAC_REG_MISCFFCTL ,MISCFFCTL_WRITE ); - wOffset++; - - wOffset += (uKeyIdx *4 ); -pr_debug ("1. wOffset: %d, Data: %lX, idx:%d\n" , - wOffset, *pdwKey, uKeyIdx); -// always push 128 bits -for (ii =0 ; ii <4 ; ii++) { -pr_debug ("2.(%d) wOffset: %d, Data: %lX\n" , - ii, wOffset+ii, *pdwKey); -VNSvOutPortW (dwIoBase +MAC_REG_MISCFFNDEX , wOffset+ii); -VNSvOutPortD (dwIoBase +MAC_REG_MISCFFDATA , *pdwKey++); -VNSvOutPortW (dwIoBase +MAC_REG_MISCFFCTL ,MISCFFCTL_WRITE ); - } -} - -/* -* Description: -* Set the Key Control by MISCFIFO -* -* Parameters: -* In: -* dwIoBase - Base Address for MAC -* -* Out: -* none -* -* Return Value: none -* -*/ - -void MACvSetDefaultKeyCtl (void __iomem *dwIoBase,unsigned short wKeyCtl,unsigned int uEntryIdx,unsigned char byLocalID) -{ -unsigned short wOffset; -unsigned long dwData; - -if (byLocalID <=1 ) -return ; - -pr_debug ("MACvSetKeyEntry\n" ); - wOffset =MISCFIFO_KEYETRY0 ; - wOffset += (uEntryIdx *MISCFIFO_KEYENTRYSIZE ); - - dwData =0 ; - dwData |= wKeyCtl; - dwData <<=16 ; - dwData |=0xffff ; -pr_debug ("1. wOffset: %d, Data: %lX, KeyCtl:%X\n" , - wOffset, dwData, wKeyCtl); - -VNSvOutPortW (dwIoBase +MAC_REG_MISCFFNDEX , wOffset); -VNSvOutPortD (dwIoBase +MAC_REG_MISCFFDATA , dwData); -VNSvOutPortW (dwIoBase +MAC_REG_MISCFFCTL ,MISCFFCTL_WRITE ); -}
drivers/staging/vt6655/mac.h +0 -32
@@ -964,41 +964,22 @@ do { \#define MACvSetRFLE_LatchBase (dwIoBase) \ MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT) -void MACvReadAllRegs (void __iomem *dwIoBase,unsigned char *pbyMacRegs); -bool MACbIsRegBitsOn (void __iomem *dwIoBase,unsigned char byRegOfs,unsigned char byTestBits);bool MACbIsRegBitsOff (void __iomem *dwIoBase,unsigned char byRegOfs,unsigned char byTestBits);bool MACbIsIntDisable (void __iomem *dwIoBase); -unsigned char MACbyReadMultiAddr (void __iomem *dwIoBase,unsigned int uByteIdx); -void MACvWriteMultiAddr (void __iomem *dwIoBase,unsigned int uByteIdx,unsigned char byData); -void MACvSetMultiAddrByHash (void __iomem *dwIoBase,unsigned char byHashIdx); -void MACvResetMultiAddrByHash (void __iomem *dwIoBase,unsigned char byHashIdx); - -void MACvSetRxThreshold (void __iomem *dwIoBase,unsigned char byThreshold); -void MACvGetRxThreshold (void __iomem *dwIoBase,unsigned char *pbyThreshold); - -void MACvSetTxThreshold (void __iomem *dwIoBase,unsigned char byThreshold); -void MACvGetTxThreshold (void __iomem *dwIoBase,unsigned char *pbyThreshold); - -void MACvSetDmaLength (void __iomem *dwIoBase,unsigned char byDmaLength); -void MACvGetDmaLength (void __iomem *dwIoBase,unsigned char *pbyDmaLength); -void MACvSetShortRetryLimit (void __iomem *dwIoBase,unsigned char byRetryLimit); -void MACvGetShortRetryLimit (void __iomem *dwIoBase,unsigned char *pbyRetryLimit);void MACvSetLongRetryLimit (void __iomem *dwIoBase,unsigned char byRetryLimit);void MACvGetLongRetryLimit (void __iomem *dwIoBase,unsigned char *pbyRetryLimit);void MACvSetLoopbackMode (void __iomem *dwIoBase,unsigned char byLoopbackMode); -bool MACbIsInLoopbackMode (void __iomem *dwIoBase);void MACvSetPacketFilter (void __iomem *dwIoBase,unsigned short wFilterType);void MACvSaveContext (void __iomem *dwIoBase,unsigned char *pbyCxtBuf);void MACvRestoreContext (void __iomem *dwIoBase,unsigned char *pbyCxtBuf); -bool MACbCompareContext (void __iomem *dwIoBase,unsigned char *pbyCxtBuf);bool MACbSoftwareReset (void __iomem *dwIoBase);bool MACbSafeSoftwareReset (void __iomem *dwIoBase);
@@ -1015,27 +996,14 @@ void MACvSetCurrAC0DescAddrEx(void __iomem *dwIoBase, unsigned long dwCurrDescAdvoid MACvSetCurrSyncDescAddrEx (void __iomem *dwIoBase,unsigned long dwCurrDescAddr);void MACvSetCurrATIMDescAddrEx (void __iomem *dwIoBase,unsigned long dwCurrDescAddr);void MACvTimer0MicroSDelay (void __iomem *dwIoBase,unsigned int uDelay); -void MACvOneShotTimer0MicroSec (void __iomem *dwIoBase,unsigned int uDelayTime);void MACvOneShotTimer1MicroSec (void __iomem *dwIoBase,unsigned int uDelayTime);void MACvSetMISCFifo (void __iomem *dwIoBase,unsigned short wOffset,unsigned long dwData); -bool MACbTxDMAOff (void __iomem *dwIoBase,unsigned int idx); - -void MACvClearBusSusInd (void __iomem *dwIoBase); -void MACvEnableBusSusEn (void __iomem *dwIoBase); - -bool MACbFlushSYNCFifo (void __iomem *dwIoBase);bool MACbPSWakeup (void __iomem *dwIoBase);void MACvSetKeyEntry (void __iomem *dwIoBase,unsigned short wKeyCtl,unsigned int uEntryIdx,unsigned int uKeyIdx,unsigned char *pbyAddr,u32 *pdwKey,unsigned char byLocalID);void MACvDisableKeyEntry (void __iomem *dwIoBase,unsigned int uEntryIdx); -void MACvSetDefaultKeyEntry (void __iomem *dwIoBase,unsigned int uKeyLen, -unsigned int uKeyIdx,unsigned long *pdwKey,unsigned char byLocalID); -void MACvDisableDefaultKey (void __iomem *dwIoBase); -void MACvSetDefaultTKIPKeyEntry (void __iomem *dwIoBase,unsigned int uKeyLen, -unsigned int uKeyIdx,unsigned long *pdwKey,unsigned char byLocalID); -void MACvSetDefaultKeyCtl (void __iomem *dwIoBase,unsigned short wKeyCtl,unsigned int uEntryIdx,unsigned char byLocalID);#endif // __MAC_H__
Signature · 1 line
2.1.0
PATCH 4/11 staging: vt6655: remove fragmentation from driver
In reply to Malcolm Priestleyfragmentation is now handled by mac80211.
Remove functionsdevice_alloc_frag_bufdevice_init_defrag_cbdevice_free_frag_buf
Removing
typedef struct tagSDeFragControlBlockfrag_thresh
sRxDFCB
cbDFCB;
cbFreeDFCB;
uCurrentDFCBIdx;
macrosFRAG_THRESH_MINFRAG_THRESH_MAX
--- drivers/staging/vt6655/card.c | 3 -- drivers/staging/vt6655/device.h | 25 ----------------- drivers/staging/vt6655/device_main.c | 53 ------------------------------------ 3 files changed, 81 deletions(-)
drivers/staging/vt6655/card.c +0 -3
@@ -583,9 +583,6 @@ CARDvSafeResetRx( pDesc->m_rd1RD1.wReqCount = (unsigned short )(pDevice->rx_buf_sz); } - pDevice->cbDFCB =CB_MAX_RX_FRAG ; - pDevice->cbFreeDFCB = pDevice->cbDFCB; -/* set perPkt mode */ MACvRx0PerPktMode (pDevice->PortOffset);MACvRx1PerPktMode (pDevice->PortOffset);
drivers/staging/vt6655/device.h +0 -25
@@ -177,19 +177,6 @@ typedef enum { OWNED_BY_NIC = 1 }DEVICE_OWNER_TYPE , *PDEVICE_OWNER_TYPE ; -#define CB_MAX_RX_FRAG 64 -/* DeFragment Control Block, used for collecting fragments prior to reassembly */ -typedef struct tagSDeFragControlBlock { -unsigned short wSequence; -unsigned short wFragNum; -unsigned char abyAddr2[ETH_ALEN ]; -unsigned int uLifetime; -struct sk_buff *skb; -unsigned char *pbyRxBuffer; -unsigned int cbFrameLength; -bool bInUse; -}SDeFragControlBlock , *PSDeFragControlBlock ; -/* flags for options */ #define DEVICE_FLAGS_IP_ALIGN 0x00000001UL#define DEVICE_FLAGS_PREAMBLE_TYPE 0x00000002UL
@@ -223,7 +210,6 @@ typedef struct __device_opt {int nTxDescs[2 ];/* Number of TX descriptors 0, 1 */ int int_works;/* interrupt limits */ int rts_thresh;/* rts threshold */ -int frag_thresh;int data_rate;int channel_num;int short_retry;
@@ -287,11 +273,6 @@ struct vnt_private {volatile PSRxDesc aRD1Ring;volatile PSRxDesc pCurrRD[TYPE_MAXRD ]; -SDeFragControlBlock sRxDFCB[CB_MAX_RX_FRAG ]; -unsigned int cbDFCB; -unsigned int cbFreeDFCB; -unsigned int uCurrentDFCBIdx; -OPTIONS sOpts;u32 flags;
@@ -364,7 +345,6 @@ struct vnt_private {unsigned short wCurrentRate;unsigned short wRTSThreshold; -unsigned short wFragmentationThreshold;unsigned char byShortRetryLimit;unsigned char byLongRetryLimit;enum nl80211_iftype op_mode;
@@ -487,9 +467,4 @@ static inline PDEVICE_TD_INFO alloc_td_info(void) {return kzalloc (sizeof (DEVICE_TD_INFO ),GFP_ATOMIC ); } - -/*--------------------- Export Functions --------------------------*/ - -bool device_alloc_frag_buf (struct vnt_private *pDevice, -PSDeFragControlBlock pDeF);#endif
drivers/staging/vt6655/device_main.c +0 -53
128 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH 5/11 staging: vt6655: device_get_options remove unused device parameters
In reply to Malcolm PriestleyIP_byte_align
Channel
PreambleType
RTSThreshold
ConnectionRate
OPMode
b80211hEnable
--- drivers/staging/vt6655/device.h | 3 -- drivers/staging/vt6655/device_main.c | 100 ----------------------------------- 2 files changed, 103 deletions(-)
drivers/staging/vt6655/device.h +0 -3
@@ -209,9 +209,6 @@ typedef struct __device_opt {int nRxDescs1;/* Number of RX descriptors1 */ int nTxDescs[2 ];/* Number of TX descriptors 0, 1 */ int int_works;/* interrupt limits */ -int rts_thresh;/* rts threshold */ -int data_rate; -int channel_num;int short_retry;int long_retry;int bbp_type;
drivers/staging/vt6655/device_main.c +0 -100
146 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH 6/11 staging: vt6655: device_set_options remove unused ethernet addresses
In reply to Malcolm PriestleyRemoving these variables
abyBroadcastAddrabySNAP_RFC1042abySNAP_Bridgetunnel
--- drivers/staging/vt6655/device.h | 3 --- drivers/staging/vt6655/device_main.c | 8 -------- 2 files changed, 11 deletions(-)
drivers/staging/vt6655/device.h +0 -3
@@ -440,9 +440,6 @@ struct vnt_private {unsigned long uNumSQ3[MAX_RATE ];unsigned short wAntDiversityMaxRate; -unsigned char abyBroadcastAddr[ETH_ALEN ]; -unsigned char abySNAP_RFC1042[ETH_ALEN ]; -unsigned char abySNAP_Bridgetunnel[ETH_ALEN ];unsigned char abyEEPROM[EEP_MAX_CONTEXT_SIZE ];/* unsigned long alignment */ /* for 802.11h */
drivers/staging/vt6655/device_main.c +0 -8
@@ -222,14 +222,6 @@ static void device_get_options(struct vnt_private *pDevice)static void device_set_options (struct vnt_private *pDevice) { -unsigned char abyBroadcastAddr[ETH_ALEN ] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; -unsigned char abySNAP_RFC1042[ETH_ALEN ] = {0xAA ,0xAA ,0x03 ,0x00 ,0x00 ,0x00 }; -unsigned char abySNAP_Bridgetunnel[ETH_ALEN ] = {0xAA ,0xAA ,0x03 ,0x00 ,0x00 ,0xF8 }; - -ether_addr_copy (pDevice->abyBroadcastAddr, abyBroadcastAddr); -ether_addr_copy (pDevice->abySNAP_RFC1042, abySNAP_RFC1042); -ether_addr_copy (pDevice->abySNAP_Bridgetunnel, abySNAP_Bridgetunnel); - pDevice->byShortRetryLimit = pDevice->sOpts.short_retry; pDevice->byLongRetryLimit = pDevice->sOpts.long_retry; pDevice->bDiversityRegCtlON = (pDevice->sOpts.flags & DEVICE_FLAGS_DiversityANT) ?1 :0 ;
Signature · 1 line
2.1.0
PATCH 7/11 staging: vt6655: device_init_registers remove uConnectionRate
In reply to Malcolm PriestleyThe device starts up with a default rate of 54M
--- drivers/staging/vt6655/device_main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/staging/vt6655/device_main.c +1 -4
@@ -456,10 +456,7 @@ static void device_init_registers(struct vnt_private *pDevice)/* Set BB and packet type at the same time. */ /* Set Short Slot Time, xIFS, and RSPINF. */ -if (pDevice->uConnectionRate ==RATE_AUTO ) - pDevice->wCurrentRate =RATE_54M ; -else - pDevice->wCurrentRate = (unsigned short )pDevice->uConnectionRate; + pDevice->wCurrentRate =RATE_54M ; pDevice->bRadioOff = false;
Signature · 1 line
2.1.0
PATCH 8/11 staging: vt6655: baseband.c/h remove dead functions
In reply to Malcolm PriestleyThese functions are not used so remove them
BBbIsRegBitsOn
BBbIsRegBitsOff
BBvReadAllRegs
BBvLoopbackOn
BBvLoopbackOff
--- drivers/staging/vt6655/baseband.c | 162 -------------------------------------- drivers/staging/vt6655/baseband.h | 5 -- 2 files changed, 167 deletions(-)
drivers/staging/vt6655/baseband.c +0 -162
@@ -30,12 +30,7 @@* BBvCaculateParameter - Caculate PhyLength, PhyService and Phy Signal parameter for baseband Tx * BBbReadEmbedded - Embedded read baseband register via MAC * BBbWriteEmbedded - Embedded write baseband register via MAC -* BBbIsRegBitsOn - Test if baseband register bits on -* BBbIsRegBitsOff - Test if baseband register bits off * BBbVT3253Init - VIA VT3253 baseband chip init code -* BBvReadAllRegs - Read All Baseband Registers -* BBvLoopbackOn - Turn on BaseBand Loopback mode -* BBvLoopbackOff - Turn off BaseBand Loopback mode * * Revision History: * 06-10-2003 Bryan YC Fan: Re-write codes to support VT3253 spec.
@@ -2036,50 +2031,6 @@ bool BBbWriteEmbedded(void __iomem *dwIoBase, unsigned char byBBAddr, unsigned c }/* -* Description: Test if all bits are set for the Baseband register -* -* Parameters: -* In: -* dwIoBase - I/O base address -* byBBAddr - address of register in Baseband -* byTestBits - TestBits -* Out: -* none -* -* Return Value: true if all TestBits are set; false otherwise. -* -*/ -bool BBbIsRegBitsOn (void __iomem *dwIoBase,unsigned char byBBAddr,unsigned char byTestBits) -{ -unsigned char byOrgData; - -BBbReadEmbedded (dwIoBase, byBBAddr, &byOrgData); -return (byOrgData & byTestBits) == byTestBits; -} - -/* -* Description: Test if all bits are clear for the Baseband register -* -* Parameters: -* In: -* dwIoBase - I/O base address -* byBBAddr - address of register in Baseband -* byTestBits - TestBits -* Out: -* none -* -* Return Value: true if all TestBits are clear; false otherwise. -* -*/ -bool BBbIsRegBitsOff (void __iomem *dwIoBase,unsigned char byBBAddr,unsigned char byTestBits) -{ -unsigned char byOrgData; - -BBbReadEmbedded (dwIoBase, byBBAddr, &byOrgData); -return (byOrgData & byTestBits) ==0 ; -} - -/* * Description: VIA VT3253 Baseband chip init function * * Parameters:
@@ -2252,119 +2203,6 @@ bool BBbVT3253Init(struct vnt_private *pDevice) }/* -* Description: Read All Baseband Registers -* -* Parameters: -* In: -* dwIoBase - I/O base address -* pbyBBRegs - Point to struct that stores Baseband Registers -* Out: -* none -* -* Return Value: none -* -*/ -void BBvReadAllRegs (void __iomem *dwIoBase,unsigned char *pbyBBRegs) -{ -int ii; -unsigned char byBase =1 ; - -for (ii =0 ; ii <BB_MAX_CONTEXT_SIZE ; ii++) { -BBbReadEmbedded (dwIoBase, (unsigned char )(ii*byBase), pbyBBRegs); - pbyBBRegs += byBase; - } -} - -/* -* Description: Turn on BaseBand Loopback mode -* -* Parameters: -* In: -* dwIoBase - I/O base address -* bCCK - If CCK is set -* Out: -* none -* -* Return Value: none -* -*/ - -void BBvLoopbackOn (struct vnt_private *pDevice) -{ -unsigned char byData; -void __iomem *dwIoBase = pDevice->PortOffset; - -/* CR C9 = 0x00 */ -BBbReadEmbedded (dwIoBase,0xC9 , &pDevice->byBBCRc9);/* CR201 */ -BBbWriteEmbedded (dwIoBase,0xC9 ,0 ); -BBbReadEmbedded (dwIoBase,0x4D , &pDevice->byBBCR4d);/* CR77 */ -BBbWriteEmbedded (dwIoBase,0x4D ,0x90 ); - -/* CR 88 = 0x02(CCK), 0x03(OFDM) */ -BBbReadEmbedded (dwIoBase,0x88 , &pDevice->byBBCR88);/* CR136 */ - -if (pDevice->uConnectionRate <=RATE_11M ) {/* CCK */ -/* Enable internal digital loopback: CR33 |= 0000 0001 */ -BBbReadEmbedded (dwIoBase,0x21 , &byData);/* CR33 */ -BBbWriteEmbedded (dwIoBase,0x21 , (unsigned char )(byData |0x01 ));/* CR33 */ -/* CR154 = 0x00 */ -BBbWriteEmbedded (dwIoBase,0x9A ,0 );/* CR154 */ - -BBbWriteEmbedded (dwIoBase,0x88 ,0x02 );/* CR239 */ - }else {/* OFDM */ -/* Enable internal digital loopback:CR154 |= 0000 0001 */ -BBbReadEmbedded (dwIoBase,0x9A , &byData);/* CR154 */ -BBbWriteEmbedded (dwIoBase,0x9A , (unsigned char )(byData |0x01 ));/* CR154 */ -/* CR33 = 0x00 */ -BBbWriteEmbedded (dwIoBase,0x21 ,0 );/* CR33 */ - -BBbWriteEmbedded (dwIoBase,0x88 ,0x03 );/* CR239 */ - } - -/* CR14 = 0x00 */ -BBbWriteEmbedded (dwIoBase,0x0E ,0 );/* CR14 */ - -/* Disable TX_IQUN */ -BBbReadEmbedded (pDevice->PortOffset,0x09 , &pDevice->byBBCR09); -BBbWriteEmbedded (pDevice->PortOffset,0x09 , (unsigned char )(pDevice->byBBCR09 &0xDE )); -} - -/* -* Description: Turn off BaseBand Loopback mode -* -* Parameters: -* In: -* pDevice - Device Structure -* -* Out: -* none -* -* Return Value: none -* -*/ -void BBvLoopbackOff (struct vnt_private *pDevice) -{ -unsigned char byData; -void __iomem *dwIoBase = pDevice->PortOffset; - -BBbWriteEmbedded (dwIoBase,0xC9 , pDevice->byBBCRc9);/* CR201 */ -BBbWriteEmbedded (dwIoBase,0x88 , pDevice->byBBCR88);/* CR136 */ -BBbWriteEmbedded (dwIoBase,0x09 , pDevice->byBBCR09);/* CR136 */ -BBbWriteEmbedded (dwIoBase,0x4D , pDevice->byBBCR4d);/* CR77 */ - -if (pDevice->uConnectionRate <=RATE_11M ) {/* CCK */ -/* Set the CR33 Bit2 to disable internal Loopback. */ -BBbReadEmbedded (dwIoBase,0x21 , &byData);/* CR33 */ -BBbWriteEmbedded (dwIoBase,0x21 , (unsigned char )(byData &0xFE ));/* CR33 */ - }else {/* OFDM */ -BBbReadEmbedded (dwIoBase,0x9A , &byData);/* CR154 */ -BBbWriteEmbedded (dwIoBase,0x9A , (unsigned char )(byData &0xFE ));/* CR154 */ - } -BBbReadEmbedded (dwIoBase,0x0E , &byData);/* CR14 */ -BBbWriteEmbedded (dwIoBase,0x0E , (unsigned char )(byData |0x80 ));/* CR14 */ -} - -/* * Description: Set ShortSlotTime mode * * Parameters:
drivers/staging/vt6655/baseband.h +0 -5
@@ -80,12 +80,7 @@ void vnt_get_phy_field(struct vnt_private *, u32 frame_length,bool BBbReadEmbedded (void __iomem *dwIoBase,unsigned char byBBAddr,unsigned char *pbyData);bool BBbWriteEmbedded (void __iomem *dwIoBase,unsigned char byBBAddr,unsigned char byData); -void BBvReadAllRegs (void __iomem *dwIoBase,unsigned char *pbyBBRegs); -void BBvLoopbackOn (struct vnt_private *pDevice); -void BBvLoopbackOff (struct vnt_private *pDevice);void BBvSetShortSlotTime (struct vnt_private *pDevice); -bool BBbIsRegBitsOn (void __iomem *dwIoBase,unsigned char byBBAddr,unsigned char byTestBits); -bool BBbIsRegBitsOff (void __iomem *dwIoBase,unsigned char byBBAddr,unsigned char byTestBits);void BBvSetVGAGainOffset (struct vnt_private *pDevice,unsigned char byData);/* VT3253 Baseband */
Signature · 1 line
2.1.0
PATCH 9/11 staging: vt6655: device_set_options remove dead variables
In reply to Malcolm PriestleyuConnectionRate
wRTSThreshold
byOpMode
b11hEnable
uChannel
--- drivers/staging/vt6655/device.h | 8 -------- drivers/staging/vt6655/device_main.c | 5 ----- 2 files changed, 13 deletions(-)
drivers/staging/vt6655/device.h +0 -8
@@ -335,17 +335,14 @@ struct vnt_private {unsigned char byMinChannel;unsigned char byMaxChannel; -unsigned int uConnectionRate;unsigned char byPreambleType;unsigned char byShortPreamble;unsigned short wCurrentRate; -unsigned short wRTSThreshold;unsigned char byShortRetryLimit;unsigned char byLongRetryLimit;enum nl80211_iftype op_mode; -unsigned char byOpMode;bool bBSSIDFilter;unsigned short wMaxTransmitMSDULifetime;
@@ -442,13 +439,8 @@ struct vnt_private {unsigned char abyEEPROM[EEP_MAX_CONTEXT_SIZE ];/* unsigned long alignment */ -/* for 802.11h */ -bool b11hEnable; -unsigned short wBeaconInterval; -unsigned int uChannel; -struct iw_statistics wstats;/* wireless stats */ };
drivers/staging/vt6655/device_main.c +0 -5
@@ -231,16 +231,11 @@ device_set_options(struct vnt_private *pDevice) pDevice->bUpdateBBVGA = true; pDevice->byPreambleType =0 ; -pr_debug (" uChannel= %d\n" , (int )pDevice->uChannel); -pr_debug (" byOpMode= %d\n" , (int )pDevice->byOpMode); -pr_debug (" wRTSThreshold= %d\n" , (int )pDevice->wRTSThreshold);pr_debug (" byShortRetryLimit= %d\n" , (int )pDevice->byShortRetryLimit);pr_debug (" byLongRetryLimit= %d\n" , (int )pDevice->byLongRetryLimit);pr_debug (" byPreambleType= %d\n" , (int )pDevice->byPreambleType);pr_debug (" byShortPreamble= %d\n" , (int )pDevice->byShortPreamble); -pr_debug (" uConnectionRate= %d\n" , (int )pDevice->uConnectionRate);pr_debug (" byBBType= %d\n" , (int )pDevice->byBBType); -pr_debug (" pDevice->b11hEnable= %d\n" , (int )pDevice->b11hEnable);pr_debug (" pDevice->bDiversityRegCtlON= %d\n" , (int )pDevice->bDiversityRegCtlON); }
Signature · 1 line
2.1.0
PATCH 10/11 staging: vt6655: device.h remove dead member wstats
In reply to Malcolm Priestley--- drivers/staging/vt6655/device.h | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/vt6655/device.h +0 -2
@@ -440,8 +440,6 @@ struct vnt_private {unsigned char abyEEPROM[EEP_MAX_CONTEXT_SIZE ];/* unsigned long alignment */ unsigned short wBeaconInterval; - -struct iw_statistics wstats;/* wireless stats */ };static inline PDEVICE_RD_INFO alloc_rd_info (void )
Signature · 1 line
2.1.0
PATCH 11/11 staging: vt6655 baseband.c camel case replace pDevice -> priv
In reply to Malcolm Priestleyfor struct vnt_private
--- drivers/staging/vt6655/baseband.c | 472 +++++++++++++++++++------------------- 1 file changed, 236 insertions(+), 236 deletions(-)
drivers/staging/vt6655/baseband.c +236 -236
@@ -1702,39 +1702,39 @@ static const unsigned short awcFrameTime[MAX_RATE] = {static unsigned long -s_ulGetRatio (struct vnt_private *pDevice); +s_ulGetRatio (struct vnt_private *priv);static void s_vChangeAntenna ( -struct vnt_private *pDevice +struct vnt_private *priv );static void s_vChangeAntenna ( -struct vnt_private *pDevice +struct vnt_private *priv ) { -if (pDevice->dwRxAntennaSel ==0 ) { - pDevice->dwRxAntennaSel =1 ; -if (pDevice->bTxRxAntInv == true) -BBvSetRxAntennaMode (pDevice->PortOffset,ANT_A ); +if (priv->dwRxAntennaSel ==0 ) { + priv->dwRxAntennaSel =1 ; +if (priv->bTxRxAntInv == true) +BBvSetRxAntennaMode (priv->PortOffset,ANT_A );else -BBvSetRxAntennaMode (pDevice->PortOffset,ANT_B ); +BBvSetRxAntennaMode (priv->PortOffset,ANT_B ); }else { - pDevice->dwRxAntennaSel =0 ; -if (pDevice->bTxRxAntInv == true) -BBvSetRxAntennaMode (pDevice->PortOffset,ANT_B ); + priv->dwRxAntennaSel =0 ; +if (priv->bTxRxAntInv == true) +BBvSetRxAntennaMode (priv->PortOffset,ANT_B );else -BBvSetRxAntennaMode (pDevice->PortOffset,ANT_A ); +BBvSetRxAntennaMode (priv->PortOffset,ANT_A ); } -if (pDevice->dwTxAntennaSel ==0 ) { - pDevice->dwTxAntennaSel =1 ; -BBvSetTxAntennaMode (pDevice->PortOffset,ANT_B ); +if (priv->dwTxAntennaSel ==0 ) { + priv->dwTxAntennaSel =1 ; +BBvSetTxAntennaMode (priv->PortOffset,ANT_B ); }else { - pDevice->dwTxAntennaSel =0 ; -BBvSetTxAntennaMode (pDevice->PortOffset,ANT_A ); + priv->dwTxAntennaSel =0 ; +BBvSetTxAntennaMode (priv->PortOffset,ANT_A ); } }
@@ -2045,13 +2045,13 @@ bool BBbWriteEmbedded(void __iomem *dwIoBase, unsigned char byBBAddr, unsigned c* */ -bool BBbVT3253Init (struct vnt_private *pDevice) +bool BBbVT3253Init (struct vnt_private *priv) {bool bResult = true;int ii; -void __iomem *dwIoBase = pDevice->PortOffset; -unsigned char byRFType = pDevice->byRFType; -unsigned char byLocalID = pDevice->byLocalID; +void __iomem *dwIoBase = priv->PortOffset; +unsigned char byRFType = priv->byRFType; +unsigned char byLocalID = priv->byLocalID;if (byRFType ==RF_RFMD2959 ) {if (byLocalID <=REV_ID_VT3253_A1 ) {
@@ -2068,14 +2068,14 @@ bool BBbVT3253Init(struct vnt_private *pDevice)VNSvOutPortD (dwIoBase +MAC_REG_ITRTMSET ,0x23 );MACvRegBitsOn (dwIoBase,MAC_REG_PAPEDELAY ,BIT (0 )); } - pDevice->abyBBVGA[0 ] =0x18 ; - pDevice->abyBBVGA[1 ] =0x0A ; - pDevice->abyBBVGA[2 ] =0x0 ; - pDevice->abyBBVGA[3 ] =0x0 ; - pDevice->ldBmThreshold[0 ] =-70 ; - pDevice->ldBmThreshold[1 ] =-50 ; - pDevice->ldBmThreshold[2 ] =0 ; - pDevice->ldBmThreshold[3 ] =0 ; + priv->abyBBVGA[0 ] =0x18 ; + priv->abyBBVGA[1 ] =0x0A ; + priv->abyBBVGA[2 ] =0x0 ; + priv->abyBBVGA[3 ] =0x0 ; + priv->ldBmThreshold[0 ] =-70 ; + priv->ldBmThreshold[1 ] =-50 ; + priv->ldBmThreshold[2 ] =0 ; + priv->ldBmThreshold[3 ] =0 ; }else if ((byRFType ==RF_AIROHA ) || (byRFType ==RF_AL2230S )) {for (ii =0 ; ii <CB_VT3253B0_INIT_FOR_AIROHA2230 ; ii++) bResult &=BBbWriteEmbedded (dwIoBase, byVT3253B0_AIROHA2230[ii][0 ], byVT3253B0_AIROHA2230[ii][1 ]);
@@ -2083,14 +2083,14 @@ bool BBbVT3253Init(struct vnt_private *pDevice)for (ii =0 ; ii <CB_VT3253B0_AGC ; ii++) bResult &=BBbWriteEmbedded (dwIoBase, byVT3253B0_AGC[ii][0 ], byVT3253B0_AGC[ii][1 ]); - pDevice->abyBBVGA[0 ] =0x1C ; - pDevice->abyBBVGA[1 ] =0x10 ; - pDevice->abyBBVGA[2 ] =0x0 ; - pDevice->abyBBVGA[3 ] =0x0 ; - pDevice->ldBmThreshold[0 ] =-70 ; - pDevice->ldBmThreshold[1 ] =-48 ; - pDevice->ldBmThreshold[2 ] =0 ; - pDevice->ldBmThreshold[3 ] =0 ; + priv->abyBBVGA[0 ] =0x1C ; + priv->abyBBVGA[1 ] =0x10 ; + priv->abyBBVGA[2 ] =0x0 ; + priv->abyBBVGA[3 ] =0x0 ; + priv->ldBmThreshold[0 ] =-70 ; + priv->ldBmThreshold[1 ] =-48 ; + priv->ldBmThreshold[2 ] =0 ; + priv->ldBmThreshold[3 ] =0 ; }else if (byRFType ==RF_UW2451 ) {for (ii =0 ; ii <CB_VT3253B0_INIT_FOR_UW2451 ; ii++) bResult &=BBbWriteEmbedded (dwIoBase, byVT3253B0_UW2451[ii][0 ], byVT3253B0_UW2451[ii][1 ]);
@@ -2101,14 +2101,14 @@ bool BBbVT3253Init(struct vnt_private *pDevice)VNSvOutPortB (dwIoBase +MAC_REG_ITRTMSET ,0x23 );MACvRegBitsOn (dwIoBase,MAC_REG_PAPEDELAY ,BIT (0 )); - pDevice->abyBBVGA[0 ] =0x14 ; - pDevice->abyBBVGA[1 ] =0x0A ; - pDevice->abyBBVGA[2 ] =0x0 ; - pDevice->abyBBVGA[3 ] =0x0 ; - pDevice->ldBmThreshold[0 ] =-60 ; - pDevice->ldBmThreshold[1 ] =-50 ; - pDevice->ldBmThreshold[2 ] =0 ; - pDevice->ldBmThreshold[3 ] =0 ; + priv->abyBBVGA[0 ] =0x14 ; + priv->abyBBVGA[1 ] =0x0A ; + priv->abyBBVGA[2 ] =0x0 ; + priv->abyBBVGA[3 ] =0x0 ; + priv->ldBmThreshold[0 ] =-60 ; + priv->ldBmThreshold[1 ] =-50 ; + priv->ldBmThreshold[2 ] =0 ; + priv->ldBmThreshold[3 ] =0 ; }else if (byRFType ==RF_UW2452 ) {for (ii =0 ; ii <CB_VT3253B0_INIT_FOR_UW2451 ; ii++) bResult &=BBbWriteEmbedded (dwIoBase, byVT3253B0_UW2451[ii][0 ], byVT3253B0_UW2451[ii][1 ]);
@@ -2134,14 +2134,14 @@ bool BBbVT3253Init(struct vnt_private *pDevice)for (ii =0 ; ii <CB_VT3253B0_AGC ; ii++) bResult &=BBbWriteEmbedded (dwIoBase, byVT3253B0_AGC[ii][0 ], byVT3253B0_AGC[ii][1 ]); - pDevice->abyBBVGA[0 ] =0x14 ; - pDevice->abyBBVGA[1 ] =0x0A ; - pDevice->abyBBVGA[2 ] =0x0 ; - pDevice->abyBBVGA[3 ] =0x0 ; - pDevice->ldBmThreshold[0 ] =-60 ; - pDevice->ldBmThreshold[1 ] =-50 ; - pDevice->ldBmThreshold[2 ] =0 ; - pDevice->ldBmThreshold[3 ] =0 ; + priv->abyBBVGA[0 ] =0x14 ; + priv->abyBBVGA[1 ] =0x0A ; + priv->abyBBVGA[2 ] =0x0 ; + priv->abyBBVGA[3 ] =0x0 ; + priv->ldBmThreshold[0 ] =-60 ; + priv->ldBmThreshold[1 ] =-50 ; + priv->ldBmThreshold[2 ] =0 ; + priv->ldBmThreshold[3 ] =0 ;/* }} RobertYu */ }else if (byRFType ==RF_VT3226 ) {
@@ -2151,14 +2151,14 @@ bool BBbVT3253Init(struct vnt_private *pDevice)for (ii =0 ; ii <CB_VT3253B0_AGC ; ii++) bResult &=BBbWriteEmbedded (dwIoBase, byVT3253B0_AGC[ii][0 ], byVT3253B0_AGC[ii][1 ]); - pDevice->abyBBVGA[0 ] =0x1C ; - pDevice->abyBBVGA[1 ] =0x10 ; - pDevice->abyBBVGA[2 ] =0x0 ; - pDevice->abyBBVGA[3 ] =0x0 ; - pDevice->ldBmThreshold[0 ] =-70 ; - pDevice->ldBmThreshold[1 ] =-48 ; - pDevice->ldBmThreshold[2 ] =0 ; - pDevice->ldBmThreshold[3 ] =0 ; + priv->abyBBVGA[0 ] =0x1C ; + priv->abyBBVGA[1 ] =0x10 ; + priv->abyBBVGA[2 ] =0x0 ; + priv->abyBBVGA[3 ] =0x0 ; + priv->ldBmThreshold[0 ] =-70 ; + priv->ldBmThreshold[1 ] =-48 ; + priv->ldBmThreshold[2 ] =0 ; + priv->ldBmThreshold[3 ] =0 ;/* Fix VT3226 DFC system timing issue */ MACvSetRFLE_LatchBase (dwIoBase);/* {{ RobertYu: 20050104 */
@@ -2179,19 +2179,19 @@ bool BBbVT3253Init(struct vnt_private *pDevice)for (ii =0 ; ii <CB_VT3253B0_AGC ; ii++) bResult &=BBbWriteEmbedded (dwIoBase, byVT3253B0_AGC[ii][0 ], byVT3253B0_AGC[ii][1 ]); - pDevice->abyBBVGA[0 ] =0x1C ; - pDevice->abyBBVGA[1 ] =0x10 ; - pDevice->abyBBVGA[2 ] =0x0 ; - pDevice->abyBBVGA[3 ] =0x0 ; - pDevice->ldBmThreshold[0 ] =-70 ; - pDevice->ldBmThreshold[1 ] =-48 ; - pDevice->ldBmThreshold[2 ] =0 ; - pDevice->ldBmThreshold[3 ] =0 ; + priv->abyBBVGA[0 ] =0x1C ; + priv->abyBBVGA[1 ] =0x10 ; + priv->abyBBVGA[2 ] =0x0 ; + priv->abyBBVGA[3 ] =0x0 ; + priv->ldBmThreshold[0 ] =-70 ; + priv->ldBmThreshold[1 ] =-48 ; + priv->ldBmThreshold[2 ] =0 ; + priv->ldBmThreshold[3 ] =0 ;/* }} RobertYu */ }else {/* No VGA Table now */ - pDevice->bUpdateBBVGA = false; - pDevice->abyBBVGA[0 ] =0x1C ; + priv->bUpdateBBVGA = false; + priv->abyBBVGA[0 ] =0x1C ; }if (byLocalID >REV_ID_VT3253_A1 ) {
@@ -2207,7 +2207,7 @@ bool BBbVT3253Init(struct vnt_private *pDevice)* * Parameters: * In: -* pDevice - Device Structure +* priv - Device Structure * Out: * none *
@@ -2215,42 +2215,42 @@ bool BBbVT3253Init(struct vnt_private *pDevice)* */ void -BBvSetShortSlotTime (struct vnt_private *pDevice) +BBvSetShortSlotTime (struct vnt_private *priv) {unsigned char byBBRxConf =0 ;unsigned char byBBVGA =0 ; -BBbReadEmbedded (pDevice->PortOffset,0x0A , &byBBRxConf);/* CR10 */ +BBbReadEmbedded (priv->PortOffset,0x0A , &byBBRxConf);/* CR10 */ -if (pDevice->bShortSlotTime) +if (priv->bShortSlotTime) byBBRxConf &=0xDF ;/* 1101 1111 */ else byBBRxConf |=0x20 ;/* 0010 0000 */ /* patch for 3253B0 Baseband with Cardbus module */ -BBbReadEmbedded (pDevice->PortOffset,0xE7 , &byBBVGA); -if (byBBVGA == pDevice->abyBBVGA[0 ]) +BBbReadEmbedded (priv->PortOffset,0xE7 , &byBBVGA); +if (byBBVGA == priv->abyBBVGA[0 ]) byBBRxConf |=0x20 ;/* 0010 0000 */ -BBbWriteEmbedded (pDevice->PortOffset,0x0A , byBBRxConf);/* CR10 */ +BBbWriteEmbedded (priv->PortOffset,0x0A , byBBRxConf);/* CR10 */ } -void BBvSetVGAGainOffset (struct vnt_private *pDevice,unsigned char byData) +void BBvSetVGAGainOffset (struct vnt_private *priv,unsigned char byData) {unsigned char byBBRxConf =0 ; -BBbWriteEmbedded (pDevice->PortOffset,0xE7 , byData); +BBbWriteEmbedded (priv->PortOffset,0xE7 , byData); -BBbReadEmbedded (pDevice->PortOffset,0x0A , &byBBRxConf);/* CR10 */ +BBbReadEmbedded (priv->PortOffset,0x0A , &byBBRxConf);/* CR10 */ /* patch for 3253B0 Baseband with Cardbus module */ -if (byData == pDevice->abyBBVGA[0 ]) +if (byData == priv->abyBBVGA[0 ]) byBBRxConf |=0x20 ;/* 0010 0000 */ -else if (pDevice->bShortSlotTime) +else if (priv->bShortSlotTime) byBBRxConf &=0xDF ;/* 1101 1111 */ else byBBRxConf |=0x20 ;/* 0010 0000 */ - pDevice->byBBVGACurrent = byData; -BBbWriteEmbedded (pDevice->PortOffset,0x0A , byBBRxConf);/* CR10 */ + priv->byBBVGACurrent = byData; +BBbWriteEmbedded (priv->PortOffset,0x0A , byBBRxConf);/* CR10 */ }/*
@@ -2323,7 +2323,7 @@ BBvPowerSaveModeOFF(void __iomem *dwIoBase)* * Parameters: * In: -* pDevice - Device Structure +* priv - Device Structure * byAntennaMode - Antenna Mode * Out: * none
@@ -2356,7 +2356,7 @@ BBvSetTxAntennaMode(void __iomem *dwIoBase, unsigned char byAntennaMode)* * Parameters: * In: -* pDevice - Device Structure +* priv - Device Structure * byAntennaMode - Antenna Mode * Out: * none
@@ -2388,7 +2388,7 @@ BBvSetRxAntennaMode(void __iomem *dwIoBase, unsigned char byAntennaMode)* * Parameters: * In: -* pDevice - Device Structure +* priv - Device Structure * Out: * none *
@@ -2411,94 +2411,94 @@ BBvExitDeepSleep(void __iomem *dwIoBase, unsigned char byLocalID)static unsigned long -s_ulGetRatio (struct vnt_private *pDevice) +s_ulGetRatio (struct vnt_private *priv) {unsigned long ulRatio =0 ;unsigned long ulMaxPacket;unsigned long ulPacketNum;/* This is a thousand-ratio */ - ulMaxPacket = pDevice->uNumSQ3[RATE_54M ]; -if (pDevice->uNumSQ3[RATE_54M ] !=0 ) { - ulPacketNum = pDevice->uNumSQ3[RATE_54M ]; - ulRatio = (ulPacketNum *1000 / pDevice->uDiversityCnt); + ulMaxPacket = priv->uNumSQ3[RATE_54M ]; +if (priv->uNumSQ3[RATE_54M ] !=0 ) { + ulPacketNum = priv->uNumSQ3[RATE_54M ]; + ulRatio = (ulPacketNum *1000 / priv->uDiversityCnt); ulRatio +=TOP_RATE_54M ; } -if (pDevice->uNumSQ3[RATE_48M ] > ulMaxPacket) { - ulPacketNum = pDevice->uNumSQ3[RATE_54M ] + pDevice->uNumSQ3[RATE_48M ]; - ulRatio = (ulPacketNum *1000 / pDevice->uDiversityCnt); +if (priv->uNumSQ3[RATE_48M ] > ulMaxPacket) { + ulPacketNum = priv->uNumSQ3[RATE_54M ] + priv->uNumSQ3[RATE_48M ]; + ulRatio = (ulPacketNum *1000 / priv->uDiversityCnt); ulRatio +=TOP_RATE_48M ; - ulMaxPacket = pDevice->uNumSQ3[RATE_48M ]; + ulMaxPacket = priv->uNumSQ3[RATE_48M ]; } -if (pDevice->uNumSQ3[RATE_36M ] > ulMaxPacket) { - ulPacketNum = pDevice->uNumSQ3[RATE_54M ] + pDevice->uNumSQ3[RATE_48M ] + - pDevice->uNumSQ3[RATE_36M ]; - ulRatio = (ulPacketNum *1000 / pDevice->uDiversityCnt); +if (priv->uNumSQ3[RATE_36M ] > ulMaxPacket) { + ulPacketNum = priv->uNumSQ3[RATE_54M ] + priv->uNumSQ3[RATE_48M ] + + priv->uNumSQ3[RATE_36M ]; + ulRatio = (ulPacketNum *1000 / priv->uDiversityCnt); ulRatio +=TOP_RATE_36M ; - ulMaxPacket = pDevice->uNumSQ3[RATE_36M ]; + ulMaxPacket = priv->uNumSQ3[RATE_36M ]; } -if (pDevice->uNumSQ3[RATE_24M ] > ulMaxPacket) { - ulPacketNum = pDevice->uNumSQ3[RATE_54M ] + pDevice->uNumSQ3[RATE_48M ] + - pDevice->uNumSQ3[RATE_36M ] + pDevice->uNumSQ3[RATE_24M ]; - ulRatio = (ulPacketNum *1000 / pDevice->uDiversityCnt); +if (priv->uNumSQ3[RATE_24M ] > ulMaxPacket) { + ulPacketNum = priv->uNumSQ3[RATE_54M ] + priv->uNumSQ3[RATE_48M ] + + priv->uNumSQ3[RATE_36M ] + priv->uNumSQ3[RATE_24M ]; + ulRatio = (ulPacketNum *1000 / priv->uDiversityCnt); ulRatio +=TOP_RATE_24M ; - ulMaxPacket = pDevice->uNumSQ3[RATE_24M ]; + ulMaxPacket = priv->uNumSQ3[RATE_24M ]; } -if (pDevice->uNumSQ3[RATE_18M ] > ulMaxPacket) { - ulPacketNum = pDevice->uNumSQ3[RATE_54M ] + pDevice->uNumSQ3[RATE_48M ] + - pDevice->uNumSQ3[RATE_36M ] + pDevice->uNumSQ3[RATE_24M ] + - pDevice->uNumSQ3[RATE_18M ]; - ulRatio = (ulPacketNum *1000 / pDevice->uDiversityCnt); +if (priv->uNumSQ3[RATE_18M ] > ulMaxPacket) { + ulPacketNum = priv->uNumSQ3[RATE_54M ] + priv->uNumSQ3[RATE_48M ] + + priv->uNumSQ3[RATE_36M ] + priv->uNumSQ3[RATE_24M ] + + priv->uNumSQ3[RATE_18M ]; + ulRatio = (ulPacketNum *1000 / priv->uDiversityCnt); ulRatio +=TOP_RATE_18M ; - ulMaxPacket = pDevice->uNumSQ3[RATE_18M ]; + ulMaxPacket = priv->uNumSQ3[RATE_18M ]; } -if (pDevice->uNumSQ3[RATE_12M ] > ulMaxPacket) { - ulPacketNum = pDevice->uNumSQ3[RATE_54M ] + pDevice->uNumSQ3[RATE_48M ] + - pDevice->uNumSQ3[RATE_36M ] + pDevice->uNumSQ3[RATE_24M ] + - pDevice->uNumSQ3[RATE_18M ] + pDevice->uNumSQ3[RATE_12M ]; - ulRatio = (ulPacketNum *1000 / pDevice->uDiversityCnt); +if (priv->uNumSQ3[RATE_12M ] > ulMaxPacket) { + ulPacketNum = priv->uNumSQ3[RATE_54M ] + priv->uNumSQ3[RATE_48M ] + + priv->uNumSQ3[RATE_36M ] + priv->uNumSQ3[RATE_24M ] + + priv->uNumSQ3[RATE_18M ] + priv->uNumSQ3[RATE_12M ]; + ulRatio = (ulPacketNum *1000 / priv->uDiversityCnt); ulRatio +=TOP_RATE_12M ; - ulMaxPacket = pDevice->uNumSQ3[RATE_12M ]; + ulMaxPacket = priv->uNumSQ3[RATE_12M ]; } -if (pDevice->uNumSQ3[RATE_11M ] > ulMaxPacket) { - ulPacketNum = pDevice->uDiversityCnt - pDevice->uNumSQ3[RATE_1M ] - - pDevice->uNumSQ3[RATE_2M ] - pDevice->uNumSQ3[RATE_5M ] - - pDevice->uNumSQ3[RATE_6M ] - pDevice->uNumSQ3[RATE_9M ]; - ulRatio = (ulPacketNum *1000 / pDevice->uDiversityCnt); +if (priv->uNumSQ3[RATE_11M ] > ulMaxPacket) { + ulPacketNum = priv->uDiversityCnt - priv->uNumSQ3[RATE_1M ] - + priv->uNumSQ3[RATE_2M ] - priv->uNumSQ3[RATE_5M ] - + priv->uNumSQ3[RATE_6M ] - priv->uNumSQ3[RATE_9M ]; + ulRatio = (ulPacketNum *1000 / priv->uDiversityCnt); ulRatio +=TOP_RATE_11M ; - ulMaxPacket = pDevice->uNumSQ3[RATE_11M ]; + ulMaxPacket = priv->uNumSQ3[RATE_11M ]; } -if (pDevice->uNumSQ3[RATE_9M ] > ulMaxPacket) { - ulPacketNum = pDevice->uDiversityCnt - pDevice->uNumSQ3[RATE_1M ] - - pDevice->uNumSQ3[RATE_2M ] - pDevice->uNumSQ3[RATE_5M ] - - pDevice->uNumSQ3[RATE_6M ]; - ulRatio = (ulPacketNum *1000 / pDevice->uDiversityCnt); +if (priv->uNumSQ3[RATE_9M ] > ulMaxPacket) { + ulPacketNum = priv->uDiversityCnt - priv->uNumSQ3[RATE_1M ] - + priv->uNumSQ3[RATE_2M ] - priv->uNumSQ3[RATE_5M ] - + priv->uNumSQ3[RATE_6M ]; + ulRatio = (ulPacketNum *1000 / priv->uDiversityCnt); ulRatio +=TOP_RATE_9M ; - ulMaxPacket = pDevice->uNumSQ3[RATE_9M ]; + ulMaxPacket = priv->uNumSQ3[RATE_9M ]; } -if (pDevice->uNumSQ3[RATE_6M ] > ulMaxPacket) { - ulPacketNum = pDevice->uDiversityCnt - pDevice->uNumSQ3[RATE_1M ] - - pDevice->uNumSQ3[RATE_2M ] - pDevice->uNumSQ3[RATE_5M ]; - ulRatio = (ulPacketNum *1000 / pDevice->uDiversityCnt); +if (priv->uNumSQ3[RATE_6M ] > ulMaxPacket) { + ulPacketNum = priv->uDiversityCnt - priv->uNumSQ3[RATE_1M ] - + priv->uNumSQ3[RATE_2M ] - priv->uNumSQ3[RATE_5M ]; + ulRatio = (ulPacketNum *1000 / priv->uDiversityCnt); ulRatio +=TOP_RATE_6M ; - ulMaxPacket = pDevice->uNumSQ3[RATE_6M ]; + ulMaxPacket = priv->uNumSQ3[RATE_6M ]; } -if (pDevice->uNumSQ3[RATE_5M ] > ulMaxPacket) { - ulPacketNum = pDevice->uDiversityCnt - pDevice->uNumSQ3[RATE_1M ] - - pDevice->uNumSQ3[RATE_2M ]; - ulRatio = (ulPacketNum *1000 / pDevice->uDiversityCnt); +if (priv->uNumSQ3[RATE_5M ] > ulMaxPacket) { + ulPacketNum = priv->uDiversityCnt - priv->uNumSQ3[RATE_1M ] - + priv->uNumSQ3[RATE_2M ]; + ulRatio = (ulPacketNum *1000 / priv->uDiversityCnt); ulRatio +=TOP_RATE_55M ; - ulMaxPacket = pDevice->uNumSQ3[RATE_5M ]; + ulMaxPacket = priv->uNumSQ3[RATE_5M ]; } -if (pDevice->uNumSQ3[RATE_2M ] > ulMaxPacket) { - ulPacketNum = pDevice->uDiversityCnt - pDevice->uNumSQ3[RATE_1M ]; - ulRatio = (ulPacketNum *1000 / pDevice->uDiversityCnt); +if (priv->uNumSQ3[RATE_2M ] > ulMaxPacket) { + ulPacketNum = priv->uDiversityCnt - priv->uNumSQ3[RATE_1M ]; + ulRatio = (ulPacketNum *1000 / priv->uDiversityCnt); ulRatio +=TOP_RATE_2M ; - ulMaxPacket = pDevice->uNumSQ3[RATE_2M ]; + ulMaxPacket = priv->uNumSQ3[RATE_2M ]; } -if (pDevice->uNumSQ3[RATE_1M ] > ulMaxPacket) { - ulPacketNum = pDevice->uDiversityCnt; - ulRatio = (ulPacketNum *1000 / pDevice->uDiversityCnt); +if (priv->uNumSQ3[RATE_1M ] > ulMaxPacket) { + ulPacketNum = priv->uDiversityCnt; + ulRatio = (ulPacketNum *1000 / priv->uDiversityCnt); ulRatio +=TOP_RATE_1M ; }
@@ -2506,13 +2506,13 @@ s_ulGetRatio(struct vnt_private *pDevice) }void -BBvClearAntDivSQ3Value (struct vnt_private *pDevice) +BBvClearAntDivSQ3Value (struct vnt_private *priv) {unsigned int ii; - pDevice->uDiversityCnt =0 ; + priv->uDiversityCnt =0 ;for (ii =0 ; ii <MAX_RATE ; ii++) - pDevice->uNumSQ3[ii] =0 ; + priv->uNumSQ3[ii] =0 ; }/*
@@ -2520,7 +2520,7 @@ BBvClearAntDivSQ3Value(struct vnt_private *pDevice)* * Parameters: * In: -* pDevice - Device Structure +* priv - Device Structure * byRSR - RSR from received packet * bySQ3 - SQ3 value from received packet * Out:
@@ -2530,75 +2530,75 @@ BBvClearAntDivSQ3Value(struct vnt_private *pDevice)* */ -void BBvAntennaDiversity (struct vnt_private *pDevice, +void BBvAntennaDiversity (struct vnt_private *priv,unsigned char byRxRate,unsigned char bySQ3) { -if ((byRxRate >=MAX_RATE ) || (pDevice->wAntDiversityMaxRate >=MAX_RATE )) +if ((byRxRate >=MAX_RATE ) || (priv->wAntDiversityMaxRate >=MAX_RATE ))return ; - pDevice->uDiversityCnt++; + priv->uDiversityCnt++; - pDevice->uNumSQ3[byRxRate]++; + priv->uNumSQ3[byRxRate]++; -if (pDevice->byAntennaState ==0 ) { -if (pDevice->uDiversityCnt > pDevice->ulDiversityNValue) { +if (priv->byAntennaState ==0 ) { +if (priv->uDiversityCnt > priv->ulDiversityNValue) {pr_debug ("ulDiversityNValue=[%d],54M-[%d]\n" , - (int )pDevice->ulDiversityNValue, - (int )pDevice->uNumSQ3[(int )pDevice->wAntDiversityMaxRate]); + (int )priv->ulDiversityNValue, + (int )priv->uNumSQ3[(int )priv->wAntDiversityMaxRate]); -if (pDevice->uNumSQ3[pDevice->wAntDiversityMaxRate] < pDevice->uDiversityCnt/2 ) { - pDevice->ulRatio_State0 =s_ulGetRatio (pDevice); +if (priv->uNumSQ3[priv->wAntDiversityMaxRate] < priv->uDiversityCnt/2 ) { + priv->ulRatio_State0 =s_ulGetRatio (priv);pr_debug ("SQ3_State0, rate = [%08x]\n" , - (int )pDevice->ulRatio_State0); + (int )priv->ulRatio_State0); -if (pDevice->byTMax ==0 ) +if (priv->byTMax ==0 )return ;pr_debug ("1.[%08x], uNumSQ3[%d]=%d, %d\n" , - (int )pDevice->ulRatio_State0, - (int )pDevice->wAntDiversityMaxRate, - (int )pDevice->uNumSQ3[(int )pDevice->wAntDiversityMaxRate], - (int )pDevice->uDiversityCnt); - -s_vChangeAntenna (pDevice); - pDevice->byAntennaState =1 ; -del_timer (&pDevice->TimerSQ3Tmax3); -del_timer (&pDevice->TimerSQ3Tmax2); - pDevice->TimerSQ3Tmax1.expires =RUN_AT (pDevice->byTMax *HZ ); -add_timer (&pDevice->TimerSQ3Tmax1); + (int )priv->ulRatio_State0, + (int )priv->wAntDiversityMaxRate, + (int )priv->uNumSQ3[(int )priv->wAntDiversityMaxRate], + (int )priv->uDiversityCnt); + +s_vChangeAntenna (priv); + priv->byAntennaState =1 ; +del_timer (&priv->TimerSQ3Tmax3); +del_timer (&priv->TimerSQ3Tmax2); + priv->TimerSQ3Tmax1.expires =RUN_AT (priv->byTMax *HZ ); +add_timer (&priv->TimerSQ3Tmax1); }else { - pDevice->TimerSQ3Tmax3.expires =RUN_AT (pDevice->byTMax3 *HZ ); -add_timer (&pDevice->TimerSQ3Tmax3); + priv->TimerSQ3Tmax3.expires =RUN_AT (priv->byTMax3 *HZ ); +add_timer (&priv->TimerSQ3Tmax3); } -BBvClearAntDivSQ3Value (pDevice); +BBvClearAntDivSQ3Value (priv); } }else {/* byAntennaState == 1 */ -if (pDevice->uDiversityCnt > pDevice->ulDiversityMValue) { -del_timer (&pDevice->TimerSQ3Tmax1); +if (priv->uDiversityCnt > priv->ulDiversityMValue) { +del_timer (&priv->TimerSQ3Tmax1); - pDevice->ulRatio_State1 =s_ulGetRatio (pDevice); + priv->ulRatio_State1 =s_ulGetRatio (priv);pr_debug ("RX:SQ3_State1, rate0 = %08x,rate1 = %08x\n" , - (int )pDevice->ulRatio_State0, - (int )pDevice->ulRatio_State1); + (int )priv->ulRatio_State0, + (int )priv->ulRatio_State1); -if (pDevice->ulRatio_State1 < pDevice->ulRatio_State0) { +if (priv->ulRatio_State1 < priv->ulRatio_State0) {pr_debug ("2.[%08x][%08x], uNumSQ3[%d]=%d, %d\n" , - (int )pDevice->ulRatio_State0, - (int )pDevice->ulRatio_State1, - (int )pDevice->wAntDiversityMaxRate, - (int )pDevice->uNumSQ3[(int )pDevice->wAntDiversityMaxRate], - (int )pDevice->uDiversityCnt); - -s_vChangeAntenna (pDevice); - pDevice->TimerSQ3Tmax3.expires =RUN_AT (pDevice->byTMax3 *HZ ); - pDevice->TimerSQ3Tmax2.expires =RUN_AT (pDevice->byTMax2 *HZ ); -add_timer (&pDevice->TimerSQ3Tmax3); -add_timer (&pDevice->TimerSQ3Tmax2); + (int )priv->ulRatio_State0, + (int )priv->ulRatio_State1, + (int )priv->wAntDiversityMaxRate, + (int )priv->uNumSQ3[(int )priv->wAntDiversityMaxRate], + (int )priv->uDiversityCnt); + +s_vChangeAntenna (priv); + priv->TimerSQ3Tmax3.expires =RUN_AT (priv->byTMax3 *HZ ); + priv->TimerSQ3Tmax2.expires =RUN_AT (priv->byTMax2 *HZ ); +add_timer (&priv->TimerSQ3Tmax3); +add_timer (&priv->TimerSQ3Tmax2); } - pDevice->byAntennaState =0 ; -BBvClearAntDivSQ3Value (pDevice); + priv->byAntennaState =0 ; +BBvClearAntDivSQ3Value (priv); } }/* byAntennaState */ }
@@ -2622,27 +2622,27 @@ TimerSQ3CallBack(unsigned long data ) { -struct vnt_private *pDevice = (struct vnt_private *)data; +struct vnt_private *priv = (struct vnt_private *)data;unsigned long flags;pr_debug ("TimerSQ3CallBack...\n" ); -spin_lock_irqsave (&pDevice->lock, flags); +spin_lock_irqsave (&priv->lock, flags);pr_debug ("3.[%08x][%08x], %d\n" , - (int )pDevice->ulRatio_State0, (int )pDevice->ulRatio_State1, - (int )pDevice->uDiversityCnt); + (int )priv->ulRatio_State0, (int )priv->ulRatio_State1, + (int )priv->uDiversityCnt); -s_vChangeAntenna (pDevice); - pDevice->byAntennaState =0 ; -BBvClearAntDivSQ3Value (pDevice); +s_vChangeAntenna (priv); + priv->byAntennaState =0 ; +BBvClearAntDivSQ3Value (priv); - pDevice->TimerSQ3Tmax3.expires =RUN_AT (pDevice->byTMax3 *HZ ); - pDevice->TimerSQ3Tmax2.expires =RUN_AT (pDevice->byTMax2 *HZ ); -add_timer (&pDevice->TimerSQ3Tmax3); -add_timer (&pDevice->TimerSQ3Tmax2); + priv->TimerSQ3Tmax3.expires =RUN_AT (priv->byTMax3 *HZ ); + priv->TimerSQ3Tmax2.expires =RUN_AT (priv->byTMax2 *HZ ); +add_timer (&priv->TimerSQ3Tmax3); +add_timer (&priv->TimerSQ3Tmax2); -spin_unlock_irqrestore (&pDevice->lock, flags); +spin_unlock_irqrestore (&priv->lock, flags); }/*+
@@ -2668,43 +2668,43 @@ TimerState1CallBack(unsigned long data ) { -struct vnt_private *pDevice = (struct vnt_private *)data; +struct vnt_private *priv = (struct vnt_private *)data;unsigned long flags;pr_debug ("TimerState1CallBack...\n" ); -spin_lock_irqsave (&pDevice->lock, flags); +spin_lock_irqsave (&priv->lock, flags); -if (pDevice->uDiversityCnt < pDevice->ulDiversityMValue/100 ) { -s_vChangeAntenna (pDevice); - pDevice->TimerSQ3Tmax3.expires =RUN_AT (pDevice->byTMax3 *HZ ); - pDevice->TimerSQ3Tmax2.expires =RUN_AT (pDevice->byTMax2 *HZ ); -add_timer (&pDevice->TimerSQ3Tmax3); -add_timer (&pDevice->TimerSQ3Tmax2); +if (priv->uDiversityCnt < priv->ulDiversityMValue/100 ) { +s_vChangeAntenna (priv); + priv->TimerSQ3Tmax3.expires =RUN_AT (priv->byTMax3 *HZ ); + priv->TimerSQ3Tmax2.expires =RUN_AT (priv->byTMax2 *HZ ); +add_timer (&priv->TimerSQ3Tmax3); +add_timer (&priv->TimerSQ3Tmax2); }else { - pDevice->ulRatio_State1 =s_ulGetRatio (pDevice); + priv->ulRatio_State1 =s_ulGetRatio (priv);pr_debug ("SQ3_State1, rate0 = %08x,rate1 = %08x\n" , - (int )pDevice->ulRatio_State0, - (int )pDevice->ulRatio_State1); + (int )priv->ulRatio_State0, + (int )priv->ulRatio_State1); -if (pDevice->ulRatio_State1 < pDevice->ulRatio_State0) { +if (priv->ulRatio_State1 < priv->ulRatio_State0) {pr_debug ("2.[%08x][%08x], uNumSQ3[%d]=%d, %d\n" , - (int )pDevice->ulRatio_State0, - (int )pDevice->ulRatio_State1, - (int )pDevice->wAntDiversityMaxRate, - (int )pDevice->uNumSQ3[(int )pDevice->wAntDiversityMaxRate], - (int )pDevice->uDiversityCnt); - -s_vChangeAntenna (pDevice); - - pDevice->TimerSQ3Tmax3.expires =RUN_AT (pDevice->byTMax3 *HZ ); - pDevice->TimerSQ3Tmax2.expires =RUN_AT (pDevice->byTMax2 *HZ ); -add_timer (&pDevice->TimerSQ3Tmax3); -add_timer (&pDevice->TimerSQ3Tmax2); + (int )priv->ulRatio_State0, + (int )priv->ulRatio_State1, + (int )priv->wAntDiversityMaxRate, + (int )priv->uNumSQ3[(int )priv->wAntDiversityMaxRate], + (int )priv->uDiversityCnt); + +s_vChangeAntenna (priv); + + priv->TimerSQ3Tmax3.expires =RUN_AT (priv->byTMax3 *HZ ); + priv->TimerSQ3Tmax2.expires =RUN_AT (priv->byTMax2 *HZ ); +add_timer (&priv->TimerSQ3Tmax3); +add_timer (&priv->TimerSQ3Tmax2); } } - pDevice->byAntennaState =0 ; -BBvClearAntDivSQ3Value (pDevice); + priv->byAntennaState =0 ; +BBvClearAntDivSQ3Value (priv); -spin_unlock_irqrestore (&pDevice->lock, flags); +spin_unlock_irqrestore (&priv->lock, flags); }
Signature · 1 line
2.1.0