lkml.org 
[lkml]   [2009]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 13/22] Staging: rtl8192su: remove RTL8192SU_FPGA_2MAC_VERIFICATION ifdefs
    From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    Subject: [PATCH staging] Staging: rtl8192su: remove RTL8192SU_FPGA_2MAC_VERIFICATION ifdefs

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    drivers/staging/rtl8192su/Makefile | 1 -
    drivers/staging/rtl8192su/r8192S_firmware.c | 2 +-
    drivers/staging/rtl8192su/r8192U_core.c | 12 ++++++------
    3 files changed, 7 insertions(+), 8 deletions(-)

    Index: b/drivers/staging/rtl8192su/Makefile
    ===================================================================
    --- a/drivers/staging/rtl8192su/Makefile
    +++ b/drivers/staging/rtl8192su/Makefile
    @@ -12,7 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmw
    EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE
    EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1

    -#EXTRA_CFLAGS += -DRTL8192SU_FPGA_2MAC_VERIFICATION #=0
    EXTRA_CFLAGS += -DRTL8192SU_ASIC_VERIFICATION
    EXTRA_CFLAGS += -DRTL8192SU_USB_PHY_TEST=0

    Index: b/drivers/staging/rtl8192su/r8192S_firmware.c
    ===================================================================
    --- a/drivers/staging/rtl8192su/r8192S_firmware.c
    +++ b/drivers/staging/rtl8192su/r8192S_firmware.c
    @@ -320,7 +320,7 @@ FirmwareCheckReady(struct net_device *de

    RT_TRACE(COMP_FIRMWARE, "FirmwareCheckReady(): Current RCR settings(%#x)\n", tmpU4b);

    -#if (defined (RTL8192SU_FPGA_2MAC_VERIFICATION) ||defined (RTL8192SU_ASIC_VERIFICATION))
    +#if defined (RTL8192SU_ASIC_VERIFICATION)
    #ifdef NOT_YET //YJ,TMP
    priv->TransmitConfig = read_nic_dword(dev, TCR);
    RT_TRACE(COMP_FIRMWARE, "FirmwareCheckReady(): Current TCR settings(%x)\n", priv->TransmitConfig);
    Index: b/drivers/staging/rtl8192su/r8192U_core.c
    ===================================================================
    --- a/drivers/staging/rtl8192su/r8192U_core.c
    +++ b/drivers/staging/rtl8192su/r8192U_core.c
    @@ -2957,7 +2957,7 @@ short rtl8192SU_tx(struct net_device *de
    memset(tx_desc, 0, sizeof(tx_desc_819x_usb));


    -#if (defined (RTL8192SU_FPGA_2MAC_VERIFICATION)||defined (RTL8192SU_ASIC_VERIFICATION))
    +#if defined (RTL8192SU_ASIC_VERIFICATION)
    tx_desc->NonQos = (IsQoSDataFrame(skb->data)==TRUE)? 0:1;
    #endif

    @@ -4029,7 +4029,7 @@ bool GetNmodeSupportBySecCfg8192(struct
    int wpa_ie_len= ieee->wpa_ie_len;
    struct ieee80211_crypt_data* crypt;
    int encrypt;
    -#if (defined (RTL8192SU_FPGA_2MAC_VERIFICATION)||defined (RTL8192SU_ASIC_VERIFICATION))
    +#if defined (RTL8192SU_ASIC_VERIFICATION)
    return TRUE;
    #endif

    @@ -4883,7 +4883,7 @@ static void rtl8192SU_ReadAdapterInfo819
    RT_TRACE(COMP_EPROM, "MAC addr:"MAC_FMT"\n", MAC_ARG(dev->dev_addr));

    priv->rf_type = RTL819X_DEFAULT_RF_TYPE; //default 1T2R
    -#if (defined (RTL8192SU_FPGA_2MAC_VERIFICATION)||defined (RTL8192SU_ASIC_VERIFICATION))
    +#if defined (RTL8192SU_ASIC_VERIFICATION)
    priv->rf_chip = RF_6052;
    priv->rf_type = RTL819X_DEFAULT_RF_TYPE;
    //priv->card_8192_version = VERSION_8192SU_A; //Over write for temporally experiment. 2008.10.16. By Roger.
    @@ -5215,7 +5215,7 @@ rtl8192SU_ReadAdapterInfo8192SEFuse(stru
    // 2007/11/15 MH For RTL8192USB we assign as 1T2R now.
    priv->rf_type = RTL819X_DEFAULT_RF_TYPE; // default : 1T2R

    -#if (defined (RTL8192SU_FPGA_2MAC_VERIFICATION)||defined (RTL8192SU_ASIC_VERIFICATION))
    +#if defined (RTL8192SU_ASIC_VERIFICATION)
    priv->rf_chip = RF_6052;
    priv->rf_type = RTL819X_DEFAULT_RF_TYPE;
    #else
    @@ -5660,7 +5660,7 @@ rtl8192SU_ReadAdapterInfo8192SUsb(struct
    // priv->rf_type = RF_1T2R;
    //}

    -#if (defined (RTL8192SU_FPGA_2MAC_VERIFICATION)||defined (RTL8192SU_ASIC_VERIFICATION))
    +#if defined (RTL8192SU_ASIC_VERIFICATION)
    priv->rf_chip = RF_6052;
    #else
    priv->rf_chip = RF_8256;
    @@ -7778,7 +7778,7 @@ rtl819x_ifcheck_resetornot(struct net_de
    RESET_TYPE RxResetType = RESET_TYPE_NORESET;
    RT_RF_POWER_STATE rfState;

    -#if (defined (RTL8192SU_FPGA_2MAC_VERIFICATION)||defined (RTL8192SU_ASIC_VERIFICATION))
    +#if defined (RTL8192SU_ASIC_VERIFICATION)
    return RESET_TYPE_NORESET;
    #endif


    \
     
     \ /
      Last update: 2009-07-03 16:09    [W:0.026 / U:0.028 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site