]> Pileus Git - ~andy/linux/blobdiff - drivers/staging/rt3070/rtmp.h
Staging: rt3070: remove dead SINGLE_SKU code
[~andy/linux] / drivers / staging / rt3070 / rtmp.h
index d80d74ffbc89944648aa11e0a6305c51775047c9..d754886d00ddfae8dce92d7b69f37d74eb5a4b04 100644 (file)
 #include "link_list.h"
 #include "spectrum_def.h"
 
-#ifdef MLME_EX
-#include "mlme_ex_def.h"
-#endif // MLME_EX //
-
 #ifdef CONFIG_STA_SUPPORT
 #include "aironet.h"
 #endif // CONFIG_STA_SUPPORT //
 
-#undef AP_WSC_INCLUDED
-#undef STA_WSC_INCLUDED
-#undef WSC_INCLUDED
-
-
-#ifdef CONFIG_STA_SUPPORT
-#endif // CONFIG_STA_SUPPORT //
-
-#if defined(AP_WSC_INCLUDED) || defined(STA_WSC_INCLUDED)
-#define WSC_INCLUDED
-#endif
-
-
-
-
-
 //#define DBG          1
 
 //#define DBG_DIAGNOSE         1
@@ -305,92 +285,6 @@ extern UCHAR  PRE_N_HT_OUI[];
 
 #define        MAXSEQ          (0xFFF)
 
