staging: vt6656: Remove dead code hostap.
PATCH 1/20 staging: vt6656: Remove dead code hostap.
It is based on viawget, proprietary version of wpa supplicant.
The code is not compatible with the current version of hostapd.
It may be possible to implement when the driver is fully converted to mac80211.
--- drivers/staging/vt6656/Makefile | 1 - drivers/staging/vt6656/dpc.c | 1 - drivers/staging/vt6656/hostap.c | 781 -------------------------------------- drivers/staging/vt6656/hostap.h | 58 --- drivers/staging/vt6656/iwctl.c | 1 - drivers/staging/vt6656/main_usb.c | 12 - drivers/staging/vt6656/rxtx.c | 1 - 7 files changed, 855 deletions(-) delete mode 100644 drivers/staging/vt6656/hostap.c delete mode 100644 drivers/staging/vt6656/hostap.h
drivers/staging/vt6656/Makefile +0 -1
@@ -19,7 +19,6 @@ vt6656_stage-y += main_usb.o \ rc4.o \ tether.o \ tcrc.o \ - hostap.o \ wpa.o \ key.o \ tkip.o \
drivers/staging/vt6656/dpc.c +0 -1
@@ -50,7 +50,6 @@#include "tkip.h" #include "tcrc.h" #include "wctl.h" -#include "hostap.h" #include "rf.h" #include "iowpa.h" #include "aes_ccmp.h"
drivers/staging/vt6656/hostap.c deleted +0 -781
781 lines not on this page · raw message
drivers/staging/vt6656/hostap.h deleted +0 -58
58 lines not on this page · raw message
drivers/staging/vt6656/iwctl.c +0 -1
@@ -34,7 +34,6 @@#include "iwctl.h" #include "mac.h" #include "card.h" -#include "hostap.h" #include "power.h" #include "rf.h" #include "iowpa.h"
drivers/staging/vt6656/main_usb.c +0 -12
@@ -60,7 +60,6 @@#include "tcrc.h" #include "rxtx.h" #include "bssdb.h" -#include "hostap.h" #include "wpactl.h" #include "iwctl.h" #include "dpc.h"
@@ -1391,20 +1390,9 @@ static struct net_device_stats *device_get_stats(struct net_device *dev)static int device_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) { -struct vnt_private *pDevice =netdev_priv (dev); -struct iwreq *wrq = (struct iwreq *) rq;int rc =0 ;switch (cmd) { - -case IOCTL_CMD_HOSTAPD : - -if (!(pDevice->flags &DEVICE_FLAGS_OPENED )) - rc = -EFAULT ; - - rc =vt6656_hostap_ioctl (pDevice, &wrq->u.data); -break ; -case SIOCETHTOOL :return ethtool_ioctl (dev, rq);
drivers/staging/vt6656/rxtx.c +0 -1
@@ -56,7 +56,6 @@#include "tkip.h" #include "tcrc.h" #include "wctl.h" -#include "hostap.h" #include "rf.h" #include "datarate.h" #include "usbpipe.h"
Signature · 1 line
1.9.1
PATCH 2/20 staging: vt6656: Remove hostapd functions.
Remove throughout driver
bEnableHostapd
bEnable8021x
bEnableHostWEP
struct net_device *apdevtx_80211
--- drivers/staging/vt6656/bssdb.c | 4 +- drivers/staging/vt6656/device.h | 7 - drivers/staging/vt6656/dpc.c | 210 +------------------- drivers/staging/vt6656/iocmd.h | 301 ---------------------------- drivers/staging/vt6656/iwctl.c | 16 -- drivers/staging/vt6656/main_usb.c | 18 -- drivers/staging/vt6656/rxtx.c | 406 -------------------------------------- drivers/staging/vt6656/wcmd.c | 7 +- drivers/staging/vt6656/wmgr.c | 45 +---- 9 files changed, 13 insertions(+), 1001 deletions(-)
drivers/staging/vt6656/bssdb.c +2 -2
@@ -771,8 +771,8 @@ void BSSvAddMulticastNode(struct vnt_private *pDevice) {struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; -if (!pDevice->bEnableHostWEP) -memset (&pMgmt->sNodeDBTable[0 ],0 ,sizeof (KnownNodeDB)); +memset (&pMgmt->sNodeDBTable[0 ],0 ,sizeof (KnownNodeDB)); +memset (pMgmt->sNodeDBTable[0 ].abyMACAddr,0xff ,WLAN_ADDR_LEN ); pMgmt->sNodeDBTable[0 ].bActive = true; pMgmt->sNodeDBTable[0 ].bPSEnable = false;
drivers/staging/vt6656/device.h +0 -7
@@ -707,13 +707,6 @@ struct vnt_private {int bwextstep3;int bWPASuppWextEnabled; -/* user space daemon: hostapd, is used for HOSTAP */ -int bEnableHostapd; -int bEnable8021x; -int bEnableHostWEP; -struct net_device *apdev; -int (*tx_80211)(struct sk_buff *skb,struct net_device *dev); -u32 uChannel;struct iw_statistics wstats;/* wireless stats */
drivers/staging/vt6656/dpc.c +3 -207
252 lines not on this page · raw message
drivers/staging/vt6656/iocmd.h +0 -301
331 lines not on this page · raw message
drivers/staging/vt6656/iwctl.c +0 -16
@@ -382,12 +382,6 @@ int iwctl_siwmode(struct net_device *dev, struct iw_request_info *info,if (pMgmt ==NULL )return -EFAULT ; -if (pMgmt->eCurrMode ==WMAC_MODE_ESS_AP && pDevice->bEnableHostapd) { -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO -"Can't set operation mode, hostapd is running\n" ); -return rc; - } -switch (*wmode) {case IW_MODE_ADHOC :if (pMgmt->eConfigMode !=WMAC_CONFIG_IBSS_STA ) {
@@ -407,19 +401,9 @@ int iwctl_siwmode(struct net_device *dev, struct iw_request_info *info,DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "set mode to infrastructure\n" );break ;case IW_MODE_MASTER : - - pMgmt->eConfigMode =WMAC_CONFIG_ESS_STA ; rc = -EOPNOTSUPP ;break ; -if (pMgmt->eConfigMode !=WMAC_CONFIG_AP ) { - pMgmt->eConfigMode =WMAC_CONFIG_AP ; -if (pDevice->flags &DEVICE_FLAGS_OPENED ) - pDevice->bCommit = true; - } -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "set mode to Access Point\n" ); -break ; -case IW_MODE_REPEAT : pMgmt->eConfigMode =WMAC_CONFIG_ESS_STA ; rc = -EOPNOTSUPP ;
drivers/staging/vt6656/main_usb.c +0 -18
@@ -216,7 +216,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);static int device_init_registers (struct vnt_private *pDevice);static bool device_init_defrag_cb (struct vnt_private *pDevice);static void device_init_diversity_timer (struct vnt_private *pDevice); -static int device_dma0_tx_80211 (struct sk_buff *skb,struct net_device *dev);static int ethtool_ioctl (struct net_device *dev,struct ifreq *);static void device_free_tx_bufs (struct vnt_private *pDevice);
@@ -683,7 +682,6 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)INIT_WORK (&pDevice->read_work_item, RXvWorkItem);INIT_WORK (&pDevice->rx_mng_work_item, RXvMngWorkItem); - pDevice->tx_80211 = device_dma0_tx_80211; pDevice->vnt_mgmt.pAdapter = (void *) pDevice; netdev->netdev_ops = &device_netdev_ops;
@@ -1108,22 +1106,6 @@ static void vt6656_disconnect(struct usb_interface *intf) } } -static int device_dma0_tx_80211 (struct sk_buff *skb,struct net_device *dev) -{ -struct vnt_private *pDevice =netdev_priv (dev); - -spin_lock_irq (&pDevice->lock); - -if (unlikely (pDevice->bStopTx0Pkt)) -dev_kfree_skb_irq (skb); -else -vDMA0_tx_80211 (pDevice, skb); - -spin_unlock_irq (&pDevice->lock); - -return NETDEV_TX_OK ; -} -static int device_xmit (struct sk_buff *skb,struct net_device *dev) {struct vnt_private *pDevice =netdev_priv (dev);
drivers/staging/vt6656/rxtx.c +0 -406
454 lines not on this page · raw message
drivers/staging/vt6656/wcmd.c +3 -4
@@ -627,10 +627,9 @@ void vRunCommand(struct work_struct *work) pMgmt->eCurrMode =WMAC_MODE_STANDBY ; pDevice->bLinkPass = false;ControlvMaskByte (pDevice,MESSAGE_REQUEST_MACREG ,MAC_REG_PAPEDELAY ,LEDSTS_STS ,LEDSTS_SLOW ); -if (pDevice->bEnableHostWEP == true) -BSSvClearNodeDBTable (pDevice,1 ); -else -BSSvClearNodeDBTable (pDevice,0 ); + +BSSvClearNodeDBTable (pDevice,0 ); + pDevice->uAssocCount =0 ; pMgmt->eCurrState =WMAC_STATE_IDLE ; pDevice->bFixRate = false;
drivers/staging/vt6656/wmgr.c +5 -40
87 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH 3/20 staging: vt6656: dpc.c remove hostapd
In reply to Malcolm PriestleyRemove dead functionss_bAPModeRxCtls_bAPModeRxData
--- drivers/staging/vt6656/dpc.c | 223 +------------------------------------------ 1 file changed, 1 insertion(+), 222 deletions(-)
drivers/staging/vt6656/dpc.c +1 -222
@@ -26,8 +26,6 @@* * Functions: * device_receive_frame - Rcv 802.11 frame function -* s_bAPModeRxCtl- AP Rcv frame filer Ctl. -* s_bAPModeRxData- AP Rcv data frame handle * s_bHandleRxEncryption- Rcv decrypted data via on-fly * s_byGetRateIdx- get rate index * s_vGetDASA- get data offset
@@ -75,12 +73,6 @@ static void s_vProcessRxMACHeader(struct vnt_private *pDevice, u8 *pbyRxBufferAddr, u32 cbPacketSize, int bIsWEP, int bExtIV, u32 *pcbHeadSize); -static int s_bAPModeRxCtl (struct vnt_private *pDevice,u8 *pbyFrame, -s32 iSANodeIndex); - -static int s_bAPModeRxData (struct vnt_private *pDevice,struct sk_buff *skb, -u32 FrameSize,u32 cbHeaderOffset,s32 iSANodeIndex,s32 iDANodeIndex); -static int s_bHandleRxEncryption (struct vnt_private *pDevice,u8 *pbyFrame,u32 FrameSize,u8 *pbyRsr,u8 *pbyNewRsr,PSKeyItem *pKeyOut,s32 *pbExtIV,u16 *pwRxTSC15_0,u32 *pdwRxTSC47_16);
@@ -255,7 +247,7 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, struct vnt_rcb *pRCB,u32 cbHeaderOffset, cbIVOffset;u32 FrameSize;u16 wEtherType =0 ; -s32 iSANodeIndex =-1 , iDANodeIndex =-1 ; +s32 iSANodeIndex =-1 ;int ii;u8 *pbyRxSts, *pbyRxRate, *pbySQ, *pby3SQ;u32 cbHeaderSize;
@@ -383,12 +375,6 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, struct vnt_rcb *pRCB, } } -if (pMgmt->eCurrMode ==WMAC_MODE_ESS_AP ) { -if (s_bAPModeRxCtl (pDevice, pbyFrame, iSANodeIndex) == true) { -return false; - } - } -if (IS_FC_WEP (pbyFrame)) {bool bRxDecryOK = false;
@@ -735,26 +721,6 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, struct vnt_rcb *pRCB,if (FrameSize <12 )return false; -if (pMgmt->eCurrMode ==WMAC_MODE_ESS_AP ) { -if (s_bAPModeRxData (pDevice, - skb, - FrameSize, - cbHeaderOffset, - iSANodeIndex, - iDANodeIndex - ) == false) { - -if (bDeFragRx) { -if (!device_alloc_frag_buf (pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) { -DBG_PRT (MSG_LEVEL_ERR ,KERN_ERR "%s: can not alloc more frag bufs\n" , - pDevice->dev->name); - } - } -return false; - } - - } - skb->data += cbHeaderOffset; skb->tail += cbHeaderOffset;skb_put (skb, FrameSize);
@@ -774,112 +740,6 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, struct vnt_rcb *pRCB,return true; } -static int s_bAPModeRxCtl (struct vnt_private *pDevice,u8 *pbyFrame, -s32 iSANodeIndex) -{ -struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; -struct ieee80211_hdr *p802_11Header; -CMD_STATUS Status; - -if (IS_CTL_PSPOLL (pbyFrame) || !IS_TYPE_CONTROL (pbyFrame)) { - - p802_11Header = (struct ieee80211_hdr *) (pbyFrame); -if (!IS_TYPE_MGMT (pbyFrame)) { - -// Data & PS-Poll packet -// check frame class -if (iSANodeIndex >0 ) { -// frame class 3 fliter & checking -if (pMgmt->sNodeDBTable[iSANodeIndex].eNodeState <NODE_AUTH ) { -// send deauth notification -// reason = (6) class 2 received from nonauth sta -vMgrDeAuthenBeginSta (pDevice, - pMgmt, - (u8 *)(p802_11Header->addr2), - (WLAN_MGMT_REASON_CLASS2_NONAUTH ), - &Status - ); -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "dpc: send vMgrDeAuthenBeginSta 1\n" ); -return true; - } -if (pMgmt->sNodeDBTable[iSANodeIndex].eNodeState <NODE_ASSOC ) { -// send deassoc notification -// reason = (7) class 3 received from nonassoc sta -vMgrDisassocBeginSta (pDevice, - pMgmt, - (u8 *)(p802_11Header->addr2), - (WLAN_MGMT_REASON_CLASS3_NONASSOC ), - &Status - ); -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "dpc: send vMgrDisassocBeginSta 2\n" ); -return true; - } - -if (pMgmt->sNodeDBTable[iSANodeIndex].bPSEnable) { -// delcare received ps-poll event -if (IS_CTL_PSPOLL (pbyFrame)) { - pMgmt->sNodeDBTable[iSANodeIndex].bRxPSPoll = true; -bScheduleCommand ((void *) pDevice, -WLAN_CMD_RX_PSPOLL , -NULL ); -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "dpc: WLAN_CMD_RX_PSPOLL 1\n" ); - } -else { -// check Data PS state -// if PW bit off, send out all PS bufferring packets. -if (!IS_FC_POWERMGT (pbyFrame)) { - pMgmt->sNodeDBTable[iSANodeIndex].bPSEnable = false; - pMgmt->sNodeDBTable[iSANodeIndex].bRxPSPoll = true; -bScheduleCommand ((void *) pDevice, -WLAN_CMD_RX_PSPOLL , -NULL ); -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "dpc: WLAN_CMD_RX_PSPOLL 2\n" ); - } - } - } -else { -if (IS_FC_POWERMGT (pbyFrame)) { - pMgmt->sNodeDBTable[iSANodeIndex].bPSEnable = true; -// Once if STA in PS state, enable multicast bufferring - pMgmt->sNodeDBTable[0 ].bPSEnable = true; - } -else { -// clear all pending PS frame. -if (pMgmt->sNodeDBTable[iSANodeIndex].wEnQueueCnt >0 ) { - pMgmt->sNodeDBTable[iSANodeIndex].bPSEnable = false; - pMgmt->sNodeDBTable[iSANodeIndex].bRxPSPoll = true; -bScheduleCommand ((void *) pDevice, -WLAN_CMD_RX_PSPOLL , -NULL ); -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "dpc: WLAN_CMD_RX_PSPOLL 3\n" ); - - } - } - } - } -else { -vMgrDeAuthenBeginSta (pDevice, - pMgmt, - (u8 *)(p802_11Header->addr2), - (WLAN_MGMT_REASON_CLASS2_NONAUTH ), - &Status - ); -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "dpc: send vMgrDeAuthenBeginSta 3\n" ); -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "BSSID:%pM\n" , - p802_11Header->addr3); -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "ADDR2:%pM\n" , - p802_11Header->addr2); -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "ADDR1:%pM\n" , - p802_11Header->addr1); -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "dpc: frame_control= %x\n" , p802_11Header->frame_control); -return true; - } - } - } -return false; - -} -static int s_bHandleRxEncryption (struct vnt_private *pDevice,u8 *pbyFrame,u32 FrameSize,u8 *pbyRsr,u8 *pbyNewRsr,PSKeyItem *pKeyOut,s32 *pbExtIV,u16 *pwRxTSC15_0,u32 *pdwRxTSC47_16)
@@ -1006,87 +866,6 @@ static int s_bHandleRxEncryption(struct vnt_private *pDevice, u8 *pbyFrame,return true; } -static int s_bAPModeRxData (struct vnt_private *pDevice,struct sk_buff *skb, -u32 FrameSize,u32 cbHeaderOffset,s32 iSANodeIndex,s32 iDANodeIndex) -{ -struct sk_buff *skbcpy; -struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; -int bRelayAndForward = false; -int bRelayOnly = false; -u8 byMask[8 ] = {1 ,2 ,4 ,8 ,0x10 ,0x20 ,0x40 ,0x80 }; -u16 wAID; - -if (FrameSize >CB_MAX_BUF_SIZE ) -return false; -// check DA -if (is_multicast_ether_addr ((u8 *)(skb->data+cbHeaderOffset))) { -if (pMgmt->sNodeDBTable[0 ].bPSEnable) { - - skbcpy =netdev_alloc_skb (pDevice->dev, pDevice->rx_buf_sz); - -// if any node in PS mode, buffer packet until DTIM. -if (skbcpy ==NULL ) { -DBG_PRT (MSG_LEVEL_NOTICE ,KERN_INFO "relay multicast no skb available \n" ); - } -else { - skbcpy->len = FrameSize; -memcpy (skbcpy->data, skb->data+cbHeaderOffset, FrameSize); -skb_queue_tail (&(pMgmt->sNodeDBTable[0 ].sTxPSQueue), skbcpy); - pMgmt->sNodeDBTable[0 ].wEnQueueCnt++; -// set tx map - pMgmt->abyPSTxMap[0 ] |= byMask[0 ]; - } - } -else { - bRelayAndForward = true; - } - } -else { -// check if relay -if (BSSbIsSTAInNodeDB (pDevice, (u8 *)(skb->data+cbHeaderOffset), &iDANodeIndex)) { -if (pMgmt->sNodeDBTable[iDANodeIndex].eNodeState >=NODE_ASSOC ) { -if (pMgmt->sNodeDBTable[iDANodeIndex].bPSEnable) { -// queue this skb until next PS tx, and then release. - - skb->data += cbHeaderOffset; - skb->tail += cbHeaderOffset; -skb_put (skb, FrameSize); -skb_queue_tail (&pMgmt->sNodeDBTable[iDANodeIndex].sTxPSQueue, skb); - - pMgmt->sNodeDBTable[iDANodeIndex].wEnQueueCnt++; - wAID = pMgmt->sNodeDBTable[iDANodeIndex].wAID; - pMgmt->abyPSTxMap[wAID >>3 ] |= byMask[wAID &7 ]; -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "relay: index= %d, pMgmt->abyPSTxMap[%d]= %d\n" , - iDANodeIndex, (wAID >>3 ), pMgmt->abyPSTxMap[wAID >>3 ]); -return true; - } -else { - bRelayOnly = true; - } - } - } - } - -if (bRelayOnly || bRelayAndForward) { -// relay this packet right now -if (bRelayAndForward) - iDANodeIndex =0 ; - -if ((pDevice->uAssocCount >1 ) && (iDANodeIndex >=0 )) { -bRelayPacketSend (pDevice, (u8 *) (skb->data + cbHeaderOffset), - FrameSize, (unsigned int ) iDANodeIndex); - } - -if (bRelayOnly) -return false; - } -// none associate, don't forward -if (pDevice->uAssocCount ==0 ) -return false; - -return true; -} -void RXvWorkItem (struct work_struct *work) { struct vnt_private *priv =
Signature · 1 line
1.9.1
PATCH 4/20 staging: vt6656: dead code bRelayPacketSend
In reply to Malcolm PriestleyAfter dead code hostapd remove bRelayPacketSend
--- drivers/staging/vt6656/rxtx.c | 126 ------------------------------------------ drivers/staging/vt6656/rxtx.h | 2 - 2 files changed, 128 deletions(-)
drivers/staging/vt6656/rxtx.c +0 -126
@@ -2073,129 +2073,3 @@ int nsDMA_tx_packet(struct vnt_private *pDevice, struct sk_buff *skb)return 0 ; } - -/* -* Description: -* Relay packet send (AC1DMA) from rx dpc. -* -* Parameters: -* In: -* pDevice - Pointer to the adapter -* pPacket - Pointer to rx packet -* cbPacketSize - rx ethernet frame size -* Out: -* TURE, false -* -* Return Value: Return true if packet is copy to dma1; otherwise false -*/ - -int bRelayPacketSend (struct vnt_private *pDevice,u8 *pbySkbData,u32 uDataLen, -u32 uNodeIndex) -{ -struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; -struct vnt_tx_buffer *pTX_Buffer; -u32 BytesToWrite =0 , uHeaderLen =0 ; -u8 byPktType =PK_TYPE_11B ; -int bNeedEncryption = false; -PSKeyItem pTransmitKey =NULL ; -u8 *pbyBSSID; -struct vnt_usb_send_context *pContext; -u8 byPktTyp; -int fConvertedPacket; -u32 status; -u16 wKeepRate = pDevice->wCurrentRate; - - pContext =s_vGetFreeContext (pDevice); - -if (NULL == pContext) { -return false; - } - -memcpy (&pDevice->sTxEthHeader, pbySkbData,ETH_HLEN ); - -if (pDevice->bEncryptionEnable == true) { - bNeedEncryption = true; -// get group key - pbyBSSID = pDevice->abyBroadcastAddr; -if (KeybGetTransmitKey (&(pDevice->sKey), pbyBSSID,GROUP_KEY , &pTransmitKey) == false) { - pTransmitKey =NULL ; -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_DEBUG "KEY is NULL. [%d]\n" , pMgmt->eCurrMode); - }else { -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_DEBUG "Get GTK.\n" ); - } - } - -if ( bNeedEncryption && (pTransmitKey ==NULL ) ) { - pContext->in_use = false; -return false; - } - - byPktTyp = (u8 )pDevice->byPacketType; - -if (pDevice->bFixRate) { -if (pDevice->byBBType ==BB_TYPE_11B ) { -if (pDevice->uConnectionRate >=RATE_11M ) { - pDevice->wCurrentRate =RATE_11M ; - }else { - pDevice->wCurrentRate = (u16 )pDevice->uConnectionRate; - } - }else { -if ((pDevice->byBBType ==BB_TYPE_11A ) && - (pDevice->uConnectionRate <=RATE_6M )) { - pDevice->wCurrentRate =RATE_6M ; - }else { -if (pDevice->uConnectionRate >=RATE_54M ) - pDevice->wCurrentRate =RATE_54M ; -else - pDevice->wCurrentRate = (u16 )pDevice->uConnectionRate; - } - } - } -else { - pDevice->wCurrentRate = pMgmt->sNodeDBTable[uNodeIndex].wTxDataRate; - } - -if (wKeepRate != pDevice->wCurrentRate) { -bScheduleCommand ((void *) pDevice,WLAN_CMD_SETPOWER ,NULL ); - } - -if (pDevice->wCurrentRate <=RATE_11M ) - byPktType =PK_TYPE_11B ; - - BytesToWrite = uDataLen +ETH_FCS_LEN ; - -// Convert the packet to an usb frame and copy into our buffer -// and send the irp. - - pTX_Buffer = (struct vnt_tx_buffer *)&pContext->data[0 ]; - - fConvertedPacket =s_bPacketToWirelessUsb (pDevice, byPktType, - pTX_Buffer, bNeedEncryption, - uDataLen, &pDevice->sTxEthHeader, - pbySkbData, pTransmitKey, uNodeIndex, - pDevice->wCurrentRate, - &uHeaderLen, &BytesToWrite - ); - -if (fConvertedPacket == false) { - pContext->in_use = false; -return false; - } - - pTX_Buffer->byPKTNO = (u8) (((pDevice->wCurrentRate<<4 ) &0x00F0 ) | ((pDevice->wSeqCounter -1 ) &0x000F )); - pTX_Buffer->tx_byte_count =cpu_to_le16 ((u16 )BytesToWrite); - - pContext->skb =NULL ; - pContext->type =CONTEXT_DATA_PACKET ; - pContext->buf_len = (u16 )BytesToWrite +4 ;/* USB header */ - -s_vSaveTxPktInfo (pDevice, (u8)(pTX_Buffer->byPKTNO &0x0F ), - &pDevice->sTxEthHeader.h_dest[0 ], - (u16)(BytesToWrite - uHeaderLen), - pTX_Buffer->fifo_head.wFIFOCtl); - - status =PIPEnsSendBulkOut (pDevice,pContext); - -return true; -} -
drivers/staging/vt6656/rxtx.h +0 -2
@@ -250,7 +250,5 @@ void vDMA0_tx_80211(struct vnt_private *, struct sk_buff *skb);int nsDMA_tx_packet (struct vnt_private *,struct sk_buff *skb);CMD_STATUS csMgmt_xmit (struct vnt_private *,struct vnt_tx_mgmt *);CMD_STATUS csBeacon_xmit (struct vnt_private *,struct vnt_tx_mgmt *); -int bRelayPacketSend (struct vnt_private *,u8 *pbySkbData,u32 uDataLen, -u32 uNodeIndex);#endif /* __RXTX_H__ */
Signature · 1 line
1.9.1
PATCH 5/20 staging; vt6656: dead code aes_ccmp.
In reply to Malcolm PriestleyAfter dead code dpc hostapd remove aes.c/h
--- drivers/staging/vt6656/Makefile | 1 - drivers/staging/vt6656/aes_ccmp.c | 374 -------------------------------------- drivers/staging/vt6656/aes_ccmp.h | 35 ---- drivers/staging/vt6656/dpc.c | 1 - 4 files changed, 411 deletions(-) delete mode 100644 drivers/staging/vt6656/aes_ccmp.c delete mode 100644 drivers/staging/vt6656/aes_ccmp.h
drivers/staging/vt6656/Makefile +0 -1
@@ -26,7 +26,6 @@ vt6656_stage-y += main_usb.o \ rf.o \ iwctl.o \ wpactl.o \ - aes_ccmp.o \ usbpipe.o \ channel.o \ control.o \
drivers/staging/vt6656/aes_ccmp.c deleted +0 -374
374 lines not on this page · raw message
drivers/staging/vt6656/aes_ccmp.h deleted +0 -35
@@ -1,35 +0,0 @@ -/* -* Copyright (c) 1996, 2003 VIA Networking Technologies, Inc. -* All rights reserved. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -* -* -* File: aes_ccmp.h -* -* Purpose: AES_CCMP Decryption -* -* Author: Warren Hsu -* -* Date: Feb 15, 2005 -* -*/ - -#ifndef __AES_H__ -#define __AES_H__ - -bool AESbGenCCMP (u8 * pbyRxKey,u8 * pbyFrame,u16 wFrameSize); - -#endif /* __AES_CCMP_H__ */
drivers/staging/vt6656/dpc.c +0 -1
@@ -49,7 +49,6 @@#include "wctl.h" #include "rf.h" #include "iowpa.h" -#include "aes_ccmp.h" #include "datarate.h" #include "usbpipe.h"
Signature · 1 line
1.9.1
PATCH 6/20 staging: vt6656: checkpatch cleanup BBuGetFrameTime.
In reply to Malcolm Priestleyclean up white space.
--- drivers/staging/vt6656/baseband.c | 78 ++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 42 deletions(-)
drivers/staging/vt6656/baseband.c +36 -42
@@ -663,53 +663,47 @@ s_vClearSQ3Value(PSDevice pDevice);* Return Value: FrameTime * */ -unsigned int -BBuGetFrameTime ( -u8 byPreambleType, -u8 byPktType, -unsigned int cbFrameLength, -u16 wRate - ) +unsigned int BBuGetFrameTime (u8 byPreambleType,u8 byPktType, +unsigned int cbFrameLength,u16 wRate) { -unsigned int uFrameTime; -unsigned int uPreamble; -unsigned int uTmp; -unsigned int uRateIdx = (unsigned int )wRate; -unsigned int uRate =0 ; - -if (uRateIdx >RATE_54M ) { -return 0 ; - } +unsigned int uFrameTime; +unsigned int uPreamble; +unsigned int uTmp; +unsigned int uRateIdx = (unsigned int )wRate; +unsigned int uRate =0 ; - uRate = (unsigned int )awcFrameTime[uRateIdx]; +if (uRateIdx >RATE_54M ) +return 0 ; -if (uRateIdx <=3 ) {//CCK mode + uRate = (unsigned int )awcFrameTime[uRateIdx]; -if (byPreambleType ==1 ) {//Short - uPreamble =96 ; - }else { - uPreamble =192 ; - } - uFrameTime = (cbFrameLength *80 ) / uRate;//????? - uTmp = (uFrameTime * uRate) /80 ; -if (cbFrameLength != uTmp) { - uFrameTime ++; - } +if (uRateIdx <=3 ) { +if (byPreambleType ==1 ) + uPreamble =96 ; +else + uPreamble =192 ; -return (uPreamble + uFrameTime); - } -else { - uFrameTime = (cbFrameLength *8 +22 ) / uRate;//???????? - uTmp = ((uFrameTime * uRate) -22 ) /8 ; -if (cbFrameLength != uTmp) { - uFrameTime ++; - } - uFrameTime = uFrameTime *4 ;//??????? -if (byPktType !=PK_TYPE_11A ) { - uFrameTime +=6 ; - } -return (20 + uFrameTime);//?????? - } + uFrameTime = (cbFrameLength *80 ) / uRate; + uTmp = (uFrameTime * uRate) /80 ; + +if (cbFrameLength != uTmp) + uFrameTime++; + +return uPreamble + uFrameTime; + }else { + uFrameTime = (cbFrameLength *8 +22 ) / uRate; + uTmp = ((uFrameTime * uRate) -22 ) /8 ; + +if (cbFrameLength != uTmp) + uFrameTime++; + + uFrameTime = uFrameTime *4 ; + +if (byPktType !=PK_TYPE_11A ) + uFrameTime +=6 ; + +return 20 + uFrameTime; + } }/*
Signature · 1 line
1.9.1
PATCH 7/20 staging: vt6656: BBuGetFrameTime remove uRateIdx
In reply to Malcolm PriestleyRemove uRateIdx and rename wRate tx_rate
--- drivers/staging/vt6656/baseband.c | 13 ++++++------- drivers/staging/vt6656/baseband.h | 9 ++------- 2 files changed, 8 insertions(+), 14 deletions(-)
drivers/staging/vt6656/baseband.c +6 -7
@@ -657,27 +657,26 @@ s_vClearSQ3Value(PSDevice pDevice);* byPreambleType - Preamble Type * byPktType - PK_TYPE_11A, PK_TYPE_11B, PK_TYPE_11GB, PK_TYPE_11GA * cbFrameLength - Baseband Type -* wRate - Tx Rate +* tx_rate - Tx Rate * Out: * * Return Value: FrameTime * */ -unsigned int BBuGetFrameTime (u8 byPreambleType,u8 byPktType, -unsigned int cbFrameLength,u16 wRate) +unsigned int BBuGetFrameTime (u8 byPreambleType,u8 byPktType, +unsigned int cbFrameLength,u16 tx_rate) {unsigned int uFrameTime;unsigned int uPreamble;unsigned int uTmp; -unsigned int uRateIdx = (unsigned int )wRate;unsigned int uRate =0 ; -if (uRateIdx >RATE_54M ) +if (tx_rate >RATE_54M )return 0 ; - uRate = (unsigned int )awcFrameTime[uRateIdx]; + uRate = (unsigned int )awcFrameTime[tx_rate]; -if (uRateIdx <=3 ) { +if (tx_rate <=3 ) {if (byPreambleType ==1 ) uPreamble =96 ;else
drivers/staging/vt6656/baseband.h +2 -7
@@ -88,13 +88,8 @@ struct vnt_phy_field {__le16 len; } __packed; -unsigned int -BBuGetFrameTime ( -u8 byPreambleType, -u8 byFreqType, -unsigned int cbFrameLength, -u16 wRate - ); +unsigned int BBuGetFrameTime (u8 byPreambleType,u8 byPktType, +unsigned int cbFrameLength,u16 tx_rate);void BBvCalculateParameter (struct vnt_private *,u32 cbFrameLength,u16 wRate,u8 byPacketType,struct vnt_phy_field *);
Signature · 1 line
1.9.1
PATCH 8/20 staging: vt6656: BBuGetFrameTime remove camel case.
In reply to Malcolm PriestleyCamel case changes.
byPreambleType, byPktType, cbFrameLength, uFrameTime, uPreamble, uTmp, uRate ->preamble_type, pkt_type, frame_length, frame_time, preamble, tmp, rate
--- drivers/staging/vt6656/baseband.c | 52 +++++++++++++++++++-------------------- drivers/staging/vt6656/baseband.h | 4 +-- 2 files changed, 28 insertions(+), 28 deletions(-)
drivers/staging/vt6656/baseband.c +26 -26
@@ -654,54 +654,54 @@ s_vClearSQ3Value(PSDevice pDevice);* * Parameters: * In: -* byPreambleType - Preamble Type -* byPktType - PK_TYPE_11A, PK_TYPE_11B, PK_TYPE_11GB, PK_TYPE_11GA -* cbFrameLength - Baseband Type +* preamble_type - Preamble Type +* pkt_type - PK_TYPE_11A, PK_TYPE_11B, PK_TYPE_11GB, PK_TYPE_11GA +* frame_length - Baseband Type * tx_rate - Tx Rate * Out: * * Return Value: FrameTime * */ -unsigned int BBuGetFrameTime (u8 byPreambleType,u8 byPktType, -unsigned int cbFrameLength,u16 tx_rate) +unsigned int BBuGetFrameTime (u8 preamble_type,u8 pkt_type, +unsigned int frame_length,u16 tx_rate) { -unsigned int uFrameTime; -unsigned int uPreamble; -unsigned int uTmp; -unsigned int uRate =0 ; +unsigned int frame_time; +unsigned int preamble; +unsigned int tmp; +unsigned int rate =0 ;if (tx_rate >RATE_54M )return 0 ; - uRate = (unsigned int )awcFrameTime[tx_rate]; + rate = (unsigned int )awcFrameTime[tx_rate];if (tx_rate <=3 ) { -if (byPreambleType ==1 ) - uPreamble =96 ; +if (preamble_type ==1 ) + preamble =96 ;else - uPreamble =192 ; + preamble =192 ; - uFrameTime = (cbFrameLength *80 ) / uRate; - uTmp = (uFrameTime * uRate) /80 ; + frame_time = (frame_length *80 ) / rate; + tmp = (frame_time * rate) /80 ; -if (cbFrameLength != uTmp) - uFrameTime++; +if (frame_length != tmp) + frame_time++; -return uPreamble + uFrameTime; +return preamble + frame_time; }else { - uFrameTime = (cbFrameLength *8 +22 ) / uRate; - uTmp = ((uFrameTime * uRate) -22 ) /8 ; + frame_time = (frame_length *8 +22 ) / rate; + tmp = ((frame_time * rate) -22 ) /8 ; -if (cbFrameLength != uTmp) - uFrameTime++; +if (frame_length != tmp) + frame_time++; - uFrameTime = uFrameTime *4 ; + frame_time = frame_time *4 ; -if (byPktType !=PK_TYPE_11A ) - uFrameTime +=6 ; +if (pkt_type !=PK_TYPE_11A ) + frame_time +=6 ; -return 20 + uFrameTime; +return 20 + frame_time; } }
drivers/staging/vt6656/baseband.h +2 -2
@@ -88,8 +88,8 @@ struct vnt_phy_field {__le16 len; } __packed; -unsigned int BBuGetFrameTime (u8 byPreambleType,u8 byPktType, -unsigned int cbFrameLength,u16 tx_rate); +unsigned int BBuGetFrameTime (u8 preamble_type,u8 pkt_type, +unsigned int frame_length,u16 tx_rate);void BBvCalculateParameter (struct vnt_private *,u32 cbFrameLength,u16 wRate,u8 byPacketType,struct vnt_phy_field *);
Signature · 1 line
1.9.1
PATCH 9/20 staging: vt6656: checkpatch cleanup BBvCalculateParameter.
In reply to Malcolm PriestleyWhite space clean up.
--- drivers/staging/vt6656/baseband.c | 218 ++++++++++++++++++-------------------- 1 file changed, 103 insertions(+), 115 deletions(-)
drivers/staging/vt6656/baseband.c +103 -115
@@ -731,129 +731,117 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength,int bExtBit;u8 byPreambleType = pDevice->byPreambleType; - cbBitCount = cbFrameLength *8 ; - bExtBit = false; - -switch (wRate) { -case RATE_1M : - cbUsCount = cbBitCount; - phy->signal =0x00 ; -break ; - -case RATE_2M : - cbUsCount = cbBitCount /2 ; -if (byPreambleType ==1 ) - phy->signal =0x09 ; -else // long preamble - phy->signal =0x01 ; -break ; - -case RATE_5M : - cbUsCount = (cbBitCount *10 ) /55 ; - cbTmp = (cbUsCount *55 ) /10 ; -if (cbTmp != cbBitCount) - cbUsCount ++; -if (byPreambleType ==1 ) - phy->signal =0x0a ; -else // long preamble - phy->signal =0x02 ; -break ; - -case RATE_11M : - cbUsCount = cbBitCount /11 ; - cbTmp = cbUsCount *11 ; -if (cbTmp != cbBitCount) { - cbUsCount ++; -if ((cbBitCount - cbTmp) <=3 ) - bExtBit = true; - } -if (byPreambleType ==1 ) - phy->signal =0x0b ; -else // long preamble - phy->signal =0x03 ; -break ; - -case RATE_6M : -if (byPacketType ==PK_TYPE_11A ) {//11a, 5GHZ - phy->signal =0x9b ; - } -else {//11g, 2.4GHZ - phy->signal =0x8b ; - } -break ; + cbBitCount = cbFrameLength *8 ; + bExtBit = false; -case RATE_9M : -if (byPacketType ==PK_TYPE_11A ) {//11a, 5GHZ - phy->signal =0x9f ; - } -else {//11g, 2.4GHZ - phy->signal =0x8f ; - } -break ; +switch (wRate) { +case RATE_1M : + cbUsCount = cbBitCount; -case RATE_12M : -if (byPacketType ==PK_TYPE_11A ) {//11a, 5GHZ - phy->signal =0x9a ; - } -else {//11g, 2.4GHZ - phy->signal =0x8a ; - } -break ; + phy->signal =0x00 ; -case RATE_18M : -if (byPacketType ==PK_TYPE_11A ) {//11a, 5GHZ - phy->signal =0x9e ; - } -else {//11g, 2.4GHZ - phy->signal =0x8e ; - } -break ; +break ; +case RATE_2M : + cbUsCount = cbBitCount /2 ; -case RATE_24M : -if (byPacketType ==PK_TYPE_11A ) {//11a, 5GHZ - phy->signal =0x99 ; - } -else {//11g, 2.4GHZ - phy->signal =0x89 ; - } -break ; +if (byPreambleType ==1 ) + phy->signal =0x09 ; +else + phy->signal =0x01 ; -case RATE_36M : -if (byPacketType ==PK_TYPE_11A ) {//11a, 5GHZ - phy->signal =0x9d ; - } -else {//11g, 2.4GHZ - phy->signal =0x8d ; - } -break ; +break ; +case RATE_5M : + cbUsCount = (cbBitCount *10 ) /55 ; + cbTmp = (cbUsCount *55 ) /10 ; -case RATE_48M : -if (byPacketType ==PK_TYPE_11A ) {//11a, 5GHZ - phy->signal =0x98 ; - } -else {//11g, 2.4GHZ - phy->signal =0x88 ; - } -break ; +if (cbTmp != cbBitCount) + cbUsCount++; -case RATE_54M : -if (byPacketType ==PK_TYPE_11A ) {//11a, 5GHZ - phy->signal =0x9c ; - } -else {//11g, 2.4GHZ - phy->signal =0x8c ; - } -break ; +if (byPreambleType ==1 ) + phy->signal =0x0a ; +else + phy->signal =0x02 ; -default : -if (byPacketType ==PK_TYPE_11A ) {//11a, 5GHZ - phy->signal =0x9c ; - } -else {//11g, 2.4GHZ - phy->signal =0x8c ; - } -break ; - } +break ; +case RATE_11M : + cbUsCount = cbBitCount /11 ; + cbTmp = cbUsCount *11 ; + +if (cbTmp != cbBitCount) { + cbUsCount++; + +if ((cbBitCount - cbTmp) <=3 ) + bExtBit = true; + } + +if (byPreambleType ==1 ) + phy->signal =0x0b ; +else + phy->signal =0x03 ; + +break ; +case RATE_6M : +if (byPacketType ==PK_TYPE_11A ) + phy->signal =0x9b ; +else + phy->signal =0x8b ; + +break ; +case RATE_9M : +if (byPacketType ==PK_TYPE_11A ) + phy->signal =0x9f ; +else + phy->signal =0x8f ; + +break ; +case RATE_12M : +if (byPacketType ==PK_TYPE_11A ) + phy->signal =0x9a ; +else + phy->signal =0x8a ; + +break ; +case RATE_18M : +if (byPacketType ==PK_TYPE_11A ) + phy->signal =0x9e ; +else + phy->signal =0x8e ; + +break ; +case RATE_24M : +if (byPacketType ==PK_TYPE_11A ) + phy->signal =0x99 ; +else + phy->signal =0x89 ; + +break ; +case RATE_36M : +if (byPacketType ==PK_TYPE_11A ) + phy->signal =0x9d ; +else + phy->signal =0x8d ; + +break ; +case RATE_48M : +if (byPacketType ==PK_TYPE_11A ) + phy->signal =0x98 ; +else + phy->signal =0x88 ; + +break ; +case RATE_54M : +if (byPacketType ==PK_TYPE_11A ) + phy->signal =0x9c ; +else + phy->signal =0x8c ; +break ; +default : +if (byPacketType ==PK_TYPE_11A ) + phy->signal =0x9c ; +else + phy->signal =0x8c ; +break ; + }if (byPacketType ==PK_TYPE_11B ) { phy->service =0x00 ;
Signature · 1 line
1.9.1
PATCH 10/20 staging: vt6656: BBvCalculateParameter remove camel case
In reply to Malcolm PriestleyCamel case changes
pDevice, cbFrameLength, wRate, byPacketType, cbBitCount, cbUsCount cbTmp, bExtBit, byPreambleType
->
priv, frame_length, tx_rate, pkt_type, bit_count, count, tmp, ext_bit, preamble_type
--- drivers/staging/vt6656/baseband.c | 82 +++++++++++++++++++-------------------- drivers/staging/vt6656/baseband.h | 4 +- 2 files changed, 43 insertions(+), 43 deletions(-)
drivers/staging/vt6656/baseband.c +41 -41
@@ -710,9 +710,9 @@ unsigned int BBuGetFrameTime(u8 preamble_type, u8 pkt_type,* * Parameters: * In: -* pDevice - Device Structure -* cbFrameLength - Tx Frame Length -* wRate - Tx Rate +* priv - Device Structure +* frame_length - Tx Frame Length +* tx_rate - Tx Rate * Out: * struct vnt_phy_field *phy * - pointer to Phy Length field
@@ -722,135 +722,135 @@ unsigned int BBuGetFrameTime(u8 preamble_type, u8 pkt_type,* Return Value: none * */ -void BBvCalculateParameter (struct vnt_private *pDevice,u32 cbFrameLength, -u16 wRate,u8 byPacketType,struct vnt_phy_field *phy) +void BBvCalculateParameter (struct vnt_private *priv,u32 frame_length, +u16 tx_rate,u8 pkt_type,struct vnt_phy_field *phy) { -u32 cbBitCount; -u32 cbUsCount =0 ; -u32 cbTmp; -int bExtBit; -u8 byPreambleType = pDevice->byPreambleType; +u32 bit_count; +u32 count =0 ; +u32 tmp; +int ext_bit; +u8 preamble_type = priv->byPreambleType; - cbBitCount = cbFrameLength *8 ; - bExtBit = false; + bit_count = frame_length *8 ; + ext_bit = false; -switch (wRate) { +switch (tx_rate) {case RATE_1M : - cbUsCount = cbBitCount; + count = bit_count; phy->signal =0x00 ;break ;case RATE_2M : - cbUsCount = cbBitCount /2 ; + count = bit_count /2 ; -if (byPreambleType ==1 ) +if (preamble_type ==1 ) phy->signal =0x09 ;else phy->signal =0x01 ;break ;case RATE_5M : - cbUsCount = (cbBitCount *10 ) /55 ; - cbTmp = (cbUsCount *55 ) /10 ; + count = (bit_count *10 ) /55 ; + tmp = (count *55 ) /10 ; -if (cbTmp != cbBitCount) - cbUsCount++; +if (tmp != bit_count) + count++; -if (byPreambleType ==1 ) +if (preamble_type ==1 ) phy->signal =0x0a ;else phy->signal =0x02 ;break ;case RATE_11M : - cbUsCount = cbBitCount /11 ; - cbTmp = cbUsCount *11 ; + count = bit_count /11 ; + tmp = count *11 ; -if (cbTmp != cbBitCount) { - cbUsCount++; +if (tmp != bit_count) { + count++; -if ((cbBitCount - cbTmp) <=3 ) - bExtBit = true; +if ((bit_count - tmp) <=3 ) + ext_bit = true; } -if (byPreambleType ==1 ) +if (preamble_type ==1 ) phy->signal =0x0b ;else phy->signal =0x03 ;break ;case RATE_6M : -if (byPacketType ==PK_TYPE_11A ) +if (pkt_type ==PK_TYPE_11A ) phy->signal =0x9b ;else phy->signal =0x8b ;break ;case RATE_9M : -if (byPacketType ==PK_TYPE_11A ) +if (pkt_type ==PK_TYPE_11A ) phy->signal =0x9f ;else phy->signal =0x8f ;break ;case RATE_12M : -if (byPacketType ==PK_TYPE_11A ) +if (pkt_type ==PK_TYPE_11A ) phy->signal =0x9a ;else phy->signal =0x8a ;break ;case RATE_18M : -if (byPacketType ==PK_TYPE_11A ) +if (pkt_type ==PK_TYPE_11A ) phy->signal =0x9e ;else phy->signal =0x8e ;break ;case RATE_24M : -if (byPacketType ==PK_TYPE_11A ) +if (pkt_type ==PK_TYPE_11A ) phy->signal =0x99 ;else phy->signal =0x89 ;break ;case RATE_36M : -if (byPacketType ==PK_TYPE_11A ) +if (pkt_type ==PK_TYPE_11A ) phy->signal =0x9d ;else phy->signal =0x8d ;break ;case RATE_48M : -if (byPacketType ==PK_TYPE_11A ) +if (pkt_type ==PK_TYPE_11A ) phy->signal =0x98 ;else phy->signal =0x88 ;break ;case RATE_54M : -if (byPacketType ==PK_TYPE_11A ) +if (pkt_type ==PK_TYPE_11A ) phy->signal =0x9c ;else phy->signal =0x8c ;break ;default : -if (byPacketType ==PK_TYPE_11A ) +if (pkt_type ==PK_TYPE_11A ) phy->signal =0x9c ;else phy->signal =0x8c ;break ; } -if (byPacketType ==PK_TYPE_11B ) { +if (pkt_type ==PK_TYPE_11B ) { phy->service =0x00 ; -if (bExtBit) +if (ext_bit) phy->service |=0x80 ; - phy->len =cpu_to_le16 ((u16 )cbUsCount); + phy->len =cpu_to_le16 ((u16 )count); }else { phy->service =0x00 ; - phy->len =cpu_to_le16 ((u16 )cbFrameLength); + phy->len =cpu_to_le16 ((u16 )frame_length); } }
drivers/staging/vt6656/baseband.h +2 -2
@@ -91,8 +91,8 @@ struct vnt_phy_field {unsigned int BBuGetFrameTime (u8 preamble_type,u8 pkt_type,unsigned int frame_length,u16 tx_rate); -void BBvCalculateParameter (struct vnt_private *,u32 cbFrameLength, -u16 wRate,u8 byPacketType,struct vnt_phy_field *); +void BBvCalculateParameter (struct vnt_private *,u32 frame_length, +u16 tx_rate,u8 pkt_type,struct vnt_phy_field *);/* timer for antenna diversity */
Signature · 1 line
1.9.1
PATCH 11/20 staging: vt6656: clean up BBvSetAntennaMode.
In reply to Malcolm Priestleywhite space clean up.
--- drivers/staging/vt6656/baseband.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-)
drivers/staging/vt6656/baseband.c +14 -18
@@ -869,25 +869,21 @@ void BBvCalculateParameter(struct vnt_private *priv, u32 frame_length,*/ void BBvSetAntennaMode (struct vnt_private *pDevice,u8 byAntennaMode) { -switch (byAntennaMode) { -case ANT_TXA : -case ANT_TXB : -break ; -case ANT_RXA : - pDevice->byBBRxConf &=0xFC ; -break ; -case ANT_RXB : - pDevice->byBBRxConf &=0xFE ; - pDevice->byBBRxConf |=0x02 ; -break ; - } +switch (byAntennaMode) { +case ANT_TXA : +case ANT_TXB : +break ; +case ANT_RXA : + pDevice->byBBRxConf &=0xFC ; +break ; +case ANT_RXB : + pDevice->byBBRxConf &=0xFE ; + pDevice->byBBRxConf |=0x02 ; +break ; + } -CONTROLnsRequestOut (pDevice, -MESSAGE_TYPE_SET_ANTMD , - (u16 ) byAntennaMode, -0 , -0 , -NULL ); +CONTROLnsRequestOut (pDevice,MESSAGE_TYPE_SET_ANTMD , + (u16 )byAntennaMode,0 ,0 ,NULL ); }/*
Signature · 1 line
1.9.1
PATCH 12/20 staging: vt6656: BBvSetAntennaMode remove camel case.
In reply to Malcolm Priestleychanges
pDevice -> priv
byAntennaMode -> antenna_mode
--- drivers/staging/vt6656/baseband.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/staging/vt6656/baseband.c +9 -9
@@ -859,31 +859,31 @@ void BBvCalculateParameter(struct vnt_private *priv, u32 frame_length,* * Parameters: * In: -* pDevice - Device Structure -* byAntennaMode - Antenna Mode +* priv - Device Structure +* antenna_mode - Antenna Mode * Out: * none * * Return Value: none * */ -void BBvSetAntennaMode (struct vnt_private *pDevice,u8 byAntennaMode) +void BBvSetAntennaMode (struct vnt_private *priv,u8 antenna_mode) { -switch (byAntennaMode) { +switch (antenna_mode) {case ANT_TXA :case ANT_TXB :break ;case ANT_RXA : - pDevice->byBBRxConf &=0xFC ; + priv->byBBRxConf &=0xFC ;break ;case ANT_RXB : - pDevice->byBBRxConf &=0xFE ; - pDevice->byBBRxConf |=0x02 ; + priv->byBBRxConf &=0xFE ; + priv->byBBRxConf |=0x02 ;break ; } -CONTROLnsRequestOut (pDevice,MESSAGE_TYPE_SET_ANTMD , - (u16 )byAntennaMode,0 ,0 ,NULL ); +CONTROLnsRequestOut (priv,MESSAGE_TYPE_SET_ANTMD , + (u16 )antenna_mode,0 ,0 ,NULL ); }/*
Signature · 1 line
1.9.1
PATCH 13/20 staging: vt6656: BBvSetShortSlotTime remove camel case.
In reply to Malcolm PriestleypDevice -> priv
byBBVGA -> bb_vga
--- drivers/staging/vt6656/baseband.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/staging/vt6656/baseband.c +11 -10
@@ -1078,27 +1078,28 @@ int BBbVT3184Init(struct vnt_private *priv)* * Parameters: * In: -* pDevice - Device Structure +* priv - Device Structure * Out: * none * * Return Value: none * */ -void BBvSetShortSlotTime (struct vnt_private *pDevice) +void BBvSetShortSlotTime (struct vnt_private *priv) { -u8 byBBVGA=0 ; +u8 bb_vga =0 ; -if (pDevice->bShortSlotTime) - pDevice->byBBRxConf &=0xDF ;//1101 1111 +if (priv->bShortSlotTime) + priv->byBBRxConf &=0xdf ;else - pDevice->byBBRxConf |=0x20 ;//0010 0000 + priv->byBBRxConf |=0x20 ; + +ControlvReadByte (priv,MESSAGE_REQUEST_BBREG ,0xe7 , &bb_vga); -ControlvReadByte (pDevice,MESSAGE_REQUEST_BBREG ,0xE7 , &byBBVGA); -if (byBBVGA == pDevice->abyBBVGA[0 ]) - pDevice->byBBRxConf |=0x20 ;//0010 0000 +if (bb_vga == priv->abyBBVGA[0 ]) + priv->byBBRxConf |=0x20 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0x0A , pDevice->byBBRxConf); +ControlvWriteByte (priv,MESSAGE_REQUEST_BBREG ,0x0a , priv->byBBRxConf); }void BBvSetVGAGainOffset (struct vnt_private *pDevice,u8 byData)
Signature · 1 line
1.9.1
PATCH 14/20 staging: vt6656: BBvSetVGAGainOffset remove camel case
In reply to Malcolm PriestleypDevice -> priv
byData -> data
--- drivers/staging/vt6656/baseband.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/vt6656/baseband.c +7 -7
@@ -1102,18 +1102,18 @@ void BBvSetShortSlotTime(struct vnt_private *priv)ControlvWriteByte (priv,MESSAGE_REQUEST_BBREG ,0x0a , priv->byBBRxConf); } -void BBvSetVGAGainOffset (struct vnt_private *pDevice,u8 byData) +void BBvSetVGAGainOffset (struct vnt_private *priv,u8 data) { -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xE7 , byData); +ControlvWriteByte (priv,MESSAGE_REQUEST_BBREG ,0xE7 , data); -// patch for 3253B0 Baseband with Cardbus module -if (pDevice->bShortSlotTime) - pDevice->byBBRxConf &=0xDF ;/* 1101 1111 */ +/* patch for 3253B0 Baseband with Cardbus module */ +if (priv->bShortSlotTime) + priv->byBBRxConf &=0xdf ;/* 1101 1111 */ else - pDevice->byBBRxConf |=0x20 ;/* 0010 0000 */ + priv->byBBRxConf |=0x20 ;/* 0010 0000 */ -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0x0A , pDevice->byBBRxConf);//CR10 +ControlvWriteByte (priv,MESSAGE_REQUEST_BBREG ,0x0a , priv->byBBRxConf); }/*
Signature · 1 line
1.9.1
PATCH 15/20 staging: vt6656: BBvSetDeepSleep remove camel case
In reply to Malcolm PriestleypDevice -> priv
--- drivers/staging/vt6656/baseband.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/vt6656/baseband.c +4 -4
@@ -1121,17 +1121,17 @@ void BBvSetVGAGainOffset(struct vnt_private *priv, u8 data)* * Parameters: * In: -* pDevice - Device Structure +* priv - Device Structure * Out: * none * * Return Value: none * */ -void BBvSetDeepSleep (struct vnt_private *pDevice) +void BBvSetDeepSleep (struct vnt_private *priv) { -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0x0c ,0x17 );//CR12 -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0x0D ,0xB9 );//CR13 +ControlvWriteByte (priv,MESSAGE_REQUEST_BBREG ,0x0c ,0x17 );/* CR12 */ +ControlvWriteByte (priv,MESSAGE_REQUEST_BBREG ,0x0d ,0xB9 );/* CR13 */ }void BBvExitDeepSleep (struct vnt_private *pDevice)
Signature · 1 line
1.9.1
PATCH 16/20 staging: vt6656: BBvExitDeepSleep remove camel case.
In reply to Malcolm PriestleypDevice -> priv
--- drivers/staging/vt6656/baseband.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/vt6656/baseband.c +3 -3
@@ -1134,10 +1134,10 @@ void BBvSetDeepSleep(struct vnt_private *priv)ControlvWriteByte (priv,MESSAGE_REQUEST_BBREG ,0x0d ,0xB9 );/* CR13 */ } -void BBvExitDeepSleep (struct vnt_private *pDevice) +void BBvExitDeepSleep (struct vnt_private *priv) { -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0x0C ,0x00 );//CR12 -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0x0D ,0x01 );//CR13 +ControlvWriteByte (priv,MESSAGE_REQUEST_BBREG ,0x0c ,0x00 );/* CR12 */ +ControlvWriteByte (priv,MESSAGE_REQUEST_BBREG ,0x0d ,0x01 );/* CR13 */ }static unsigned long s_ulGetLowSQ3 (struct vnt_private *pDevice)
Signature · 1 line
1.9.1
PATCH 17/20 staging: vt6656: BBvUpdatePreEDThreshold replace debug messages.
In reply to Malcolm PriestleyReplace DBG_PRT with single dev_dbg with calling function and byBBPreEDRSSI value.
--- drivers/staging/vt6656/baseband.c | 71 ++------------------------------------- 1 file changed, 3 insertions(+), 68 deletions(-)
drivers/staging/vt6656/baseband.c +3 -68
@@ -1423,7 +1423,6 @@ void BBvUpdatePreEDThreshold(struct vnt_private *pDevice, int bScanning) pDevice->byBBPreEDIndex =0 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x30 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -69, -70, -71,...\n" );break ; }
@@ -1432,127 +1431,106 @@ void BBvUpdatePreEDThreshold(struct vnt_private *pDevice, int bScanning) pDevice->byBBPreEDIndex =20 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0xFF );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI 0, -1,-2,..-45\n" ); }else if (pDevice->byBBPreEDRSSI <=46 ) {//RSSI -46 if (pDevice->byBBPreEDIndex ==19 )break ; pDevice->byBBPreEDIndex =19 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x1A );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -46\n" ); }else if (pDevice->byBBPreEDRSSI <=47 ) {//RSSI -47 if (pDevice->byBBPreEDIndex ==18 )break ; pDevice->byBBPreEDIndex =18 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x15 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -47\n" ); }else if (pDevice->byBBPreEDRSSI <=49 ) {//RSSI -48, -49 if (pDevice->byBBPreEDIndex ==17 )break ; pDevice->byBBPreEDIndex =17 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x0E );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -48,-49\n" ); }else if (pDevice->byBBPreEDRSSI <=51 ) {//RSSI -50, -51 if (pDevice->byBBPreEDIndex ==16 )break ; pDevice->byBBPreEDIndex =16 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x09 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -50,-51\n" ); }else if (pDevice->byBBPreEDRSSI <=53 ) {//RSSI -52, -53 if (pDevice->byBBPreEDIndex ==15 )break ; pDevice->byBBPreEDIndex =15 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x06 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -52,-53\n" ); }else if (pDevice->byBBPreEDRSSI <=55 ) {//RSSI -54, -55 if (pDevice->byBBPreEDIndex ==14 )break ; pDevice->byBBPreEDIndex =14 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x03 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -54,-55\n" ); }else if (pDevice->byBBPreEDRSSI <=56 ) {//RSSI -56 if (pDevice->byBBPreEDIndex ==13 )break ; pDevice->byBBPreEDIndex =13 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x02 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xA0 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -56\n" ); }else if (pDevice->byBBPreEDRSSI <=57 ) {//RSSI -57 if (pDevice->byBBPreEDIndex ==12 )break ; pDevice->byBBPreEDIndex =12 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x02 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x20 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -57\n" ); }else if (pDevice->byBBPreEDRSSI <=58 ) {//RSSI -58 if (pDevice->byBBPreEDIndex ==11 )break ; pDevice->byBBPreEDIndex =11 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x01 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xA0 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -58\n" ); }else if (pDevice->byBBPreEDRSSI <=59 ) {//RSSI -59 if (pDevice->byBBPreEDIndex ==10 )break ; pDevice->byBBPreEDIndex =10 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x01 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x54 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -59\n" ); }else if (pDevice->byBBPreEDRSSI <=60 ) {//RSSI -60 if (pDevice->byBBPreEDIndex ==9 )break ; pDevice->byBBPreEDIndex =9 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x01 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x18 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -60\n" ); }else if (pDevice->byBBPreEDRSSI <=61 ) {//RSSI -61 if (pDevice->byBBPreEDIndex ==8 )break ; pDevice->byBBPreEDIndex =8 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xE3 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -61\n" ); }else if (pDevice->byBBPreEDRSSI <=62 ) {//RSSI -62 if (pDevice->byBBPreEDIndex ==7 )break ; pDevice->byBBPreEDIndex =7 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xB9 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -62\n" ); }else if (pDevice->byBBPreEDRSSI <=63 ) {//RSSI -63 if (pDevice->byBBPreEDIndex ==6 )break ; pDevice->byBBPreEDIndex =6 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x93 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -63\n" ); }else if (pDevice->byBBPreEDRSSI <=64 ) {//RSSI -64 if (pDevice->byBBPreEDIndex ==5 )break ; pDevice->byBBPreEDIndex =5 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x79 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -64\n" ); }else if (pDevice->byBBPreEDRSSI <=65 ) {//RSSI -65 if (pDevice->byBBPreEDIndex ==4 )break ; pDevice->byBBPreEDIndex =4 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x62 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -65\n" ); }else if (pDevice->byBBPreEDRSSI <=66 ) {//RSSI -66 if (pDevice->byBBPreEDIndex ==3 )break ; pDevice->byBBPreEDIndex =3 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x51 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -66\n" ); }else if (pDevice->byBBPreEDRSSI <=67 ) {//RSSI -67 if (pDevice->byBBPreEDIndex ==2 )break ; pDevice->byBBPreEDIndex =2 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x43 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -67\n" ); }else if (pDevice->byBBPreEDRSSI <=68 ) {//RSSI -68 if (pDevice->byBBPreEDIndex ==1 )break ; pDevice->byBBPreEDIndex =1 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x36 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -68\n" ); }else {//RSSI -69, -70,.... if (pDevice->byBBPreEDIndex ==0 )break ; pDevice->byBBPreEDIndex =0 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x30 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -69, -70,...\n" ); }break ;
@@ -1565,7 +1543,6 @@ void BBvUpdatePreEDThreshold(struct vnt_private *pDevice, int bScanning) pDevice->byBBPreEDIndex =0 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x24 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -69, -70,..\n" );break ; }
@@ -1574,139 +1551,116 @@ void BBvUpdatePreEDThreshold(struct vnt_private *pDevice, int bScanning) pDevice->byBBPreEDIndex =22 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0xFF );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI 0, -1,-2,..-41\n" ); }else if (pDevice->byBBPreEDRSSI <=42 ) {//RSSI -42 if (pDevice->byBBPreEDIndex ==21 )break ; pDevice->byBBPreEDIndex =21 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x36 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -42\n" ); }else if (pDevice->byBBPreEDRSSI <=43 ) {//RSSI -43 if (pDevice->byBBPreEDIndex ==20 )break ; pDevice->byBBPreEDIndex =20 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x26 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -43\n" ); }else if (pDevice->byBBPreEDRSSI <=45 ) {//RSSI -44, -45 if (pDevice->byBBPreEDIndex ==19 )break ; pDevice->byBBPreEDIndex =19 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x18 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -44,-45\n" ); }else if (pDevice->byBBPreEDRSSI <=47 ) {//RSSI -46, -47 if (pDevice->byBBPreEDIndex ==18 )break ; pDevice->byBBPreEDIndex =18 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x11 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -46,-47\n" ); }else if (pDevice->byBBPreEDRSSI <=49 ) {//RSSI -48, -49 if (pDevice->byBBPreEDIndex ==17 )break ; pDevice->byBBPreEDIndex =17 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x0a );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -48,-49\n" ); }else if (pDevice->byBBPreEDRSSI <=51 ) {//RSSI -50, -51 if (pDevice->byBBPreEDIndex ==16 )break ; pDevice->byBBPreEDIndex =16 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x07 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -50,-51\n" ); }else if (pDevice->byBBPreEDRSSI <=53 ) {//RSSI -52, -53 if (pDevice->byBBPreEDIndex ==15 )break ; pDevice->byBBPreEDIndex =15 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x04 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -52,-53\n" ); }else if (pDevice->byBBPreEDRSSI <=55 ) {//RSSI -54, -55 if (pDevice->byBBPreEDIndex ==14 )break ; pDevice->byBBPreEDIndex =14 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x02 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xC0 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -54,-55\n" ); }else if (pDevice->byBBPreEDRSSI <=56 ) {//RSSI -56 if (pDevice->byBBPreEDIndex ==13 )break ; pDevice->byBBPreEDIndex =13 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x02 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x30 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -56\n" ); }else if (pDevice->byBBPreEDRSSI <=57 ) {//RSSI -57 if (pDevice->byBBPreEDIndex ==12 )break ; pDevice->byBBPreEDIndex =12 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x01 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xB0 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -57\n" ); }else if (pDevice->byBBPreEDRSSI <=58 ) {//RSSI -58 if (pDevice->byBBPreEDIndex ==11 )break ; pDevice->byBBPreEDIndex =11 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x01 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x70 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -58\n" ); }else if (pDevice->byBBPreEDRSSI <=59 ) {//RSSI -59 if (pDevice->byBBPreEDIndex ==10 )break ; pDevice->byBBPreEDIndex =10 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x01 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x30 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -59\n" ); }else if (pDevice->byBBPreEDRSSI <=60 ) {//RSSI -60 if (pDevice->byBBPreEDIndex ==9 )break ; pDevice->byBBPreEDIndex =9 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xEA );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -60\n" ); }else if (pDevice->byBBPreEDRSSI <=61 ) {//RSSI -61 if (pDevice->byBBPreEDIndex ==8 )break ; pDevice->byBBPreEDIndex =8 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xC0 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -61\n" ); }else if (pDevice->byBBPreEDRSSI <=62 ) {//RSSI -62 if (pDevice->byBBPreEDIndex ==7 )break ; pDevice->byBBPreEDIndex =7 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x9C );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -62\n" ); }else if (pDevice->byBBPreEDRSSI <=63 ) {//RSSI -63 if (pDevice->byBBPreEDIndex ==6 )break ; pDevice->byBBPreEDIndex =6 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x80 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -63\n" ); }else if (pDevice->byBBPreEDRSSI <=64 ) {//RSSI -64 if (pDevice->byBBPreEDIndex ==5 )break ; pDevice->byBBPreEDIndex =5 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x68 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -64\n" ); }else if (pDevice->byBBPreEDRSSI <=65 ) {//RSSI -65 if (pDevice->byBBPreEDIndex ==4 )break ; pDevice->byBBPreEDIndex =4 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x52 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -65\n" ); }else if (pDevice->byBBPreEDRSSI <=66 ) {//RSSI -66 if (pDevice->byBBPreEDIndex ==3 )break ; pDevice->byBBPreEDIndex =3 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x43 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -66\n" ); }else if (pDevice->byBBPreEDRSSI <=67 ) {//RSSI -67 if (pDevice->byBBPreEDIndex ==2 )break ; pDevice->byBBPreEDIndex =2 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x36 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -67\n" ); }else if (pDevice->byBBPreEDRSSI <=68 ) {//RSSI -68 if (pDevice->byBBPreEDIndex ==1 )break ; pDevice->byBBPreEDIndex =1 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x2D );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -68\n" ); }else {//RSSI -69, -70, ... if (pDevice->byBBPreEDIndex ==0 )break ; pDevice->byBBPreEDIndex =0 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x24 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -69, -70,..\n" ); }break ;
@@ -1716,7 +1670,6 @@ void BBvUpdatePreEDThreshold(struct vnt_private *pDevice, int bScanning) pDevice->byBBPreEDIndex =0 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x38 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -67, -68,..\n" );break ; }
@@ -1725,131 +1678,113 @@ void BBvUpdatePreEDThreshold(struct vnt_private *pDevice, int bScanning) pDevice->byBBPreEDIndex =20 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0xFF );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI 0, -1,-2,..-41\n" ); }else if (pDevice->byBBPreEDRSSI <=42 ) {//RSSI -42 if (pDevice->byBBPreEDIndex ==19 )break ; pDevice->byBBPreEDIndex =19 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x36 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -42\n" ); }else if (pDevice->byBBPreEDRSSI <=43 ) {//RSSI -43 if (pDevice->byBBPreEDIndex ==18 )break ; pDevice->byBBPreEDIndex =18 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x26 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -43\n" ); }else if (pDevice->byBBPreEDRSSI <=45 ) {//RSSI -44, -45 if (pDevice->byBBPreEDIndex ==17 )break ; pDevice->byBBPreEDIndex =17 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x18 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -44,-45\n" ); }else if (pDevice->byBBPreEDRSSI <=47 ) {//RSSI -46, -47 if (pDevice->byBBPreEDIndex ==16 )break ; pDevice->byBBPreEDIndex =16 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x11 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -46,-47\n" ); }else if (pDevice->byBBPreEDRSSI <=49 ) {//RSSI -48, -49 if (pDevice->byBBPreEDIndex ==15 )break ; pDevice->byBBPreEDIndex =15 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x0a );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -48,-49\n" ); }else if (pDevice->byBBPreEDRSSI <=51 ) {//RSSI -50, -51 if (pDevice->byBBPreEDIndex ==14 )break ; pDevice->byBBPreEDIndex =14 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x07 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -50,-51\n" ); }else if (pDevice->byBBPreEDRSSI <=53 ) {//RSSI -52, -53 if (pDevice->byBBPreEDIndex ==13 )break ; pDevice->byBBPreEDIndex =13 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x04 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -52,-53\n" ); }else if (pDevice->byBBPreEDRSSI <=55 ) {//RSSI -54, -55 if (pDevice->byBBPreEDIndex ==12 )break ; pDevice->byBBPreEDIndex =12 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x02 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xC0 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -54,-55\n" ); }else if (pDevice->byBBPreEDRSSI <=56 ) {//RSSI -56 if (pDevice->byBBPreEDIndex ==11 )break ; pDevice->byBBPreEDIndex =11 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x02 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x30 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -56\n" ); }else if (pDevice->byBBPreEDRSSI <=57 ) {//RSSI -57 if (pDevice->byBBPreEDIndex ==10 )break ; pDevice->byBBPreEDIndex =10 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x01 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xB0 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -57\n" ); }else if (pDevice->byBBPreEDRSSI <=58 ) {//RSSI -58 if (pDevice->byBBPreEDIndex ==9 )break ; pDevice->byBBPreEDIndex =9 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x01 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x70 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -58\n" ); }else if (pDevice->byBBPreEDRSSI <=59 ) {//RSSI -59 if (pDevice->byBBPreEDIndex ==8 )break ; pDevice->byBBPreEDIndex =8 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x01 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x30 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -59\n" ); }else if (pDevice->byBBPreEDRSSI <=60 ) {//RSSI -60 if (pDevice->byBBPreEDIndex ==7 )break ; pDevice->byBBPreEDIndex =7 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xEA );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -60\n" ); }else if (pDevice->byBBPreEDRSSI <=61 ) {//RSSI -61 if (pDevice->byBBPreEDIndex ==6 )break ; pDevice->byBBPreEDIndex =6 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xC0 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -61\n" ); }else if (pDevice->byBBPreEDRSSI <=62 ) {//RSSI -62 if (pDevice->byBBPreEDIndex ==5 )break ; pDevice->byBBPreEDIndex =5 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x9C );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -62\n" ); }else if (pDevice->byBBPreEDRSSI <=63 ) {//RSSI -63 if (pDevice->byBBPreEDIndex ==4 )break ; pDevice->byBBPreEDIndex =4 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x80 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -63\n" ); }else if (pDevice->byBBPreEDRSSI <=64 ) {//RSSI -64 if (pDevice->byBBPreEDIndex ==3 )break ; pDevice->byBBPreEDIndex =3 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x68 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -64\n" ); }else if (pDevice->byBBPreEDRSSI <=65 ) {//RSSI -65 if (pDevice->byBBPreEDIndex ==2 )break ; pDevice->byBBPreEDIndex =2 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x52 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -65\n" ); }else if (pDevice->byBBPreEDRSSI <=66 ) {//RSSI -66 if (pDevice->byBBPreEDIndex ==1 )break ; pDevice->byBBPreEDIndex =1 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x43 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -66\n" ); }else {//RSSI -67, -68, ... if (pDevice->byBBPreEDIndex ==0 )break ; pDevice->byBBPreEDIndex =0 ;ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x38 );//CR206(0xCE) -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO " pDevice->byBBPreEDRSSI -67, -68,..\n" ); }break ; } +dev_dbg (&pDevice->usb->dev,"%s byBBPreEDRSSI %d\n" , + __func__, pDevice->byBBPreEDRSSI); + }
Signature · 1 line
1.9.1
PATCH 18/20 staging: vt6656: BBvUpdatePreEDThreshold reorganize ControlvWriteByte.
In reply to Malcolm PriestleyCreate variables cr_201 and cr 206 with values for registers 0xc9 and 0xce.
Set both to zero .
If cr201 and cr206 are zero drop out.
write both out with ControlvWriteByte.
pDevice->byBBPreEDIndex breaks will be dealt with in next patch
--- drivers/staging/vt6656/baseband.c | 225 +++++++++++++++----------------------- 1 file changed, 89 insertions(+), 136 deletions(-)
drivers/staging/vt6656/baseband.c +89 -136
@@ -1410,6 +1410,7 @@ void TimerSQ3Tmax3CallBack(struct vnt_private *pDevice)void BBvUpdatePreEDThreshold (struct vnt_private *pDevice,int bScanning) { +u8 cr_201 =0x0 , cr_206 =0x0 ;switch (pDevice->byRFType) {
@@ -1421,116 +1422,99 @@ void BBvUpdatePreEDThreshold(struct vnt_private *pDevice, int bScanning)if ( bScanning ) {// need Max sensitivity //RSSI -69, -70,.... pDevice->byBBPreEDIndex =0 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x30 );//CR206(0xCE) + cr_206 =0x30 ;break ; }if (pDevice->byBBPreEDRSSI <=45 ) {// RSSI 0, -1,-2,....-45 if (pDevice->byBBPreEDIndex ==20 )break ; pDevice->byBBPreEDIndex =20 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0xFF );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0xff ; }else if (pDevice->byBBPreEDRSSI <=46 ) {//RSSI -46 if (pDevice->byBBPreEDIndex ==19 )break ; pDevice->byBBPreEDIndex =19 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x1A );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0x1a ; }else if (pDevice->byBBPreEDRSSI <=47 ) {//RSSI -47 if (pDevice->byBBPreEDIndex ==18 )break ; pDevice->byBBPreEDIndex =18 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x15 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0x15 ; }else if (pDevice->byBBPreEDRSSI <=49 ) {//RSSI -48, -49 if (pDevice->byBBPreEDIndex ==17 )break ; pDevice->byBBPreEDIndex =17 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x0E );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0xe ; }else if (pDevice->byBBPreEDRSSI <=51 ) {//RSSI -50, -51 if (pDevice->byBBPreEDIndex ==16 )break ; pDevice->byBBPreEDIndex =16 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x09 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0x9 ; }else if (pDevice->byBBPreEDRSSI <=53 ) {//RSSI -52, -53 if (pDevice->byBBPreEDIndex ==15 )break ; pDevice->byBBPreEDIndex =15 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x06 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0x6 ; }else if (pDevice->byBBPreEDRSSI <=55 ) {//RSSI -54, -55 if (pDevice->byBBPreEDIndex ==14 )break ; pDevice->byBBPreEDIndex =14 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x03 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0x3 ; }else if (pDevice->byBBPreEDRSSI <=56 ) {//RSSI -56 if (pDevice->byBBPreEDIndex ==13 )break ; pDevice->byBBPreEDIndex =13 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x02 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xA0 );//CR206(0xCE) + cr_201 =0x2 ; + cr_206 =0xa0 ; }else if (pDevice->byBBPreEDRSSI <=57 ) {//RSSI -57 if (pDevice->byBBPreEDIndex ==12 )break ; pDevice->byBBPreEDIndex =12 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x02 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x20 );//CR206(0xCE) + cr_201 =0x2 ; + cr_206 =0x20 ; }else if (pDevice->byBBPreEDRSSI <=58 ) {//RSSI -58 if (pDevice->byBBPreEDIndex ==11 )break ; pDevice->byBBPreEDIndex =11 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x01 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xA0 );//CR206(0xCE) + cr_201 =0x1 ; + cr_206 =0xa0 ; }else if (pDevice->byBBPreEDRSSI <=59 ) {//RSSI -59 if (pDevice->byBBPreEDIndex ==10 )break ; pDevice->byBBPreEDIndex =10 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x01 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x54 );//CR206(0xCE) + cr_201 =0x1 ; + cr_206 =0x54 ; }else if (pDevice->byBBPreEDRSSI <=60 ) {//RSSI -60 if (pDevice->byBBPreEDIndex ==9 )break ; pDevice->byBBPreEDIndex =9 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x01 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x18 );//CR206(0xCE) + cr_201 =0x1 ; + cr_206 =0x18 ; }else if (pDevice->byBBPreEDRSSI <=61 ) {//RSSI -61 if (pDevice->byBBPreEDIndex ==8 )break ; pDevice->byBBPreEDIndex =8 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xE3 );//CR206(0xCE) + cr_206 =0xe3 ; }else if (pDevice->byBBPreEDRSSI <=62 ) {//RSSI -62 if (pDevice->byBBPreEDIndex ==7 )break ; pDevice->byBBPreEDIndex =7 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xB9 );//CR206(0xCE) + cr_206 =0xb9 ; }else if (pDevice->byBBPreEDRSSI <=63 ) {//RSSI -63 if (pDevice->byBBPreEDIndex ==6 )break ; pDevice->byBBPreEDIndex =6 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x93 );//CR206(0xCE) + cr_206 =0x93 ; }else if (pDevice->byBBPreEDRSSI <=64 ) {//RSSI -64 if (pDevice->byBBPreEDIndex ==5 )break ; pDevice->byBBPreEDIndex =5 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x79 );//CR206(0xCE) + cr_206 =0x79 ; }else if (pDevice->byBBPreEDRSSI <=65 ) {//RSSI -65 if (pDevice->byBBPreEDIndex ==4 )break ; pDevice->byBBPreEDIndex =4 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x62 );//CR206(0xCE) + cr_206 =0x62 ; }else if (pDevice->byBBPreEDRSSI <=66 ) {//RSSI -66 if (pDevice->byBBPreEDIndex ==3 )break ; pDevice->byBBPreEDIndex =3 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x51 );//CR206(0xCE) + cr_206 =0x51 ; }else if (pDevice->byBBPreEDRSSI <=67 ) {//RSSI -67 if (pDevice->byBBPreEDIndex ==2 )break ; pDevice->byBBPreEDIndex =2 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x43 );//CR206(0xCE) + cr_206 =0x43 ; }else if (pDevice->byBBPreEDRSSI <=68 ) {//RSSI -68 if (pDevice->byBBPreEDIndex ==1 )break ; pDevice->byBBPreEDIndex =1 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x36 );//CR206(0xCE) + cr_206 =0x36 ; }else {//RSSI -69, -70,.... if (pDevice->byBBPreEDIndex ==0 )break ; pDevice->byBBPreEDIndex =0 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x30 );//CR206(0xCE) + cr_206 =0x30 ; }break ;
@@ -1541,126 +1525,107 @@ void BBvUpdatePreEDThreshold(struct vnt_private *pDevice, int bScanning)if ( bScanning ) {// need Max sensitivity //RSSI -69, -70, ... pDevice->byBBPreEDIndex =0 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x24 );//CR206(0xCE) + cr_206 =0x24 ;break ; }if (pDevice->byBBPreEDRSSI <=41 ) {// RSSI 0, -1,-2,....-41 if (pDevice->byBBPreEDIndex ==22 )break ; pDevice->byBBPreEDIndex =22 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0xFF );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0xff ; }else if (pDevice->byBBPreEDRSSI <=42 ) {//RSSI -42 if (pDevice->byBBPreEDIndex ==21 )break ; pDevice->byBBPreEDIndex =21 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x36 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0x36 ; }else if (pDevice->byBBPreEDRSSI <=43 ) {//RSSI -43 if (pDevice->byBBPreEDIndex ==20 )break ; pDevice->byBBPreEDIndex =20 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x26 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0x26 ; }else if (pDevice->byBBPreEDRSSI <=45 ) {//RSSI -44, -45 if (pDevice->byBBPreEDIndex ==19 )break ; pDevice->byBBPreEDIndex =19 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x18 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0x18 ; }else if (pDevice->byBBPreEDRSSI <=47 ) {//RSSI -46, -47 if (pDevice->byBBPreEDIndex ==18 )break ; pDevice->byBBPreEDIndex =18 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x11 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0x11 ; }else if (pDevice->byBBPreEDRSSI <=49 ) {//RSSI -48, -49 if (pDevice->byBBPreEDIndex ==17 )break ; pDevice->byBBPreEDIndex =17 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x0a );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0xa ; }else if (pDevice->byBBPreEDRSSI <=51 ) {//RSSI -50, -51 if (pDevice->byBBPreEDIndex ==16 )break ; pDevice->byBBPreEDIndex =16 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x07 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0x7 ; }else if (pDevice->byBBPreEDRSSI <=53 ) {//RSSI -52, -53 if (pDevice->byBBPreEDIndex ==15 )break ; pDevice->byBBPreEDIndex =15 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x04 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0x4 ; }else if (pDevice->byBBPreEDRSSI <=55 ) {//RSSI -54, -55 if (pDevice->byBBPreEDIndex ==14 )break ; pDevice->byBBPreEDIndex =14 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x02 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xC0 );//CR206(0xCE) + cr_201 =0x2 ; + cr_206 =0xc0 ; }else if (pDevice->byBBPreEDRSSI <=56 ) {//RSSI -56 if (pDevice->byBBPreEDIndex ==13 )break ; pDevice->byBBPreEDIndex =13 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x02 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x30 );//CR206(0xCE) + cr_201 =0x2 ; + cr_206 =0x30 ; }else if (pDevice->byBBPreEDRSSI <=57 ) {//RSSI -57 if (pDevice->byBBPreEDIndex ==12 )break ; pDevice->byBBPreEDIndex =12 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x01 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xB0 );//CR206(0xCE) + cr_201 =0x1 ; + cr_206 =0xb0 ; }else if (pDevice->byBBPreEDRSSI <=58 ) {//RSSI -58 if (pDevice->byBBPreEDIndex ==11 )break ; pDevice->byBBPreEDIndex =11 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x01 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x70 );//CR206(0xCE) + cr_201 =0x1 ; + cr_206 =0x70 ; }else if (pDevice->byBBPreEDRSSI <=59 ) {//RSSI -59 if (pDevice->byBBPreEDIndex ==10 )break ; pDevice->byBBPreEDIndex =10 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x01 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x30 );//CR206(0xCE) + cr_201 =0x1 ; + cr_206 =0x30 ; }else if (pDevice->byBBPreEDRSSI <=60 ) {//RSSI -60 if (pDevice->byBBPreEDIndex ==9 )break ; pDevice->byBBPreEDIndex =9 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xEA );//CR206(0xCE) + cr_206 =0xea ; }else if (pDevice->byBBPreEDRSSI <=61 ) {//RSSI -61 if (pDevice->byBBPreEDIndex ==8 )break ; pDevice->byBBPreEDIndex =8 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xC0 );//CR206(0xCE) + cr_206 =0xc0 ; }else if (pDevice->byBBPreEDRSSI <=62 ) {//RSSI -62 if (pDevice->byBBPreEDIndex ==7 )break ; pDevice->byBBPreEDIndex =7 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x9C );//CR206(0xCE) + cr_206 =0x9c ; }else if (pDevice->byBBPreEDRSSI <=63 ) {//RSSI -63 if (pDevice->byBBPreEDIndex ==6 )break ; pDevice->byBBPreEDIndex =6 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x80 );//CR206(0xCE) + cr_206 =0x80 ; }else if (pDevice->byBBPreEDRSSI <=64 ) {//RSSI -64 if (pDevice->byBBPreEDIndex ==5 )break ; pDevice->byBBPreEDIndex =5 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x68 );//CR206(0xCE) + cr_206 =0x68 ; }else if (pDevice->byBBPreEDRSSI <=65 ) {//RSSI -65 if (pDevice->byBBPreEDIndex ==4 )break ; pDevice->byBBPreEDIndex =4 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x52 );//CR206(0xCE) + cr_206 =0x52 ; }else if (pDevice->byBBPreEDRSSI <=66 ) {//RSSI -66 if (pDevice->byBBPreEDIndex ==3 )break ; pDevice->byBBPreEDIndex =3 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x43 );//CR206(0xCE) + cr_206 =0x43 ; }else if (pDevice->byBBPreEDRSSI <=67 ) {//RSSI -67 if (pDevice->byBBPreEDIndex ==2 )break ; pDevice->byBBPreEDIndex =2 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x36 );//CR206(0xCE) + cr_206 =0x36 ; }else if (pDevice->byBBPreEDRSSI <=68 ) {//RSSI -68 if (pDevice->byBBPreEDIndex ==1 )break ; pDevice->byBBPreEDIndex =1 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x2D );//CR206(0xCE) + cr_206 =0x2d ; }else {//RSSI -69, -70, ... if (pDevice->byBBPreEDIndex ==0 )break ; pDevice->byBBPreEDIndex =0 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x24 );//CR206(0xCE) + cr_206 =0x24 ; }break ;
@@ -1668,116 +1633,99 @@ void BBvUpdatePreEDThreshold(struct vnt_private *pDevice, int bScanning)if ( bScanning ) {// need Max sensitivity //RSSI -67, -68, ... pDevice->byBBPreEDIndex =0 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x38 );//CR206(0xCE) + cr_206 =0x38 ;break ; }if (pDevice->byBBPreEDRSSI <=41 ) {// RSSI 0, -1,-2,....-41 if (pDevice->byBBPreEDIndex ==20 )break ; pDevice->byBBPreEDIndex =20 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0xFF );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0xff ; }else if (pDevice->byBBPreEDRSSI <=42 ) {//RSSI -42 if (pDevice->byBBPreEDIndex ==19 )break ; pDevice->byBBPreEDIndex =19 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x36 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0x36 ; }else if (pDevice->byBBPreEDRSSI <=43 ) {//RSSI -43 if (pDevice->byBBPreEDIndex ==18 )break ; pDevice->byBBPreEDIndex =18 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x26 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0x26 ; }else if (pDevice->byBBPreEDRSSI <=45 ) {//RSSI -44, -45 if (pDevice->byBBPreEDIndex ==17 )break ; pDevice->byBBPreEDIndex =17 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x18 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0x18 ; }else if (pDevice->byBBPreEDRSSI <=47 ) {//RSSI -46, -47 if (pDevice->byBBPreEDIndex ==16 )break ; pDevice->byBBPreEDIndex =16 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x11 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0x11 ; }else if (pDevice->byBBPreEDRSSI <=49 ) {//RSSI -48, -49 if (pDevice->byBBPreEDIndex ==15 )break ; pDevice->byBBPreEDIndex =15 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x0a );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0xa ; }else if (pDevice->byBBPreEDRSSI <=51 ) {//RSSI -50, -51 if (pDevice->byBBPreEDIndex ==14 )break ; pDevice->byBBPreEDIndex =14 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x07 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0x7 ; }else if (pDevice->byBBPreEDRSSI <=53 ) {//RSSI -52, -53 if (pDevice->byBBPreEDIndex ==13 )break ; pDevice->byBBPreEDIndex =13 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x04 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x00 );//CR206(0xCE) + cr_201 =0x4 ; }else if (pDevice->byBBPreEDRSSI <=55 ) {//RSSI -54, -55 if (pDevice->byBBPreEDIndex ==12 )break ; pDevice->byBBPreEDIndex =12 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x02 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xC0 );//CR206(0xCE) + cr_201 =0x2 ; + cr_206 =0xc0 ; }else if (pDevice->byBBPreEDRSSI <=56 ) {//RSSI -56 if (pDevice->byBBPreEDIndex ==11 )break ; pDevice->byBBPreEDIndex =11 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x02 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x30 );//CR206(0xCE) + cr_201 =0x2 ; + cr_206 =0x30 ; }else if (pDevice->byBBPreEDRSSI <=57 ) {//RSSI -57 if (pDevice->byBBPreEDIndex ==10 )break ; pDevice->byBBPreEDIndex =10 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x01 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xB0 );//CR206(0xCE) + cr_201 =0x1 ; + cr_206 =0xb0 ; }else if (pDevice->byBBPreEDRSSI <=58 ) {//RSSI -58 if (pDevice->byBBPreEDIndex ==9 )break ; pDevice->byBBPreEDIndex =9 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x01 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x70 );//CR206(0xCE) + cr_201 =0x1 ; + cr_206 =0x70 ; }else if (pDevice->byBBPreEDRSSI <=59 ) {//RSSI -59 if (pDevice->byBBPreEDIndex ==8 )break ; pDevice->byBBPreEDIndex =8 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x01 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x30 );//CR206(0xCE) + cr_201 =0x1 ; + cr_206 =0x30 ; }else if (pDevice->byBBPreEDRSSI <=60 ) {//RSSI -60 if (pDevice->byBBPreEDIndex ==7 )break ; pDevice->byBBPreEDIndex =7 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xEA );//CR206(0xCE) + cr_206 =0xea ; }else if (pDevice->byBBPreEDRSSI <=61 ) {//RSSI -61 if (pDevice->byBBPreEDIndex ==6 )break ; pDevice->byBBPreEDIndex =6 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0xC0 );//CR206(0xCE) + cr_206 =0xc0 ; }else if (pDevice->byBBPreEDRSSI <=62 ) {//RSSI -62 if (pDevice->byBBPreEDIndex ==5 )break ; pDevice->byBBPreEDIndex =5 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x9C );//CR206(0xCE) + cr_206 =0x9c ; }else if (pDevice->byBBPreEDRSSI <=63 ) {//RSSI -63 if (pDevice->byBBPreEDIndex ==4 )break ; pDevice->byBBPreEDIndex =4 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x80 );//CR206(0xCE) + cr_206 =0x80 ; }else if (pDevice->byBBPreEDRSSI <=64 ) {//RSSI -64 if (pDevice->byBBPreEDIndex ==3 )break ; pDevice->byBBPreEDIndex =3 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x68 );//CR206(0xCE) + cr_206 =0x68 ; }else if (pDevice->byBBPreEDRSSI <=65 ) {//RSSI -65 if (pDevice->byBBPreEDIndex ==2 )break ; pDevice->byBBPreEDIndex =2 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x52 );//CR206(0xCE) + cr_206 =0x52 ; }else if (pDevice->byBBPreEDRSSI <=66 ) {//RSSI -66 if (pDevice->byBBPreEDIndex ==1 )break ; pDevice->byBBPreEDIndex =1 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x43 );//CR206(0xCE) + cr_206 =0x43 ; }else {//RSSI -67, -68, ... if (pDevice->byBBPreEDIndex ==0 )break ; pDevice->byBBPreEDIndex =0 ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xC9 ,0x00 );//CR201(0xC9) -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xCE ,0x38 );//CR206(0xCE) + cr_206 =0x38 ; }break ;
@@ -1786,5 +1734,10 @@ void BBvUpdatePreEDThreshold(struct vnt_private *pDevice, int bScanning)dev_dbg (&pDevice->usb->dev,"%s byBBPreEDRSSI %d\n" , __func__, pDevice->byBBPreEDRSSI); +if (!cr_201 && !cr_206) +return ; + +ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xc9 , cr_201); +ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xce , cr_206); }
Signature · 1 line
1.9.1
PATCH 19/20 staging: vt6656: BBvUpdatePreEDThreshold change byBBPreEDIndex
In reply to Malcolm Priestleyassign pDevice->byBBPreEDIndex to ed_idx and change ed_inx value in switch.
If ed_inx == byBBPreEDIndex and not bScanning return out.
--- drivers/staging/vt6656/baseband.c | 207 ++++++++++++++------------------------ 1 file changed, 74 insertions(+), 133 deletions(-)
drivers/staging/vt6656/baseband.c +74 -133
@@ -1411,6 +1411,7 @@ void TimerSQ3Tmax3CallBack(struct vnt_private *pDevice)void BBvUpdatePreEDThreshold (struct vnt_private *pDevice,int bScanning) {u8 cr_201 =0x0 , cr_206 =0x0 ; +u8 ed_inx = pDevice->byBBPreEDIndex;switch (pDevice->byRFType) {
@@ -1421,99 +1422,78 @@ void BBvUpdatePreEDThreshold(struct vnt_private *pDevice, int bScanning)if ( bScanning ) {// need Max sensitivity //RSSI -69, -70,.... - pDevice->byBBPreEDIndex =0 ; + ed_inx =0 ; cr_206 =0x30 ;break ; }if (pDevice->byBBPreEDRSSI <=45 ) {// RSSI 0, -1,-2,....-45 -if (pDevice->byBBPreEDIndex ==20 )break ; - pDevice->byBBPreEDIndex =20 ; + ed_inx =20 ; cr_201 =0xff ; }else if (pDevice->byBBPreEDRSSI <=46 ) {//RSSI -46 -if (pDevice->byBBPreEDIndex ==19 )break ; - pDevice->byBBPreEDIndex =19 ; + ed_inx =19 ; cr_201 =0x1a ; }else if (pDevice->byBBPreEDRSSI <=47 ) {//RSSI -47 -if (pDevice->byBBPreEDIndex ==18 )break ; - pDevice->byBBPreEDIndex =18 ; + ed_inx =18 ; cr_201 =0x15 ; }else if (pDevice->byBBPreEDRSSI <=49 ) {//RSSI -48, -49 -if (pDevice->byBBPreEDIndex ==17 )break ; - pDevice->byBBPreEDIndex =17 ; + ed_inx =17 ; cr_201 =0xe ; }else if (pDevice->byBBPreEDRSSI <=51 ) {//RSSI -50, -51 -if (pDevice->byBBPreEDIndex ==16 )break ; - pDevice->byBBPreEDIndex =16 ; + ed_inx =16 ; cr_201 =0x9 ; }else if (pDevice->byBBPreEDRSSI <=53 ) {//RSSI -52, -53 -if (pDevice->byBBPreEDIndex ==15 )break ; - pDevice->byBBPreEDIndex =15 ; + ed_inx =15 ; cr_201 =0x6 ; }else if (pDevice->byBBPreEDRSSI <=55 ) {//RSSI -54, -55 -if (pDevice->byBBPreEDIndex ==14 )break ; - pDevice->byBBPreEDIndex =14 ; + ed_inx =14 ; cr_201 =0x3 ; }else if (pDevice->byBBPreEDRSSI <=56 ) {//RSSI -56 -if (pDevice->byBBPreEDIndex ==13 )break ; - pDevice->byBBPreEDIndex =13 ; + ed_inx =13 ; cr_201 =0x2 ; cr_206 =0xa0 ; }else if (pDevice->byBBPreEDRSSI <=57 ) {//RSSI -57 -if (pDevice->byBBPreEDIndex ==12 )break ; - pDevice->byBBPreEDIndex =12 ; + ed_inx =12 ; cr_201 =0x2 ; cr_206 =0x20 ; }else if (pDevice->byBBPreEDRSSI <=58 ) {//RSSI -58 -if (pDevice->byBBPreEDIndex ==11 )break ; - pDevice->byBBPreEDIndex =11 ; + ed_inx =11 ; cr_201 =0x1 ; cr_206 =0xa0 ; }else if (pDevice->byBBPreEDRSSI <=59 ) {//RSSI -59 -if (pDevice->byBBPreEDIndex ==10 )break ; - pDevice->byBBPreEDIndex =10 ; + ed_inx =10 ; cr_201 =0x1 ; cr_206 =0x54 ; }else if (pDevice->byBBPreEDRSSI <=60 ) {//RSSI -60 -if (pDevice->byBBPreEDIndex ==9 )break ; - pDevice->byBBPreEDIndex =9 ; + ed_inx =9 ; cr_201 =0x1 ; cr_206 =0x18 ; }else if (pDevice->byBBPreEDRSSI <=61 ) {//RSSI -61 -if (pDevice->byBBPreEDIndex ==8 )break ; - pDevice->byBBPreEDIndex =8 ; + ed_inx =8 ; cr_206 =0xe3 ; }else if (pDevice->byBBPreEDRSSI <=62 ) {//RSSI -62 -if (pDevice->byBBPreEDIndex ==7 )break ; - pDevice->byBBPreEDIndex =7 ; + ed_inx =7 ; cr_206 =0xb9 ; }else if (pDevice->byBBPreEDRSSI <=63 ) {//RSSI -63 -if (pDevice->byBBPreEDIndex ==6 )break ; - pDevice->byBBPreEDIndex =6 ; + ed_inx =6 ; cr_206 =0x93 ; }else if (pDevice->byBBPreEDRSSI <=64 ) {//RSSI -64 -if (pDevice->byBBPreEDIndex ==5 )break ; - pDevice->byBBPreEDIndex =5 ; + ed_inx =5 ; cr_206 =0x79 ; }else if (pDevice->byBBPreEDRSSI <=65 ) {//RSSI -65 -if (pDevice->byBBPreEDIndex ==4 )break ; - pDevice->byBBPreEDIndex =4 ; + ed_inx =4 ; cr_206 =0x62 ; }else if (pDevice->byBBPreEDRSSI <=66 ) {//RSSI -66 -if (pDevice->byBBPreEDIndex ==3 )break ; - pDevice->byBBPreEDIndex =3 ; + ed_inx =3 ; cr_206 =0x51 ; }else if (pDevice->byBBPreEDRSSI <=67 ) {//RSSI -67 -if (pDevice->byBBPreEDIndex ==2 )break ; - pDevice->byBBPreEDIndex =2 ; + ed_inx =2 ; cr_206 =0x43 ; }else if (pDevice->byBBPreEDRSSI <=68 ) {//RSSI -68 -if (pDevice->byBBPreEDIndex ==1 )break ; - pDevice->byBBPreEDIndex =1 ; + ed_inx =1 ; cr_206 =0x36 ; }else {//RSSI -69, -70,.... -if (pDevice->byBBPreEDIndex ==0 )break ; - pDevice->byBBPreEDIndex =0 ; + ed_inx =0 ; cr_206 =0x30 ; }break ;
@@ -1524,107 +1504,84 @@ void BBvUpdatePreEDThreshold(struct vnt_private *pDevice, int bScanning)if ( bScanning ) {// need Max sensitivity //RSSI -69, -70, ... - pDevice->byBBPreEDIndex =0 ; + ed_inx =0 ; cr_206 =0x24 ;break ; }if (pDevice->byBBPreEDRSSI <=41 ) {// RSSI 0, -1,-2,....-41 -if (pDevice->byBBPreEDIndex ==22 )break ; - pDevice->byBBPreEDIndex =22 ; + ed_inx =22 ; cr_201 =0xff ; }else if (pDevice->byBBPreEDRSSI <=42 ) {//RSSI -42 -if (pDevice->byBBPreEDIndex ==21 )break ; - pDevice->byBBPreEDIndex =21 ; + ed_inx =21 ; cr_201 =0x36 ; }else if (pDevice->byBBPreEDRSSI <=43 ) {//RSSI -43 -if (pDevice->byBBPreEDIndex ==20 )break ; - pDevice->byBBPreEDIndex =20 ; + ed_inx =20 ; cr_201 =0x26 ; }else if (pDevice->byBBPreEDRSSI <=45 ) {//RSSI -44, -45 -if (pDevice->byBBPreEDIndex ==19 )break ; - pDevice->byBBPreEDIndex =19 ; + ed_inx =19 ; cr_201 =0x18 ; }else if (pDevice->byBBPreEDRSSI <=47 ) {//RSSI -46, -47 -if (pDevice->byBBPreEDIndex ==18 )break ; - pDevice->byBBPreEDIndex =18 ; + ed_inx =18 ; cr_201 =0x11 ; }else if (pDevice->byBBPreEDRSSI <=49 ) {//RSSI -48, -49 -if (pDevice->byBBPreEDIndex ==17 )break ; - pDevice->byBBPreEDIndex =17 ; + ed_inx =17 ; cr_201 =0xa ; }else if (pDevice->byBBPreEDRSSI <=51 ) {//RSSI -50, -51 -if (pDevice->byBBPreEDIndex ==16 )break ; - pDevice->byBBPreEDIndex =16 ; + ed_inx =16 ; cr_201 =0x7 ; }else if (pDevice->byBBPreEDRSSI <=53 ) {//RSSI -52, -53 -if (pDevice->byBBPreEDIndex ==15 )break ; - pDevice->byBBPreEDIndex =15 ; + ed_inx =15 ; cr_201 =0x4 ; }else if (pDevice->byBBPreEDRSSI <=55 ) {//RSSI -54, -55 -if (pDevice->byBBPreEDIndex ==14 )break ; - pDevice->byBBPreEDIndex =14 ; + ed_inx =14 ; cr_201 =0x2 ; cr_206 =0xc0 ; }else if (pDevice->byBBPreEDRSSI <=56 ) {//RSSI -56 -if (pDevice->byBBPreEDIndex ==13 )break ; - pDevice->byBBPreEDIndex =13 ; + ed_inx =13 ; cr_201 =0x2 ; cr_206 =0x30 ; }else if (pDevice->byBBPreEDRSSI <=57 ) {//RSSI -57 -if (pDevice->byBBPreEDIndex ==12 )break ; - pDevice->byBBPreEDIndex =12 ; + ed_inx =12 ; cr_201 =0x1 ; cr_206 =0xb0 ; }else if (pDevice->byBBPreEDRSSI <=58 ) {//RSSI -58 -if (pDevice->byBBPreEDIndex ==11 )break ; - pDevice->byBBPreEDIndex =11 ; + ed_inx =11 ; cr_201 =0x1 ; cr_206 =0x70 ; }else if (pDevice->byBBPreEDRSSI <=59 ) {//RSSI -59 -if (pDevice->byBBPreEDIndex ==10 )break ; - pDevice->byBBPreEDIndex =10 ; + ed_inx =10 ; cr_201 =0x1 ; cr_206 =0x30 ; }else if (pDevice->byBBPreEDRSSI <=60 ) {//RSSI -60 -if (pDevice->byBBPreEDIndex ==9 )break ; - pDevice->byBBPreEDIndex =9 ; + ed_inx =9 ; cr_206 =0xea ; }else if (pDevice->byBBPreEDRSSI <=61 ) {//RSSI -61 -if (pDevice->byBBPreEDIndex ==8 )break ; - pDevice->byBBPreEDIndex =8 ; + ed_inx =8 ; cr_206 =0xc0 ; }else if (pDevice->byBBPreEDRSSI <=62 ) {//RSSI -62 -if (pDevice->byBBPreEDIndex ==7 )break ; - pDevice->byBBPreEDIndex =7 ; + ed_inx =7 ; cr_206 =0x9c ; }else if (pDevice->byBBPreEDRSSI <=63 ) {//RSSI -63 -if (pDevice->byBBPreEDIndex ==6 )break ; - pDevice->byBBPreEDIndex =6 ; + ed_inx =6 ; cr_206 =0x80 ; }else if (pDevice->byBBPreEDRSSI <=64 ) {//RSSI -64 -if (pDevice->byBBPreEDIndex ==5 )break ; - pDevice->byBBPreEDIndex =5 ; + ed_inx =5 ; cr_206 =0x68 ; }else if (pDevice->byBBPreEDRSSI <=65 ) {//RSSI -65 -if (pDevice->byBBPreEDIndex ==4 )break ; - pDevice->byBBPreEDIndex =4 ; + ed_inx =4 ; cr_206 =0x52 ; }else if (pDevice->byBBPreEDRSSI <=66 ) {//RSSI -66 -if (pDevice->byBBPreEDIndex ==3 )break ; - pDevice->byBBPreEDIndex =3 ; + ed_inx =3 ; cr_206 =0x43 ; }else if (pDevice->byBBPreEDRSSI <=67 ) {//RSSI -67 -if (pDevice->byBBPreEDIndex ==2 )break ; - pDevice->byBBPreEDIndex =2 ; + ed_inx =2 ; cr_206 =0x36 ; }else if (pDevice->byBBPreEDRSSI <=68 ) {//RSSI -68 -if (pDevice->byBBPreEDIndex ==1 )break ; - pDevice->byBBPreEDIndex =1 ; + ed_inx =1 ; cr_206 =0x2d ; }else {//RSSI -69, -70, ... -if (pDevice->byBBPreEDIndex ==0 )break ; - pDevice->byBBPreEDIndex =0 ; + ed_inx =0 ; cr_206 =0x24 ; }break ;
@@ -1632,105 +1589,89 @@ void BBvUpdatePreEDThreshold(struct vnt_private *pDevice, int bScanning)case RF_VT3342A0 ://RobertYu:20060627, testing table if ( bScanning ) {// need Max sensitivity //RSSI -67, -68, ... - pDevice->byBBPreEDIndex =0 ; + ed_inx =0 ; cr_206 =0x38 ;break ; }if (pDevice->byBBPreEDRSSI <=41 ) {// RSSI 0, -1,-2,....-41 -if (pDevice->byBBPreEDIndex ==20 )break ; - pDevice->byBBPreEDIndex =20 ; + ed_inx =20 ; cr_201 =0xff ; }else if (pDevice->byBBPreEDRSSI <=42 ) {//RSSI -42 -if (pDevice->byBBPreEDIndex ==19 )break ; - pDevice->byBBPreEDIndex =19 ; + ed_inx =19 ; cr_201 =0x36 ; }else if (pDevice->byBBPreEDRSSI <=43 ) {//RSSI -43 -if (pDevice->byBBPreEDIndex ==18 )break ; - pDevice->byBBPreEDIndex =18 ; + ed_inx =18 ; cr_201 =0x26 ; }else if (pDevice->byBBPreEDRSSI <=45 ) {//RSSI -44, -45 -if (pDevice->byBBPreEDIndex ==17 )break ; - pDevice->byBBPreEDIndex =17 ; + ed_inx =17 ; cr_201 =0x18 ; }else if (pDevice->byBBPreEDRSSI <=47 ) {//RSSI -46, -47 -if (pDevice->byBBPreEDIndex ==16 )break ; - pDevice->byBBPreEDIndex =16 ; + ed_inx =16 ; cr_201 =0x11 ; }else if (pDevice->byBBPreEDRSSI <=49 ) {//RSSI -48, -49 -if (pDevice->byBBPreEDIndex ==15 )break ; - pDevice->byBBPreEDIndex =15 ; + ed_inx =15 ; cr_201 =0xa ; }else if (pDevice->byBBPreEDRSSI <=51 ) {//RSSI -50, -51 -if (pDevice->byBBPreEDIndex ==14 )break ; - pDevice->byBBPreEDIndex =14 ; + ed_inx =14 ; cr_201 =0x7 ; }else if (pDevice->byBBPreEDRSSI <=53 ) {//RSSI -52, -53 -if (pDevice->byBBPreEDIndex ==13 )break ; - pDevice->byBBPreEDIndex =13 ; + ed_inx =13 ; cr_201 =0x4 ; }else if (pDevice->byBBPreEDRSSI <=55 ) {//RSSI -54, -55 -if (pDevice->byBBPreEDIndex ==12 )break ; - pDevice->byBBPreEDIndex =12 ; + ed_inx =12 ; cr_201 =0x2 ; cr_206 =0xc0 ; }else if (pDevice->byBBPreEDRSSI <=56 ) {//RSSI -56 -if (pDevice->byBBPreEDIndex ==11 )break ; - pDevice->byBBPreEDIndex =11 ; + ed_inx =11 ; cr_201 =0x2 ; cr_206 =0x30 ; }else if (pDevice->byBBPreEDRSSI <=57 ) {//RSSI -57 -if (pDevice->byBBPreEDIndex ==10 )break ; - pDevice->byBBPreEDIndex =10 ; + ed_inx =10 ; cr_201 =0x1 ; cr_206 =0xb0 ; }else if (pDevice->byBBPreEDRSSI <=58 ) {//RSSI -58 -if (pDevice->byBBPreEDIndex ==9 )break ; - pDevice->byBBPreEDIndex =9 ; + ed_inx =9 ; cr_201 =0x1 ; cr_206 =0x70 ; }else if (pDevice->byBBPreEDRSSI <=59 ) {//RSSI -59 -if (pDevice->byBBPreEDIndex ==8 )break ; - pDevice->byBBPreEDIndex =8 ; + ed_inx =8 ; cr_201 =0x1 ; cr_206 =0x30 ; }else if (pDevice->byBBPreEDRSSI <=60 ) {//RSSI -60 -if (pDevice->byBBPreEDIndex ==7 )break ; - pDevice->byBBPreEDIndex =7 ; + ed_inx =7 ; cr_206 =0xea ; }else if (pDevice->byBBPreEDRSSI <=61 ) {//RSSI -61 -if (pDevice->byBBPreEDIndex ==6 )break ; - pDevice->byBBPreEDIndex =6 ; + ed_inx =6 ; cr_206 =0xc0 ; }else if (pDevice->byBBPreEDRSSI <=62 ) {//RSSI -62 -if (pDevice->byBBPreEDIndex ==5 )break ; - pDevice->byBBPreEDIndex =5 ; + ed_inx =5 ; cr_206 =0x9c ; }else if (pDevice->byBBPreEDRSSI <=63 ) {//RSSI -63 -if (pDevice->byBBPreEDIndex ==4 )break ; - pDevice->byBBPreEDIndex =4 ; + ed_inx =4 ; cr_206 =0x80 ; }else if (pDevice->byBBPreEDRSSI <=64 ) {//RSSI -64 -if (pDevice->byBBPreEDIndex ==3 )break ; - pDevice->byBBPreEDIndex =3 ; + ed_inx =3 ; cr_206 =0x68 ; }else if (pDevice->byBBPreEDRSSI <=65 ) {//RSSI -65 -if (pDevice->byBBPreEDIndex ==2 )break ; - pDevice->byBBPreEDIndex =2 ; + ed_inx =2 ; cr_206 =0x52 ; }else if (pDevice->byBBPreEDRSSI <=66 ) {//RSSI -66 -if (pDevice->byBBPreEDIndex ==1 )break ; - pDevice->byBBPreEDIndex =1 ; + ed_inx =1 ; cr_206 =0x43 ; }else {//RSSI -67, -68, ... -if (pDevice->byBBPreEDIndex ==0 )break ; - pDevice->byBBPreEDIndex =0 ; + ed_inx =0 ; cr_206 =0x38 ; }break ; } +if (ed_inx == pDevice->byBBPreEDIndex && !bScanning) +return ; + + pDevice->byBBPreEDIndex = ed_inx; +dev_dbg (&pDevice->usb->dev,"%s byBBPreEDRSSI %d\n" , __func__, pDevice->byBBPreEDRSSI);
Signature · 1 line
1.9.1
PATCH 20/20 staging: vt6656: clean up BBvUpdatePreEDThreshold
In reply to Malcolm PriestleyCamel case changes
pDevice -> priv
bScanning -> scanning
White space cleanup
--- drivers/staging/vt6656/baseband.c | 504 +++++++++++++++++++------------------- drivers/staging/vt6656/baseband.h | 2 +- 2 files changed, 249 insertions(+), 257 deletions(-)
drivers/staging/vt6656/baseband.c +248 -256
@@ -1408,277 +1408,269 @@ void TimerSQ3Tmax3CallBack(struct vnt_private *pDevice)spin_unlock_irq (&pDevice->lock); } -void BBvUpdatePreEDThreshold (struct vnt_private *pDevice,int bScanning) +void BBvUpdatePreEDThreshold (struct vnt_private *priv,int scanning) {u8 cr_201 =0x0 , cr_206 =0x0 ; -u8 ed_inx = pDevice->byBBPreEDIndex; - -switch (pDevice->byRFType) - { -case RF_AL2230 : -case RF_AL2230S : -case RF_AIROHA7230 : -//RobertYu:20060627, update new table - -if ( bScanning ) - {// need Max sensitivity //RSSI -69, -70,.... - ed_inx =0 ; - cr_206 =0x30 ; -break ; - } +u8 ed_inx = priv->byBBPreEDIndex; + +switch (priv->byRFType) { +case RF_AL2230 : +case RF_AL2230S : +case RF_AIROHA7230 : +if (scanning) {/* Max sensitivity */ + ed_inx =0 ; + cr_206 =0x30 ; +break ; + } -if (pDevice->byBBPreEDRSSI <=45 ) {// RSSI 0, -1,-2,....-45 - ed_inx =20 ; - cr_201 =0xff ; - }else if (pDevice->byBBPreEDRSSI <=46 ) {//RSSI -46 - ed_inx =19 ; - cr_201 =0x1a ; - }else if (pDevice->byBBPreEDRSSI <=47 ) {//RSSI -47 - ed_inx =18 ; - cr_201 =0x15 ; - }else if (pDevice->byBBPreEDRSSI <=49 ) {//RSSI -48, -49 - ed_inx =17 ; - cr_201 =0xe ; - }else if (pDevice->byBBPreEDRSSI <=51 ) {//RSSI -50, -51 - ed_inx =16 ; - cr_201 =0x9 ; - }else if (pDevice->byBBPreEDRSSI <=53 ) {//RSSI -52, -53 - ed_inx =15 ; - cr_201 =0x6 ; - }else if (pDevice->byBBPreEDRSSI <=55 ) {//RSSI -54, -55 - ed_inx =14 ; - cr_201 =0x3 ; - }else if (pDevice->byBBPreEDRSSI <=56 ) {//RSSI -56 - ed_inx =13 ; - cr_201 =0x2 ; - cr_206 =0xa0 ; - }else if (pDevice->byBBPreEDRSSI <=57 ) {//RSSI -57 - ed_inx =12 ; - cr_201 =0x2 ; - cr_206 =0x20 ; - }else if (pDevice->byBBPreEDRSSI <=58 ) {//RSSI -58 - ed_inx =11 ; - cr_201 =0x1 ; - cr_206 =0xa0 ; - }else if (pDevice->byBBPreEDRSSI <=59 ) {//RSSI -59 - ed_inx =10 ; - cr_201 =0x1 ; - cr_206 =0x54 ; - }else if (pDevice->byBBPreEDRSSI <=60 ) {//RSSI -60 - ed_inx =9 ; - cr_201 =0x1 ; - cr_206 =0x18 ; - }else if (pDevice->byBBPreEDRSSI <=61 ) {//RSSI -61 - ed_inx =8 ; - cr_206 =0xe3 ; - }else if (pDevice->byBBPreEDRSSI <=62 ) {//RSSI -62 - ed_inx =7 ; - cr_206 =0xb9 ; - }else if (pDevice->byBBPreEDRSSI <=63 ) {//RSSI -63 - ed_inx =6 ; - cr_206 =0x93 ; - }else if (pDevice->byBBPreEDRSSI <=64 ) {//RSSI -64 - ed_inx =5 ; - cr_206 =0x79 ; - }else if (pDevice->byBBPreEDRSSI <=65 ) {//RSSI -65 - ed_inx =4 ; - cr_206 =0x62 ; - }else if (pDevice->byBBPreEDRSSI <=66 ) {//RSSI -66 - ed_inx =3 ; - cr_206 =0x51 ; - }else if (pDevice->byBBPreEDRSSI <=67 ) {//RSSI -67 - ed_inx =2 ; - cr_206 =0x43 ; - }else if (pDevice->byBBPreEDRSSI <=68 ) {//RSSI -68 - ed_inx =1 ; - cr_206 =0x36 ; - }else {//RSSI -69, -70,.... - ed_inx =0 ; - cr_206 =0x30 ; - } -break ; +if (priv->byBBPreEDRSSI <=45 ) { + ed_inx =20 ; + cr_201 =0xff ; + }else if (priv->byBBPreEDRSSI <=46 ) { + ed_inx =19 ; + cr_201 =0x1a ; + }else if (priv->byBBPreEDRSSI <=47 ) { + ed_inx =18 ; + cr_201 =0x15 ; + }else if (priv->byBBPreEDRSSI <=49 ) { + ed_inx =17 ; + cr_201 =0xe ; + }else if (priv->byBBPreEDRSSI <=51 ) { + ed_inx =16 ; + cr_201 =0x9 ; + }else if (priv->byBBPreEDRSSI <=53 ) { + ed_inx =15 ; + cr_201 =0x6 ; + }else if (priv->byBBPreEDRSSI <=55 ) { + ed_inx =14 ; + cr_201 =0x3 ; + }else if (priv->byBBPreEDRSSI <=56 ) { + ed_inx =13 ; + cr_201 =0x2 ; + cr_206 =0xa0 ; + }else if (priv->byBBPreEDRSSI <=57 ) { + ed_inx =12 ; + cr_201 =0x2 ; + cr_206 =0x20 ; + }else if (priv->byBBPreEDRSSI <=58 ) { + ed_inx =11 ; + cr_201 =0x1 ; + cr_206 =0xa0 ; + }else if (priv->byBBPreEDRSSI <=59 ) { + ed_inx =10 ; + cr_201 =0x1 ; + cr_206 =0x54 ; + }else if (priv->byBBPreEDRSSI <=60 ) { + ed_inx =9 ; + cr_201 =0x1 ; + cr_206 =0x18 ; + }else if (priv->byBBPreEDRSSI <=61 ) { + ed_inx =8 ; + cr_206 =0xe3 ; + }else if (priv->byBBPreEDRSSI <=62 ) { + ed_inx =7 ; + cr_206 =0xb9 ; + }else if (priv->byBBPreEDRSSI <=63 ) { + ed_inx =6 ; + cr_206 =0x93 ; + }else if (priv->byBBPreEDRSSI <=64 ) { + ed_inx =5 ; + cr_206 =0x79 ; + }else if (priv->byBBPreEDRSSI <=65 ) { + ed_inx =4 ; + cr_206 =0x62 ; + }else if (priv->byBBPreEDRSSI <=66 ) { + ed_inx =3 ; + cr_206 =0x51 ; + }else if (priv->byBBPreEDRSSI <=67 ) { + ed_inx =2 ; + cr_206 =0x43 ; + }else if (priv->byBBPreEDRSSI <=68 ) { + ed_inx =1 ; + cr_206 =0x36 ; + }else { + ed_inx =0 ; + cr_206 =0x30 ; + } +break ; -case RF_VT3226 : -case RF_VT3226D0 : -//RobertYu:20060627, update new table +case RF_VT3226 : +case RF_VT3226D0 : +if (scanning) {/* Max sensitivity */ + ed_inx =0 ; + cr_206 =0x24 ; +break ; + } -if ( bScanning ) - {// need Max sensitivity //RSSI -69, -70, ... - ed_inx =0 ; - cr_206 =0x24 ; -break ; - } +if (priv->byBBPreEDRSSI <=41 ) { + ed_inx =22 ; + cr_201 =0xff ; + }else if (priv->byBBPreEDRSSI <=42 ) { + ed_inx =21 ; + cr_201 =0x36 ; + }else if (priv->byBBPreEDRSSI <=43 ) { + ed_inx =20 ; + cr_201 =0x26 ; + }else if (priv->byBBPreEDRSSI <=45 ) { + ed_inx =19 ; + cr_201 =0x18 ; + }else if (priv->byBBPreEDRSSI <=47 ) { + ed_inx =18 ; + cr_201 =0x11 ; + }else if (priv->byBBPreEDRSSI <=49 ) { + ed_inx =17 ; + cr_201 =0xa ; + }else if (priv->byBBPreEDRSSI <=51 ) { + ed_inx =16 ; + cr_201 =0x7 ; + }else if (priv->byBBPreEDRSSI <=53 ) { + ed_inx =15 ; + cr_201 =0x4 ; + }else if (priv->byBBPreEDRSSI <=55 ) { + ed_inx =14 ; + cr_201 =0x2 ; + cr_206 =0xc0 ; + }else if (priv->byBBPreEDRSSI <=56 ) { + ed_inx =13 ; + cr_201 =0x2 ; + cr_206 =0x30 ; + }else if (priv->byBBPreEDRSSI <=57 ) { + ed_inx =12 ; + cr_201 =0x1 ; + cr_206 =0xb0 ; + }else if (priv->byBBPreEDRSSI <=58 ) { + ed_inx =11 ; + cr_201 =0x1 ; + cr_206 =0x70 ; + }else if (priv->byBBPreEDRSSI <=59 ) { + ed_inx =10 ; + cr_201 =0x1 ; + cr_206 =0x30 ; + }else if (priv->byBBPreEDRSSI <=60 ) { + ed_inx =9 ; + cr_206 =0xea ; + }else if (priv->byBBPreEDRSSI <=61 ) { + ed_inx =8 ; + cr_206 =0xc0 ; + }else if (priv->byBBPreEDRSSI <=62 ) { + ed_inx =7 ; + cr_206 =0x9c ; + }else if (priv->byBBPreEDRSSI <=63 ) { + ed_inx =6 ; + cr_206 =0x80 ; + }else if (priv->byBBPreEDRSSI <=64 ) { + ed_inx =5 ; + cr_206 =0x68 ; + }else if (priv->byBBPreEDRSSI <=65 ) { + ed_inx =4 ; + cr_206 =0x52 ; + }else if (priv->byBBPreEDRSSI <=66 ) { + ed_inx =3 ; + cr_206 =0x43 ; + }else if (priv->byBBPreEDRSSI <=67 ) { + ed_inx =2 ; + cr_206 =0x36 ; + }else if (priv->byBBPreEDRSSI <=68 ) { + ed_inx =1 ; + cr_206 =0x2d ; + }else { + ed_inx =0 ; + cr_206 =0x24 ; + } +break ; -if (pDevice->byBBPreEDRSSI <=41 ) {// RSSI 0, -1,-2,....-41 - ed_inx =22 ; - cr_201 =0xff ; - }else if (pDevice->byBBPreEDRSSI <=42 ) {//RSSI -42 - ed_inx =21 ; - cr_201 =0x36 ; - }else if (pDevice->byBBPreEDRSSI <=43 ) {//RSSI -43 - ed_inx =20 ; - cr_201 =0x26 ; - }else if (pDevice->byBBPreEDRSSI <=45 ) {//RSSI -44, -45 - ed_inx =19 ; - cr_201 =0x18 ; - }else if (pDevice->byBBPreEDRSSI <=47 ) {//RSSI -46, -47 - ed_inx =18 ; - cr_201 =0x11 ; - }else if (pDevice->byBBPreEDRSSI <=49 ) {//RSSI -48, -49 - ed_inx =17 ; - cr_201 =0xa ; - }else if (pDevice->byBBPreEDRSSI <=51 ) {//RSSI -50, -51 - ed_inx =16 ; - cr_201 =0x7 ; - }else if (pDevice->byBBPreEDRSSI <=53 ) {//RSSI -52, -53 - ed_inx =15 ; - cr_201 =0x4 ; - }else if (pDevice->byBBPreEDRSSI <=55 ) {//RSSI -54, -55 - ed_inx =14 ; - cr_201 =0x2 ; - cr_206 =0xc0 ; - }else if (pDevice->byBBPreEDRSSI <=56 ) {//RSSI -56 - ed_inx =13 ; - cr_201 =0x2 ; - cr_206 =0x30 ; - }else if (pDevice->byBBPreEDRSSI <=57 ) {//RSSI -57 - ed_inx =12 ; - cr_201 =0x1 ; - cr_206 =0xb0 ; - }else if (pDevice->byBBPreEDRSSI <=58 ) {//RSSI -58 - ed_inx =11 ; - cr_201 =0x1 ; - cr_206 =0x70 ; - }else if (pDevice->byBBPreEDRSSI <=59 ) {//RSSI -59 - ed_inx =10 ; - cr_201 =0x1 ; - cr_206 =0x30 ; - }else if (pDevice->byBBPreEDRSSI <=60 ) {//RSSI -60 - ed_inx =9 ; - cr_206 =0xea ; - }else if (pDevice->byBBPreEDRSSI <=61 ) {//RSSI -61 - ed_inx =8 ; - cr_206 =0xc0 ; - }else if (pDevice->byBBPreEDRSSI <=62 ) {//RSSI -62 - ed_inx =7 ; - cr_206 =0x9c ; - }else if (pDevice->byBBPreEDRSSI <=63 ) {//RSSI -63 - ed_inx =6 ; - cr_206 =0x80 ; - }else if (pDevice->byBBPreEDRSSI <=64 ) {//RSSI -64 - ed_inx =5 ; - cr_206 =0x68 ; - }else if (pDevice->byBBPreEDRSSI <=65 ) {//RSSI -65 - ed_inx =4 ; - cr_206 =0x52 ; - }else if (pDevice->byBBPreEDRSSI <=66 ) {//RSSI -66 - ed_inx =3 ; - cr_206 =0x43 ; - }else if (pDevice->byBBPreEDRSSI <=67 ) {//RSSI -67 - ed_inx =2 ; - cr_206 =0x36 ; - }else if (pDevice->byBBPreEDRSSI <=68 ) {//RSSI -68 - ed_inx =1 ; - cr_206 =0x2d ; - }else {//RSSI -69, -70, ... - ed_inx =0 ; - cr_206 =0x24 ; - } -break ; - -case RF_VT3342A0 ://RobertYu:20060627, testing table -if ( bScanning ) - {// need Max sensitivity //RSSI -67, -68, ... - ed_inx =0 ; - cr_206 =0x38 ; -break ; - } +case RF_VT3342A0 : +if (scanning) {/* need Max sensitivity */ + ed_inx =0 ; + cr_206 =0x38 ; +break ; + } -if (pDevice->byBBPreEDRSSI <=41 ) {// RSSI 0, -1,-2,....-41 - ed_inx =20 ; - cr_201 =0xff ; - }else if (pDevice->byBBPreEDRSSI <=42 ) {//RSSI -42 - ed_inx =19 ; - cr_201 =0x36 ; - }else if (pDevice->byBBPreEDRSSI <=43 ) {//RSSI -43 - ed_inx =18 ; - cr_201 =0x26 ; - }else if (pDevice->byBBPreEDRSSI <=45 ) {//RSSI -44, -45 - ed_inx =17 ; - cr_201 =0x18 ; - }else if (pDevice->byBBPreEDRSSI <=47 ) {//RSSI -46, -47 - ed_inx =16 ; - cr_201 =0x11 ; - }else if (pDevice->byBBPreEDRSSI <=49 ) {//RSSI -48, -49 - ed_inx =15 ; - cr_201 =0xa ; - }else if (pDevice->byBBPreEDRSSI <=51 ) {//RSSI -50, -51 - ed_inx =14 ; - cr_201 =0x7 ; - }else if (pDevice->byBBPreEDRSSI <=53 ) {//RSSI -52, -53 - ed_inx =13 ; - cr_201 =0x4 ; - }else if (pDevice->byBBPreEDRSSI <=55 ) {//RSSI -54, -55 - ed_inx =12 ; - cr_201 =0x2 ; - cr_206 =0xc0 ; - }else if (pDevice->byBBPreEDRSSI <=56 ) {//RSSI -56 - ed_inx =11 ; - cr_201 =0x2 ; - cr_206 =0x30 ; - }else if (pDevice->byBBPreEDRSSI <=57 ) {//RSSI -57 - ed_inx =10 ; - cr_201 =0x1 ; - cr_206 =0xb0 ; - }else if (pDevice->byBBPreEDRSSI <=58 ) {//RSSI -58 - ed_inx =9 ; - cr_201 =0x1 ; - cr_206 =0x70 ; - }else if (pDevice->byBBPreEDRSSI <=59 ) {//RSSI -59 - ed_inx =8 ; - cr_201 =0x1 ; - cr_206 =0x30 ; - }else if (pDevice->byBBPreEDRSSI <=60 ) {//RSSI -60 - ed_inx =7 ; - cr_206 =0xea ; - }else if (pDevice->byBBPreEDRSSI <=61 ) {//RSSI -61 - ed_inx =6 ; - cr_206 =0xc0 ; - }else if (pDevice->byBBPreEDRSSI <=62 ) {//RSSI -62 - ed_inx =5 ; - cr_206 =0x9c ; - }else if (pDevice->byBBPreEDRSSI <=63 ) {//RSSI -63 - ed_inx =4 ; - cr_206 =0x80 ; - }else if (pDevice->byBBPreEDRSSI <=64 ) {//RSSI -64 - ed_inx =3 ; - cr_206 =0x68 ; - }else if (pDevice->byBBPreEDRSSI <=65 ) {//RSSI -65 - ed_inx =2 ; - cr_206 =0x52 ; - }else if (pDevice->byBBPreEDRSSI <=66 ) {//RSSI -66 - ed_inx =1 ; - cr_206 =0x43 ; - }else {//RSSI -67, -68, ... - ed_inx =0 ; - cr_206 =0x38 ; - } -break ; +if (priv->byBBPreEDRSSI <=41 ) { + ed_inx =20 ; + cr_201 =0xff ; + }else if (priv->byBBPreEDRSSI <=42 ) { + ed_inx =19 ; + cr_201 =0x36 ; + }else if (priv->byBBPreEDRSSI <=43 ) { + ed_inx =18 ; + cr_201 =0x26 ; + }else if (priv->byBBPreEDRSSI <=45 ) { + ed_inx =17 ; + cr_201 =0x18 ; + }else if (priv->byBBPreEDRSSI <=47 ) { + ed_inx =16 ; + cr_201 =0x11 ; + }else if (priv->byBBPreEDRSSI <=49 ) { + ed_inx =15 ; + cr_201 =0xa ; + }else if (priv->byBBPreEDRSSI <=51 ) { + ed_inx =14 ; + cr_201 =0x7 ; + }else if (priv->byBBPreEDRSSI <=53 ) { + ed_inx =13 ; + cr_201 =0x4 ; + }else if (priv->byBBPreEDRSSI <=55 ) { + ed_inx =12 ; + cr_201 =0x2 ; + cr_206 =0xc0 ; + }else if (priv->byBBPreEDRSSI <=56 ) { + ed_inx =11 ; + cr_201 =0x2 ; + cr_206 =0x30 ; + }else if (priv->byBBPreEDRSSI <=57 ) { + ed_inx =10 ; + cr_201 =0x1 ; + cr_206 =0xb0 ; + }else if (priv->byBBPreEDRSSI <=58 ) { + ed_inx =9 ; + cr_201 =0x1 ; + cr_206 =0x70 ; + }else if (priv->byBBPreEDRSSI <=59 ) { + ed_inx =8 ; + cr_201 =0x1 ; + cr_206 =0x30 ; + }else if (priv->byBBPreEDRSSI <=60 ) { + ed_inx =7 ; + cr_206 =0xea ; + }else if (priv->byBBPreEDRSSI <=61 ) { + ed_inx =6 ; + cr_206 =0xc0 ; + }else if (priv->byBBPreEDRSSI <=62 ) { + ed_inx =5 ; + cr_206 =0x9c ; + }else if (priv->byBBPreEDRSSI <=63 ) { + ed_inx =4 ; + cr_206 =0x80 ; + }else if (priv->byBBPreEDRSSI <=64 ) { + ed_inx =3 ; + cr_206 =0x68 ; + }else if (priv->byBBPreEDRSSI <=65 ) { + ed_inx =2 ; + cr_206 =0x52 ; + }else if (priv->byBBPreEDRSSI <=66 ) { + ed_inx =1 ; + cr_206 =0x43 ; + }else { + ed_inx =0 ; + cr_206 =0x38 ; + } +break ; - } + } -if (ed_inx == pDevice->byBBPreEDIndex && !bScanning) +if (ed_inx == priv->byBBPreEDIndex && !scanning)return ; - pDevice->byBBPreEDIndex = ed_inx; + priv->byBBPreEDIndex = ed_inx; -dev_dbg (&pDevice->usb->dev,"%s byBBPreEDRSSI %d\n" , - __func__, pDevice->byBBPreEDRSSI); +dev_dbg (&priv->usb->dev,"%s byBBPreEDRSSI %d\n" , + __func__, priv->byBBPreEDRSSI);if (!cr_201 && !cr_206)return ; -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xc9 , cr_201); -ControlvWriteByte (pDevice,MESSAGE_REQUEST_BBREG ,0xce , cr_206); +ControlvWriteByte (priv,MESSAGE_REQUEST_BBREG ,0xc9 , cr_201); +ControlvWriteByte (priv,MESSAGE_REQUEST_BBREG ,0xce , cr_206); }
drivers/staging/vt6656/baseband.h +1 -1
@@ -107,6 +107,6 @@ void BBvSetAntennaMode(struct vnt_private *, u8 byAntennaMode);int BBbVT3184Init (struct vnt_private *);void BBvSetDeepSleep (struct vnt_private *);void BBvExitDeepSleep (struct vnt_private *); -void BBvUpdatePreEDThreshold (struct vnt_private *,int bScanning); +void BBvUpdatePreEDThreshold (struct vnt_private *,int scanning);#endif /* __BASEBAND_H__ */
Signature · 1 line
1.9.1