Staging: rt{286,287,307}0: various fixes/cleanups
cover Staging: rt{286,287,307}0: various fixes/cleanups
Hi,
Some fixes, some cleanups and a lot of preparations for finally merging rt{28,30}70 drivers together.
Tested with RT2860 (Asus Eee 901) and RT3070 (el cheapo USB dongle that I've bought recently to speed up the development, I'm posting this mail using it right now) chipsets.
PS I tried using rt2800usb driver found in 2.6.31-rc6 (with overdue fix for memory corruption in rf cache from Pavel Roskin) for RT3070 chipset but it doesn't seem to work yet (iwlist wlan0 scan => no stations)..
diffstat:
drivers/staging/rt2860/ap.h | 453 --- drivers/staging/rt2860/common/action.c | 11 drivers/staging/rt2860/common/ba_action.c | 15 drivers/staging/rt2860/common/cmm_data.c | 162 - drivers/staging/rt2860/common/cmm_sanity.c | 184 - drivers/staging/rt2860/common/cmm_wpa.c | 794 ------ drivers/staging/rt2860/common/eeprom.c | 32 drivers/staging/rt2860/common/mlme.c | 307 -- drivers/staging/rt2860/common/rtmp_init.c | 227 - drivers/staging/rt2860/common/spectrum.c | 5 drivers/staging/rt2860/dfs.h | 12 drivers/staging/rt2860/link_list.h | 134 - drivers/staging/rt2860/oid.h | 163 - drivers/staging/rt2860/rt28xx.h | 22 drivers/staging/rt2860/rt_config.h | 4 drivers/staging/rt2860/rt_linux.c | 9 drivers/staging/rt2860/rt_linux.h | 83 drivers/staging/rt2860/rt_main_dev.c | 40 drivers/staging/rt2860/rt_profile.c | 11 drivers/staging/rt2860/rtmp.h | 682 ----- drivers/staging/rt2860/rtmp_ckipmic.h | 35 drivers/staging/rt2860/rtmp_def.h | 14 drivers/staging/rt2860/sta/assoc.c | 6 drivers/staging/rt2860/sta/connect.c | 11 drivers/staging/rt2860/sta/rtmp_data.c | 10 drivers/staging/rt2860/sta/sync.c | 2 drivers/staging/rt2860/sta_ioctl.c | 2984 ------------------------- drivers/staging/rt2860/wpa.h | 2 drivers/staging/rt2870/2870_main_dev.c | 255 +- drivers/staging/rt2870/common/2870_rtmp_init.c | 58 drivers/staging/rt2870/common/rtusb_io.c | 33 drivers/staging/rt2870/link_list.h | 1 drivers/staging/rt2870/rt2870.h | 194 - drivers/staging/rt3070/link_list.h | 1 34 files changed, 252 insertions(+), 6704 deletions(-)
PATCH 1/22 Staging: rt2870: duplicated code is executed twice in AsicEvaluateRxAnt()
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt2870: duplicated code is executed twice in AsicEvaluateRxAnt()
Fix it.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/common/mlme.c | 20 -------------------- 1 file changed, 20 deletions(-)
drivers/staging/rt2860/common/mlme.c +0 -20
@@ -8433,26 +8433,6 @@ VOID AsicEvaluateRxAnt(#ifdef RT2860 pAd->StaCfg.BBPR3 =BBPR3 ;#endif -#ifdef RT2870 -if (OPSTATUS_TEST_FLAG (pAd, fOP_STATUS_MEDIA_STATE_CONNECTED) - ) - { -ULONG TxTotalCnt = pAd->RalinkCounters.OneSecTxNoRetryOkCount + - pAd->RalinkCounters.OneSecTxRetryOkCount + - pAd->RalinkCounters.OneSecTxFailCount; - -if (TxTotalCnt >50 ) - { -RTMPSetTimer (&pAd->Mlme.RxAntEvalTimer,20 ); - pAd->Mlme.bLowThroughput = FALSE; - } -else - { -RTMPSetTimer (&pAd->Mlme.RxAntEvalTimer,300 ); - pAd->Mlme.bLowThroughput = TRUE; - } - } -#endif #endif /* RT30xx */ #ifdef RT30xx if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS |
PATCH 2/22 Staging: rt3070: fix build warnings
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt3070: fix build warnings
In file included from drivers/staging/rt3070/common/../../rt2870/common/cmm_data.c:2,
from drivers/staging/rt3070/common/cmm_data.c:2:
drivers/staging/rt3070/common/../../rt2870/common/../../rt2860/common/cmm_data.c: In function ‘RTMP_FillTxBlkInfo’:drivers/staging/rt3070/common/../../rt2870/common/../../rt2860/common/cmm_data.c:1018: warning: label ‘FillTxBlkErr’ defined but not used
In file included from drivers/staging/rt3070/common/../../rt2870/common/eeprom.c:2,
from drivers/staging/rt3070/common/eeprom.c:2:
drivers/staging/rt3070/common/../../rt2870/common/../../rt2860/common/eeprom.c: In function ‘set_eFuseLoadFromBin_Proc’:drivers/staging/rt3070/common/../../rt2870/common/../../rt2860/common/eeprom.c:1041: warning: unused variable ‘orgfsgid’ drivers/staging/rt3070/common/../../rt2870/common/../../rt2860/common/eeprom.c:1041: warning: unused variable ‘orgfsuid’
In file included from drivers/staging/rt3070/../rt2870/rt_profile.c:2,
from drivers/staging/rt3070/rt_profile.c:2:
drivers/staging/rt3070/../rt2870/../rt2860/rt_profile.c: In function ‘RTMPReadParametersHook’:drivers/staging/rt3070/../rt2870/../rt2860/rt_profile.c:863: warning: unused variable ‘orgfsgid’ drivers/staging/rt3070/../rt2870/../rt2860/rt_profile.c:863: warning: unused variable ‘orgfsuid’
In file included from drivers/staging/rt3070/common/rtusb_io.c:2:drivers/staging/rt3070/common/../../rt2870/common/rtusb_io.c: In function ‘CMDHandler’:drivers/staging/rt3070/common/../../rt2870/common/rtusb_io.c:1763: warning: ‘CipherAlg’ may be used uninitialized in this function drivers/staging/rt3070/common/../../rt2870/common/rtusb_io.c:1758: note: ‘CipherAlg’ was declared here drivers/staging/rt3070/common/../../rt2870/common/rtusb_io.c:1763: warning: ‘KeyIdx’ may be used uninitialized in this function drivers/staging/rt3070/common/../../rt2870/common/rtusb_io.c:1757: note: ‘KeyIdx’ was declared here drivers/staging/rt3070/common/../../rt2870/common/rtusb_io.c:1763: warning: ‘ApIdx’ may be used uninitialized in this function drivers/staging/rt3070/common/../../rt2870/common/rtusb_io.c:1759: note: ‘ApIdx’ was declared here
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/common/cmm_data.c | 5 ----- drivers/staging/rt2860/common/eeprom.c | 14 +++----------- drivers/staging/rt2860/rt_profile.c | 11 +---------- drivers/staging/rt2870/common/rtusb_io.c | 6 +++--- 4 files changed, 7 insertions(+), 29 deletions(-)
drivers/staging/rt2860/common/cmm_data.c +0 -5
@@ -1013,11 +1013,6 @@ BOOLEAN RTMP_FillTxBlkInfo( }return TRUE; - -#ifdef RT30xx -FillTxBlkErr: -return FALSE; -#endif }
drivers/staging/rt2860/common/eeprom.c +3 -11
@@ -1038,7 +1038,7 @@ INT set_eFuseLoadFromBin_Proc( {CHAR *src;struct file *srcf; -INT retval, orgfsuid, orgfsgid; +INT retval;mm_segment_t orgfs;UCHAR *buffer;UCHAR BinFileSize=0 ;
@@ -1078,12 +1078,7 @@ INT set_eFuseLoadFromBin_Proc(kfree (buffer);return FALSE; } -/* Don't change to uid 0, let the file be opened as the "normal" user */ -#if 0 - orgfsuid = current->fsuid; - orgfsgid = current->fsgid; - current->fsuid=current->fsgid =0 ; -#endif + orgfs =get_fs ();set_fs (KERNEL_DS );
@@ -1146,10 +1141,7 @@ INT set_eFuseLoadFromBin_Proc(DBGPRINT (RT_DEBUG_TRACE , ("--> Error %d closing %s\n" , -retval, src)); }set_fs (orgfs); -#if 0 - current->fsuid = orgfsuid; - current->fsgid = orgfsgid; -#endif +for (j=0 ;j<i;j++) {DBGPRINT (RT_DEBUG_TRACE , ("%02X " ,buffer[j]));
drivers/staging/rt2860/rt_profile.c +1 -10
@@ -860,7 +860,7 @@ NDIS_STATUS RTMPReadParametersHook( {PUCHAR src =NULL ;struct file *srcf; -INT retval, orgfsuid, orgfsgid; +INT retval;mm_segment_t orgfs;CHAR *buffer;CHAR *tmpbuf;
@@ -884,15 +884,6 @@ NDIS_STATUS RTMPReadParametersHook( src =STA_PROFILE_PATH ; -// Save uid and gid used for filesystem access. -// Set user and group to 0 (root) -#ifndef RT30xx - orgfsuid =current_fsuid (); - orgfsgid =current_fsgid (); -/* Hm, can't really do this nicely anymore, so rely on these files -* being set to the proper permission to read them... */ -/* current->cred->fsuid = current->cred->fsgid = 0; */ -#endif orgfs =get_fs ();set_fs (KERNEL_DS );
drivers/staging/rt2870/common/rtusb_io.c +3 -3
@@ -1754,9 +1754,9 @@ VOID CMDHandler(case RT_CMD_SET_RX_WCID_TABLE ://General call for RTMPAddWcidAttributeEntry() {PMAC_TABLE_ENTRY pEntry; -UCHAR KeyIdx; -UCHAR CipherAlg; -UCHAR ApIdx; +UCHAR KeyIdx =0 ; +UCHAR CipherAlg =0 ; +UCHAR ApIdx =0 ; pEntry = (PMAC_TABLE_ENTRY )(pData);
PATCH 3/22 Staging: rtxxx0: remove support for older wireless extensions
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: remove support for older wireless extensions
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/sta/assoc.c | 6 ---- drivers/staging/rt2860/sta_ioctl.c | 55 ------------------------------------- 2 files changed, 61 deletions(-)
drivers/staging/rt2860/sta/assoc.c +0 -6
@@ -455,9 +455,7 @@ VOID MlmeAssocReqAction( }#ifdef RT30xx -#ifdef SIOCSIWGENIE if (pAd->StaCfg.WpaSupplicantUP != 1) -#endif // SIOCSIWGENIE // #endif RTMPMakeRSNIE (pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus,BSS0 );
@@ -486,7 +484,6 @@ VOID MlmeAssocReqAction( }#ifdef RT30xx -#ifdef SIOCSIWGENIEif (pAd->StaCfg.WpaSupplicantUP ==1 ) { MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp,
@@ -495,7 +492,6 @@ VOID MlmeAssocReqAction( } else#endif -#endif { MakeOutgoingFrame(pOutBuffer + FrameLen, &tmp, 1, &RSNIe,
@@ -507,10 +503,8 @@ VOID MlmeAssocReqAction( FrameLen += tmp;#ifdef RT30xx -#ifdef SIOCSIWGENIE if (pAd->StaCfg.WpaSupplicantUP != 1)#endif -#endif {// Append Variable IE NdisMoveMemory (pAd->StaCfg.ReqVarIEs + VarIesOffset, &RSNIe,1 );
drivers/staging/rt2860/sta_ioctl.c +0 -55
131 lines not on this page · raw message
PATCH 4/22 Staging: rtxxx0: remove dead platform specific code
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: remove dead platform specific code
Remove dead support for:
* IKANOS_VX_1X0
* INF_TWINPASS
* INF_DANUBE
* BRCM_6358
platforms.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/rt_config.h | 4 -- drivers/staging/rt2860/rt_linux.c | 4 -- drivers/staging/rt2860/rt_linux.h | 59 ----------------------------------- drivers/staging/rt2860/rt_main_dev.c | 7 ---- drivers/staging/rt2860/rtmp.h | 16 --------- 5 files changed, 90 deletions(-)
drivers/staging/rt2860/rt_config.h +0 -4
@@ -68,9 +68,5 @@#include "igmp_snoop.h" #endif // IGMP_SNOOP_SUPPORT // -#ifdef IKANOS_VX_1X0 -#include "vr_ikans.h" -#endif // IKANOS_VX_1X0 // -#endif // __RT_CONFIG_H__
drivers/staging/rt2860/rt_linux.c +0 -4
@@ -662,13 +662,9 @@ void announce_802_3_packet( pRxPkt =RTPKT_TO_OSPKT (pPacket);/* Push up the protocol stack */ -#ifdef IKANOS_VX_1X0 -IKANOS_DataFrameRx (pAd, pRxPkt->dev, pRxPkt, pRxPkt->len); -#else pRxPkt->protocol =eth_type_trans (pRxPkt, pRxPkt->dev);netif_rx (pRxPkt); -#endif // IKANOS_VX_1X0 // }
drivers/staging/rt2860/rt_linux.h +0 -59
83 lines not on this page · raw message
drivers/staging/rt2860/rt_main_dev.c +0 -7
@@ -515,9 +515,6 @@ static int rt28xx_init(IN struct net_devNICInitRT30xxRFRegisters (pAd);#endif // RT2870 // -#ifdef IKANOS_VX_1X0 -VR_IKANOS_FP_Init (pAd->ApCfg.BssidNum, pAd->PermanentAddress); -#endif // IKANOS_VX_1X0 // // // Initialize RF register to default value
@@ -678,11 +675,7 @@ static const struct net_device_ops rt286 .ndo_validate_addr = NULL, .ndo_set_mac_address = eth_mac_addr, .ndo_change_mtu = eth_change_mtu, -#ifdef IKANOS_VX_1X0 - .ndo_start_xmit = IKANOS_DataFramesTx, -#else .ndo_start_xmit = rt28xx_send_packets, -#endif };/* Must not be called for mdev and apdev */
drivers/staging/rt2860/rtmp.h +0 -16
@@ -2532,16 +2532,6 @@ typedef struct _INF_USB_CONFIG }INF_USB_CONFIG ; -#ifdef IKANOS_VX_1X0 -typedef void (*IkanosWlanTxCbFuncP )(void *,void *); - -struct IKANOS_TX_INFO - { -struct net_device *netdev; -IkanosWlanTxCbFuncP *fp; - }; -#endif // IKANOS_VX_1X0 // -#ifdef DBG_DIAGNOSE #define DIAGNOSE_TIME 10 // 10 sec typedef struct _RtmpDiagStrcut_
@@ -2989,12 +2979,6 @@ typedef struct _RTMP_ADAPTERUCHAR flg_be_adjust;ULONG be_adjust_last_time; -#ifdef IKANOS_VX_1X0 -struct IKANOS_TX_INFO IkanosTxInfo; -struct IKANOS_TX_INFO IkanosRxInfo[MAX_MBSSID_NUM +MAX_WDS_ENTRY +MAX_APCLI_NUM +MAX_MESH_NUM ]; -#endif // IKANOS_VX_1X0 // - -#ifdef DBG_DIAGNOSE RtmpDiagStruct DiagStruct;#endif // DBG_DIAGNOSE //
PATCH 5/22 Staging: rtxxx0: kill RT8270_USB_DEVICES() macro
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: kill RT8270_USB_DEVICES() macro
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2870/2870_main_dev.c | 118 +++++++++++++++++++++++++ drivers/staging/rt2870/rt2870.h | 151 --------------------------------- 2 files changed, 116 insertions(+), 153 deletions(-)
drivers/staging/rt2870/2870_main_dev.c +116 -2
@@ -59,9 +59,123 @@ MODULE_VERSION(STA_DRIVER_VERSION); extern INT __devinit rt28xx_probe(IN void *_dev_p, IN void *_dev_id_p, IN UINT argc, OUT PRTMP_ADAPTER *ppAd); +struct usb_device_id rtusb_usb_id[] = { + {USB_DEVICE (0x148F ,0x2770 ) },/* Ralink */ +#ifndef RT30xx + {USB_DEVICE (0x1737 ,0x0071 ) },/* Linksys WUSB600N */ + {USB_DEVICE (0x1737 ,0x0070 ) },/* Linksys */ +#endif + {USB_DEVICE (0x148F ,0x2870 ) },/* Ralink */ + {USB_DEVICE (0x148F ,0x3070 ) },/* Ralink 3070 */ +#ifdef RT30xx + {USB_DEVICE (0x148F ,0x3071 ) },/* Ralink 3071 */ + {USB_DEVICE (0x148F ,0x3072 ) },/* Ralink 3072 */ +#endif + {USB_DEVICE (0x0B05 ,0x1731 ) },/* Asus */ + {USB_DEVICE (0x0B05 ,0x1732 ) },/* Asus */ + {USB_DEVICE (0x0B05 ,0x1742 ) },/* Asus */ + {USB_DEVICE (0x0DF6 ,0x0017 ) },/* Sitecom */ + {USB_DEVICE (0x0DF6 ,0x002B ) },/* Sitecom */ + {USB_DEVICE (0x0DF6 ,0x002C ) },/* Sitecom */ +#ifdef RT30xx + {USB_DEVICE (0x0DF6 ,0x003E ) },/* Sitecom 3070 */ +#endif + {USB_DEVICE (0x0DF6 ,0x002D ) },/* Sitecom */ + {USB_DEVICE (0x0DF6 ,0x0039 ) },/* Sitecom 2770 */ +#ifndef RT30xx + {USB_DEVICE (0x0DF6 ,0x003F ) },/* Sitecom WL-608 */ +#endif + {USB_DEVICE (0x14B2 ,0x3C06 ) },/* Conceptronic */ + {USB_DEVICE (0x14B2 ,0x3C28 ) },/* Conceptronic */ + {USB_DEVICE (0x2019 ,0xED06 ) },/* Planex Communications, Inc. */ +#ifndef RT30xx + {USB_DEVICE (0x2019 ,0xED14 ) },/* Planex Communications, Inc. */ +#endif + {USB_DEVICE (0x2019 ,0xAB25 ) },/* Planex Communications, Inc. RT3070 */ + {USB_DEVICE (0x07D1 ,0x3C09 ) },/* D-Link */ + {USB_DEVICE (0x07D1 ,0x3C11 ) },/* D-Link */ +#ifdef RT30xx + {USB_DEVICE (0x2001 ,0x3C09 ) },/* D-Link */ + {USB_DEVICE (0x2001 ,0x3C0A ) },/* D-Link 3072*/ +#endif + {USB_DEVICE (0x14B2 ,0x3C07 ) },/* AL */ + {USB_DEVICE (0x14B2 ,0x3C12 ) },/* AL 3070 */ + {USB_DEVICE (0x050D ,0x8053 ) },/* Belkin */ +#ifndef RT30xx + {USB_DEVICE (0x050D ,0x815C ) },/* Belkin */ + {USB_DEVICE (0x050D ,0x825a ) },/* Belkin */ +#endif + {USB_DEVICE (0x14B2 ,0x3C23 ) },/* Airlink */ + {USB_DEVICE (0x14B2 ,0x3C27 ) },/* Airlink */ + {USB_DEVICE (0x07AA ,0x002F ) },/* Corega */ + {USB_DEVICE (0x07AA ,0x003C ) },/* Corega */ + {USB_DEVICE (0x07AA ,0x003F ) },/* Corega */ + {USB_DEVICE (0x18C5 ,0x0012 ) },/* Corega 3070 */ + {USB_DEVICE (0x1044 ,0x800B ) },/* Gigabyte */ +#ifdef RT30xx + {USB_DEVICE (0x1044 ,0x800D ) },/* Gigabyte GN-WB32L 3070 */ +#endif + {USB_DEVICE (0x15A9 ,0x0006 ) },/* Sparklan */ + {USB_DEVICE (0x083A ,0xB522 ) },/* SMC */ + {USB_DEVICE (0x083A ,0xA618 ) },/* SMC */ +#ifdef RT30xx + {USB_DEVICE (0x083A ,0x8522 ) },/* Arcadyan */ + {USB_DEVICE (0x083A ,0x7512 ) },/* Arcadyan 2770 */ +#endif + {USB_DEVICE (0x083A ,0x7522 ) },/* Arcadyan */ +#ifdef RT30xx + {USB_DEVICE (0x083A ,0x7511 ) },/* Arcadyan 3070 */ +#endif + {USB_DEVICE (0x0CDE ,0x0022 ) },/* ZCOM */ + {USB_DEVICE (0x0586 ,0x3416 ) },/* Zyxel */ + {USB_DEVICE (0x0CDE ,0x0025 ) },/* Zyxel */ + {USB_DEVICE (0x1740 ,0x9701 ) },/* EnGenius */ + {USB_DEVICE (0x1740 ,0x9702 ) },/* EnGenius */ +#ifdef RT30xx + {USB_DEVICE (0x1740 ,0x9703 ) },/* EnGenius 3070 */ +#endif + {USB_DEVICE (0x0471 ,0x200f ) },/* Philips */ + {USB_DEVICE (0x14B2 ,0x3C25 ) },/* Draytek */ + {USB_DEVICE (0x13D3 ,0x3247 ) },/* AzureWave */ +#ifdef RT30xx + {USB_DEVICE (0x13D3 ,0x3273 ) },/* AzureWave 3070*/ +#endif + {USB_DEVICE (0x083A ,0x6618 ) },/* Accton */ + {USB_DEVICE (0x15c5 ,0x0008 ) },/* Amit */ + {USB_DEVICE (0x0E66 ,0x0001 ) },/* Hawking */ + {USB_DEVICE (0x0E66 ,0x0003 ) },/* Hawking */ + {USB_DEVICE (0x129B ,0x1828 ) },/* Siemens */ + {USB_DEVICE (0x157E ,0x300E ) },/* U-Media */ + {USB_DEVICE (0x050d ,0x805c ) }, + {USB_DEVICE (0x1482 ,0x3C09 ) },/* Abocom*/ + {USB_DEVICE (0x14B2 ,0x3C09 ) },/* Alpha */ + {USB_DEVICE (0x04E8 ,0x2018 ) },/* samsung */ + {USB_DEVICE (0x07B8 ,0x3070 ) },/* AboCom 3070 */ + {USB_DEVICE (0x07B8 ,0x3071 ) },/* AboCom 3071 */ +#ifndef RT30xx + {USB_DEVICE (0x07B8 ,0x2870 ) },/* AboCom */ + {USB_DEVICE (0x07B8 ,0x2770 ) },/* AboCom */ +#else + {USB_DEVICE (0x07B8 ,0x3072 ) },/* Abocom 3072 */ +#endif + {USB_DEVICE (0x7392 ,0x7711 ) },/* Edimax 3070 */ + {USB_DEVICE (0x5A57 ,0x0280 ) },/* Zinwell */ + {USB_DEVICE (0x5A57 ,0x0282 ) },/* Zinwell */ +#ifdef RT30xx + {USB_DEVICE (0x1A32 ,0x0304 ) },/* Quanta 3070 */ +#endif + {USB_DEVICE (0x0789 ,0x0162 ) },/* Logitec 2870 */ + {USB_DEVICE (0x0789 ,0x0163 ) },/* Logitec 2870 */ + {USB_DEVICE (0x0789 ,0x0164 ) },/* Logitec 2870 */ +#ifndef RT30xx + {USB_DEVICE (0x7392 ,0x7717 ) },/* Edimax */ +#else + {USB_DEVICE (0x1EDA ,0x2310 ) },/* AirTies 3070 */ + {USB_DEVICE (0x1737 ,0x0077 ) },/* Linksys WUSB54GC-EU v3 */ +#endif + { }/* Terminating entry */ +}; -/* module table */ -struct usb_device_id rtusb_usb_id[] =RT2870_USB_DEVICES ;INT const rtusb_usb_id_len =sizeof (rtusb_usb_id) /sizeof (struct usb_device_id );MODULE_DEVICE_TABLE (usb, rtusb_usb_id);
drivers/staging/rt2870/rt2870.h +0 -151
157 lines not on this page · raw message
PATCH 6/22 Staging: rtxxx0: PID checking fixes
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: PID checking fixes
* rt3070:
- add missing pid_nr() invocations
* rt{28,30}70:
- do not treat PID 0 as valid
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/rt_linux.h | 2 +- drivers/staging/rt2870/2870_main_dev.c | 6 +++--- drivers/staging/rt2870/rt2870.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rt2860/rt_linux.h +1 -1
@@ -166,7 +166,7 @@ typedef struct pid * THREAD_PID;#define THREAD_PID_INIT_VALUE NULL#define GET_PID (_v) find_get_pid(_v)#define GET_PID_NUMBER (_v) pid_nr(_v) -#define CHECK_PID_LEGALITY (_pid) if (pid_nr(_pid) >= 0) +#define CHECK_PID_LEGALITY (_pid) if (pid_nr(_pid) > 0)#define KILL_THREAD_PID (_A, _B, _C) kill_pid(_A, _B, _C)#endif
drivers/staging/rt2870/2870_main_dev.c +3 -3
@@ -1061,7 +1061,7 @@ VOID RT28xxThreadTerminate( }#endif #ifdef RT30xx -if (pObj->MLMEThr_pid) +if (pid_nr (pObj->MLMEThr_pid) >0 ) {printk ("Terminate the MLMEThr_pid=%d!\n" ,pid_nr (pObj->MLMEThr_pid));mb ();
@@ -1082,7 +1082,7 @@ VOID RT28xxThreadTerminate( } } -if (pObj->RTUSBCmdThr_pid >=0 ) +if (pid_nr (pObj->RTUSBCmdThr_pid) >0 ) {printk ("Terminate the RTUSBCmdThr_pid=%d!\n" ,pid_nr (pObj->RTUSBCmdThr_pid));mb ();
@@ -1104,7 +1104,7 @@ VOID RT28xxThreadTerminate( pObj->RTUSBCmdThr_pid =NULL ; } } -if (pObj->TimerQThr_pid >=0 ) +if (pid_nr (pObj->TimerQThr_pid) >0 ) {POS_COOKIE pObj = (POS_COOKIE )pAd->OS_Cookie;printk ("Terminate the TimerQThr_pid=%d!\n" ,pid_nr (pObj->TimerQThr_pid));
drivers/staging/rt2870/rt2870.h +2 -2
@@ -456,14 +456,14 @@ VOID RTUSBBulkRxComplete(purbb_t pUrb, s#define RTUSBMlmeUp (pAd) \ { \ POS_COOKIE pObj = (POS_COOKIE) pAd->OS_Cookie; \ - if(pObj->MLMEThr_pid>0) \ + if (pid_nr(pObj->MLMEThr_pid) > 0) \ up(&(pAd->mlme_semaphore)); \ }#define RTUSBCMDUp (pAd) \ { \ POS_COOKIE pObj = (POS_COOKIE) pAd->OS_Cookie; \ - if(pObj->RTUSBCmdThr_pid>0) \ + if (pid_nr(pObj->RTUSBCmdThr_pid) > 0) \ up(&(pAd->RTUSBCmd_semaphore)); \ }#endif
PATCH 7/22 Staging: rt3070: kill TimerQThr thread first in RT28xxThreadTerminate()
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rt3070: kill TimerQThr thread first in RT28xxThreadTerminate()
* kill TimerQThr thread first in RT28xxThreadTerminate()
* remove the debugging printk() while at it
This makes rt3070 driver match rt2870 driver's behavior.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2870/2870_main_dev.c | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-)
drivers/staging/rt2870/2870_main_dev.c +20 -20
@@ -1061,6 +1061,26 @@ VOID RT28xxThreadTerminate( }#endif #ifdef RT30xx +if (pid_nr (pObj->TimerQThr_pid) >0 ) + { +POS_COOKIE pObj = (POS_COOKIE )pAd->OS_Cookie; +printk ("Terminate the TimerQThr_pid=%d!\n" ,pid_nr (pObj->TimerQThr_pid)); +mb (); + pAd->TimerFunc_kill =1 ; +mb (); + ret =kill_pid (pObj->TimerQThr_pid,SIGTERM ,1 ); +if (ret) + { +printk (KERN_WARNING "%s: unable to stop TimerQThread, pid=%d, ret=%d!\n" , + pAd->net_dev->name,pid_nr (pObj->TimerQThr_pid), ret); + } +else + { +wait_for_completion (&pAd->TimerQComplete); + pObj->TimerQThr_pid =NULL ; + } + } +if (pid_nr (pObj->MLMEThr_pid) >0 ) {printk ("Terminate the MLMEThr_pid=%d!\n" ,pid_nr (pObj->MLMEThr_pid));
@@ -1104,26 +1124,6 @@ VOID RT28xxThreadTerminate( pObj->RTUSBCmdThr_pid = NULL; } } -if (pid_nr (pObj->TimerQThr_pid) >0 ) - { -POS_COOKIE pObj = (POS_COOKIE )pAd->OS_Cookie; -printk ("Terminate the TimerQThr_pid=%d!\n" ,pid_nr (pObj->TimerQThr_pid)); -mb (); - pAd->TimerFunc_kill =1 ; -mb (); - ret =kill_pid (pObj->TimerQThr_pid,SIGTERM ,1 ); -if (ret) - { -printk (KERN_WARNING "%s: unable to stop TimerQThread, pid=%d, ret=%d!\n" , - pAd->net_dev->name,pid_nr (pObj->TimerQThr_pid), ret); - } -else - { -printk ("wait_for_completion TimerQThr\n" ); -wait_for_completion (&pAd->TimerQComplete); - pObj->TimerQThr_pid =NULL ; - } - }#endif // Kill tasklets
PATCH 8/22 Staging: rtxxx0: kill PID macros
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: kill PID macros
* kill PID macros
* unify now identical RT30xx and !RT30xx code
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/rt_linux.h | 16 ---- drivers/staging/rt2870/2870_main_dev.c | 86 ------------------------- drivers/staging/rt2870/common/2870_rtmp_init.c | 48 +------------ drivers/staging/rt2870/common/rtusb_io.c | 2 drivers/staging/rt2870/rt2870.h | 17 ---- 5 files changed, 9 insertions(+), 160 deletions(-)
drivers/staging/rt2860/rt_linux.h +0 -16
@@ -161,15 +161,6 @@ typedef int (*HARD_START_XMIT_FUNC)(stru#define NDIS_PACKET_TYPE_BROADCAST 2#define NDIS_PACKET_TYPE_ALL_MULTICAST 3 -#ifndef RT30xx -typedef struct pid *THREAD_PID ; -#define THREAD_PID_INIT_VALUE NULL -#define GET_PID (_v) find_get_pid(_v) -#define GET_PID_NUMBER (_v) pid_nr(_v) -#define CHECK_PID_LEGALITY (_pid) if (pid_nr(_pid) > 0) -#define KILL_THREAD_PID (_A, _B, _C) kill_pid(_A, _B, _C) -#endif -struct os_lock {spinlock_t lock;unsigned long flags;
@@ -185,16 +176,9 @@ struct os_cookie {#ifdef RT2870 struct usb_device *pUsb_Dev; -#ifndef RT30xx -THREAD_PID MLMEThr_pid; -THREAD_PID RTUSBCmdThr_pid; -THREAD_PID TimerQThr_pid; -#endif -#ifdef RT30xxstruct pid *MLMEThr_pid;struct pid *RTUSBCmdThr_pid;struct pid *TimerQThr_pid; -#endif #endif // RT2870 // struct tasklet_struct rx_done_task;
drivers/staging/rt2870/2870_main_dev.c +3 -83
129 lines not on this page · raw message
drivers/staging/rt2870/common/2870_rtmp_init.c +5 -43
94 lines not on this page · raw message
drivers/staging/rt2870/common/rtusb_io.c +1 -1
@@ -984,7 +984,7 @@ NDIS_STATUS RTUSBEnqueueCmdFromNdis(POS_COOKIE pObj = (POS_COOKIE ) pAd->OS_Cookie;#ifndef RT30xx - CHECK_PID_LEGALITY(pObj->RTUSBCmdThr_pid) + if (pid_nr(pObj->RTUSBCmdThr_pid) > 0)#endif #ifdef RT30xxif (pObj->RTUSBCmdThr_pid <0 )
drivers/staging/rt2870/rt2870.h +0 -17
@@ -437,22 +437,6 @@ VOID RTUSBBulkOutRTSFrameComplete(purbb_VOID RTUSBBulkOutPsPollComplete (purbb_t pUrb,struct pt_regs *pt_regs);VOID RTUSBBulkRxComplete (purbb_t pUrb,struct pt_regs *pt_regs); -#ifndef RT30xx -#define RTUSBMlmeUp (pAd) \ -{ \ - POS_COOKIE pObj = (POS_COOKIE) pAd->OS_Cookie; \ - CHECK_PID_LEGALITY(pObj->MLMEThr_pid) \ - up(&(pAd->mlme_semaphore)); \ -} - -#define RTUSBCMDUp (pAd) \ -{ \ - POS_COOKIE pObj = (POS_COOKIE) pAd->OS_Cookie; \ - CHECK_PID_LEGALITY(pObj->RTUSBCmdThr_pid) \ - up(&(pAd->RTUSBCmd_semaphore)); \ -} -#endif -#ifdef RT30xx#define RTUSBMlmeUp (pAd) \ { \ POS_COOKIE pObj = (POS_COOKIE) pAd->OS_Cookie; \
@@ -466,7 +450,6 @@ VOID RTUSBBulkRxComplete(purbb_t pUrb, sif (pid_nr (pObj->RTUSBCmdThr_pid) >0 ) \up (&(pAd->RTUSBCmd_semaphore)); \ } -#endif static inline NDIS_STATUS RTMPAllocateMemory( OUT PVOID *ptr,
PATCH 9/22 Staging: rtxxx0: remove unused defines
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: remove unused defines
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/oid.h | 26 -------------------------- drivers/staging/rt2860/rtmp.h | 7 ------- drivers/staging/rt2860/rtmp_def.h | 5 ----- 3 files changed, 38 deletions(-)
drivers/staging/rt2860/oid.h +0 -26
@@ -670,32 +670,6 @@ enum {#define OID_802_11_GET_COUNTRY_CODE 0x0716#define OID_802_11_GET_CHANNEL_GEOGRAPHY 0x0717 -#ifdef RT30xx -#define RT_OID_WSC_SET_PASSPHRASE 0x0740 // passphrase for wpa(2)-psk -#define RT_OID_WSC_DRIVER_AUTO_CONNECT 0x0741 -#define RT_OID_WSC_QUERY_DEFAULT_PROFILE 0x0742 -#define RT_OID_WSC_SET_CONN_BY_PROFILE_INDEX 0x0743 -#define RT_OID_WSC_SET_ACTION 0x0744 -#define RT_OID_WSC_SET_SSID 0x0745 -#define RT_OID_WSC_SET_PIN_CODE 0x0746 -#define RT_OID_WSC_SET_MODE 0x0747 // PIN or PBC -#define RT_OID_WSC_SET_CONF_MODE 0x0748 // Enrollee or Registrar -#define RT_OID_WSC_SET_PROFILE 0x0749 - -#define RT_OID_802_11_WSC_QUERY_PROFILE 0x0750 -// for consistency with RT61 -#define RT_OID_WSC_QUERY_STATUS 0x0751 -#define RT_OID_WSC_PIN_CODE 0x0752 -#define RT_OID_WSC_UUID 0x0753 -#define RT_OID_WSC_SET_SELECTED_REGISTRAR 0x0754 -#define RT_OID_WSC_EAPMSG 0x0755 -#define RT_OID_WSC_MANUFACTURER 0x0756 -#define RT_OID_WSC_MODEL_NAME 0x0757 -#define RT_OID_WSC_MODEL_NO 0x0758 -#define RT_OID_WSC_SERIAL_NO 0x0759 -#define RT_OID_WSC_MAC_ADDRESS 0x0760 -#endif -#ifdef LLTD_SUPPORT // for consistency with RT61 #define RT_OID_GET_PHY_MODE 0x761
drivers/staging/rt2860/rtmp.h +0 -7
@@ -407,8 +407,6 @@ typedef struct _QUEUE_HEADER {#define IS_RT3070 (_pAd) (((_pAd)->MACVersion & 0xffff0000) == 0x30700000)#ifdef RT30xx#define IS_RT3071 (_pAd) (((_pAd)->MACVersion & 0xffff0000) == 0x30710000) -#define IS_RT2070 (_pAd) (((_pAd)->RfIcType == RFIC_2020) || ((_pAd)->EFuseTag == 0x27)) -#define IS_RT30xx (_pAd) (((_pAd)->MACVersion & 0xfff00000) == 0x30700000)#endif
@@ -664,11 +662,6 @@ typedef struct _QUEUE_HEADER {#define BBP_IO_READ8_BY_REG_ID (_A, _I, _pV) RTUSBReadBBPRegister(_A, _I, _pV)#endif // RT2870 // -#ifdef RT30xx -#define RTMP_RF_IO_READ8_BY_REG_ID (_A, _I, _pV) RT30xxReadRFRegister(_A, _I, _pV) -#define RTMP_RF_IO_WRITE8_BY_REG_ID (_A, _I, _V) RT30xxWriteRFRegister(_A, _I, _V) -#endif // RT30xx // -#define MAP_CHANNEL_ID_TO_KHZ (ch, khz) { \ switch (ch) \ { \
drivers/staging/rt2860/rtmp_def.h +0 -5
@@ -624,11 +624,6 @@#define AP_CNTL_STATE_MACHINE 15#define AP_WPA_STATE_MACHINE 16 -#ifdef RT30xx -#define WSC_STATE_MACHINE 17 -#define WSC_UPNP_STATE_MACHINE 18 -#endif -// // STA's CONTROL/CONNECT state machine: states, events, total function # //
PATCH 10/22 Staging: rtxxx0: unify different RT30xx{Read,Write}RFRegister() flavors
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: unify different RT30xx{Read,Write}RFRegister() flavors
RTMP_IO_{READ,WRITE}32 equals RTUSB{Read,Write}MACRegister in case of USB chipsets so unify RT30xx and !RT30xx code.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/common/mlme.c | 111 ------------------------------- drivers/staging/rt2860/rt28xx.h | 3 drivers/staging/rt2860/rtmp.h | 14 --- drivers/staging/rt2870/common/rtusb_io.c | 25 +++--- drivers/staging/rt2870/rt2870.h | 3 5 files changed, 15 insertions(+), 141 deletions(-)
drivers/staging/rt2860/common/mlme.c +0 -111
@@ -5636,117 +5636,6 @@ VOID AsicUpdateProtect( }#ifdef RT30xx -/* -======================================================================== - -Routine Description: Write RT30xx RF register through MAC - -Arguments: - -Return Value: - -IRQL = - -Note: - -======================================================================== -*/ -NTSTATUS RT30xxWriteRFRegister ( - IN PRTMP_ADAPTER pAd, - IN UCHAR RegID, - IN UCHAR Value) -{ -RF_CSR_CFG_STRUC rfcsr; -UINT i =0 ; - -do - { -RTMP_IO_READ32 (pAd,RF_CSR_CFG , &rfcsr.word); - -if (!rfcsr.field.RF_CSR_KICK) -break ; - i++; - } -while ((i <RETRY_LIMIT ) && (!RTMP_TEST_FLAG (pAd, fRTMP_ADAPTER_NIC_NOT_EXIST))); - -if ((i ==RETRY_LIMIT ) || (RTMP_TEST_FLAG (pAd, fRTMP_ADAPTER_NIC_NOT_EXIST))) - { -DBGPRINT_RAW (RT_DEBUG_ERROR , ("Retry count exhausted or device removed!!!\n" )); -return STATUS_UNSUCCESSFUL ; - } - - rfcsr.field.RF_CSR_WR =1 ; - rfcsr.field.RF_CSR_KICK =1 ; - rfcsr.field.TESTCSR_RFACC_REGNUM = RegID; - rfcsr.field.RF_CSR_DATA = Value; - -RTMP_IO_WRITE32 (pAd,RF_CSR_CFG , rfcsr.word); - -return STATUS_SUCCESS ; -} - - -/* -======================================================================== - -Routine Description: Read RT30xx RF register through MAC - -Arguments: - -Return Value: - -IRQL = - -Note: - -======================================================================== -*/ -NTSTATUS RT30xxReadRFRegister ( - IN PRTMP_ADAPTER pAd, - IN UCHAR RegID, - IN PUCHAR pValue) -{ -RF_CSR_CFG_STRUC rfcsr; -UINT i=0 , k=0 ; - -for (i=0 ; i<MAX_BUSY_COUNT ; i++) - { -RTMP_IO_READ32 (pAd,RF_CSR_CFG , &rfcsr.word); - -if (rfcsr.field.RF_CSR_KICK ==BUSY ) - { -continue ; - } - rfcsr.word =0 ; - rfcsr.field.RF_CSR_WR =0 ; - rfcsr.field.RF_CSR_KICK =1 ; - rfcsr.field.TESTCSR_RFACC_REGNUM = RegID; -RTMP_IO_WRITE32 (pAd,RF_CSR_CFG , rfcsr.word); -for (k=0 ; k<MAX_BUSY_COUNT ; k++) - { -RTMP_IO_READ32 (pAd,RF_CSR_CFG , &rfcsr.word); - -if (rfcsr.field.RF_CSR_KICK ==IDLE ) -break ; - } -if ((rfcsr.field.RF_CSR_KICK ==IDLE ) && - (rfcsr.field.TESTCSR_RFACC_REGNUM == RegID)) - { - *pValue = (UCHAR )rfcsr.field.RF_CSR_DATA; -break ; - } - } -if (rfcsr.field.RF_CSR_KICK ==BUSY ) - { -DBGPRINT_ERR (("RF read R%d=0x%x fail, i[%d], k[%d]\n" , RegID, rfcsr.word,i,k)); -return STATUS_UNSUCCESSFUL ; - } - -return STATUS_SUCCESS ; -} -#endif // RT30xx // - -#ifdef RT30xx// add by johnli, RF power sequence setup /* ==========================================================================
drivers/staging/rt2860/rt28xx.h +2 -1
@@ -47,10 +47,11 @@#define PCI_EECTRL 0x0004#define PCI_MCUCTRL 0x0008 +typedef int NTSTATUS ; +#ifdef RT30xx#define OPT_14 0x114 -typedef int NTSTATUS ;#define RETRY_LIMIT 10#define STATUS_SUCCESS 0x00#define STATUS_UNSUCCESSFUL 0x01
drivers/staging/rt2860/rtmp.h +1 -13
@@ -6528,7 +6528,6 @@ VOID AsicTurnOnRFClk( IN PRTMP_ADAPTER pAd, IN UCHAR Channel); -#ifdef RT30xx NTSTATUS RT30xxWriteRFRegister( IN PRTMP_ADAPTER pAd, IN UCHAR RegID,
@@ -6539,6 +6538,7 @@ NTSTATUS RT30xxReadRFRegister( IN UCHAR RegID, IN PUCHAR pValue); +#ifdef RT30xx//2008/09/11:KH add to support efuse<-- UCHAR eFuseReadRegisters( IN PRTMP_ADAPTER pAd,
@@ -6735,18 +6735,6 @@ NTSTATUS RTUSBWriteRFRegister( IN PRTMP_ADAPTER pAd, IN UINT32 Value); -#ifndef RT30xx -NTSTATUS RT30xxWriteRFRegister ( - IN PRTMP_ADAPTER pAd, - IN UCHAR RegID, - IN UCHAR Value); - -NTSTATUS RT30xxReadRFRegister ( - IN PRTMP_ADAPTER pAd, - IN UCHAR RegID, - IN PUCHAR pValue); -#endif - NTSTATUS RTUSB_VendorRequest( IN PRTMP_ADAPTER pAd, IN UINT32 TransferFlags,
drivers/staging/rt2870/common/rtusb_io.c +12 -13
@@ -671,11 +671,10 @@ NTSTATUS RTUSBWriteRFRegister(return STATUS_SUCCESS ; } -#ifndef RT30xx/* ======================================================================== -Routine Description: Write RT3070 RF register through MAC +Routine Description: Write RT30xx RF register through MAC Arguments:
@@ -687,7 +686,7 @@ NTSTATUS RTUSBWriteRFRegister(======================================================================== */ -NTSTATUS RT30xxWriteRFRegister ( +NTSTATUS RT30xxWriteRFRegister ( IN PRTMP_ADAPTER pAd, IN UCHAR RegID, IN UCHAR Value)
@@ -697,7 +696,7 @@ NTSTATUS RT30xxWriteRFRegister( do { - RTUSBReadMACRegister(pAd, RF_CSR_CFG, &rfcsr.word); + RTMP_IO_READ32(pAd, RF_CSR_CFG, &rfcsr.word); if (!rfcsr.field.RF_CSR_KICK) break;
@@ -716,15 +715,16 @@ NTSTATUS RT30xxWriteRFRegister( rfcsr.field.TESTCSR_RFACC_REGNUM = RegID; rfcsr.field.RF_CSR_DATA = Value; -RTUSBWriteMACRegister (pAd,RF_CSR_CFG , rfcsr.word); +RTMP_IO_WRITE32 (pAd,RF_CSR_CFG , rfcsr.word);return STATUS_SUCCESS ; } +/* ======================================================================== -Routine Description: Read RT3070 RF register through MAC +Routine Description: Read RT30xx RF register through MAC Arguments:
@@ -736,17 +736,17 @@ NTSTATUS RT30xxWriteRFRegister(======================================================================== */ -NTSTATUS RT30xxReadRFRegister ( +NTSTATUS RT30xxReadRFRegister ( IN PRTMP_ADAPTER pAd, IN UCHAR RegID, IN PUCHAR pValue) {RF_CSR_CFG_STRUC rfcsr; -UINT i=0 , k; +UINT i=0 , k=0 ;for (i=0 ; i<MAX_BUSY_COUNT ; i++) { -RTUSBReadMACRegister (pAd,RF_CSR_CFG , &rfcsr.word); +RTMP_IO_READ32 (pAd,RF_CSR_CFG , &rfcsr.word);if (rfcsr.field.RF_CSR_KICK ==BUSY ) {
@@ -756,10 +756,10 @@ NTSTATUS RT30xxReadRFRegister( rfcsr.field.RF_CSR_WR =0 ; rfcsr.field.RF_CSR_KICK =1 ; rfcsr.field.TESTCSR_RFACC_REGNUM = RegID; -RTUSBWriteMACRegister (pAd,RF_CSR_CFG , rfcsr.word); +RTMP_IO_WRITE32 (pAd,RF_CSR_CFG , rfcsr.word);for (k=0 ; k<MAX_BUSY_COUNT ; k++) { -RTUSBReadMACRegister (pAd,RF_CSR_CFG , &rfcsr.word); +RTMP_IO_READ32 (pAd,RF_CSR_CFG , &rfcsr.word);if (rfcsr.field.RF_CSR_KICK ==IDLE )break ;
@@ -773,13 +773,12 @@ NTSTATUS RT30xxReadRFRegister( }if (rfcsr.field.RF_CSR_KICK ==BUSY ) { -DBGPRINT_ERR (("RF read R%d=0x%x fail\n" , RegID, rfcsr.word)); +DBGPRINT_ERR (("RF read R%d=0x%x fail, i[%d], k[%d]\n" , RegID, rfcsr.word,i,k));return STATUS_UNSUCCESSFUL ; }return STATUS_SUCCESS ; } -#endif /* RT30xx */ /* ========================================================================
drivers/staging/rt2870/rt2870.h +0 -3
@@ -407,9 +407,6 @@ extern UCHAR EpToQueue[6];//#undef MlmeAllocateMemory //#undef MlmeFreeMemory -#ifndef RT30xx -typedef int NTSTATUS ; -#endif typedef struct usb_device *PUSB_DEV ;/* MACRO for linux usb */
PATCH 11/22 Staging: rtxxx0: remove superfluous RT30xx ifdefs
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: remove superfluous RT30xx ifdefs
* add !RT30xx version of IS_RT3090() macro
* remove superfluous RT30xx ifdefs
* unify RT30xx and !RT30xx code where possible
* kill RT28XX_UPDATE_PROTECT() macro
* remove needless variable initializations
* kill some needless function prototypes
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/common/action.c | 11 ---- drivers/staging/rt2860/common/ba_action.c | 8 --- drivers/staging/rt2860/common/cmm_data.c | 4 + drivers/staging/rt2860/common/eeprom.c | 18 +----- drivers/staging/rt2860/common/mlme.c | 65 ++++--------------------- drivers/staging/rt2860/common/rtmp_init.c | 6 -- drivers/staging/rt2860/oid.h | 8 --- drivers/staging/rt2860/rt28xx.h | 19 ------- drivers/staging/rt2860/rtmp.h | 20 ------- drivers/staging/rt2860/rtmp_def.h | 6 -- drivers/staging/rt2860/sta/connect.c | 11 +--- drivers/staging/rt2860/sta/rtmp_data.c | 10 +-- drivers/staging/rt2860/sta_ioctl.c | 10 +-- drivers/staging/rt2860/wpa.h | 2 drivers/staging/rt2870/2870_main_dev.c | 5 - drivers/staging/rt2870/common/2870_rtmp_init.c | 5 - drivers/staging/rt2870/rt2870.h | 19 ------- 17 files changed, 34 insertions(+), 193 deletions(-)
drivers/staging/rt2860/common/action.c +2 -9
@@ -528,15 +528,8 @@ VOID SendRefreshBAR(sizeof (FRAME_BAR ), &FrameBar, END_OF_ARGS); -if (1 )// Now we always send BAR. - { -#ifndef RT30xx -MiniportMMRequest (pAd,0 , pOutBuffer, FrameLen); -#endif -#ifdef RT30xx -MiniportMMRequest (pAd,QID_AC_BE , pOutBuffer, FrameLen); -#endif - } +MiniportMMRequest (pAd,QID_AC_BE , pOutBuffer, FrameLen); +MlmeFreeMemory (pAd, pOutBuffer); } }
drivers/staging/rt2860/common/ba_action.c +0 -8
@@ -1391,10 +1391,8 @@ VOID SendPSMPAction(//ULONG Idx; FRAME_PSMP_ACTION Frame;ULONG FrameLen; -#ifdef RT30xxUCHAR bbpdata=0 ;UINT32 macdata; -#endif // RT30xx // NStatus =MlmeAllocateMemory (pAd, &pOutBuffer);//Get an unused nonpaged memory if (NStatus !=NDIS_STATUS_SUCCESS )
@@ -1410,7 +1408,6 @@ VOID SendPSMPAction(switch (Psmp) {case MMPS_ENABLE : -#ifdef RT30xxif (IS_RT3090 (pAd)) {// disable MMPS BBP control register
@@ -1423,11 +1420,9 @@ VOID SendPSMPAction( macdata &= ~(0x09 );//bit 0, 3 RTMP_IO_WRITE32 (pAd,0x1210 , macdata); } -#endif // RT30xx // Frame.Psmp =0 ;break ;case MMPS_DYNAMIC : -#ifdef RT30xxif (IS_RT3090 (pAd)) {// enable MMPS BBP control register
@@ -1440,11 +1435,9 @@ VOID SendPSMPAction( macdata |=0x09 ;//bit 0, 3 RTMP_IO_WRITE32 (pAd,0x1210 , macdata); } -#endif // RT30xx // Frame.Psmp =3 ;break ;case MMPS_STATIC : -#ifdef RT30xxif (IS_RT3090 (pAd)) {// enable MMPS BBP control register
@@ -1457,7 +1450,6 @@ VOID SendPSMPAction( macdata |=0x09 ;//bit 0, 3 RTMP_IO_WRITE32 (pAd,0x1210 , macdata); } -#endif // RT30xx // Frame.Psmp =1 ;break ; }
drivers/staging/rt2860/common/cmm_data.c +3 -1
@@ -2616,7 +2616,9 @@ BOOLEAN MacTableDeleteEntry(AsicUpdateProtect (pAd,0 /*pAd->CommonCfg.AddHTInfo.AddHtInfo2.OperaionMode*/ , (ALLN_SETPROTECT ), TRUE,0 /*pAd->MacTab.fAnyStationNonGF*/ );#endif #ifdef RT30xx -RT28XX_UPDATE_PROTECT (pAd);// edit by johnli, fix "in_interrupt" error when call "MacTableDeleteEntry" in Rx tasklet +// edit by johnli, fix "in_interrupt" error when call "MacTableDeleteEntry" in Rx tasklet +// Set MAC register value according operation mode +RTUSBEnqueueInternalCmd (pAd,CMDTHREAD_UPDATE_PROTECT ,NULL ,0 );#endif }
drivers/staging/rt2860/common/eeprom.c +3 -15
@@ -73,16 +73,12 @@ USHORT ShiftInBits(RaiseClock (pAd, &x);RTMP_IO_READ32 (pAd,E2PROM_CSR , &x); -#ifdef RT30xx -LowerClock (pAd, &x);//prevent read failed -#endif + +LowerClock (pAd, &x);/* prevent read failed */ + x &= ~(EEDI );if (x &EEDO ) data |=1 ; - -#ifndef RT30xx -LowerClock (pAd, &x); -#endif }return data;
@@ -201,17 +197,13 @@ USHORT RTMP_EEPROM_READ16( x |=EECS ;RTMP_IO_WRITE32 (pAd,E2PROM_CSR , x); -#ifdef RT30xx// patch can not access e-Fuse issue if (!IS_RT3090 (pAd)) { -#endif // kick a pulse RaiseClock (pAd, &x);LowerClock (pAd, &x); -#ifdef RT30xx } -#endif // output the read_opcode and register number in that order ShiftOutBits (pAd,EEPROM_READ_OPCODE ,3 );
@@ -262,17 +254,13 @@ VOID RTMP_EEPROM_WRITE16( x |=EECS ;RTMP_IO_WRITE32 (pAd,E2PROM_CSR , x); -#ifdef RT30xx// patch can not access e-Fuse issue if (!IS_RT3090 (pAd)) { -#endif // kick a pulse RaiseClock (pAd, &x);LowerClock (pAd, &x); -#ifdef RT30xx } -#endif // output the read_opcode ,register number and data in that order ShiftOutBits (pAd,EEPROM_WRITE_OPCODE ,3 );
drivers/staging/rt2860/common/mlme.c +12 -53
150 lines not on this page · raw message
drivers/staging/rt2860/common/rtmp_init.c +1 -5
@@ -1675,7 +1675,6 @@ VOID NICReadEEPROMParameters( Antenna.word = pAd->EEPROMDefaultValue[0 ];if (Antenna.word ==0xFFFF ) { -#ifdef RT30xxif (IS_RT3090 (pAd)) { Antenna.word =0 ;
@@ -1685,15 +1684,12 @@ VOID NICReadEEPROMParameters( }else { -#endif // RT30xx // Antenna.word =0 ; Antenna.field.RfIcType =RFIC_2820 ; Antenna.field.TxPath =1 ; Antenna.field.RxPath =2 ;DBGPRINT (RT_DEBUG_WARN , ("E2PROM error, hard code as 0x%04x\n" , Antenna.word)); -#ifdef RT30xx } -#endif // RT30xx // }// Choose the desired Tx&Rx stream.
@@ -2445,7 +2441,6 @@ NDIS_STATUS NICInitializeAsic( } } -#ifdef RT30xx// Initialize RT3070 serial MAc registers which is different from RT2870 serial if (IS_RT3090 (pAd)) {
@@ -2468,6 +2463,7 @@ NDIS_STATUS NICInitializeAsic(RTMP_IO_WRITE32 (pAd,TX_SW_CFG2 ,0x0 ); } } +#ifdef RT30xx else if (IS_RT3070(pAd)) {RTMP_IO_WRITE32 (pAd,TX_SW_CFG1 ,0 );
drivers/staging/rt2860/oid.h +1 -7
@@ -535,10 +535,8 @@ typedef enum _NDIS_802_11_WEP_STATUS Ndis802_11Encryption3KeyAbsent, Ndis802_11Encryption4Enabled,// TKIP or AES mix Ndis802_11Encryption4KeyAbsent, -#ifndef RT30xx Ndis802_11GroupWEP40Enabled, Ndis802_11GroupWEP104Enabled, -#endif } NDIS_802_11_WEP_STATUS, *PNDIS_802_11_WEP_STATUS,NDIS_802_11_ENCRYPTION_STATUS , *PNDIS_802_11_ENCRYPTION_STATUS ;
@@ -626,17 +624,13 @@ typedef struct _NDIS_802_11_CAPABILITYNDIS_802_11_AUTHENTICATION_ENCRYPTION AuthenticationEncryptionSupported[1 ]; }NDIS_802_11_CAPABILITY , *PNDIS_802_11_CAPABILITY ; -#ifdef RT30xx#define RT_PRIV_IOCTL_EXT (SIOCIWFIRSTPRIV + 0x01) // Sync. with AP for wsc upnp daemon -#endif #define RTPRIV_IOCTL_SET (SIOCIWFIRSTPRIV + 0x02)#ifdef DBG #define RTPRIV_IOCTL_BBP (SIOCIWFIRSTPRIV + 0x03)#define RTPRIV_IOCTL_MAC (SIOCIWFIRSTPRIV + 0x05) -#ifdef RT30xx#define RTPRIV_IOCTL_RF (SIOCIWFIRSTPRIV + 0x13) -#endif #define RTPRIV_IOCTL_E2P (SIOCIWFIRSTPRIV + 0x07)#endif
@@ -660,7 +654,7 @@ enum {RAIO_OFF =10 ,RAIO_ON =11 ,SHOW_CFG_VALUE =20 , -#if !defined(RT2860) && !defined(RT30xx) +#if !defined(RT2860) SHOW_ADHOC_ENTRY_INFO = 21,#endif };
drivers/staging/rt2860/rt28xx.h +0 -19
@@ -49,14 +49,8 @@typedef int NTSTATUS ; -#ifdef RT30xx#define OPT_14 0x114 -#define RETRY_LIMIT 10 -#define STATUS_SUCCESS 0x00 -#define STATUS_UNSUCCESSFUL 0x01 -#endif -// // SCH/DMA registers - base address 0x0200 //
@@ -292,7 +286,6 @@ typedef union _USB_DMA_CFG_STRUC {#define PBF_DBG 0x043c#define PBF_CAP_CTRL 0x0440 -#ifdef RT30xx// eFuse registers #define EFUSE_CTRL 0x0580#define EFUSE_DATA0 0x0590
@@ -320,7 +313,6 @@ typedef union _EFUSE_CTRL_STRUC {#define LDO_CFG0 0x05d4#define GPIO_SWITCH 0x05dc -#endif /* RT30xx */ // // 4 MAC registers
@@ -1137,9 +1129,7 @@ typedef struct _HW_WCID_ENTRY { // 8-by#define BBP_R22 22#define BBP_R24 24#define BBP_R25 25 -#ifdef RT30xx#define BBP_R31 31 -#endif #define BBP_R49 49 //TSSI#define BBP_R50 50#define BBP_R51 51
@@ -1157,10 +1147,8 @@ typedef struct _HW_WCID_ENTRY { // 8-by#define BBP_R73 73#define BBP_R75 75#define BBP_R77 77 -#ifdef RT30xx#define BBP_R79 79#define BBP_R80 80 -#endif #define BBP_R81 81#define BBP_R82 82#define BBP_R83 83
@@ -1182,9 +1170,7 @@ typedef struct _HW_WCID_ENTRY { // 8-by#define BBP_R121 121#define BBP_R122 122#define BBP_R123 123 -#ifdef RT30xx#define BBP_R138 138 // add by johnli, RF power sequence setup, ADC dynamic on/off control -#endif // RT30xx // #define BBPR94_DEFAULT 0x06 // Add 1 value will gain 1db
@@ -1608,15 +1594,10 @@ typedef union _EEPROM_NIC_CINFIG2_STRUC USHORT EnableWPSPBC:1; // WPS PBC Control bit USHORT BW40MAvailForG:1; // 0:enable, 1:disable USHORT BW40MAvailForA:1; // 0:enable, 1:disable -#ifndef RT30xx - USHORT Rsv2:6; // must be 0 -#endif -#ifdef RT30xx USHORT Rsv1:1; // must be 0 USHORT AntDiversity:1; // Antenna diversity USHORT Rsv2:3; // must be 0 USHORT DACTestBit:1; // control if driver should patch the DAC issue -#endif } field;USHORT word; }EEPROM_NIC_CONFIG2_STRUC , *PEEPROM_NIC_CONFIG2_STRUC ;
drivers/staging/rt2860/rtmp.h +2 -18
@@ -403,6 +403,8 @@ typedef struct _QUEUE_HEADER {#ifdef RT30xx// We will have a cost down version which mac version is 0x3090xxxx #define IS_RT3090 (_pAd) ((((_pAd)->MACVersion & 0xffff0000) == 0x30710000) || (((_pAd)->MACVersion & 0xffff0000) == 0x30900000)) +#else +#define IS_RT3090 (_pAd) 0#endif #define IS_RT3070 (_pAd) (((_pAd)->MACVersion & 0xffff0000) == 0x30700000)#ifdef RT30xx
@@ -928,7 +930,6 @@ typedef struct _RTMP_SCATTER_GATHER_LIST }#endif // RT2870 // -#ifdef RT30xx//Need to collect each ant's rssi concurrently //rssi1 is report to pair2 Ant and rss2 is reprot to pair1 Ant when 4 Ant #define COLLECT_RX_ANTENNA_AVERAGE_RSSI (_pAd, _rssi1, _rssi2) \
@@ -960,8 +961,6 @@ typedef struct _RTMP_SCATTER_GATHER_LIST _pAd->RxAnt.RcvPktNumWhenEvaluate++; \ } \ } -#endif // RT30xx // -#define NDIS_QUERY_BUFFER (_NdisBuf, _ppVA, _pBufLen) \ NdisQueryBuffer(_NdisBuf, _ppVA, _pBufLen)
@@ -4885,11 +4884,9 @@ CHAR RTMPMaxRssi( IN CHAR Rssi1, IN CHAR Rssi2); -#ifdef RT30xxVOID AsicSetRxAnt ( IN PRTMP_ADAPTER pAd, IN UCHAR Ant); -#endif VOID AsicEvaluateRxAnt ( IN PRTMP_ADAPTER pAd);
@@ -5564,11 +5561,6 @@ VOID RTMPSendTriggerFrame( IN UCHAR TxRate, IN BOOLEAN bQosNull); -#ifdef RT30xx -VOID RTMPFilterCalibration ( - IN PRTMP_ADAPTER pAd); -#endif // RT30xx // -/* timeout -- ms */ VOID RTMP_SetPeriodicTimer( IN NDIS_MINIPORT_TIMER *pTimer,
@@ -6538,8 +6530,6 @@ NTSTATUS RT30xxReadRFRegister( IN UCHAR RegID, IN PUCHAR pValue); -#ifdef RT30xx -//2008/09/11:KH add to support efuse<-- UCHAR eFuseReadRegisters( IN PRTMP_ADAPTER pAd, IN USHORT Offset,
@@ -6615,11 +6605,7 @@ NDIS_STATUS NICLoadEEPROM(BOOLEAN bNeedLoadEEPROM ( IN PRTMP_ADAPTER pAd); -//2008/09/11:KH add to support efuse--> -#endif // RT30xx // -#ifdef RT30xx -// add by johnli, RF power sequence setup VOID RT30xxLoadRFNormalModeSetup ( IN PRTMP_ADAPTER pAd);
@@ -6628,8 +6614,6 @@ VOID RT30xxLoadRFSleepModeSetup(VOID RT30xxReverseRFSleepModeSetup ( IN PRTMP_ADAPTER pAd); -// end johnli -#endif // RT30xx // #ifdef RT2870 //
drivers/staging/rt2860/rtmp_def.h +0 -6
@@ -148,11 +148,7 @@#define MAX_PACKETS_IN_PS_QUEUE 128 //32#define WMM_NUM_OF_AC 4/* AC0, AC1, AC2, and AC3 */ -#ifdef RT30xx -//2008/09/11:KH add to support efuse<-- #define MAX_EEPROM_BIN_FILE_SIZE 1024 -//2008/09/11:KH add to support efuse--> -#endif // RxFilter #define STANORMAL 0x17f97
@@ -1210,10 +1206,8 @@#define RFIC_2750 4 // 2.4G/5G 1T2R#define RFIC_3020 5 // 2.4G 1T1R#define RFIC_2020 6 // 2.4G B/G -#ifdef RT30xx#define RFIC_3021 7 // 2.4G 1T2R#define RFIC_3022 8 // 2.4G 2T2R -#endif // LED Status. #define LED_LINK_DOWN 0
drivers/staging/rt2860/sta/connect.c +3 -8
@@ -1711,15 +1711,12 @@ VOID LinkUp(// Txop can only be modified when RDG is off, WMM is disable and TxBurst is enable // // if 1. Legacy AP WMM on, or 2. 11n AP, AMPDU disable. Force turn off burst no matter what bEnableTxBurst is. + if (#ifdef RT30xx -if (!((pAd->CommonCfg.RxStream ==1 )&&(pAd->CommonCfg.TxStream ==1 )) && + !(pAd->CommonCfg.RxStream == 1 && pAd->CommonCfg.TxStream == 1) && +#endif (((pAd->StaActive.SupportedPhyInfo.bHtEnable == FALSE) && OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_WMM_INUSED)) || ((pAd->StaActive.SupportedPhyInfo.bHtEnable == TRUE) && (pAd->CommonCfg.BACapability.field.Policy == BA_NOTUSE)))) -#endif -#ifndef RT30xx -if (((pAd->StaActive.SupportedPhyInfo.bHtEnable == FALSE) && (OPSTATUS_TEST_FLAG (pAd, fOP_STATUS_WMM_INUSED))) - || ((pAd->StaActive.SupportedPhyInfo.bHtEnable == TRUE) && (pAd->CommonCfg.BACapability.field.Policy == BA_NOTUSE))) -#endif {RTMP_IO_READ32 (pAd,EDCA_AC0_CFG , &Data); Data &=0xFFFFFF00 ;
@@ -2101,7 +2098,6 @@ VOID LinkDown(wireless_send_event (pAd->net_dev,SIOCGIWAP , &wrqu,NULL ); } -#ifdef RT30xxif (IS_RT3090 (pAd)) {UINT32 macdata;
@@ -2115,7 +2111,6 @@ VOID LinkDown( macdata &= ~(0x09 );//bit 0, 3 RTMP_IO_WRITE32 (pAd,0x1210 , macdata); } -#endif // RT30xx // }/*
drivers/staging/rt2860/sta/rtmp_data.c +4 -6
@@ -575,14 +575,12 @@ VOID STAHandleRxMgmtFrame( {// We should collect RSSI not only U2M data but also my beacon + if (#ifdef RT30xx -if ((pHeader->FC.SubType ==SUBTYPE_BEACON ) && (MAC_ADDR_EQUAL (&pAd->CommonCfg.Bssid, &pHeader->Addr2)) - && (pAd->RxAnt.EvaluatePeriod == 0)) + pAd->RxAnt.EvaluatePeriod == 0 && #endif -#ifndef RT30xx - if ((pHeader->FC.SubType == SUBTYPE_BEACON) && (MAC_ADDR_EQUAL(&pAd->CommonCfg.Bssid, &pHeader->Addr2))) -#endif - { + pHeader->FC.SubType == SUBTYPE_BEACON && + MAC_ADDR_EQUAL(&pAd->CommonCfg.Bssid, &pHeader->Addr2)) {Update_Rssi_Sample (pAd, &pAd->StaCfg.RssiSample, pRxWI); pAd->StaCfg.LastSNR0 = (UCHAR )(pRxWI->SNR0);
drivers/staging/rt2860/sta_ioctl.c +3 -7
@@ -1676,15 +1676,11 @@ int rt_ioctl_siwencode(struct net_device pAdapter->StaCfg.OrigWepStatus = pAdapter->StaCfg.WepStatus; pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeOpen; goto done; - } + } else if (#ifndef RT30xx - else if ((erq->length == 0) && - (erq->flags & IW_ENCODE_RESTRICTED || erq->flags & IW_ENCODE_OPEN)) -#endif -#ifdef RT30xx - else if (erq->flags & IW_ENCODE_RESTRICTED || erq->flags & IW_ENCODE_OPEN) + erq->length == 0 && #endif - { + (erq->flags & IW_ENCODE_RESTRICTED || erq->flags & IW_ENCODE_OPEN)) {STA_PORT_SECURED (pAdapter); pAdapter->StaCfg.PairCipher = Ndis802_11WEPEnabled; pAdapter->StaCfg.GroupCipher = Ndis802_11WEPEnabled;
drivers/staging/rt2860/wpa.h +0 -2
@@ -90,9 +90,7 @@#define TKIP_AP_RXMICK_OFFSET (TKIP_AP_TXMICK_OFFSET+LEN_TKIP_TXMICK)#define TKIP_GTK_LENGTH ((LEN_TKIP_EK)+(LEN_TKIP_RXMICK)+(LEN_TKIP_TXMICK))#define LEN_PTK ((LEN_EAP_KEY)+(LEN_TKIP_KEY)) -#ifndef RT30xx#define MIN_LEN_OF_GTK 5 -#endif // RSN IE Length definition #define MAX_LEN_OF_RSNIE 90
drivers/staging/rt2870/2870_main_dev.c +0 -5
@@ -1101,12 +1101,7 @@ BOOLEAN RT28XXChipsetCheck(if (dev_p->descriptor.idVendor == rtusb_usb_id[i].idVendor && dev_p->descriptor.idProduct == rtusb_usb_id[i].idProduct) { -#ifndef RT30xxprintk ("rt2870: idVendor = 0x%x, idProduct = 0x%x\n" , -#endif -#ifdef RT30xx -printk ("rt2870: idVendor = 0x%x, idProduct = 0x%x\n" , -#endif dev_p->descriptor.idVendor, dev_p->descriptor.idProduct);break ; }
drivers/staging/rt2870/common/2870_rtmp_init.c +0 -5
@@ -737,12 +737,7 @@ NDIS_STATUS CreateThreads( {PRTMP_ADAPTER pAd = net_dev->ml_priv;POS_COOKIE pObj = (POS_COOKIE ) pAd->OS_Cookie; -#ifndef RT30xx -pid_t pid_number =-1 ; -#endif -#ifdef RT30xxpid_t pid_number; -#endif //init_MUTEX(&(pAd->usbdev_semaphore));
drivers/staging/rt2870/rt2870.h +0 -19
@@ -46,9 +46,7 @@#define MAX_TXBULK_SIZE (LOCAL_TXBUF_SIZE*BULKAGGRE_ZISE)#define MAX_RXBULK_SIZE (LOCAL_TXBUF_SIZE*RXBULKAGGRE_ZISE)#define MAX_MLME_HANDLER_MEMORY 20 -#ifndef RT30xx#define RETRY_LIMIT 10 -#endif #define BUFFER_SIZE 2400 //2048#define TX_RING 0xa#define PRIO_RING 0xc
@@ -64,9 +62,7 @@#define fRTUSB_BULK_OUT_DATA_NORMAL_2 0x00020000#define fRTUSB_BULK_OUT_DATA_NORMAL_3 0x00040000#define fRTUSB_BULK_OUT_DATA_NORMAL_4 0x00080000 -#ifdef RT30xx#define fRTUSB_BULK_OUT_DATA_NORMAL_5 0x00100000 -#endif #define fRTUSB_BULK_OUT_PSPOLL 0x00000020#define fRTUSB_BULK_OUT_DATA_FRAG 0x00000040
@@ -284,14 +280,6 @@ extern UCHAR EpToQueue[6];RTUSBEnqueueInternalCmd (pAd,CMDTHREAD_SET_CLIENT_MAC_ENTRY , \ pEntry,sizeof (MAC_TABLE_ENTRY )); -#ifdef RT30xx -// add by johnli, fix "in_interrupt" error when call "MacTableDeleteEntry" in Rx tasklet -// Set MAC register value according operation mode -#define RT28XX_UPDATE_PROTECT (pAd) \ - RTUSBEnqueueInternalCmd(pAd, CMDTHREAD_UPDATE_PROTECT, NULL, 0); -// end johnli -#endif -// remove Pair-wise key material from ASIC // yet implement #define RT28XX_STA_ENTRY_KEY_DEL (pAd, BssIdx, Wcid)
@@ -383,10 +371,8 @@ extern UCHAR EpToQueue[6];#define RT28xx_CHIP_NAME "RT2870"#endif #define USB_CYC_CFG 0x02a4 -#ifndef RT30xx#define STATUS_SUCCESS 0x00#define STATUS_UNSUCCESSFUL 0x01 -#endif #define NT_SUCCESS (status) (((status) > 0) ? (1):(0))#define InterlockedIncrement atomic_inc#define NdisInterlockedIncrement atomic_inc
@@ -595,12 +581,7 @@ typedef struct _CMDHandler_TLV {#define CMDTHREAD_802_11_SET_STA_CONFIG 0x0D790111 // cmd#define CMDTHREAD_802_11_SET_PREAMBLE 0x0D790101 // cmd#define CMDTHREAD_802_11_COUNTER_MEASURE 0x0D790102 // cmd - -#ifdef RT30xx -// add by johnli, fix "in_interrupt" error when call "MacTableDeleteEntry" in Rx tasklet #define CMDTHREAD_UPDATE_PROTECT 0x0D790103 // cmd -// end johnli -#endif #define WPA1AKMBIT 0x01#define WPA2AKMBIT 0x02
PATCH 12/22 Staging: rtxxx0: unify RT{USB,MP}FilterCalibration()
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: unify RT{USB,MP}FilterCalibration()
RTMP_BBP_IO_{READ,WRITE}8_BY_REG_ID equals RTUSB{Read,Write}BBPRegister in case of USB chipsets so unify RT30xx and !RT30xx code.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/common/rtmp_init.c | 154 +----------------------------- 1 file changed, 10 insertions(+), 144 deletions(-)
drivers/staging/rt2860/common/rtmp_init.c +10 -144
@@ -1099,145 +1099,6 @@ NDIS_STATUS NICReadRegParameters(======================================================================== */ -#ifndef RT30xx -VOID RTUSBFilterCalibration ( - IN PRTMP_ADAPTER pAd) -{ -UCHAR R55x =0 , value, FilterTarget =0x1E , BBPValue; -UINT loop =0 , count =0 , loopcnt =0 , ReTry =0 ; -UCHAR RF_R24_Value =0 ; - -// Give bbp filter initial value - pAd->Mlme.CaliBW20RfR24 =0x16 ; - pAd->Mlme.CaliBW40RfR24 =0x36 ;//Bit[5] must be 1 for BW 40 - -do - { -if (loop ==1 )//BandWidth = 40 MHz - { -// Write 0x27 to RF_R24 to program filter - RF_R24_Value =0x27 ; -RT30xxWriteRFRegister (pAd,RF_R24 , RF_R24_Value); - FilterTarget =0x19 ; - -// when calibrate BW40, BBP mask must set to BW40. -RTUSBReadBBPRegister (pAd,BBP_R4 , &BBPValue); - BBPValue&= (~0x18 ); - BBPValue|= (0x10 ); -RTUSBWriteBBPRegister (pAd,BBP_R4 , BBPValue); - } -else //BandWidth = 20 MHz - { -// Write 0x07 to RF_R24 to program filter - RF_R24_Value =0x07 ; -RT30xxWriteRFRegister (pAd,RF_R24 , RF_R24_Value); - FilterTarget =0x16 ; - } - -// Write 0x01 to RF_R22 to enable baseband loopback mode -RT30xxReadRFRegister (pAd,RF_R22 , &value); - value |=0x01 ; -RT30xxWriteRFRegister (pAd,RF_R22 , value); - -// Write 0x00 to BBP_R24 to set power & frequency of passband test tone -RTUSBWriteBBPRegister (pAd,BBP_R24 ,0 ); - -do - { -// Write 0x90 to BBP_R25 to transmit test tone -RTUSBWriteBBPRegister (pAd,BBP_R25 ,0x90 ); - -RTMPusecDelay (1000 ); -// Read BBP_R55[6:0] for received power, set R55x = BBP_R55[6:0] -RTUSBReadBBPRegister (pAd,BBP_R55 , &value); - R55x = value &0xFF ; - - }while ((ReTry++ <100 ) && (R55x ==0 )); - -// Write 0x06 to BBP_R24 to set power & frequency of stopband test tone -RTUSBWriteBBPRegister (pAd,BBP_R24 ,0x06 ); - -while (TRUE) - { -// Write 0x90 to BBP_R25 to transmit test tone -RTUSBWriteBBPRegister (pAd,BBP_R25 ,0x90 ); - -//We need to wait for calibration -RTMPusecDelay (1000 ); -RTUSBReadBBPRegister (pAd,BBP_R55 , &value); - value &=0xFF ; -if ((R55x - value) < FilterTarget) - { - RF_R24_Value ++; - } -else if ((R55x - value) == FilterTarget) - { - RF_R24_Value ++; - count ++; - } -else - { -break ; - } - -// prevent infinite loop cause driver hang. -if (loopcnt++ >100 ) - { -DBGPRINT (RT_DEBUG_ERROR , ("RTUSBFilterCalibration - can't find a valid value, loopcnt=%d stop calibrating" , loopcnt)); -break ; - } - -// Write RF_R24 to program filter -RT30xxWriteRFRegister (pAd,RF_R24 , RF_R24_Value); - } - -if (count >0 ) - { - RF_R24_Value = RF_R24_Value - ((count) ? (1 ) : (0 )); - } - -// Store for future usage -if (loopcnt <100 ) - { -if (loop++ ==0 ) - { -//BandWidth = 20 MHz - pAd->Mlme.CaliBW20RfR24 = (UCHAR )RF_R24_Value; - } -else - { -//BandWidth = 40 MHz - pAd->Mlme.CaliBW40RfR24 = (UCHAR )RF_R24_Value; -break ; - } - } -else -break ; - -RT30xxWriteRFRegister (pAd,RF_R24 , RF_R24_Value); - -// reset count - count =0 ; - }while (TRUE); - -// -// Set back to initial state -// -RTUSBWriteBBPRegister (pAd,BBP_R24 ,0 ); - -RT30xxReadRFRegister (pAd,RF_R22 , &value); - value &= ~(0x01 ); -RT30xxWriteRFRegister (pAd,RF_R22 , value); - -// set BBP back to BW20 -RTUSBReadBBPRegister (pAd,BBP_R4 , &BBPValue); - BBPValue&= (~0x18 ); -RTUSBWriteBBPRegister (pAd,BBP_R4 , BBPValue); - -DBGPRINT (RT_DEBUG_TRACE , ("RTUSBFilterCalibration - CaliBW20RfR24=0x%x, CaliBW40RfR24=0x%x\n" , pAd->Mlme.CaliBW20RfR24, pAd->Mlme.CaliBW40RfR24)); -} -#endif /* RT30xx */ -#ifdef RT30xxVOID RTMPFilterCalibration ( IN PRTMP_ADAPTER pAd) {
@@ -1246,9 +1107,13 @@ VOID RTMPFilterCalibration(UCHAR RF_R24_Value =0 ;// Give bbp filter initial value +#ifndef RT30xx + pAd->Mlme.CaliBW20RfR24 =0x16 ; + pAd->Mlme.CaliBW40RfR24 =0x36 ;//Bit[5] must be 1 for BW 40 +#else pAd->Mlme.CaliBW20RfR24 =0x1F ; pAd->Mlme.CaliBW40RfR24 =0x2F ;//Bit[5] must be 1 for BW 40 - +#endif do { if (loop == 1) //BandWidth = 40 MHz
@@ -1266,11 +1131,12 @@ VOID RTMPFilterCalibration( BBPValue&= (~0x18 ); BBPValue|= (0x10 );RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R4 , BBPValue); - +#ifdef RT30xx// set to BW40 RT30xxReadRFRegister (pAd,RF_R31 , &value); value |=0x20 ;RT30xxWriteRFRegister (pAd,RF_R31 , value); +#endif }else //BandWidth = 20 MHz {
@@ -1281,11 +1147,12 @@ VOID RTMPFilterCalibration( FilterTarget =0x13 ; else FilterTarget =0x16 ; - +#ifdef RT30xx// set to BW20 RT30xxReadRFRegister (pAd,RF_R31 , &value); value &= (~0x20 );RT30xxWriteRFRegister (pAd,RF_R31 , value); +#endif }// Write 0x01 to RF_R22 to enable baseband loopback mode
@@ -1390,7 +1257,6 @@ VOID RTMPFilterCalibration(DBGPRINT (RT_DEBUG_TRACE , ("RTMPFilterCalibration - CaliBW20RfR24=0x%x, CaliBW40RfR24=0x%x\n" , pAd->Mlme.CaliBW20RfR24, pAd->Mlme.CaliBW40RfR24)); } -#endif /* RT30xx */ VOID NICInitRT30xxRFRegisters(IN PRTMP_ADAPTER pAd) {
@@ -1417,7 +1283,7 @@ VOID NICInitRT30xxRFRegisters(IN PRTMP_A }//For RF filter Calibration -RTUSBFilterCalibration (pAd); +RTMPFilterCalibration (pAd); }#endif #ifdef RT30xx
PATCH 13/22 Staging: rtxxx0: unify MlmeCheckPsmChange()
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: unify MlmeCheckPsmChange()
Unify RT30xx and !RT30xx code in MlmeCheckPsmChange().
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/common/mlme.c | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-)
drivers/staging/rt2860/common/mlme.c +2 -28
@@ -2771,44 +2771,19 @@ VOID MlmeCheckPsmChange( (pAd->StaCfg.Psm == PWR_ACTIVE) &&#ifdef RT2860 RTMP_TEST_PSFLAG(pAd, fRTMP_PS_CAN_GO_SLEEP)) -#endif -#if !defined(RT2860 ) && !defined(RT30xx) +#else (pAd->Mlme.CntlMachine.CurrState == CNTL_IDLE))#endif -#ifndef RT30xx { -NdisGetSystemUpTime (&pAd->Mlme.LastSendNULLpsmTime); - pAd->RalinkCounters.RxCountSinceLastNULL =0 ; -MlmeSetPsmBit (pAd,PWR_SAVE ); -if (!(pAd->CommonCfg.bAPSDCapable && pAd->CommonCfg.APEdcaParm.bAPSDCapable)) - { -RTMPSendNullFrame (pAd, pAd->CommonCfg.TxRate, FALSE); - } -else - { -RTMPSendNullFrame (pAd, pAd->CommonCfg.TxRate, TRUE); - } - } -#endif #ifdef RT30xx -// (! RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_BSS_SCAN_IN_PROGRESS)) - (pAd->Mlme.CntlMachine.CurrState == CNTL_IDLE) /*&& - (pAd->RalinkCounters.OneSecTxNoRetryOkCount == 0) && - (pAd->RalinkCounters.OneSecTxRetryOkCount == 0)*/) - {// add by johnli, use Rx OK data count per second to calculate throughput // If Ttraffic is too high ( > 400 Rx per second), don't go to sleep mode. If tx rate is low, use low criteria // Mode=CCK/MCS=3 => 11 Mbps, Mode=OFDM/MCS=3 => 18 Mbps if (((pAd->StaCfg.HTPhyMode.field.MCS <=3 ) && -/* Iverson mark -(pAd->StaCfg.HTPhyMode.field.MODE <= MODE_OFDM) && -*/ (pAd->RalinkCounters.OneSecRxOkDataCnt < (ULONG )100 )) || ((pAd->StaCfg.HTPhyMode.field.MCS >3 ) && -/* Iverson mark -(pAd->StaCfg.HTPhyMode.field.MODE > MODE_OFDM) && -*/ (pAd->RalinkCounters.OneSecRxOkDataCnt < (ULONG)400))) +#endif {// Get this time NdisGetSystemUpTime (&pAd->Mlme.LastSendNULLpsmTime);
@@ -2824,7 +2799,6 @@ VOID MlmeCheckPsmChange( } } } -#endif }// IRQL = PASSIVE_LEVEL
PATCH 14/22 Staging: rtxxx0: unify AsicEvaluateRxAnt()
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: unify AsicEvaluateRxAnt()
Unify RT30xx and !RT30xx code in AsicEvaluateRxAnt().
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/common/mlme.c | 63 ++++++++--------------------------- 1 file changed, 15 insertions(+), 48 deletions(-)
drivers/staging/rt2860/common/mlme.c +15 -48
@@ -8252,56 +8252,19 @@ VOID AsicEvaluateRxAnt( {UCHAR BBPR3 =0 ; -#ifndef RT30xx - { -if (RTMP_TEST_FLAG (pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS | - fRTMP_ADAPTER_HALT_IN_PROGRESS | - fRTMP_ADAPTER_RADIO_OFF | - fRTMP_ADAPTER_NIC_NOT_EXIST | - fRTMP_ADAPTER_BSS_SCAN_IN_PROGRESS)) -return ; - -if (pAd->StaCfg.Psm ==PWR_SAVE ) +if (RTMP_TEST_FLAG (pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS | + fRTMP_ADAPTER_HALT_IN_PROGRESS | + fRTMP_ADAPTER_RADIO_OFF | + fRTMP_ADAPTER_NIC_NOT_EXIST | + fRTMP_ADAPTER_BSS_SCAN_IN_PROGRESS) +#ifdef RT30xx + ||OPSTATUS_TEST_FLAG (pAd, fOP_STATUS_DOZE) + || (pAd->EepromAccess) +#endif + )return ; - } -RTMP_BBP_IO_READ8_BY_REG_ID (pAd,BBP_R3 , &BBPR3 ); -BBPR3 &= (~0x18 ); -if (pAd->Antenna.field.RxPath ==3 ) - { -BBPR3 |= (0x10 ); - } -else if (pAd->Antenna.field.RxPath ==2 ) - { -BBPR3 |= (0x8 ); - } -else if (pAd->Antenna.field.RxPath ==1 ) - { -BBPR3 |= (0x0 ); - } -RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R3 ,BBPR3 ); - -#ifdef RT2860 - pAd->StaCfg.BBPR3 =BBPR3 ; -#endif -#endif /* RT30xx */ #ifdef RT30xx -if (RTMP_TEST_FLAG (pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS | - fRTMP_ADAPTER_HALT_IN_PROGRESS | - fRTMP_ADAPTER_RADIO_OFF | - fRTMP_ADAPTER_NIC_NOT_EXIST | - fRTMP_ADAPTER_BSS_SCAN_IN_PROGRESS) || -OPSTATUS_TEST_FLAG (pAd, fOP_STATUS_DOZE) - || (pAd->EepromAccess) - ) -return ; - - - { -//if (pAd->StaCfg.Psm == PWR_SAVE) -// return; - } -// two antenna selection mechanism- one is antenna diversity, the other is failed antenna remove // one is antenna diversity:there is only one antenna can rx and tx // the other is failed antenna remove:two physical antenna can rx and tx
@@ -8324,6 +8287,7 @@ VOID AsicEvaluateRxAnt( RTMPSetTimer(&pAd->Mlme.RxAntEvalTimer, 300); } else +#endif {if (pAd->StaCfg.Psm ==PWR_SAVE )return ;
@@ -8343,8 +8307,11 @@ VOID AsicEvaluateRxAnt(BBPR3 |= (0x0 ); }RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R3 ,BBPR3 ); + +#ifdef RT2860 + pAd->StaCfg.BBPR3 =BBPR3 ; +#endif } -#endif /* RT30xx */ if (OPSTATUS_TEST_FLAG (pAd, fOP_STATUS_MEDIA_STATE_CONNECTED) )
PATCH 15/22 Staging: rtxxx0: remove dead DBG_DIAGNOSE code
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: remove dead DBG_DIAGNOSE code
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/common/cmm_data.c | 40 ----------------- drivers/staging/rt2860/common/rtmp_init.c | 67 ------------------------------ drivers/staging/rt2860/rtmp.h | 32 -------------- 3 files changed, 139 deletions(-)
drivers/staging/rt2860/common/cmm_data.c +0 -40
@@ -1096,10 +1096,6 @@ VOID RTMPDeQueuePacket(TX_BLK TxBlk;TX_BLK *pTxBlk; -#ifdef DBG_DIAGNOSE -BOOLEAN firstRound; -RtmpDiagStruct *pDiagStruct = &pAd->DiagStruct; -#endif if (QIdx ==NUM_OF_TX_RING )
@@ -1119,9 +1115,6 @@ VOID RTMPDeQueuePacket(RT28XX_START_DEQUEUE (pAd, QueIdx, IrqFlags); -#ifdef DBG_DIAGNOSE - firstRound = ((QueIdx ==0 ) ? TRUE : FALSE); -#endif // DBG_DIAGNOSE // while (1 ) {
@@ -1141,31 +1134,12 @@ VOID RTMPDeQueuePacket(DEQUEUE_LOCK (&pAd->irq_lock, bIntContext, IrqFlags);if (&pAd->TxSwQueue[QueIdx] ==NULL ) { -#ifdef DBG_DIAGNOSE -if (firstRound == TRUE) - pDiagStruct->TxSWQueCnt[pDiagStruct->ArrayCurIdx][0 ]++; -#endif // DBG_DIAGNOSE // DEQUEUE_UNLOCK (&pAd->irq_lock, bIntContext, IrqFlags);break ; }#ifdef RT2860 FreeNumber[QueIdx] =GET_TXRING_FREENO (pAd, QueIdx); -#ifdef DBG_DIAGNOSE -if (firstRound == TRUE) - { -UCHAR txDescNumLevel, txSwQNumLevel; - - txDescNumLevel = (TX_RING_SIZE - FreeNumber[QueIdx]);// Number of occupied hw desc. - txDescNumLevel = ((txDescNumLevel <=15 ) ? txDescNumLevel :15 ); - pDiagStruct->TxDescCnt[pDiagStruct->ArrayCurIdx][txDescNumLevel]++; - - txSwQNumLevel = ((pAd->TxSwQueue[QueIdx].Number <=7 ) ? pAd->TxSwQueue[QueIdx].Number :8 ); - pDiagStruct->TxSWQueCnt[pDiagStruct->ArrayCurIdx][txSwQNumLevel]++; - - firstRound = FALSE; - } -#endif // DBG_DIAGNOSE // if (FreeNumber[QueIdx] <=5 ) {
@@ -1533,13 +1507,6 @@ VOID RTMPWriteTxWI_Data( } } -#ifdef DBG_DIAGNOSE -if (pTxBlk->QueIdx==0 ) - { - pAd->DiagStruct.TxDataCnt[pAd->DiagStruct.ArrayCurIdx]++; - pAd->DiagStruct.TxMcsCnt[pAd->DiagStruct.ArrayCurIdx][pTxWI->MCS]++; - } -#endif // DBG_DIAGNOSE // // for rate adapation pTxWI->PacketId = pTxWI->MCS;
@@ -1598,13 +1565,6 @@ VOID RTMPWriteTxWI_Cache( } } -#ifdef DBG_DIAGNOSE -if (pTxBlk->QueIdx==0 ) - { - pAd->DiagStruct.TxDataCnt[pAd->DiagStruct.ArrayCurIdx]++; - pAd->DiagStruct.TxMcsCnt[pAd->DiagStruct.ArrayCurIdx][pTxWI->MCS]++; - } -#endif // DBG_DIAGNOSE // pTxWI->MPDUtotalByteCount = pTxBlk->MpduHeaderLen + pTxBlk->SrcBufLen;
drivers/staging/rt2860/common/rtmp_init.c +0 -67
73 lines not on this page · raw message
drivers/staging/rt2860/rtmp.h +0 -32
@@ -45,8 +45,6 @@#include "aironet.h" -//#define DBG_DIAGNOSE 1 -#define VIRTUAL_IF_INC (__pAd) ((__pAd)->VirtualIfCnt++)#define VIRTUAL_IF_DEC (__pAd) ((__pAd)->VirtualIfCnt--)#define VIRTUAL_IF_NUM (__pAd) ((__pAd)->VirtualIfCnt)
@@ -2518,33 +2516,6 @@ typedef struct _INF_USB_CONFIG }INF_USB_CONFIG ; -#ifdef DBG_DIAGNOSE -#define DIAGNOSE_TIME 10 // 10 sec -typedef struct _RtmpDiagStrcut_ -{// Diagnosis Related element -unsigned char inited; -unsigned char qIdx; -unsigned char ArrayStartIdx; -unsigned char ArrayCurIdx; -// Tx Related Count -USHORT TxDataCnt[DIAGNOSE_TIME ]; -USHORT TxFailCnt[DIAGNOSE_TIME ]; -USHORT TxDescCnt[DIAGNOSE_TIME ][24 ];// 3*3 // TxDesc queue length in scale of 0~14, >=15 -USHORT TxMcsCnt[DIAGNOSE_TIME ][24 ];// 3*3 -USHORT TxSWQueCnt[DIAGNOSE_TIME ][9 ];// TxSwQueue length in scale of 0, 1, 2, 3, 4, 5, 6, 7, >=8 - -USHORT TxAggCnt[DIAGNOSE_TIME ]; -USHORT TxNonAggCnt[DIAGNOSE_TIME ]; -USHORT TxAMPDUCnt[DIAGNOSE_TIME ][24 ];// 3*3 // 10 sec, TxDMA APMDU Aggregation count in range from 0 to 15, in setp of 1. -USHORT TxRalinkCnt[DIAGNOSE_TIME ];// TxRalink Aggregation Count in 1 sec scale. -USHORT TxAMSDUCnt[DIAGNOSE_TIME ];// TxAMSUD Aggregation Count in 1 sec scale. - -// Rx Related Count -USHORT RxDataCnt[DIAGNOSE_TIME ];// Rx Total Data count. -USHORT RxCrcErrCnt[DIAGNOSE_TIME ]; -USHORT RxMcsCnt[DIAGNOSE_TIME ][24 ];// 3*3 -}RtmpDiagStruct ; -#endif // DBG_DIAGNOSE // //
@@ -2965,9 +2936,6 @@ typedef struct _RTMP_ADAPTERUCHAR flg_be_adjust;ULONG be_adjust_last_time; -#ifdef DBG_DIAGNOSE -RtmpDiagStruct DiagStruct; -#endif // DBG_DIAGNOSE // UINT8 PM_FlgSuspend;
PATCH 16/22 Staging: rtxxx0: remove dead virtual adapter support
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: remove dead virtual adapter support
* remove dead virtual adapter support
* remove needless rt28xx_ioctl() wrapper
* remove superfluous NULL checks
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/rt_linux.h | 6 drivers/staging/rt2860/rt_main_dev.c | 33 --- drivers/staging/rt2860/rtmp.h | 5 drivers/staging/rt2860/sta_ioctl.c | 293 ----------------------------------- 4 files changed, 9 insertions(+), 328 deletions(-)
drivers/staging/rt2860/rt_linux.h +0 -6
@@ -198,12 +198,6 @@ struct os_cookie {INT ioctl_if; }; -typedef struct _VIRTUAL_ADAPTER -{ -struct net_device *RtmpDev; -struct net_device *VirtualDev; -}VIRTUAL_ADAPTER ,PVIRTUAL_ADAPTER ; -#undef ASSERT#define ASSERT (x)
drivers/staging/rt2860/rt_main_dev.c +1 -32
@@ -670,7 +670,7 @@ err:static const struct net_device_ops rt2860_netdev_ops = { .ndo_open = MainVirtualIF_open, .ndo_stop = MainVirtualIF_close, - .ndo_do_ioctl = rt28xx_ioctl, + .ndo_do_ioctl = rt28xx_sta_ioctl, .ndo_get_stats = RT28xx_get_ether_stats, .ndo_validate_addr =NULL , .ndo_set_mac_address = eth_mac_addr,
@@ -970,37 +970,6 @@ void tbtt_tasklet(unsigned long data) } -INT rt28xx_ioctl( - IN struct net_device *net_dev, - IN OUT struct ifreq *rq, - IN INT cmd) -{ - VIRTUAL_ADAPTER *pVirtualAd = NULL; -RTMP_ADAPTER *pAd =NULL ; -INT ret =0 ; - -if (net_dev->priv_flags ==INT_MAIN ) - { - pAd = net_dev->ml_priv; - } -else - { - pVirtualAd = net_dev->ml_priv; - pAd = pVirtualAd->RtmpDev->ml_priv; - } - -if (pAd ==NULL ) - { -/* if 1st open fail, pAd will be free; -So the net_dev->ml_priv will be NULL in 2rd open */ -return -ENETDOWN ; - } - - ret =rt28xx_sta_ioctl (net_dev, rq, cmd); - -return ret; -} -/* ========================================================================
drivers/staging/rt2860/rtmp.h +0 -5
@@ -6331,11 +6331,6 @@ VOID RT28xx_UpdateBeaconToAsic( IN ULONG BeaconLen, IN ULONG UpdatePos); -INT rt28xx_ioctl( - IN struct net_device *net_dev, - IN OUT struct ifreq *rq, - IN INT cmd); - INT rt28xx_sta_ioctl( IN struct net_device *net_dev, IN OUT struct ifreq *rq,
drivers/staging/rt2860/sta_ioctl.c +8 -285
391 lines not on this page · raw message
PATCH 17/22 Staging: rtxxx0: debug messages fixes
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: debug messages fixes
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/common/ba_action.c | 7 ------- drivers/staging/rt2860/common/mlme.c | 14 +------------- drivers/staging/rt2860/common/spectrum.c | 5 ----- drivers/staging/rt2860/rt_linux.c | 5 ----- drivers/staging/rt2860/sta/sync.c | 2 -- drivers/staging/rt2870/common/2870_rtmp_init.c | 5 ----- 6 files changed, 1 insertion(+), 37 deletions(-)
drivers/staging/rt2860/common/ba_action.c +0 -7
@@ -531,12 +531,10 @@ VOID BAOriSessionSetUp( pBAEntry->TimeOutValue = TimeOut; pBAEntry->pAdapter = pAd; -#ifdef RT30xxDBGPRINT (RT_DEBUG_TRACE ,("Send AddBA to %02x:%02x:%02x:%02x:%02x:%02x Tid:%d isForced:%d Wcid:%d\n" ,pEntry->Addr[0 ],pEntry->Addr[1 ],pEntry->Addr[2 ] ,pEntry->Addr[3 ],pEntry->Addr[4 ],pEntry->Addr[5 ] ,TID ,isForced,pEntry->Aid)); -#endif if (!(pEntry->TXBAbitmap & (1 <<TID ))) {
@@ -1078,16 +1076,11 @@ VOID BAOriSessionSetupTimeout( AddbaReq.Token = pBAEntry->Token;MlmeEnqueue (pAd,ACTION_STATE_MACHINE ,MT2_MLME_ADD_BA_CATE ,sizeof (MLME_ADDBA_REQ_STRUCT ), (PVOID )&AddbaReq);RT28XX_MLME_HANDLER (pAd); -#ifndef RT30xx -DBGPRINT (RT_DEBUG_TRACE ,("BA Ori Session Timeout(%d) : Send ADD BA again\n" , pBAEntry->Token)); -#endif -#ifdef RT30xxDBGPRINT (RT_DEBUG_TRACE ,("BA Ori Session Timeout(%d) to %02x:%02x:%02x:%02x:%02x:%02x Tid:%d Wcid:%d\n" ,pBAEntry->Token ,pEntry->Addr[0 ],pEntry->Addr[1 ],pEntry->Addr[2 ] ,pEntry->Addr[3 ],pEntry->Addr[4 ],pEntry->Addr[5 ] ,pBAEntry->TID,pEntry->Aid)); -#endif pBAEntry->Token++;RTMPSetTimer (&pBAEntry->ORIBATimer,ORI_BA_SESSION_TIMEOUT ); }
drivers/staging/rt2860/common/mlme.c +1 -13
@@ -2845,9 +2845,8 @@ VOID MlmeSetPsmBit(RTMP_IO_READ32 (pAd,AUTO_RSP_CFG , &csr4.word); csr4.field.AckCtsPsmBit = (psm ==PWR_SAVE )?1 :0 ;RTMP_IO_WRITE32 (pAd,AUTO_RSP_CFG , csr4.word); -#ifndef RT30xx +DBGPRINT (RT_DEBUG_TRACE , ("MlmeSetPsmBit = %d\n" , psm)); -#endif }// IRQL = DISPATCH_LEVEL
@@ -5842,14 +5841,7 @@ VOID AsicSwitchChannel(#endif if (index ==MAX_NUM_OF_CHANNELS ) - { -#ifndef RT30xx -DBGPRINT (RT_DEBUG_ERROR , ("AsicSwitchChannel: Cant find the Channel#%d \n" , Channel)); -#endif -#ifdef RT30xxDBGPRINT (RT_DEBUG_ERROR , ("AsicSwitchChannel: Can't find the Channel#%d \n" , Channel)); -#endif - }#ifdef RT2870 // The RF programming sequence is difference between 3xxx and 2xxx
@@ -5971,7 +5963,6 @@ VOID AsicSwitchChannel( } } -#ifndef RT30xx DBGPRINT(RT_DEBUG_TRACE, ("SwitchChannel#%d(RF=%d, Pwr0=%d, Pwr1=%d, %dT), N=0x%02X, K=0x%02X, R=0x%02X\n", Channel, pAd->RfIcType,
@@ -5981,7 +5972,6 @@ VOID AsicSwitchChannel( FreqItems3020[index].N, FreqItems3020[index].K, FreqItems3020[index].R)); -#endif } else#endif // RT2870 //
@@ -9164,11 +9154,9 @@ VOID AsicTurnOnRFClk(break ; } -#ifndef RT30xxDBGPRINT (RT_DEBUG_TRACE , ("AsicTurnOnRFClk#%d(RF=%d, ) , R2=0x%08x\n" , Channel, pAd->RfIcType,R2 )); -#endif }
drivers/staging/rt2860/common/spectrum.c +0 -5
@@ -1570,12 +1570,7 @@ static VOID PeerMeasureReportAction(if ((pMeasureReportInfo =kmalloc (sizeof (MEASURE_RPI_REPORT ),GFP_ATOMIC )) ==NULL ) { -#ifndef RT30xxDBGPRINT (RT_DEBUG_ERROR , ("%s unable to alloc memory for measure report buffer (size=%zu).\n" , __func__,sizeof (MEASURE_RPI_REPORT ))); -#endif -#ifdef RT30xx -DBGPRINT (RT_DEBUG_ERROR , ("%s unable to alloc memory for measure report buffer (size=%d).\n" , __func__,sizeof (MEASURE_RPI_REPORT ))); -#endif return ; }
drivers/staging/rt2860/rt_linux.c +0 -5
@@ -826,12 +826,7 @@ void send_monitor_packets(if (pRxBlk->DataSize +sizeof (wlan_ng_prism2_header) >RX_BUFFER_AGGRESIZE ) { -#ifndef RT30xxDBGPRINT (RT_DEBUG_ERROR , ("%s : Size is too large! (%zu)\n" , __func__, pRxBlk->DataSize +sizeof (wlan_ng_prism2_header))); -#endif -#ifdef RT30xx -DBGPRINT (RT_DEBUG_ERROR , ("%s : Size is too large! (%d)\n" , __func__, pRxBlk->DataSize +sizeof (wlan_ng_prism2_header))); -#endif goto err_free_sk_buff; }
drivers/staging/rt2860/sta/sync.c +0 -2
@@ -1116,10 +1116,8 @@ VOID PeerBeacon(// Add the safeguard against the mismatch of adhoc wep status if (pAd->StaCfg.WepStatus != pAd->ScanTab.BssEntry[Bssidx].WepStatus) { -#ifdef RT30xxDBGPRINT (RT_DEBUG_TRACE , ("SYNC - Not matched wep status %d %d\n" , pAd->StaCfg.WepStatus, pAd->ScanTab.BssEntry[Bssidx].WepStatus));DBGPRINT (RT_DEBUG_TRACE , ("bssid=%s\n" , pAd->ScanTab.BssEntry[Bssidx].Bssid)); -#endif return ; }
drivers/staging/rt2870/common/2870_rtmp_init.c +0 -5
@@ -1263,9 +1263,7 @@ static void rt2870_hcca_dma_done_taskletUCHAR BulkOutPipeId =4 ;purbb_t pUrb; -#ifndef RT30xxDBGPRINT_RAW (RT_DEBUG_ERROR , ("--->hcca_dma_done_tasklet\n" )); -#endif pUrb = (purbb_t )data; pHTTXContext = (PHT_TX_CONTEXT )pUrb->context;
@@ -1305,10 +1303,7 @@ static void rt2870_hcca_dma_done_tasklet } } -#ifndef RT30xxDBGPRINT_RAW (RT_DEBUG_ERROR , ("<---hcca_dma_done_tasklet\n" )); -#endif -return ; }
PATCH 18/22 Staging: rtxxx0: remove unused link_list.h
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: remove unused link_list.h
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/link_list.h | 134 ------------------------------------- drivers/staging/rt2860/rtmp.h | 1 drivers/staging/rt2870/link_list.h | 1 drivers/staging/rt3070/link_list.h | 1 4 files changed, 137 deletions(-)
drivers/staging/rt2860/link_list.h deleted +0 -134
@@ -1,134 +0,0 @@ -/* -************************************************************************* -* Ralink Tech Inc. -* 5F., No.36, Taiyuan St., Jhubei City, -* Hsinchu County 302, -* Taiwan, R.O.C. -* -* (c) Copyright 2002-2007, Ralink Technology, Inc. -* -* 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., * -* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * -* * -************************************************************************* -*/ - -#ifndef __LINK_LIST_H__ -#define __LINK_LIST_H__ - -typedef struct _LIST_ENTRY -{ -struct _LIST_ENTRY *pNext; -}LIST_ENTRY , *PLIST_ENTRY ; - -typedef struct _LIST_HEADR -{ -PLIST_ENTRY pHead; -PLIST_ENTRY pTail; -UCHAR size; -}LIST_HEADER , *PLIST_HEADER ; - -static inline VOID initList ( - IN PLIST_HEADER pList) -{ - pList->pHead = pList->pTail =NULL ; - pList->size =0 ; -return ; -} - -static inline VOID insertTailList ( - IN PLIST_HEADER pList, - IN PLIST_ENTRY pEntry) -{ - pEntry->pNext =NULL ; -if (pList->pTail) - pList->pTail->pNext = pEntry; -else - pList->pHead = pEntry; - pList->pTail = pEntry; - pList->size++; - -return ; -} - -static inline PLIST_ENTRY removeHeadList ( - IN PLIST_HEADER pList) -{ -PLIST_ENTRY pNext; -PLIST_ENTRY pEntry; - - pEntry = pList->pHead; -if (pList->pHead !=NULL ) - { - pNext = pList->pHead->pNext; - pList->pHead = pNext; -if (pNext ==NULL ) - pList->pTail =NULL ; - pList->size--; - } -return pEntry; -} - -static inline int getListSize ( - IN PLIST_HEADER pList) -{ -return pList->size; -} - -static inline PLIST_ENTRY delEntryList ( - IN PLIST_HEADER pList, - IN PLIST_ENTRY pEntry) -{ -PLIST_ENTRY pCurEntry; -PLIST_ENTRY pPrvEntry; - -if (pList->pHead ==NULL ) -return NULL ; - -if (pEntry == pList->pHead) - { - pCurEntry = pList->pHead; - pList->pHead = pCurEntry->pNext; - -if (pList->pHead ==NULL ) - pList->pTail =NULL ; - - pList->size--; -return pCurEntry; - } - - pPrvEntry = pList->pHead; - pCurEntry = pPrvEntry->pNext; -while (pCurEntry !=NULL ) - { -if (pEntry == pCurEntry) - { - pPrvEntry->pNext = pCurEntry->pNext; - -if (pEntry == pList->pTail) - pList->pTail = pPrvEntry; - - pList->size--; -break ; - } - pPrvEntry = pCurEntry; - pCurEntry = pPrvEntry->pNext; - } - -return pCurEntry; -} - -#endif // ___LINK_LIST_H__ // -
drivers/staging/rt2860/rtmp.h +0 -1
@@ -40,7 +40,6 @@#ifndef __RTMP_H__#define __RTMP_H__ -#include "link_list.h" #include "spectrum_def.h" #include "aironet.h"
drivers/staging/rt2870/link_list.h deleted +0 -1
@@ -1 +0,0 @@ -#include "../rt2860/link_list.h"
drivers/staging/rt3070/link_list.h deleted +0 -1
@@ -1 +0,0 @@ -#include "../rt2870/link_list.h"
PATCH 19/22 Staging: rtxxx0: remove superfluous function prototypes
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: remove superfluous function prototypes
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/ap.h | 453 ------------------------------ drivers/staging/rt2860/dfs.h | 12 drivers/staging/rt2860/rtmp.h | 503 ---------------------------------- drivers/staging/rt2860/rtmp_ckipmic.h | 35 -- 4 files changed, 1003 deletions(-)
drivers/staging/rt2860/ap.h +0 -453
@@ -40,290 +40,8 @@#ifndef __AP_H__#define __AP_H__ - - -// ========================= AP RTMP.h ================================ - - - -// ============================================================= -// Function Prototypes -// ============================================================= - -// ap_data.c - -BOOLEAN APBridgeToWirelessSta ( - IN PRTMP_ADAPTER pAd, - IN PUCHAR pHeader, - IN UINT HdrLen, - IN PUCHAR pData, - IN UINT DataLen, - IN ULONG fromwdsidx); - -BOOLEAN APHandleRxDoneInterrupt ( - IN PRTMP_ADAPTER pAd); - -VOID APSendPackets ( - IN NDIS_HANDLE MiniportAdapterContext, - IN PPNDIS_PACKET ppPacketArray, - IN UINT NumberOfPackets); - -NDIS_STATUS APSendPacket ( - IN PRTMP_ADAPTER pAd, - IN PNDIS_PACKET pPacket); - - -NDIS_STATUS APHardTransmit ( - IN PRTMP_ADAPTER pAd, - IN TX_BLK *pTxBlk, - IN UCHAR QueIdx); - -VOID APRxEAPOLFrameIndicate ( - IN PRTMP_ADAPTER pAd, - IN MAC_TABLE_ENTRY *pEntry, - IN RX_BLK *pRxBlk, - IN UCHAR FromWhichBSSID); - -NDIS_STATUS APCheckRxError ( - IN PRTMP_ADAPTER pAd, - IN PRT28XX_RXD_STRUC pRxD, - IN UCHAR Wcid); - -BOOLEAN APCheckClass2Class3Error ( - IN PRTMP_ADAPTER pAd, - IN ULONG Wcid, - IN PHEADER_802_11 pHeader); - -VOID APHandleRxPsPoll ( - IN PRTMP_ADAPTER pAd, - IN PUCHAR pAddr, - IN USHORT Aid, - IN BOOLEAN isActive); - -VOID RTMPDescriptorEndianChange ( - IN PUCHAR pData, - IN ULONG DescriptorType); - -VOID RTMPFrameEndianChange ( - IN PRTMP_ADAPTER pAd, - IN PUCHAR pData, - IN ULONG Dir, - IN BOOLEAN FromRxDoneInt); - -// ap_assoc.c - -VOID APAssocStateMachineInit ( - IN PRTMP_ADAPTER pAd, - IN STATE_MACHINE *S, - OUT STATE_MACHINE_FUNC Trans[]); - -VOID APPeerAssocReqAction ( - IN PRTMP_ADAPTER pAd, - IN MLME_QUEUE_ELEM *Elem); - -VOID APPeerReassocReqAction ( - IN PRTMP_ADAPTER pAd, - IN MLME_QUEUE_ELEM *Elem); - -VOID APPeerDisassocReqAction ( - IN PRTMP_ADAPTER pAd, - IN MLME_QUEUE_ELEM *Elem); - -VOID MbssKickOutStas ( - IN PRTMP_ADAPTER pAd, - IN INT apidx, - IN USHORT Reason); - -VOID APMlmeKickOutSta ( - IN PRTMP_ADAPTER pAd, - IN PUCHAR pStaAddr, - IN UCHAR Wcid, - IN USHORT Reason); - -VOID APMlmeDisassocReqAction ( - IN PRTMP_ADAPTER pAd, - IN MLME_QUEUE_ELEM *Elem); - -VOID APCls3errAction ( - IN PRTMP_ADAPTER pAd, - IN ULONG Wcid, - IN PHEADER_802_11 pHeader); - - -USHORT APBuildAssociation ( - IN PRTMP_ADAPTER pAd, - IN MAC_TABLE_ENTRY *pEntry, - IN USHORT CapabilityInfo, - IN UCHAR MaxSupportedRateIn500Kbps, - IN UCHAR *RSN, - IN UCHAR *pRSNLen, - IN BOOLEAN bWmmCapable, - IN ULONG RalinkIe, - IN HT_CAPABILITY_IE *pHtCapability, - IN UCHAR HtCapabilityLen, - OUT USHORT *pAid); - -// ap_auth.c - -void APAuthStateMachineInit ( - IN PRTMP_ADAPTER pAd, - IN STATE_MACHINE *Sm, - OUT STATE_MACHINE_FUNC Trans[]); - -VOID APMlmeDeauthReqAction ( - IN PRTMP_ADAPTER pAd, - IN MLME_QUEUE_ELEM *Elem); - -VOID APCls2errAction ( - IN PRTMP_ADAPTER pAd, - IN ULONG Wcid, - IN PHEADER_802_11 pHeader); - -// ap_authrsp.c - -VOID APAuthRspStateMachineInit ( - IN PRTMP_ADAPTER pAd, - IN PSTATE_MACHINE Sm, - IN STATE_MACHINE_FUNC Trans[]); - -VOID APPeerAuthAtAuthRspIdleAction ( - IN PRTMP_ADAPTER pAd, - IN MLME_QUEUE_ELEM *Elem); - -VOID APPeerDeauthReqAction ( - IN PRTMP_ADAPTER pAd, - IN MLME_QUEUE_ELEM *Elem); - -VOID APPeerAuthSimpleRspGenAndSend ( - IN PRTMP_ADAPTER pAd, - IN PHEADER_802_11 pHdr80211, - IN USHORT Alg, - IN USHORT Seq, - IN USHORT StatusCode); - -// ap_connect.c - -BOOLEAN BeaconTransmitRequired ( - IN PRTMP_ADAPTER pAd, - IN INT apidx); - -VOID APMakeBssBeacon ( - IN PRTMP_ADAPTER pAd, - IN INT apidx); - -VOID APUpdateBeaconFrame ( - IN PRTMP_ADAPTER pAd, - IN INT apidx); - -VOID APMakeAllBssBeacon ( - IN PRTMP_ADAPTER pAd); - -VOID APUpdateAllBeaconFrame ( - IN PRTMP_ADAPTER pAd); - - -// ap_sync.c - -VOID APSyncStateMachineInit ( - IN PRTMP_ADAPTER pAd, - IN STATE_MACHINE *Sm, - OUT STATE_MACHINE_FUNC Trans[]); - -VOID APScanTimeout ( - IN PVOID SystemSpecific1, - IN PVOID FunctionContext, - IN PVOID SystemSpecific2, - IN PVOID SystemSpecific3); - -VOID APInvalidStateWhenScan ( - IN PRTMP_ADAPTER pAd, - IN MLME_QUEUE_ELEM *Elem); - -VOID APScanTimeoutAction ( - IN PRTMP_ADAPTER pAd, - IN MLME_QUEUE_ELEM *Elem); - -VOID APPeerProbeReqAction ( - IN PRTMP_ADAPTER pAd, - IN MLME_QUEUE_ELEM *Elem); - -VOID APPeerBeaconAction ( - IN PRTMP_ADAPTER pAd, - IN MLME_QUEUE_ELEM *Elem); - -VOID APMlmeScanReqAction ( - IN PRTMP_ADAPTER pAd, - IN MLME_QUEUE_ELEM *Elem); - -VOID APPeerBeaconAtScanAction ( - IN PRTMP_ADAPTER pAd, - IN MLME_QUEUE_ELEM *Elem); - -VOID APScanCnclAction ( - IN PRTMP_ADAPTER pAd, - IN MLME_QUEUE_ELEM *Elem); - -VOID ApSiteSurvey ( - IN PRTMP_ADAPTER pAd); - -VOID SupportRate ( - IN PUCHAR SupRate, - IN UCHAR SupRateLen, - IN PUCHAR ExtRate, - IN UCHAR ExtRateLen, - OUT PUCHAR *Rates, - OUT PUCHAR RatesLen, - OUT PUCHAR pMaxSupportRate); - - -BOOLEAN ApScanRunning ( - IN PRTMP_ADAPTER pAd); - -// ap_wpa.c - -VOID APWpaStateMachineInit ( - IN PRTMP_ADAPTER pAd, - IN STATE_MACHINE *Sm, - OUT STATE_MACHINE_FUNC Trans[]); -// ap_mlme.c -VOID APMlmePeriodicExec ( - IN PRTMP_ADAPTER pAd); - -VOID APMlmeSelectTxRateTable ( - IN PRTMP_ADAPTER pAd, - IN PMAC_TABLE_ENTRY pEntry, - IN PUCHAR *ppTable, - IN PUCHAR pTableSize, - IN PUCHAR pInitTxRateIdx); - -VOID APMlmeSetTxRate ( - IN PRTMP_ADAPTER pAd, - IN PMAC_TABLE_ENTRY pEntry, - IN PRTMP_TX_RATE_SWITCH pTxRate); - -VOID APMlmeDynamicTxRateSwitching ( - IN PRTMP_ADAPTER pAd); - -VOID APQuickResponeForRateUpExec ( - IN PVOID SystemSpecific1, - IN PVOID FunctionContext, - IN PVOID SystemSpecific2, - IN PVOID SystemSpecific3); - -BOOLEAN APMsgTypeSubst ( - IN PRTMP_ADAPTER pAd, - IN PFRAME_802_11 pFrame, - OUT INT *Machine, - OUT INT *MsgType); - -VOID APQuickResponeForRateUpExec ( - IN PVOID SystemSpecific1, - IN PVOID FunctionContext, - IN PVOID SystemSpecific2, - IN PVOID SystemSpecific3); -#ifdef RT2870 VOID BeaconUpdateExec( IN PVOID SystemSpecific1,
@@ -336,34 +54,8 @@ VOID RTMPSetPiggyBack( IN PRTMP_ADAPTER pAd, IN BOOLEAN bPiggyBack); -VOID APAsicEvaluateRxAnt ( - IN PRTMP_ADAPTER pAd); - -VOID APAsicRxAntEvalTimeout ( - IN PRTMP_ADAPTER pAd); -// ap.c -VOID APSwitchChannel ( - IN PRTMP_ADAPTER pAd, - IN INT Channel); - -NDIS_STATUS APInitialize ( - IN PRTMP_ADAPTER pAd); - -VOID APShutdown ( - IN PRTMP_ADAPTER pAd); - -VOID APStartUp ( - IN PRTMP_ADAPTER pAd); - -VOID APStop ( - IN PRTMP_ADAPTER pAd); - -VOID APCleanupPsQueue ( - IN PRTMP_ADAPTER pAd, - IN PQUEUE_HEADER pQueue); -VOID MacTableReset ( IN PRTMP_ADAPTER pAd);
@@ -382,150 +74,5 @@ MAC_TABLE_ENTRY *MacTableLookup( IN PRTMP_ADAPTER pAd, IN PUCHAR pAddr); -VOID MacTableMaintenance ( - IN PRTMP_ADAPTER pAd); - -UINT32 MacTableAssocStaNumGet ( - IN PRTMP_ADAPTER pAd); - -MAC_TABLE_ENTRY *APSsPsInquiry ( - IN PRTMP_ADAPTER pAd, - IN PUCHAR pAddr, - OUT SST *Sst, - OUT USHORT *Aid, - OUT UCHAR *PsMode, - OUT UCHAR *Rate); - -BOOLEAN APPsIndicate ( - IN PRTMP_ADAPTER pAd, - IN PUCHAR pAddr, - IN ULONG Wcid, - IN UCHAR Psm); - -VOID ApLogEvent ( - IN PRTMP_ADAPTER pAd, - IN PUCHAR pAddr, - IN USHORT Event); - -VOID APUpdateOperationMode ( - IN PRTMP_ADAPTER pAd); - -VOID APUpdateCapabilityAndErpIe ( - IN PRTMP_ADAPTER pAd); - -BOOLEAN ApCheckAccessControlList ( - IN PRTMP_ADAPTER pAd, - IN PUCHAR pAddr, - IN UCHAR Apidx); - -VOID ApUpdateAccessControlList ( - IN PRTMP_ADAPTER pAd, - IN UCHAR Apidx); - -VOID ApEnqueueNullFrame ( - IN PRTMP_ADAPTER pAd, - IN PUCHAR pAddr, - IN UCHAR TxRate, - IN UCHAR PID, - IN UCHAR apidx, - IN BOOLEAN bQosNull, - IN BOOLEAN bEOSP, - IN UCHAR OldUP); - -VOID ApSendFrame ( - IN PRTMP_ADAPTER pAd, - IN PVOID pBuffer, - IN ULONG Length, - IN UCHAR TxRate, - IN UCHAR PID); - -VOID ApEnqueueAckFrame ( - IN PRTMP_ADAPTER pAd, - IN PUCHAR pAddr, - IN UCHAR TxRate, - IN UCHAR apidx); - -UCHAR APAutoSelectChannel ( - IN PRTMP_ADAPTER pAd, - IN BOOLEAN Optimal); - -// ap_sanity.c - - -BOOLEAN PeerAssocReqCmmSanity ( - IN PRTMP_ADAPTER pAd, - IN BOOLEAN isRessoc, - IN VOID *Msg, - IN ULONG MsgLen, - OUT PUCHAR pAddr2, - OUT USHORT *pCapabilityInfo, - OUT USHORT *pListenInterval, - OUT PUCHAR pApAddr, - OUT UCHAR *pSsidLen, - OUT char *Ssid, - OUT UCHAR *pRatesLen, - OUT UCHAR Rates[], - OUT UCHAR *RSN, - OUT UCHAR *pRSNLen, - OUT BOOLEAN *pbWmmCapable, - OUT ULONG *pRalinkIe, - OUT UCHAR *pHtCapabilityLen, - OUT HT_CAPABILITY_IE *pHtCapability); - -BOOLEAN PeerDisassocReqSanity ( - IN PRTMP_ADAPTER pAd, - IN VOID *Msg, - IN ULONG MsgLen, - OUT PUCHAR pAddr2, - OUT USHORT *Reason); - -BOOLEAN PeerDeauthReqSanity ( - IN PRTMP_ADAPTER pAd, - IN VOID *Msg, - IN ULONG MsgLen, - OUT PUCHAR pAddr2, - OUT USHORT *Reason); - -BOOLEAN APPeerAuthSanity ( - IN PRTMP_ADAPTER pAd, - IN VOID *Msg, - IN ULONG MsgLen, - OUT PUCHAR pAddr1, - OUT PUCHAR pAddr2, - OUT USHORT *Alg, - OUT USHORT *Seq, - OUT USHORT *Status, -CHAR *ChlgText); - -BOOLEAN APPeerProbeReqSanity ( - IN PRTMP_ADAPTER pAd, - IN VOID *Msg, - IN ULONG MsgLen, - OUT PUCHAR pAddr2, - OUT CHAR Ssid[], - OUT UCHAR *SsidLen); - -BOOLEAN APPeerBeaconAndProbeRspSanity ( - IN PRTMP_ADAPTER pAd, - IN VOID *Msg, - IN ULONG MsgLen, - OUT PUCHAR pAddr2, - OUT PUCHAR pBssid, - OUT CHAR Ssid[], - OUT UCHAR *SsidLen, - OUT UCHAR *BssType, - OUT USHORT *BeaconPeriod, - OUT UCHAR *Channel, - OUT LARGE_INTEGER *Timestamp, - OUT USHORT *CapabilityInfo, - OUT UCHAR Rate[], - OUT UCHAR *RateLen, - OUT BOOLEAN *ExtendedRateIeExist, - OUT UCHAR *Erp); - - -// ================== end of AP RTMP.h ======================== - -#endif // __AP_H__
drivers/staging/rt2860/dfs.h +0 -12
@@ -77,18 +77,6 @@ ULONG RTMPReadRadarDuration(VOID RTMPCleanRadarDuration ( IN PRTMP_ADAPTER pAd); -VOID RTMPPrepareRDCTSFrame ( - IN PRTMP_ADAPTER pAd, - IN PUCHAR pDA, - IN ULONG Duration, - IN UCHAR RTSRate, - IN ULONG CTSBaseAddr, - IN UCHAR FrameGap); - -VOID RTMPPrepareRadarDetectParams ( - IN PRTMP_ADAPTER pAd); - -INT Set_ChMovingTime_Proc ( IN PRTMP_ADAPTER pAd, IN PUCHAR arg);
drivers/staging/rt2860/rtmp.h +0 -503
750 lines not on this page · raw message
drivers/staging/rt2860/rtmp_ckipmic.h +0 -35
@@ -46,24 +46,6 @@ typedef struct _MIC_CONTEXT {UCHAR part[4 ];/* for conversion of message to u32 for mmh */ }MIC_CONTEXT , *PMIC_CONTEXT ; -VOID CKIP_key_permute ( - OUT UCHAR *PK, /* output permuted key */ - IN UCHAR *CK, /* input CKIP key */ - IN UCHAR toDsFromDs, /* input toDs/FromDs bits */ - IN UCHAR *piv); /* input pointer to IV */ - -VOID RTMPCkipMicInit ( - IN PMIC_CONTEXT pContext, - IN PUCHAR CK); - -VOID RTMPMicUpdate ( - IN PMIC_CONTEXT pContext, - IN PUCHAR pOctets, - IN INT len); - -ULONG RTMPMicGetCoefficient ( - IN PMIC_CONTEXT pContext); - VOID xor_128( IN PUCHAR a, IN PUCHAR b,
@@ -93,21 +75,4 @@ VOID mix_column( IN PUCHAR in, OUT PUCHAR out); -VOID RTMPAesEncrypt ( - IN PUCHAR key, - IN PUCHAR data, - IN PUCHAR ciphertext); - -VOID RTMPMicFinal ( - IN PMIC_CONTEXT pContext, - OUT UCHAR digest[4]); - -VOID RTMPCkipInsertCMIC ( - IN PRTMP_ADAPTER pAd, - OUT PUCHAR pMIC, - IN PUCHAR p80211hdr, - IN PNDIS_PACKET pPacket, - IN PCIPHER_KEY pKey, - IN PUCHAR mic_snap); -#endif //__RTMP_CKIPMIC_H__
PATCH 20/22 Staging: rtxxx0: remove private debugging ioctls
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: remove private debugging ioctls
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/oid.h | 7 drivers/staging/rt2860/sta_ioctl.c | 775 ------------------------------------- 2 files changed, 782 deletions(-)
drivers/staging/rt2860/oid.h +0 -7
@@ -627,13 +627,6 @@ typedef struct _NDIS_802_11_CAPABILITY#define RT_PRIV_IOCTL_EXT (SIOCIWFIRSTPRIV + 0x01) // Sync. with AP for wsc upnp daemon#define RTPRIV_IOCTL_SET (SIOCIWFIRSTPRIV + 0x02) -#ifdef DBG -#define RTPRIV_IOCTL_BBP (SIOCIWFIRSTPRIV + 0x03) -#define RTPRIV_IOCTL_MAC (SIOCIWFIRSTPRIV + 0x05) -#define RTPRIV_IOCTL_RF (SIOCIWFIRSTPRIV + 0x13) -#define RTPRIV_IOCTL_E2P (SIOCIWFIRSTPRIV + 0x07) -#endif -#define RTPRIV_IOCTL_STATISTICS (SIOCIWFIRSTPRIV + 0x09)#define RTPRIV_IOCTL_ADD_PMKID_CACHE (SIOCIWFIRSTPRIV + 0x0A)#define RTPRIV_IOCTL_RADIUS_DATA (SIOCIWFIRSTPRIV + 0x0C)
drivers/staging/rt2860/sta_ioctl.c +0 -775
812 lines not on this page · raw message
PATCH 21/22 Staging: rtxxx0: remove private ioctls
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: remove private ioctls
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/oid.h | 122 -- drivers/staging/rt2860/sta_ioctl.c | 1851 ------------------------------------- 2 files changed, 8 insertions(+), 1965 deletions(-)
drivers/staging/rt2860/oid.h +6 -116
@@ -92,136 +92,31 @@// #define OID_GET_SET_TOGGLE 0x8000 -#define OID_802_11_NETWORK_TYPES_SUPPORTED 0x0103 -#define OID_802_11_NETWORK_TYPE_IN_USE 0x0104 -#define OID_802_11_RSSI_TRIGGER 0x0107 -#define RT_OID_802_11_RSSI 0x0108 //rt2860 only , kathy -#define RT_OID_802_11_RSSI_1 0x0109 //rt2860 only , kathy -#define RT_OID_802_11_RSSI_2 0x010A //rt2860 only , kathy -#define OID_802_11_NUMBER_OF_ANTENNAS 0x010B -#define OID_802_11_RX_ANTENNA_SELECTED 0x010C -#define OID_802_11_TX_ANTENNA_SELECTED 0x010D -#define OID_802_11_SUPPORTED_RATES 0x010E -#define OID_802_11_ADD_WEP 0x0112 -#define OID_802_11_REMOVE_WEP 0x0113 -#define OID_802_11_DISASSOCIATE 0x0114 -#define OID_802_11_PRIVACY_FILTER 0x0118 -#define OID_802_11_ASSOCIATION_INFORMATION 0x011E -#define OID_802_11_TEST 0x011F -#define RT_OID_802_11_COUNTRY_REGION 0x0507 -#define OID_802_11_BSSID_LIST_SCAN 0x0508 -#define OID_802_11_SSID 0x0509 -#define OID_802_11_BSSID 0x050A -#define RT_OID_802_11_RADIO 0x050B -#define RT_OID_802_11_PHY_MODE 0x050C -#define RT_OID_802_11_STA_CONFIG 0x050D -#define OID_802_11_DESIRED_RATES 0x050E -#define RT_OID_802_11_PREAMBLE 0x050F -#define OID_802_11_WEP_STATUS 0x0510 -#define OID_802_11_AUTHENTICATION_MODE 0x0511 -#define OID_802_11_INFRASTRUCTURE_MODE 0x0512 -#define RT_OID_802_11_RESET_COUNTERS 0x0513 -#define OID_802_11_RTS_THRESHOLD 0x0514 -#define OID_802_11_FRAGMENTATION_THRESHOLD 0x0515 -#define OID_802_11_POWER_MODE 0x0516 -#define OID_802_11_TX_POWER_LEVEL 0x0517 -#define RT_OID_802_11_ADD_WPA 0x0518 -#define OID_802_11_REMOVE_KEY 0x0519 -#define OID_802_11_ADD_KEY 0x0520 -#define OID_802_11_CONFIGURATION 0x0521 -#define OID_802_11_TX_PACKET_BURST 0x0522 -#define RT_OID_802_11_QUERY_NOISE_LEVEL 0x0523 -#define RT_OID_802_11_EXTRA_INFO 0x0524 -#ifdef DBG -#define RT_OID_802_11_HARDWARE_REGISTER 0x0525 -#endif -#define OID_802_11_ENCRYPTION_STATUS OID_802_11_WEP_STATUS -#define OID_802_11_DEAUTHENTICATION 0x0526 -#define OID_802_11_DROP_UNENCRYPTED 0x0527 -#define OID_802_11_MIC_FAILURE_REPORT_FRAME 0x0528 - -// For 802.1x daemin using to require current driver configuration -#define OID_802_11_RADIUS_QUERY_SETTING 0x0540 +#define OID_802_11_ADD_WEP 0x0112 +#define OID_802_11_DISASSOCIATE 0x0114 +#define OID_802_11_BSSID_LIST_SCAN 0x0508 +#define OID_802_11_SSID 0x0509 +#define OID_802_11_BSSID 0x050A +#define OID_802_11_MIC_FAILURE_REPORT_FRAME 0x0528#define RT_OID_DEVICE_NAME 0x0607#define RT_OID_VERSION_INFO 0x0608 -#define OID_802_11_BSSID_LIST 0x0609 -#define OID_802_3_CURRENT_ADDRESS 0x060A#define OID_GEN_MEDIA_CONNECT_STATUS 0x060B -#define RT_OID_802_11_QUERY_LINK_STATUS 0x060C -#define OID_802_11_RSSI 0x060D -#define OID_802_11_STATISTICS 0x060E#define OID_GEN_RCV_OK 0x060F#define OID_GEN_RCV_NO_BUFFER 0x0610 -#define RT_OID_802_11_QUERY_EEPROM_VERSION 0x0611 -#define RT_OID_802_11_QUERY_FIRMWARE_VERSION 0x0612 -#define RT_OID_802_11_QUERY_LAST_RX_RATE 0x0613 -#define RT_OID_802_11_TX_POWER_LEVEL_1 0x0614 -#define RT_OID_802_11_QUERY_PIDVID 0x0615#define OID_SET_COUNTERMEASURES 0x0616 -#define OID_802_11_SET_IEEE8021X 0x0617 -#define OID_802_11_SET_IEEE8021X_REQUIRE_KEY 0x0618 -#define OID_802_11_PMKID 0x0620#define RT_OID_WPA_SUPPLICANT_SUPPORT 0x0621#define RT_OID_WE_VERSION_COMPILED 0x0622#define RT_OID_NEW_DRIVER 0x0623 -//rt2860 , kathy -#define RT_OID_802_11_SNR_0 0x0630 -#define RT_OID_802_11_SNR_1 0x0631 -#define RT_OID_802_11_QUERY_LAST_TX_RATE 0x0632 -#define RT_OID_802_11_QUERY_HT_PHYMODE 0x0633 -#define RT_OID_802_11_SET_HT_PHYMODE 0x0634 -#define OID_802_11_RELOAD_DEFAULTS 0x0635 -#define RT_OID_802_11_QUERY_APSD_SETTING 0x0636 -#define RT_OID_802_11_SET_APSD_SETTING 0x0637 -#define RT_OID_802_11_QUERY_APSD_PSM 0x0638 -#define RT_OID_802_11_SET_APSD_PSM 0x0639 -#define RT_OID_802_11_QUERY_DLS 0x063A -#define RT_OID_802_11_SET_DLS 0x063B -#define RT_OID_802_11_QUERY_DLS_PARAM 0x063C -#define RT_OID_802_11_SET_DLS_PARAM 0x063D -#define RT_OID_802_11_QUERY_WMM 0x063E -#define RT_OID_802_11_SET_WMM 0x063F -#define RT_OID_802_11_QUERY_IMME_BA_CAP 0x0640 -#define RT_OID_802_11_SET_IMME_BA_CAP 0x0641 -#define RT_OID_802_11_QUERY_BATABLE 0x0642 -#define RT_OID_802_11_ADD_IMME_BA 0x0643 -#define RT_OID_802_11_TEAR_IMME_BA 0x0644#define RT_OID_DRIVER_DEVICE_NAME 0x0645 -#define RT_OID_802_11_QUERY_DAT_HT_PHYMODE 0x0646#define RT_OID_QUERY_MULTIPLE_CARD_SUPPORT 0x0647// Ralink defined OIDs // Dennis Lee move to platform specific -#define RT_OID_802_11_BSSID (OID_GET_SET_TOGGLE | OID_802_11_BSSID) -#define RT_OID_802_11_SSID (OID_GET_SET_TOGGLE | OID_802_11_SSID) -#define RT_OID_802_11_INFRASTRUCTURE_MODE (OID_GET_SET_TOGGLE | OID_802_11_INFRASTRUCTURE_MODE) -#define RT_OID_802_11_ADD_WEP (OID_GET_SET_TOGGLE | OID_802_11_ADD_WEP) -#define RT_OID_802_11_ADD_KEY (OID_GET_SET_TOGGLE | OID_802_11_ADD_KEY) -#define RT_OID_802_11_REMOVE_WEP (OID_GET_SET_TOGGLE | OID_802_11_REMOVE_WEP) -#define RT_OID_802_11_REMOVE_KEY (OID_GET_SET_TOGGLE | OID_802_11_REMOVE_KEY) -#define RT_OID_802_11_DISASSOCIATE (OID_GET_SET_TOGGLE | OID_802_11_DISASSOCIATE) -#define RT_OID_802_11_AUTHENTICATION_MODE (OID_GET_SET_TOGGLE | OID_802_11_AUTHENTICATION_MODE) -#define RT_OID_802_11_PRIVACY_FILTER (OID_GET_SET_TOGGLE | OID_802_11_PRIVACY_FILTER) -#define RT_OID_802_11_BSSID_LIST_SCAN (OID_GET_SET_TOGGLE | OID_802_11_BSSID_LIST_SCAN) -#define RT_OID_802_11_WEP_STATUS (OID_GET_SET_TOGGLE | OID_802_11_WEP_STATUS) -#define RT_OID_802_11_RELOAD_DEFAULTS (OID_GET_SET_TOGGLE | OID_802_11_RELOAD_DEFAULTS) -#define RT_OID_802_11_NETWORK_TYPE_IN_USE (OID_GET_SET_TOGGLE | OID_802_11_NETWORK_TYPE_IN_USE) -#define RT_OID_802_11_TX_POWER_LEVEL (OID_GET_SET_TOGGLE | OID_802_11_TX_POWER_LEVEL) -#define RT_OID_802_11_RSSI_TRIGGER (OID_GET_SET_TOGGLE | OID_802_11_RSSI_TRIGGER) -#define RT_OID_802_11_FRAGMENTATION_THRESHOLD (OID_GET_SET_TOGGLE | OID_802_11_FRAGMENTATION_THRESHOLD) -#define RT_OID_802_11_RTS_THRESHOLD (OID_GET_SET_TOGGLE | OID_802_11_RTS_THRESHOLD) -#define RT_OID_802_11_RX_ANTENNA_SELECTED (OID_GET_SET_TOGGLE | OID_802_11_RX_ANTENNA_SELECTED) -#define RT_OID_802_11_TX_ANTENNA_SELECTED (OID_GET_SET_TOGGLE | OID_802_11_TX_ANTENNA_SELECTED) -#define RT_OID_802_11_SUPPORTED_RATES (OID_GET_SET_TOGGLE | OID_802_11_SUPPORTED_RATES) -#define RT_OID_802_11_DESIRED_RATES (OID_GET_SET_TOGGLE | OID_802_11_DESIRED_RATES) -#define RT_OID_802_11_CONFIGURATION (OID_GET_SET_TOGGLE | OID_802_11_CONFIGURATION) -#define RT_OID_802_11_POWER_MODE (OID_GET_SET_TOGGLE | OID_802_11_POWER_MODE) - typedef enum _NDIS_802_11_STATUS_TYPE { Ndis802_11StatusType_Authentication,
@@ -652,11 +547,6 @@ enum {#endif }; -#define OID_802_11_BUILD_CHANNEL_EX 0x0714 -#define OID_802_11_GET_CH_LIST 0x0715 -#define OID_802_11_GET_COUNTRY_CODE 0x0716 -#define OID_802_11_GET_CHANNEL_GEOGRAPHY 0x0717 -#ifdef LLTD_SUPPORT // for consistency with RT61 #define RT_OID_GET_PHY_MODE 0x761
drivers/staging/rt2860/sta_ioctl.c +2 -1849
1,870 lines not on this page · raw message
PATCH 22/22 Staging: rtxxx0: remove unused code
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] Staging: rtxxx0: remove unused code
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/staging/rt2860/common/cmm_data.c | 113 ---- drivers/staging/rt2860/common/cmm_sanity.c | 184 ------ drivers/staging/rt2860/common/cmm_wpa.c | 794 ----------------------------- drivers/staging/rt2860/common/mlme.c | 4 drivers/staging/rt2860/rtmp.h | 84 --- drivers/staging/rt2860/rtmp_def.h | 3 6 files changed, 1182 deletions(-)
drivers/staging/rt2860/common/cmm_data.c +0 -113
@@ -2017,119 +2017,6 @@ VOID RTMPHandleRxCoherentInterrupt( DBGPRINT(RT_DEBUG_TRACE, ("<== RTMPHandleRxCoherentInterrupt \n")); } - - -VOID DBGPRINT_TX_RING ( - IN PRTMP_ADAPTER pAd, - IN UCHAR QueIdx) -{ -UINT32 Ac0Base; -UINT32 Ac0HwIdx =0 , Ac0SwIdx =0 , AC0freeIdx; -int i; -PULONG ptemp; - -DBGPRINT_RAW (RT_DEBUG_TRACE , ("=====================================================\n " )); -switch (QueIdx) - { -case QID_AC_BE : -RTMP_IO_READ32 (pAd,TX_BASE_PTR0 , &Ac0Base); -RTMP_IO_READ32 (pAd,TX_CTX_IDX0 , &Ac0SwIdx); -RTMP_IO_READ32 (pAd,TX_DTX_IDX0 , &Ac0HwIdx); -DBGPRINT_RAW (RT_DEBUG_TRACE , ("All QID_AC_BE DESCRIPTOR \n " )); -for (i=0 ;i<TX_RING_SIZE ;i++) - { - ptemp= (PULONG )pAd->TxRing[QID_AC_BE ].Cell[i].AllocVa; -DBGPRINT_RAW (RT_DEBUG_TRACE , ("[%02d] %08lx: %08lx: %08lx: %08lx\n " , i, *ptemp,*(ptemp+1 ),*(ptemp+2 ),*(ptemp+3 ))); - } -DBGPRINT_RAW (RT_DEBUG_TRACE , (" \n " )); -break ; -case QID_AC_BK : -RTMP_IO_READ32 (pAd,TX_BASE_PTR1 , &Ac0Base); -RTMP_IO_READ32 (pAd,TX_CTX_IDX1 , &Ac0SwIdx); -RTMP_IO_READ32 (pAd,TX_DTX_IDX1 , &Ac0HwIdx); -DBGPRINT_RAW (RT_DEBUG_TRACE , ("All QID_AC_BK DESCRIPTOR \n " )); -for (i=0 ;i<TX_RING_SIZE ;i++) - { - ptemp= (PULONG )pAd->TxRing[QID_AC_BK ].Cell[i].AllocVa; -DBGPRINT_RAW (RT_DEBUG_TRACE , ("[%02d] %08lx: %08lx: %08lx: %08lx\n " , i, *ptemp,*(ptemp+1 ),*(ptemp+2 ),*(ptemp+3 ))); - } -DBGPRINT_RAW (RT_DEBUG_TRACE , (" \n " )); -break ; -case QID_AC_VI : -RTMP_IO_READ32 (pAd,TX_BASE_PTR2 , &Ac0Base); -RTMP_IO_READ32 (pAd,TX_CTX_IDX2 , &Ac0SwIdx); -RTMP_IO_READ32 (pAd,TX_DTX_IDX2 , &Ac0HwIdx); -DBGPRINT_RAW (RT_DEBUG_TRACE , ("All QID_AC_VI DESCRIPTOR \n " )); -for (i=0 ;i<TX_RING_SIZE ;i++) - { - ptemp= (PULONG )pAd->TxRing[QID_AC_VI ].Cell[i].AllocVa; -DBGPRINT_RAW (RT_DEBUG_TRACE , ("[%02d] %08lx: %08lx: %08lx: %08lx\n " , i, *ptemp,*(ptemp+1 ),*(ptemp+2 ),*(ptemp+3 ))); - } -DBGPRINT_RAW (RT_DEBUG_TRACE , (" \n " )); -break ; -case QID_AC_VO : -RTMP_IO_READ32 (pAd,TX_BASE_PTR3 , &Ac0Base); -RTMP_IO_READ32 (pAd,TX_CTX_IDX3 , &Ac0SwIdx); -RTMP_IO_READ32 (pAd,TX_DTX_IDX3 , &Ac0HwIdx); -DBGPRINT_RAW (RT_DEBUG_TRACE , ("All QID_AC_VO DESCRIPTOR \n " )); -for (i=0 ;i<TX_RING_SIZE ;i++) - { - ptemp= (PULONG )pAd->TxRing[QID_AC_VO ].Cell[i].AllocVa; -DBGPRINT_RAW (RT_DEBUG_TRACE , ("[%02d] %08lx: %08lx: %08lx: %08lx\n " , i, *ptemp,*(ptemp+1 ),*(ptemp+2 ),*(ptemp+3 ))); - } -DBGPRINT_RAW (RT_DEBUG_TRACE , (" \n " )); -break ; -case QID_MGMT : -RTMP_IO_READ32 (pAd,TX_BASE_PTR5 , &Ac0Base); -RTMP_IO_READ32 (pAd,TX_CTX_IDX5 , &Ac0SwIdx); -RTMP_IO_READ32 (pAd,TX_DTX_IDX5 , &Ac0HwIdx); -DBGPRINT_RAW (RT_DEBUG_TRACE , (" All QID_MGMT DESCRIPTOR \n " )); -for (i=0 ;i<MGMT_RING_SIZE ;i++) - { - ptemp= (PULONG )pAd->MgmtRing.Cell[i].AllocVa; -DBGPRINT_RAW (RT_DEBUG_TRACE , ("[%02d] %08lx: %08lx: %08lx: %08lx\n " , i, *ptemp,*(ptemp+1 ),*(ptemp+2 ),*(ptemp+3 ))); - } -DBGPRINT_RAW (RT_DEBUG_TRACE , (" \n " )); -break ; - -default : -DBGPRINT_ERR (("DBGPRINT_TX_RING(Ring %d) not supported\n" , QueIdx)); -break ; - } - AC0freeIdx = pAd->TxRing[QueIdx].TxSwFreeIdx; - -DBGPRINT (RT_DEBUG_TRACE ,("TxRing%d, TX_DTX_IDX=%d, TX_CTX_IDX=%d\n" , QueIdx, Ac0HwIdx, Ac0SwIdx)); -DBGPRINT_RAW (RT_DEBUG_TRACE ,(" TxSwFreeIdx[%d]" , AC0freeIdx)); -DBGPRINT_RAW (RT_DEBUG_TRACE ,(" pending-NDIS=%ld\n" , pAd->RalinkCounters.PendingNdisPacketCount)); - - -} - - -VOID DBGPRINT_RX_RING ( - IN PRTMP_ADAPTER pAd) -{ -UINT32 Ac0Base; -UINT32 Ac0HwIdx =0 , Ac0SwIdx =0 , AC0freeIdx; -int i; -UINT32 *ptemp; - -DBGPRINT_RAW (RT_DEBUG_TRACE , ("=====================================================\n " )); -RTMP_IO_READ32 (pAd,RX_BASE_PTR , &Ac0Base); -RTMP_IO_READ32 (pAd,RX_CRX_IDX , &Ac0SwIdx); -RTMP_IO_READ32 (pAd,RX_DRX_IDX , &Ac0HwIdx); - AC0freeIdx = pAd->RxRing.RxSwReadIdx; - -DBGPRINT_RAW (RT_DEBUG_TRACE , ("All RX DSP \n " )); -for (i=0 ;i<RX_RING_SIZE ;i++) - { - ptemp = (UINT32 *)pAd->RxRing.Cell[i].AllocVa; -DBGPRINT_RAW (RT_DEBUG_TRACE , ("[%02d] %08x: %08x: %08x: %08x\n " , i, *ptemp,*(ptemp+1 ),*(ptemp+2 ),*(ptemp+3 ))); - } -DBGPRINT (RT_DEBUG_TRACE ,("RxRing, RX_DRX_IDX=%d, RX_CRX_IDX=%d \n" , Ac0HwIdx, Ac0SwIdx)); -DBGPRINT_RAW (RT_DEBUG_TRACE ,(" RxSwReadIdx [%d]=" , AC0freeIdx)); -DBGPRINT_RAW (RT_DEBUG_TRACE ,(" pending-NDIS=%ld\n" , pAd->RalinkCounters.PendingNdisPacketCount)); -}#endif /* RT2860 */ /*
drivers/staging/rt2860/common/cmm_sanity.c +0 -184
187 lines not on this page · raw message
drivers/staging/rt2860/common/cmm_wpa.c +0 -794
803 lines not on this page · raw message
drivers/staging/rt2860/common/mlme.c +0 -4
@@ -43,7 +43,6 @@ UCHAR CISCO_OUI[] = {0x00, 0x40, 0x96};UCHAR WPA_OUI [] = {0x00 ,0x50 ,0xf2 ,0x01 };UCHAR RSN_OUI [] = {0x00 ,0x0f ,0xac }; -UCHAR WAPI_OUI [] = {0x00 ,0x14 ,0x72 };UCHAR WME_INFO_ELEM [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x00 ,0x01 };UCHAR WME_PARM_ELEM [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x01 ,0x01 };UCHAR Ccx2QosInfo[] = {0x00 ,0x40 ,0x96 ,0x04 };
@@ -338,9 +337,6 @@ UCHAR WpaIe = IE_WPA;UCHAR Wpa2Ie =IE_WPA2 ;UCHAR IbssIe =IE_IBSS_PARM ;UCHAR Ccx2Ie =IE_CCX_V2 ; -#ifdef RT2870 -UCHAR WapiIe =IE_WAPI ; -#endif extern UCHAR WPA_OUI [];
drivers/staging/rt2860/rtmp.h +0 -84
117 lines not on this page · raw message
drivers/staging/rt2860/rtmp_def.h +0 -3
@@ -569,9 +569,6 @@// For 802.11n D3.03 //#define IE_NEW_EXT_CHA_OFFSET 62 // 802.11n d1. New extension channel offset elemet #define IE_SECONDARY_CH_OFFSET 62 // 802.11n D3.03 Secondary Channel Offset element -#ifdef RT2870 -#define IE_WAPI 68 // WAPI information element -#endif #define IE_2040_BSS_COEXIST 72 // 802.11n D3.0.3#define IE_2040_BSS_INTOLERANT_REPORT 73 // 802.11n D3.03#define IE_OVERLAPBSS_SCAN_PARM 74 // 802.11n D3.03
Quoted 8 lines · Bartlomiej Zolnierkiewicz
Hi,
Some fixes, some cleanups and a lot of preparations for finally merging rt{28,30}70 drivers together.
Tested with RT2860 (Asus Eee 901) and RT3070 (el cheapo USB dongle that I've bought recently to speed up the development, I'm posting this mail using it right now) chipsets.
I plugged these into tip this morning (3, 5 and 21 needed hammering) and tried my box's onboard USB gizmo:
Bus 007 Device 003: ID 13d3:3247 IMC Networks 802.11 n/g/b Wireless LAN Adapter
Works fine here.
Quoted 3 lines
PS I tried using rt2800usb driver found in 2.6.31-rc6 (with overdue fix for memory corruption in rf cache from Pavel Roskin) for RT3070 chipset but it doesn't seem to work yet (iwlist wlan0 scan => no stations)..
Yeah, I can ping/traceroute with it, but that's about it, seems to choke as soon as you need to xfer non-dinky packets. (I would have thought that the corruption fix would swim upstream given it's utterly deadly)
-Mike
[email protected] seems to make replies arrive only at /dev/null, so I'll try again without.
Hi. This is the qmail-send program at mail.gmx.net.
I'm afraid I wasn't able to deliver your message to the following addresses. This is a permanent error; I've given up. Sorry it didn't work out.
<[email protected]>:
140.211.166.17_does_not_like_recipient./Remote_host_said:_550_5.1.1_<[email protected]>:_Recipient_address_rejected:_User_unknown_in_virtual_alias_table/Giving_up_on_140.211.166.17./
Quoted 26 lines · Mike Galbraith
Quoted 8 lines · Bartlomiej Zolnierkiewicz
Hi,
Some fixes, some cleanups and a lot of preparations for finally merging rt{28,30}70 drivers together.
Tested with RT2860 (Asus Eee 901) and RT3070 (el cheapo USB dongle that I've bought recently to speed up the development, I'm posting this mail using it right now) chipsets.
I plugged these into tip this morning (3, 5 and 21 needed hammering) and tried my box's onboard USB gizmo:
Bus 007 Device 003: ID 13d3:3247 IMC Networks 802.11 n/g/b Wireless LAN Adapter
Works fine here.
Quoted 3 lines
PS I tried using rt2800usb driver found in 2.6.31-rc6 (with overdue fix for memory corruption in rf cache from Pavel Roskin) for RT3070 chipset but it doesn't seem to work yet (iwlist wlan0 scan => no stations)..
Yeah, I can ping/traceroute with it, but that's about it, seems to choke as soon as you need to xfer non-dinky packets. (I would have thought that the corruption fix would swim upstream given it's utterly deadly)
-Mike
Quoted 9 lines · Mike Galbraith
[email protected] seems to make replies arrive only at
/dev/null, so I'll try again without.Hi. This is the qmail-send program at mail.gmx.net.
I'm afraid I wasn't able to deliver your message to the following addresses. This is a permanent error; I've given up. Sorry it didn't work out.<[email protected]>:
140.211.166.17_does_not_like_recipient./Remote_host_said:_550_5.1.1_<[email protected]>:_Recipient_address_rejected:_User_unknown_in_virtual_alias_table/Giving_up_on_140.211.166.17./
Yeah, we are having major postfix problems, people are still working on it :(
thanks,
greg k-h
Quoted 10 lines · On Monday 17 August 2009 05:47:45 Mike Galbraith wrote:
Quoted 8 lines · Bartlomiej Zolnierkiewicz
Hi,
Some fixes, some cleanups and a lot of preparations for finally merging rt{28,30}70 drivers together.
Tested with RT2860 (Asus Eee 901) and RT3070 (el cheapo USB dongle that I've bought recently to speed up the development, I'm posting this mail using it right now) chipsets.
Quoted 6 lines
I plugged these into tip this morning (3, 5 and 21 needed hammering) and tried my box's onboard USB gizmo:
Bus 007 Device 003: ID 13d3:3247 IMC Networks 802.11 n/g/b Wireless LAN Adapter
Works fine here.
Thanks a lot for extra testing, could you also check what MAC version is this beast using? I'm now working on merging rt2870 and rt3070 together, and I would need somebody with 2870 flavor to verify the end result.. :)
The USB dongle that I'm doing tests with is:
Bus 004 Device 003: ID 148f:3070 Ralink Technology, Corp.
and is identified by rt2800usb as 3070 flavor:
phy0 -> rt2x00_set_chip: Info - Chipset detected - rt: 1600, rf: 0005, rev: 30700200.
Quoted 7 lines
Quoted 3 lines
PS I tried using rt2800usb driver found in 2.6.31-rc6 (with overdue fix for memory corruption in rf cache from Pavel Roskin) for RT3070 chipset but it doesn't seem to work yet (iwlist wlan0 scan => no stations)..
Yeah, I can ping/traceroute with it, but that's about it, seems to choke as soon as you need to xfer non-dinky packets. (I would have thought that the corruption fix would swim upstream given it's utterly deadly)
It it in upstream now, a bit of competition (even if the end goal is exactly the same) is never a bad thing.. ;)
Quoted 11 lines · Bartlomiej Zolnierkiewicz
Thanks a lot for extra testing, could you also check what MAC version is this beast using? I'm now working on merging rt2870 and rt3070 together, and I would need somebody with 2870 flavor to verify the end result.. :)
The USB dongle that I'm doing tests with is:
Bus 004 Device 003: ID 148f:3070 Ralink Technology, Corp.and is identified by rt2800usb as 3070 flavor:
phy0 -> rt2x00_set_chip: Info - Chipset detected - rt: 1600, rf: 0005, rev: 30700200.
phy1 -> rt2x00_set_chip: Info - Chipset detected - rt: 1600, rf: 0003, rev: 28600101.
This doesn't tell me whole lot, 2860 is allegedly PCI, my gizmo is USB. (maybe i should poke it with sharp stick... nah, not bored enough)
USB device ID is 13D3:3247, which is supported by both 2870 and 3070 drivers, though it's associated with AzureWave instead of IMC Networks as reported by lsusb. In the 3070 section of 2870.h however, I see...
{USB_DEVICE(0x13D3,0x3247)}, /* AzureWave */ \
{USB_DEVICE(0x13D3,0x3273)}, /* AzureWave 3070*/ \... so _maybe_ it's a 2870.
-Mike
Quoted 19 lines · On Thursday 20 August 2009 07:44:01 Mike Galbraith wrote:
Quoted 11 lines · Bartlomiej Zolnierkiewicz
Thanks a lot for extra testing, could you also check what MAC version is this beast using? I'm now working on merging rt2870 and rt3070 together, and I would need somebody with 2870 flavor to verify the end result.. :)
The USB dongle that I'm doing tests with is:
Bus 004 Device 003: ID 148f:3070 Ralink Technology, Corp.and is identified by rt2800usb as 3070 flavor:
phy0 -> rt2x00_set_chip: Info - Chipset detected - rt: 1600, rf: 0005, rev: 30700200.phy1 ->
rt2x00_set_chip: Info - Chipset detected - rt: 1600, rf: 0003, rev: 28600101.This doesn't tell me whole lot, 2860 is allegedly PCI, my gizmo is USB. (maybe i should poke it with sharp stick... nah, not bored enough)
Quoted 8 lines
USB device ID is 13D3:3247, which is supported by both 2870 and 3070 drivers, though it's associated with AzureWave instead of IMC Networks as reported by lsusb. In the 3070 section of 2870.h however, I see...
{USB_DEVICE(0x13D3,0x3247)}, /* AzureWave */ \ {USB_DEVICE(0x13D3,0x3273)}, /* AzureWave 3070*/ \... so _maybe_ it's a 2870.
Seems to be a case here (2870 is USB version of 2860 which would explain why MAC version is reported to be 2860)..