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 <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rt2860/common/action.c b/drivers/staging/rt2860/common/action.c
index a4d9fdc..256cb67 100644 (file)
--- a/drivers/staging/rt2860/common/action.c
+++ b/drivers/staging/rt2860/common/action.c
@@ -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);
                }
        }

diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c
index b95a341..872349a 100644 (file)
--- a/drivers/staging/rt2860/common/ba_action.c
+++ b/drivers/staging/rt2860/common/ba_action.c
@@ -1391,10 +1391,8 @@ VOID SendPSMPAction(
        //ULONG           Idx;
        FRAME_PSMP_ACTION   Frame;
        ULONG           FrameLen;
-#ifdef RT30xx
        UCHAR                   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 RT30xx
                        if (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 RT30xx
                        if (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 RT30xx
                        if (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;
        }

diff --git a/drivers/staging/rt2860/common/cmm_data.c b/drivers/staging/rt2860/common/cmm_data.c
index 2936ca3..8d2e7db 100644 (file)
--- a/drivers/staging/rt2860/common/cmm_data.c
+++ b/drivers/staging/rt2860/common/cmm_data.c
@@ -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
        }
 

diff --git a/drivers/staging/rt2860/common/eeprom.c b/drivers/staging/rt2860/common/eeprom.c
index d179a9f..3a52966 100644 (file)
--- a/drivers/staging/rt2860/common/eeprom.c
+++ b/drivers/staging/rt2860/common/eeprom.c
@@ -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);

diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c
index c9be889..d2f0a8b 100644 (file)
--- a/drivers/staging/rt2860/common/mlme.c
+++ b/drivers/staging/rt2860/common/mlme.c
@@ -449,13 +449,7 @@ FREQUENCY_ITEM FreqItems3020[] =
        {13,   247,      2,  2},
        {14,   248,      2,  4},
 };
-#ifndef RT30xx
-#define        NUM_OF_3020_CHNL        (sizeof(FreqItems3020) / sizeof(FREQUENCY_ITEM))
-#endif
-#ifdef RT30xx
-//2008/07/10:KH Modified to share this variable
 UCHAR  NUM_OF_3020_CHNL=(sizeof(FreqItems3020) / sizeof(FREQUENCY_ITEM));
-#endif
 
 /*
        ==========================================================================
@@ -3949,14 +3943,12 @@ VOID BssTableSsidSort(
                                                        continue;
 
                                        // check group cipher
+                                       if (
 #ifndef RT30xx
-                                       if ((pAd->StaCfg.WepStatus < pInBss->WPA.GroupCipher) &&
-                                               (pInBss->WPA.GroupCipher != Ndis802_11GroupWEP40Enabled) &&
-                                               (pInBss->WPA.GroupCipher != Ndis802_11GroupWEP104Enabled))
-#endif
-#ifdef RT30xx
-                                       if (pAd->StaCfg.WepStatus < pInBss->WPA.GroupCipher)
+                                           pInBss->WPA.GroupCipher != Ndis802_11GroupWEP40Enabled &&
+                                           pInBss->WPA.GroupCipher != Ndis802_11GroupWEP104Enabled &&
 #endif
+                                           pAd->StaCfg.WepStatus < pInBss->WPA.GroupCipher)
                                                continue;
 
                                        // check pairwise cipher, skip if none matched
@@ -3975,14 +3967,12 @@ VOID BssTableSsidSort(
                                                        continue;
 
                                        // check group cipher
+                                       if (
 #ifndef RT30xx
-                                       if ((pAd->StaCfg.WepStatus < pInBss->WPA.GroupCipher) &&
-                                               (pInBss->WPA2.GroupCipher != Ndis802_11GroupWEP40Enabled) &&
-                                               (pInBss->WPA2.GroupCipher != Ndis802_11GroupWEP104Enabled))
-#endif
-#ifdef RT30xx
-                                       if (pAd->StaCfg.WepStatus < pInBss->WPA2.GroupCipher)
+                                           pInBss->WPA2.GroupCipher != Ndis802_11GroupWEP40Enabled &&
+                                           pInBss->WPA2.GroupCipher != Ndis802_11GroupWEP104Enabled &&
 #endif
+                                           pAd->StaCfg.WepStatus < pInBss->WPA2.GroupCipher)
                                                continue;
 
                                        // check pairwise cipher, skip if none matched
@@ -8229,7 +8219,6 @@ VOID AsicSetRxAnt(
        IN PRTMP_ADAPTER        pAd,
        IN UCHAR                        Ant)
 {
-#ifdef RT30xx
        UINT32  Value;
        UINT32  x;
 
@@ -8268,7 +8257,6 @@ VOID AsicSetRxAnt(
                RTMP_IO_WRITE32(pAd, GPIO_CTRL_CFG, Value);
                DBGPRINT_RAW(RT_DEBUG_TRACE, ("AsicSetRxAnt, switch to aux antenna\n"));
        }
-#endif // RT30xx //
 }
 #endif /* RT30xx */
 