-#ifdef RALINK_ATE
-typedef        struct _ATE_INFO {
-       UCHAR   Mode;
-       CHAR    TxPower0;
-       CHAR    TxPower1;
-       CHAR    TxAntennaSel;
-       CHAR    RxAntennaSel;
-       TXWI_STRUC  TxWI;         // TXWI
-       USHORT  QID;
-       UCHAR   Addr1[MAC_ADDR_LEN];
-       UCHAR   Addr2[MAC_ADDR_LEN];
-       UCHAR   Addr3[MAC_ADDR_LEN];
-       UCHAR   Channel;
-       UINT32  TxLength;
-       UINT32  TxCount;
-       UINT32  TxDoneCount; // Tx DMA Done
-       UINT32  RFFreqOffset;
-       BOOLEAN bRxFer;
-       BOOLEAN bQATxStart; // Have compiled QA in and use it to ATE tx.
-       BOOLEAN bQARxStart;     // Have compiled QA in and use it to ATE rx.
-       UINT32  RxTotalCnt;
-       UINT32  RxCntPerSec;
-
-       CHAR    LastSNR0;             // last received SNR
-       CHAR    LastSNR1;             // last received SNR for 2nd  antenna
-       CHAR    LastRssi0;            // last received RSSI
-       CHAR    LastRssi1;            // last received RSSI for 2nd  antenna
-       CHAR    LastRssi2;            // last received RSSI for 3rd  antenna
-       CHAR    AvgRssi0;             // last 8 frames' average RSSI
-       CHAR    AvgRssi1;             // last 8 frames' average RSSI
-       CHAR    AvgRssi2;             // last 8 frames' average RSSI
-       SHORT   AvgRssi0X8;           // sum of last 8 frames' RSSI
-       SHORT   AvgRssi1X8;           // sum of last 8 frames' RSSI
-       SHORT   AvgRssi2X8;           // sum of last 8 frames' RSSI
-
-       UINT32  NumOfAvgRssiSample;
-
-#ifdef RALINK_28xx_QA
-       // Tx frame
-#ifdef RT2870
-       /* not used in RT2860 */
-       TXINFO_STRUC            TxInfo; // TxInfo
-#endif // RT2870 //
-       USHORT          HLen; // Header Length
-       USHORT          PLen; // Pattern Length
-       UCHAR           Header[32]; // Header buffer
-       UCHAR           Pattern[32]; // Pattern buffer
-       USHORT          DLen; // Data Length
-       USHORT          seq;
-       UINT32          CID;
-       pid_t           AtePid;
-       // counters
-       UINT32          U2M;
-       UINT32          OtherData;
-       UINT32          Beacon;
-       UINT32          OtherCount;
-       UINT32          TxAc0;
-       UINT32          TxAc1;
-       UINT32          TxAc2;
-       UINT32          TxAc3;
-       UINT32          TxHCCA;
-       UINT32          TxMgmt;
-       UINT32          RSSI0;
-       UINT32          RSSI1;
-       UINT32          RSSI2;
-       UINT32          SNR0;
-       UINT32          SNR1;
-       // control
-       //UINT32                Repeat; // Tx Cpu count
-       UCHAR           TxStatus; // task Tx status // 0 --> task is idle, 1 --> task is running
-#endif // RALINK_28xx_QA //
-}      ATE_INFO, *PATE_INFO;
-
-#ifdef RALINK_28xx_QA
-struct ate_racfghdr {
-       UINT32          magic_no;
-       USHORT          command_type;
-       USHORT          command_id;
-       USHORT          length;
-       USHORT          sequence;
-       USHORT          status;
-       UCHAR           data[2046];
-}  __attribute__((packed));
-#endif // RALINK_28xx_QA //
-#endif // RALINK_ATE //
-
 #ifdef DOT11_N_SUPPORT
 struct reordering_mpdu
 {
@@ -1430,15 +1324,6 @@ typedef struct _MLME_STRUCT {
        // Action
        STATE_MACHINE           ActMachine;
 
-
-#ifdef QOS_DLS_SUPPORT
-       STATE_MACHINE                   DlsMachine;
-       STATE_MACHINE_FUNC      DlsFunc[DLS_FUNC_SIZE];
-#endif // QOS_DLS_SUPPORT //
-
-
-
-
        ULONG                   ChannelQuality;  // 0..100, Channel Quality Indication for Roaming
        ULONG                   Now32;           // latch the value of NdisGetSystemUpTime()
        ULONG                   LastSendNULLpsmTime;
@@ -1489,23 +1374,6 @@ typedef struct _RADAR_DETECT_STRUCT {
        UINT8           LongPulseRadarTh;
 } RADAR_DETECT_STRUCT, *PRADAR_DETECT_STRUCT;
 
-#ifdef CARRIER_DETECTION_SUPPORT
-typedef enum CD_STATE_n
-{
-       CD_NORMAL,
-       CD_SILENCE,
-       CD_MAX_STATE
-} CD_STATE;
-
-typedef struct CARRIER_DETECTION_s
-{
-       BOOLEAN                                 Enable;
-       UINT8                                   CDSessionTime;
-       UINT8                                   CDPeriod;
-       CD_STATE                                CD_State;
-} CARRIER_DETECTION, *PCARRIER_DETECTION;
-#endif // CARRIER_DETECTION_SUPPORT //
-
 typedef enum _REC_BLOCKACK_STATUS
 {
     Recipient_NONE=0,
@@ -1974,10 +1842,6 @@ typedef struct _COMMON_CONFIG {
        // IEEE802.11H--DFS.
        RADAR_DETECT_STRUCT     RadarDetect;
 
-#ifdef CARRIER_DETECTION_SUPPORT
-       CARRIER_DETECTION               CarrierDetect;
-#endif // CARRIER_DETECTION_SUPPORT //
-
 #ifdef DOT11_N_SUPPORT
        // HT
        UCHAR                   BASize;         // USer desired BAWindowSize. Should not exceed our max capability
@@ -2070,12 +1934,6 @@ typedef struct _COMMON_CONFIG {
 #ifdef MCAST_RATE_SPECIFIC
        HTTRANSMIT_SETTING              MCastPhyMode;
 #endif // MCAST_RATE_SPECIFIC //
-
-#ifdef SINGLE_SKU
-       UINT16                                  DefineMaxTxPwr;
-#endif // SINGLE_SKU //
-
-
 } COMMON_CONFIG, *PCOMMON_CONFIG;
 
 
@@ -2253,10 +2111,6 @@ typedef struct _STA_ADMIN_CONFIG {
        UCHAR                   DtimCount;      // 0.. DtimPeriod-1
        UCHAR                   DtimPeriod;     // default = 3
 
-#ifdef QOS_DLS_SUPPORT
-       RT_802_11_DLS           DLSEntry[MAX_NUM_OF_DLS_ENTRY];
-       UCHAR                           DlsReplayCounter[8];
-#endif // QOS_DLS_SUPPORT //
        ////////////////////////////////////////////////////////////////////////////////////////
        // This is only for WHQL test.
        BOOLEAN                         WhqlTest;
@@ -2290,13 +2144,6 @@ typedef struct _STA_ADMIN_CONFIG {
        DESIRED_TRANSMIT_SETTING        DesiredTransmitSetting;
        RT_HT_PHY_INFO                                  DesiredHtPhyInfo;
        BOOLEAN                                                 bAutoTxRateSwitch;
-
-
-#ifdef EXT_BUILD_CHANNEL_LIST
-       UCHAR                           IEEE80211dClientMode;
-       UCHAR                           StaOriCountryCode[3];
-       UCHAR                           StaOriGeography;
-#endif // EXT_BUILD_CHANNEL_LIST //
 } STA_ADMIN_CONFIG, *PSTA_ADMIN_CONFIG;
 
 // This data structure keep the current active BSS/IBSS's configuration that this STA
@@ -2428,14 +2275,6 @@ typedef struct _MAC_TABLE_ENTRY {
        UCHAR           TxRateUpPenalty;      // extra # of second penalty due to last unstable condition
 //====================================================
 
-
-
-#ifdef CONFIG_STA_SUPPORT
-#ifdef QOS_DLS_SUPPORT
-       UINT                    MatchDlsEntryIdx; // indicate the index in pAd->StaCfg.DLSEntry
-#endif // QOS_DLS_SUPPORT //
-#endif // CONFIG_STA_SUPPORT //
-
        BOOLEAN         fNoisyEnvironment;
        BOOLEAN                 fLastSecAccordingRSSI;
        UCHAR           LastSecTxRateChangeAction; // 0: no change, 1:rate UP, 2:rate down
@@ -2643,15 +2482,6 @@ typedef struct _APCLI_STRUCT {
 
 // ----------- end of AP ----------------------------
 
-#ifdef BLOCK_NET_IF
-typedef struct _BLOCK_QUEUE_ENTRY
-{
-       BOOLEAN SwTxQueueBlockFlag;
-       LIST_HEADER NetIfList;
-} BLOCK_QUEUE_ENTRY, *PBLOCK_QUEUE_ENTRY;
-#endif // BLOCK_NET_IF //
-
-
 struct wificonf
 {
        BOOLEAN bShortGI;
@@ -2683,28 +2513,6 @@ typedef struct _INF_USB_CONFIG
        };
 #endif // IKANOS_VX_1X0 //
 
-#ifdef NINTENDO_AP
-typedef struct _NINDO_CTRL_BLOCK {
-
-       RT_NINTENDO_TABLE       DS_TABLE;
-
-#ifdef CHIP25XX
-       spinlock_t                      NINTENDO_TABLE_Lock;
-#else
-       NDIS_SPIN_LOCK          NINTENDO_TABLE_Lock;
-#endif // CHIP25XX //
-
-       UCHAR                           NINTENDO_UP_BUFFER[512];
-       UCHAR                           Local_KeyIdx;
-       CIPHER_KEY                      Local_SharedKey;
-       UCHAR                           Local_bHideSsid;
-       UCHAR                           Local_AuthMode;
-       UCHAR                           Local_WepStatus;
-       USHORT                          Local_CapabilityInfo;
-} NINDO_CTRL_BLOCK;
-#endif // NINTENDO_AP //
-
-
 #ifdef DBG_DIAGNOSE
 #define DIAGNOSE_TIME  10   // 10 sec
 typedef struct _RtmpDiagStrcut_
@@ -2795,12 +2603,6 @@ typedef struct _RTMP_ADAPTER
        struct completion                       mlmeComplete;
        struct completion                       CmdQComplete;
        wait_queue_head_t                       *wait;
-
-       //======Lock for 2870 ATE
-#ifdef RALINK_ATE
-       NDIS_SPIN_LOCK                  GenericLock;            // ATE Tx/Rx generic spinlock
-#endif // RALINK_ATE //
-
 #endif // RT2870 //
 
 
@@ -3041,11 +2843,6 @@ typedef struct _RTMP_ADAPTER
        // current TX sequence #
        USHORT                  Sequence;
 
-#ifdef UNDER_CE
-       NDIS_HANDLE             hGiISR;
-#endif
-
-
        // Control disconnect / connect event generation
        //+++Didn't used anymore
        ULONG                   LinkDownTime;
@@ -3122,16 +2919,6 @@ typedef struct _RTMP_ADAPTER
 
     struct wificonf                    WIFItestbed;
 
-#ifdef RALINK_ATE
-       ATE_INFO                                ate;
-#ifdef RT2870
-       BOOLEAN                                 ContinBulkOut;          //ATE bulk out control
-       BOOLEAN                                 ContinBulkIn;           //ATE bulk in control
-       atomic_t                                BulkOutRemained;
-       atomic_t                                BulkInRemained;
-#endif // RT2870 //
-#endif // RALINK_ATE //
-
 #ifdef DOT11_N_SUPPORT
        struct reordering_mpdu_pool mpdu_blk_pool;
 #endif // DOT11_N_SUPPORT //
@@ -3144,17 +2931,6 @@ typedef struct _RTMP_ADAPTER
 
        struct net_device_stats stats;
 
-#ifdef BLOCK_NET_IF
-       BLOCK_QUEUE_ENTRY               blockQueueTab[NUM_OF_TX_RING];
-#endif // BLOCK_NET_IF //
-
-
-
-#ifdef MULTIPLE_CARD_SUPPORT
-       INT32                                   MC_RowID;
-       UCHAR                                   MC_FileName[256];
-#endif // MULTIPLE_CARD_SUPPORT //
-
        ULONG                                   TbttTickCount;
 #ifdef PCI_MSI_SUPPORT
        BOOLEAN                                 HaveMsi;
@@ -3168,11 +2944,6 @@ typedef struct _RTMP_ADAPTER
        UCHAR                                   flg_be_adjust;
        ULONG                                   be_adjust_last_time;
 
-#ifdef NINTENDO_AP
-       NINDO_CTRL_BLOCK                nindo_ctrl_block;
-#endif // NINTENDO_AP //
-
-
 #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];
@@ -3927,22 +3698,6 @@ VOID PeerQOSAction(
     IN PRTMP_ADAPTER pAd,
     IN MLME_QUEUE_ELEM *Elem);
 
-#ifdef QOS_DLS_SUPPORT
-VOID PeerDLSAction(
-    IN PRTMP_ADAPTER pAd,
-    IN MLME_QUEUE_ELEM *Elem);
-#endif // QOS_DLS_SUPPORT //
-
-#ifdef CONFIG_STA_SUPPORT
-#ifdef QOS_DLS_SUPPORT
-VOID DlsParmFill(
-       IN PRTMP_ADAPTER pAd,
-       IN OUT MLME_DLS_REQ_STRUCT *pDlsReq,
-       IN PRT_802_11_DLS pDls,
-       IN USHORT reason);
-#endif // QOS_DLS_SUPPORT //
-#endif // CONFIG_STA_SUPPORT //
-
 #ifdef DOT11_N_SUPPORT
 VOID RECBATimerTimeout(
     IN PVOID SystemSpecific1,
@@ -4874,142 +4629,6 @@ VOID PeerAuthSimpleRspGenAndSend(
 // Private routines in dls.c
 //
 
-#ifdef CONFIG_STA_SUPPORT
-#ifdef QOS_DLS_SUPPORT
-void DlsStateMachineInit(
-    IN PRTMP_ADAPTER pAd,
-    IN STATE_MACHINE *Sm,
-    OUT STATE_MACHINE_FUNC Trans[]);
-
-VOID MlmeDlsReqAction(
-    IN PRTMP_ADAPTER pAd,
-    IN MLME_QUEUE_ELEM *Elem);
-
-VOID PeerDlsReqAction(
-    IN PRTMP_ADAPTER   pAd,
-    IN MLME_QUEUE_ELEM *Elem);
-
-VOID PeerDlsRspAction(
-    IN PRTMP_ADAPTER   pAd,
-    IN MLME_QUEUE_ELEM *Elem);
-
-VOID MlmeDlsTearDownAction(
-    IN PRTMP_ADAPTER pAd,
-    IN MLME_QUEUE_ELEM *Elem);
-
-VOID PeerDlsTearDownAction(
-    IN PRTMP_ADAPTER   pAd,
-    IN MLME_QUEUE_ELEM *Elem);
-
-VOID RTMPCheckDLSTimeOut(
-       IN PRTMP_ADAPTER        pAd);
-
-BOOLEAN RTMPRcvFrameDLSCheck(
-       IN PRTMP_ADAPTER        pAd,
-       IN PHEADER_802_11       pHeader,
-       IN ULONG                        Len,
-       IN PRT28XX_RXD_STRUC    pRxD);
-
-INT    RTMPCheckDLSFrame(
-       IN      PRTMP_ADAPTER   pAd,
-       IN  PUCHAR          pDA);
-
-VOID RTMPSendDLSTearDownFrame(
-       IN      PRTMP_ADAPTER   pAd,
-       IN  PUCHAR          pDA);
-
-NDIS_STATUS RTMPSendSTAKeyRequest(
-       IN      PRTMP_ADAPTER   pAd,
-       IN      PUCHAR                  pDA);
-
-NDIS_STATUS RTMPSendSTAKeyHandShake(
-       IN      PRTMP_ADAPTER   pAd,
-       IN      PUCHAR                  pDA);
-
-VOID DlsTimeoutAction(
-       IN PVOID SystemSpecific1,
-       IN PVOID FunctionContext,
-       IN PVOID SystemSpecific2,
-       IN PVOID SystemSpecific3);
-
-BOOLEAN MlmeDlsReqSanity(
-       IN PRTMP_ADAPTER pAd,
-    IN VOID *Msg,
-    IN ULONG MsgLen,
-    OUT PRT_802_11_DLS *pDLS,
-    OUT PUSHORT pReason);
-
-INT Set_DlsEntryInfo_Display_Proc(
-       IN PRTMP_ADAPTER pAd,
-       IN PUCHAR arg);
-
-MAC_TABLE_ENTRY *MacTableInsertDlsEntry(
-       IN  PRTMP_ADAPTER   pAd,
-       IN  PUCHAR      pAddr,
-       IN  UINT        DlsEntryIdx);
-
-BOOLEAN MacTableDeleteDlsEntry(
-       IN PRTMP_ADAPTER pAd,
-       IN USHORT wcid,
-       IN PUCHAR pAddr);
-
-MAC_TABLE_ENTRY *DlsEntryTableLookup(
-       IN PRTMP_ADAPTER pAd,
-       IN PUCHAR       pAddr,
-       IN BOOLEAN      bResetIdelCount);
-
-MAC_TABLE_ENTRY *DlsEntryTableLookupByWcid(
-       IN PRTMP_ADAPTER pAd,
-       IN UCHAR        wcid,
-       IN PUCHAR       pAddr,
-       IN BOOLEAN      bResetIdelCount);
-
-INT    Set_DlsAddEntry_Proc(
-       IN      PRTMP_ADAPTER   pAd,
-       IN      PUCHAR                  arg);
-
-INT    Set_DlsTearDownEntry_Proc(
-       IN      PRTMP_ADAPTER   pAd,
-       IN      PUCHAR                  arg);
-#endif // QOS_DLS_SUPPORT //
-#endif // CONFIG_STA_SUPPORT //
-
-#ifdef QOS_DLS_SUPPORT
-BOOLEAN PeerDlsReqSanity(
-    IN PRTMP_ADAPTER pAd,
-    IN VOID *Msg,
-    IN ULONG MsgLen,
-    OUT PUCHAR pDA,
-    OUT PUCHAR pSA,
-    OUT USHORT *pCapabilityInfo,
-    OUT USHORT *pDlsTimeout,
-    OUT UCHAR *pRatesLen,
-    OUT UCHAR Rates[],
-    OUT UCHAR *pHtCapabilityLen,
-    OUT HT_CAPABILITY_IE *pHtCapability);
-
-BOOLEAN PeerDlsRspSanity(
-    IN PRTMP_ADAPTER pAd,
-    IN VOID *Msg,
-    IN ULONG MsgLen,
-    OUT PUCHAR pDA,
-    OUT PUCHAR pSA,
-    OUT USHORT *pCapabilityInfo,
-    OUT USHORT *pStatus,
-    OUT UCHAR *pRatesLen,
-    OUT UCHAR Rates[],
-    OUT UCHAR *pHtCapabilityLen,
-    OUT HT_CAPABILITY_IE *pHtCapability);
-
-BOOLEAN PeerDlsTearDownSanity(
-    IN PRTMP_ADAPTER pAd,
-    IN VOID *Msg,
-    IN ULONG MsgLen,
-    OUT PUCHAR pDA,
-    OUT PUCHAR pSA,
-    OUT USHORT *pReason);
-#endif // QOS_DLS_SUPPORT //
-
 //========================================
 
 VOID SyncStateMachineInit(
@@ -5114,12 +4733,6 @@ VOID CntlWaitAssocProc(
        IN  PRTMP_ADAPTER   pAd,
        IN  MLME_QUEUE_ELEM *Elem);
 
-#ifdef QOS_DLS_SUPPORT
-VOID CntlOidDLSSetupProc(
-       IN PRTMP_ADAPTER pAd,
-       IN MLME_QUEUE_ELEM *Elem);
-#endif // QOS_DLS_SUPPORT //
-
 VOID LinkUp(
        IN  PRTMP_ADAPTER   pAd,
        IN  UCHAR BssType);
@@ -6497,35 +6110,6 @@ void ChannelInfoDestroy(
 UCHAR New_ApAutoSelectChannel(
        IN PRTMP_ADAPTER pAd);
 
-
-#ifdef NINTENDO_AP
-VOID   InitNINTENDO_TABLE(
-       IN PRTMP_ADAPTER pAd);
-
-UCHAR  CheckNINTENDO_TABLE(
-       IN PRTMP_ADAPTER pAd,
-       PCHAR pDS_Ssid,
-       UCHAR DS_SsidLen,
-       PUCHAR pDS_Addr);
-
-UCHAR  DelNINTENDO_ENTRY(
-       IN      PRTMP_ADAPTER pAd,
-       UCHAR * pDS_Addr);
-
-VOID   RTMPIoctlNintendoCapable(
-       IN      PRTMP_ADAPTER   pAd,
-       IN      struct iwreq    *wrq);
-
-VOID   RTMPIoctlNintendoGetTable(
-       IN      PRTMP_ADAPTER   pAd,
-       IN      struct iwreq    *wrq);
-
-VOID   RTMPIoctlNintendoSetTable(
-       IN      PRTMP_ADAPTER   pAd,
-       IN      struct iwreq    *wrq);
-
-#endif // NINTENDO_AP //
-
 BOOLEAN rtstrmactohex(
        IN char *s1,
        IN char *s2);
@@ -6924,20 +6508,6 @@ PNDIS_PACKET RTMPDeFragmentDataFrame(
 
 ////////////////////////////////////////
 
-
-
-
-
-#ifdef SNMP_SUPPORT
-//for snmp , kathy
-typedef struct _DefaultKeyIdxValue
-{
-       UCHAR   KeyIdx;
-       UCHAR   Value[16];
-} DefaultKeyIdxValue, *PDefaultKeyIdxValue;
-#endif
-
-
 #ifdef CONFIG_STA_SUPPORT
 enum {
        DIDmsg_lnxind_wlansniffrm               = 0x00000044,
@@ -7057,12 +6627,6 @@ INT      Set_FixedTxMode_Proc(
        IN      PRTMP_ADAPTER   pAd,
        IN      PUCHAR                  arg);
 
-#ifdef CONFIG_APSTA_MIXED_SUPPORT
-INT    Set_OpMode_Proc(
-       IN      PRTMP_ADAPTER   pAd,
-       IN      PUCHAR                  arg);
-#endif // CONFIG_APSTA_MIXED_SUPPORT //
-
 static inline char* GetPhyMode(
        int Mode)
 {