Staging: rt3070: remove CONFIG_STA_SUPPORT ifdefs

[safe/jmp/linux-2.6] / drivers / staging / rt3070 / common / rtmp_init.c

diff --git a/drivers/staging/rt3070/common/rtmp_init.c b/drivers/staging/rt3070/common/rtmp_init.c
index 617476e..bcdf7b0 100644 (file)
--- a/drivers/staging/rt3070/common/rtmp_init.c
+++ b/drivers/staging/rt3070/common/rtmp_init.c
@@ -179,12 +179,9 @@ RTMP_REG_PAIR      MACRegTable[] = {
        {TX_TIMEOUT_CFG,        0x000a2090},
        {MAX_LEN_CFG,           MAX_AGGREGATION_SIZE | 0x00001000},     // 0x3018, MAX frame length. Max PSDU = 16kbytes.
        {LED_CFG,               0x7f031e46}, // Gary, 2006-08-23
-
-//#ifdef CONFIG_STA_SUPPORT
 //     {WMM_AIFSN_CFG,         0x00002273},
 //     {WMM_CWMIN_CFG,         0x00002344},
 //     {WMM_CWMAX_CFG,         0x000034aa},
-//#endif // CONFIG_STA_SUPPORT //
        {PBF_MAX_PCNT,                  0x1F3FBF9F},    //0x1F3f7f9f},          //Jan, 2006/04/20
        //{TX_RTY_CFG,                  0x6bb80408},    // Jan, 2006/11/16
        {TX_RTY_CFG,                    0x47d01f0f},    // Jan, 2006/11/16, Set TxWI->ACK =0 in Probe Rsp Modify for 2860E ,2007-08-03
@@ -193,9 +190,7 @@ RTMP_REG_PAIR       MACRegTable[] = {
        {OFDM_PROT_CFG,                 0x05740003 /*0x01740003*/},     // Initial Auto_Responder, because QA will turn off Auto-Responder. And RTS threshold is enabled.
 //PS packets use Tx1Q (for HCCA) when dequeue from PS unicast queue (WiFi WPA2 MA9_DT1 for Marvell B STA)
 #ifdef RT2870
-#ifdef CONFIG_STA_SUPPORT
        {PBF_CFG,                               0xf40006},              // Only enable Queue 2
-#endif // CONFIG_STA_SUPPORT //
        {MM40_PROT_CFG,                 0x3F44084},             // Initial Auto_Responder, because QA will turn off Auto-Responder
        {WPDMA_GLO_CFG,                 0x00000030},
 #endif // RT2870 //
@@ -219,19 +214,14 @@ RTMP_REG_PAIR     MACRegTable[] = {
        {PWR_PIN_CFG,                   0x00000003},    // patch for 2880-E
 };
 
-
-#ifdef CONFIG_STA_SUPPORT
 RTMP_REG_PAIR  STAMACRegTable[] =      {
        {WMM_AIFSN_CFG,         0x00002273},
        {WMM_CWMIN_CFG, 0x00002344},
        {WMM_CWMAX_CFG, 0x000034aa},
 };
-#endif // CONFIG_STA_SUPPORT //
 
 #define        NUM_MAC_REG_PARMS               (sizeof(MACRegTable) / sizeof(RTMP_REG_PAIR))
-#ifdef CONFIG_STA_SUPPORT
 #define        NUM_STA_MAC_REG_PARMS   (sizeof(STAMACRegTable) / sizeof(RTMP_REG_PAIR))
-#endif // CONFIG_STA_SUPPORT //
 
 #ifdef RT2870
 //
@@ -1558,9 +1548,6 @@ VOID      NICReadEEPROMParameters(
 
        NicConfig2.word = pAd->EEPROMDefaultValue[1];
 
-
-
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                if ((NicConfig2.word & 0x00ff) == 0xff)
@@ -1573,7 +1560,6 @@ VOID      NICReadEEPROMParameters(
                        NicConfig2.word &= 0x00ff;
                }
        }
-#endif // CONFIG_STA_SUPPORT //
 
        if (NicConfig2.field.DynamicTxAgcControl == 1)
                pAd->bAutoTxAgcA = pAd->bAutoTxAgcG = TRUE;
@@ -1792,10 +1778,8 @@ VOID     NICReadEEPROMParameters(
 VOID   NICInitAsicFromEEPROM(
        IN      PRTMP_ADAPTER   pAd)
 {
-#ifdef CONFIG_STA_SUPPORT
        UINT32                                  data = 0;
        UCHAR   BBPR1 = 0;
-#endif // CONFIG_STA_SUPPORT //
        USHORT                                  i;
        EEPROM_ANTENNA_STRUC    Antenna;
        EEPROM_NIC_CONFIG2_STRUC    NicConfig2;
@@ -1830,8 +1814,6 @@ VOID      NICInitAsicFromEEPROM(
 
        NicConfig2.word = pAd->EEPROMDefaultValue[1];
 
-
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                if ((NicConfig2.word & 0x00ff) == 0xff)
@@ -1844,7 +1826,6 @@ VOID      NICInitAsicFromEEPROM(
                        NicConfig2.word &= 0x00ff;
                }
        }
-#endif // CONFIG_STA_SUPPORT //
 
        // Save the antenna for future use
        pAd->NicConfig2.word = NicConfig2.word;
@@ -1873,7 +1854,6 @@ VOID      NICInitAsicFromEEPROM(
     pAd->LedIndicatorStregth = 0xFF;
     RTMPSetSignalLED(pAd, -100);       // Force signal strength Led to be turned off, before link up
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // Read Hardware controlled Radio state enable bit
@@ -1903,7 +1883,6 @@ VOID      NICInitAsicFromEEPROM(
                        RTMPSetLED(pAd, LED_RADIO_ON);
                }
        }
-#endif // CONFIG_STA_SUPPORT //
 
        // Turn off patching for cardbus controller
        if (NicConfig2.field.CardbusAcceleration == 1)
@@ -1937,7 +1916,6 @@ VOID      NICInitAsicFromEEPROM(
        }
        RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R3, BBPR3);
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // Handle the difference when 1T
@@ -1950,7 +1928,7 @@ VOID      NICInitAsicFromEEPROM(
 
                DBGPRINT(RT_DEBUG_TRACE, ("Use Hw Radio Control Pin=%d; if used Pin=%d;\n", pAd->CommonCfg.bHardwareRadio, pAd->CommonCfg.bHardwareRadio));
        }
-#endif // CONFIG_STA_SUPPORT //
+
        DBGPRINT(RT_DEBUG_TRACE, ("TxPath = %d, RxPath = %d, RFIC=%d, Polar+LED mode=%x\n", pAd->Antenna.field.TxPath, pAd->Antenna.field.RxPath, pAd->RfIcType, pAd->LedCntl.word));
        DBGPRINT(RT_DEBUG_TRACE, ("<-- NICInitAsicFromEEPROM\n"));
 }
@@ -2142,7 +2120,6 @@ NDIS_STATUS       NICInitializeAsic(
        }
 
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                for (Index = 0; Index < NUM_STA_MAC_REG_PARMS; Index++)
@@ -2150,7 +2127,6 @@ NDIS_STATUS       NICInitializeAsic(
                        RTMP_IO_WRITE32(pAd, (USHORT)STAMACRegTable[Index].Register, STAMACRegTable[Index].Value);
                }
        }
-#endif // CONFIG_STA_SUPPORT //
 #endif // RT2870 //
 
 #ifdef RT30xx
@@ -2302,7 +2278,6 @@ NDIS_STATUS       NICInitializeAsic(
 #endif // RT2870 //
 
        // Add radio off control
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                if (pAd->StaCfg.bRadio == FALSE)
@@ -2312,7 +2287,6 @@ NDIS_STATUS       NICInitializeAsic(
                        DBGPRINT(RT_DEBUG_TRACE, ("Set Radio Off\n"));
                }
        }
-#endif // CONFIG_STA_SUPPORT //
 
        // Clear raw counters
        RTMP_IO_READ32(pAd, RX_STA_CNT0, &Counter);
@@ -2383,14 +2357,12 @@ NDIS_STATUS     NICInitializeAsic(
        }
 #endif // RT30xx //
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // for rt2860E and after, init TXOP_CTRL_CFG with 0x583f. This is for extension channel overlapping IOT.
                if ((pAd->MACVersion&0xffff) != 0x0101)
                        RTMP_IO_WRITE32(pAd, TXOP_CTRL_CFG, 0x583f);
        }