@@ -8330,9 +8318,7 @@ VOID AsicEvaluateRxAnt(
                                                        fRTMP_ADAPTER_NIC_NOT_EXIST             |
                                                        fRTMP_ADAPTER_BSS_SCAN_IN_PROGRESS) ||
                                                        OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE)
-#ifdef RT30xx
                                                        || (pAd->EepromAccess)
-#endif // RT30xx //
                                                        )
                return;
 
@@ -8822,27 +8808,13 @@ VOID AsicStaBbpTuning(
                                {
                                        R66 = 0x1C + 2*GET_LNA_GAIN(pAd) + 0x20;
                                        if (OrigR66Value != R66)
-                                       {
-#ifndef RT30xx
-                                               RTUSBWriteBBPRegister(pAd, BBP_R66, R66);
-#endif
-#ifdef RT30xx
                                                RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R66, R66);
-#endif
-                                       }
                                }
                                else
                                {
                                        R66 = 0x1C + 2*GET_LNA_GAIN(pAd);
                                        if (OrigR66Value != R66)
-                                       {
-#ifndef RT30xx
-                                               RTUSBWriteBBPRegister(pAd, BBP_R66, R66);
-#endif
-#ifdef RT30xx
                                                RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R66, R66);
-#endif
-                                       }
                                }
                        }
                        else
@@ -9051,15 +9023,13 @@ VOID AsicTurnOffRFClk(
        UCHAR                   index;
        RTMP_RF_REGS    *RFRegTable;
 
-#ifdef RT30xx
        // The RF programming sequence is difference between 3xxx and 2xxx
        if (IS_RT3090(pAd))
        {
                RT30xxLoadRFSleepModeSetup(pAd);  // add by johnli,  RF power sequence setup, load RF sleep-mode setup
+               return;
        }
-       else
-       {
-#endif // RT30xx //
+
        RFRegTable = RF2850RegTable;
 
        switch (pAd->RfIcType)
@@ -9101,10 +9071,6 @@ VOID AsicTurnOffRFClk(
                default:
                        break;
        }
-#ifdef RT30xx
-       }
-#endif // RT30xx //
-
 }
 
 
@@ -9118,14 +9084,10 @@ VOID AsicTurnOnRFClk(
        UCHAR                   index;
        RTMP_RF_REGS    *RFRegTable;
 
-#ifdef RT30xx
        // The RF programming sequence is difference between 3xxx and 2xxx
        if (IS_RT3090(pAd))
-       {
-       }
-       else
-       {
-#endif // RT30xx //
+               return;
+
        RFRegTable = RF2850RegTable;
 
        switch (pAd->RfIcType)
@@ -9178,8 +9140,5 @@ VOID AsicTurnOnRFClk(
                pAd->RfIcType,
                R2));
 #endif
-#ifdef RT30xx
-       }
-#endif // RT30xx //
 }
 

diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c
index 004f530..88c0615 100644 (file)
--- a/drivers/staging/rt2860/common/rtmp_init.c
+++ b/drivers/staging/rt2860/common/rtmp_init.c
@@ -1675,7 +1675,6 @@ VOID      NICReadEEPROMParameters(
        Antenna.word = pAd->EEPROMDefaultValue[0];
        if (Antenna.word == 0xFFFF)
        {
-#ifdef RT30xx
                if(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);

diff --git a/drivers/staging/rt2860/oid.h b/drivers/staging/rt2860/oid.h
index 8a3b2ab..61fbe93 100644 (file)
--- a/drivers/staging/rt2860/oid.h
+++ b/drivers/staging/rt2860/oid.h
@@ -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_CAPABILITY
      NDIS_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
 };

diff --git a/drivers/staging/rt2860/rt28xx.h b/drivers/staging/rt2860/rt28xx.h
index 0f832ab..c085250 100644 (file)
--- a/drivers/staging/rt2860/rt28xx.h
+++ b/drivers/staging/rt2860/rt28xx.h
@@ -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-byte per entry
 #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-byte per entry
 #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-byte per entry
 #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;

diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h
index 99f9ebc..4c17cc5 100644 (file)
--- a/drivers/staging/rt2860/rtmp.h
+++ b/drivers/staging/rt2860/rtmp.h
@@ -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 RT30xx
 VOID 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
 //

diff --git a/drivers/staging/rt2860/rtmp_def.h b/drivers/staging/rt2860/rtmp_def.h
index 8a7dd10..def240b 100644 (file)
--- a/drivers/staging/rt2860/rtmp_def.h
+++ b/drivers/staging/rt2860/rtmp_def.h
@@ -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

diff --git a/drivers/staging/rt2860/sta/connect.c b/drivers/staging/rt2860/sta/connect.c
index ac71351..a0c6407 100644 (file)
--- a/drivers/staging/rt2860/sta/connect.c
+++ b/drivers/staging/rt2860/sta/connect.c
@@ -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 RT30xx
        if (IS_RT3090(pAd))
        {
                UINT32                          macdata;
@@ -2115,7 +2111,6 @@ VOID LinkDown(
                macdata &= ~(0x09);     //bit 0, 3
                RTMP_IO_WRITE32(pAd, 0x1210, macdata);
        }
-#endif // RT30xx //
 }
 
 /*

diff --git a/drivers/staging/rt2860/sta/rtmp_data.c b/drivers/staging/rt2860/sta/rtmp_data.c
index b41ce23..91a98af 100644 (file)
--- a/drivers/staging/rt2860/sta/rtmp_data.c
+++ b/drivers/staging/rt2860/sta/rtmp_data.c
@@ -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);

diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c
index fa09441..bfbfba9 100644 (file)
--- a/drivers/staging/rt2860/sta_ioctl.c
+++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -1676,15 +1676,11 @@ int rt_ioctl_siwencode(struct net_device *dev,
         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;

diff --git a/drivers/staging/rt2860/wpa.h b/drivers/staging/rt2860/wpa.h
index e671674..355309a 100644 (file)
--- a/drivers/staging/rt2860/wpa.h
+++ b/drivers/staging/rt2860/wpa.h
@@ -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

diff --git a/drivers/staging/rt2870/2870_main_dev.c b/drivers/staging/rt2870/2870_main_dev.c
index 26ba013..35c1970 100644 (file)
--- a/drivers/staging/rt2870/2870_main_dev.c
+++ b/drivers/staging/rt2870/2870_main_dev.c
@@ -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 RT30xx
                        printk("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;
                }

diff --git a/drivers/staging/rt2870/common/2870_rtmp_init.c b/drivers/staging/rt2870/common/2870_rtmp_init.c
index 259dca9..a20550e 100644 (file)
--- a/drivers/staging/rt2870/common/2870_rtmp_init.c
+++ b/drivers/staging/rt2870/common/2870_rtmp_init.c
@@ -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 RT30xx
        pid_t pid_number;
-#endif
 
        //init_MUTEX(&(pAd->usbdev_semaphore));
 

diff --git a/drivers/staging/rt2870/rt2870.h b/drivers/staging/rt2870/rt2870.h
index a555f16..04508c2 100644 (file)
--- a/drivers/staging/rt2870/rt2870.h
+++ b/drivers/staging/rt2870/rt2870.h
@@ -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