Commit cd2c3c97 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8192su: remove RTL8192SU_FPGA_2MAC_VERIFICATION ifdefs 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1522987a

drivers/staging/rtl8192su/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ EXTRA_CFLAGS += -DRTL8190_Download_Firmware_From_Header=1 
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

drivers/staging/rtl8192su/r8192S_firmware.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ FirmwareCheckReady(struct net_device *dev, u8 LoadFWStatus) 


		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);

drivers/staging/rtl8192su/r8192U_core.c

+6 −6
Original line number Diff line number Diff line
@@ -2957,7 +2957,7 @@ short rtl8192SU_tx(struct net_device *dev, struct sk_buff* skb) 
	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 net_device*dev) 
        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_ReadAdapterInfo8192SEEPROM(struct net_device* dev) 
	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(struct net_device* dev) 
	// 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 net_device* dev) 
	//	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_device *dev) 
	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