-#endif // CONFIG_STA_SUPPORT //
 
        DBGPRINT(RT_DEBUG_TRACE, ("<-- NICInitializeAsic\n"));
        return NDIS_STATUS_SUCCESS;
@@ -3336,7 +3308,6 @@ VOID      UserCfgInit(
        //
        // part II. intialize STA specific configuration
        //
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                RX_FILTER_SET_FLAG(pAd, fRX_FILTER_ACCEPT_DIRECT);
@@ -3375,7 +3346,6 @@ VOID      UserCfgInit(
                pAd->StaCfg.bAutoTxRateSwitch = TRUE;
                pAd->StaCfg.DesiredTransmitSetting.field.MCS = MCS_AUTO;
        }
-#endif // CONFIG_STA_SUPPORT //
 
        // global variables mXXXX used in MAC protocol state machines
        OPSTATUS_SET_FLAG(pAd, fOP_STATUS_RECEIVE_DTIM);
@@ -3386,7 +3356,6 @@ VOID      UserCfgInit(
        pAd->CommonCfg.PhyMode = PHY_11BG_MIXED;                // default PHY mode
        OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_SHORT_PREAMBLE_INUSED);  // CCK use LONG preamble
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // user desired power mode
@@ -3431,7 +3400,6 @@ VOID      UserCfgInit(
 #endif // WPA_SUPPLICANT_SUPPORT //
 
        }
-#endif // CONFIG_STA_SUPPORT //
 
        // Default for extra information is not valid
        pAd->ExtraInfo = EXTRA_INFO_CLEAR;