Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Staging: rtl8192su: remove RTL8190_Download_Firmware_From_Header ifdefs 



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

drivers/staging/rtl8192su/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,6 @@ EXTRA_CFLAGS += -DJACKSON_NEW_RX 
EXTRA_CFLAGS += -DTHOMAS_BEACON

EXTRA_CFLAGS += -DTHOMAS_BEACON





EXTRA_CFLAGS += -DRTL8192SU

EXTRA_CFLAGS += -DRTL8192SU

EXTRA_CFLAGS += -DRTL8190_Download_Firmware_From_Header=1

EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE

EXTRA_CFLAGS += -DRTL8192S_PREPARE_FOR_NORMAL_RELEASE

EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1

EXTRA_CFLAGS += -DRTL8192SU_DISABLE_IQK=1

drivers/staging/rtl8192su/r8192S_phy.c

+0 −36
Original line number Original line Diff line number Diff line
@@ -1331,13 +1331,7 @@ extern bool PHY_MACConfig8192S(struct net_device* dev) 
	//

	//

	// Config MAC

	// Config MAC

	//

	//

#if RTL8190_Download_Firmware_From_Header

	rtStatus = phy_ConfigMACWithHeaderFile(dev);

	rtStatus = phy_ConfigMACWithHeaderFile(dev);

#else

	// Not make sure EEPROM, add later

	RT_TRACE(COMP_INIT, "Read MACREG.txt\n");

	//rtStatus = phy_ConfigMACWithParaFile(dev, RTL819X_PHY_MACREG);// lzm del it temp

#endif

	return (rtStatus == RT_STATUS_SUCCESS) ? true:false;

	return (rtStatus == RT_STATUS_SUCCESS) ? true:false;





}

}
@@ -1545,7 +1539,6 @@ phy_BB8192S_Config_ParaFile(struct net_device* dev) 
	// 1. Read PHY_REG.TXT BB INIT!!

	// 1. Read PHY_REG.TXT BB INIT!!

	// We will seperate as 1T1R/1T2R/1T2R_GREEN/2T2R

	// We will seperate as 1T1R/1T2R/1T2R_GREEN/2T2R

	//

	//

#if RTL8190_Download_Firmware_From_Header

	if (priv->rf_type == RF_1T2R || priv->rf_type == RF_2T2R ||

	if (priv->rf_type == RF_1T2R || priv->rf_type == RF_2T2R ||

	    priv->rf_type == RF_1T1R ||priv->rf_type == RF_2T2R_GREEN)

	    priv->rf_type == RF_1T1R ||priv->rf_type == RF_2T2R_GREEN)

	{

	{
@@ -1557,26 +1550,6 @@ phy_BB8192S_Config_ParaFile(struct net_device* dev) 
		}

		}

	}else

	}else

		rtStatus = RT_STATUS_FAILURE;

		rtStatus = RT_STATUS_FAILURE;

#else

	RT_TRACE(COMP_INIT, "RF_Type == %d\n", priv->rf_type);

	// No matter what kind of RF we always read PHY_REG.txt. We must copy different

	// type of parameter files to phy_reg.txt at first.

	if (priv->rf_type == RF_1T2R || priv->rf_type == RF_2T2R ||

	    priv->rf_type == RF_1T1R ||priv->rf_type == RF_2T2R_GREEN)

	{

		rtStatus = phy_ConfigBBWithParaFile(dev, (char* )&szBBRegFile);

		if(priv->rf_type != RF_2T2R && priv->rf_type != RF_2T2R_GREEN)

		{//2008.11.10 Added by tynli. The default PHY_REG.txt we read is for 2T2R,

		  //so we should reconfig BB reg with the right PHY parameters.

			if(priv->rf_type == RF_1T1R)

				rtStatus = phy_SetBBtoDiffRFWithParaFile(dev, (char* )&szBBRegto1T1RFile);

			else if(priv->rf_type == RF_1T2R)

				rtStatus = phy_SetBBtoDiffRFWithParaFile(dev, (char* )&szBBRegto1T2RFile);

		}



	}else

		rtStatus = RT_STATUS_FAILURE;

#endif





	if(rtStatus != RT_STATUS_SUCCESS){

	if(rtStatus != RT_STATUS_SUCCESS){

		RT_TRACE(COMP_INIT, "phy_BB8192S_Config_ParaFile():Write BB Reg Fail!!");

		RT_TRACE(COMP_INIT, "phy_BB8192S_Config_ParaFile():Write BB Reg Fail!!");
@@ -1588,11 +1561,7 @@ phy_BB8192S_Config_ParaFile(struct net_device* dev) 
	//

	//

	if (priv->AutoloadFailFlag == false)

	if (priv->AutoloadFailFlag == false)

	{

	{

#if	RTL8190_Download_Firmware_From_Header

		rtStatus = phy_ConfigBBWithPgHeaderFile(dev,BaseBand_Config_PHY_REG);

		rtStatus = phy_ConfigBBWithPgHeaderFile(dev,BaseBand_Config_PHY_REG);

#else

		rtStatus = phy_ConfigBBWithPgParaFile(dev, (char* )&szBBRegPgFile);

#endif

	}

	}

	if(rtStatus != RT_STATUS_SUCCESS){

	if(rtStatus != RT_STATUS_SUCCESS){

		RT_TRACE(COMP_INIT, "phy_BB8192S_Config_ParaFile():BB_PG Reg Fail!!");

		RT_TRACE(COMP_INIT, "phy_BB8192S_Config_ParaFile():BB_PG Reg Fail!!");
@@ -1602,12 +1571,7 @@ phy_BB8192S_Config_ParaFile(struct net_device* dev) 
	//

	//

	// 3. BB AGC table Initialization

	// 3. BB AGC table Initialization

	//

	//

#if RTL8190_Download_Firmware_From_Header

	rtStatus = phy_ConfigBBWithHeaderFile(dev,BaseBand_Config_AGC_TAB);

	rtStatus = phy_ConfigBBWithHeaderFile(dev,BaseBand_Config_AGC_TAB);

#else

	RT_TRACE(COMP_INIT, "phy_BB8192S_Config_ParaFile AGC_TAB.txt\n");

	rtStatus = phy_ConfigBBWithParaFile(Adapter, (char* )&szAGCTableFile);

#endif





	if(rtStatus != RT_STATUS_SUCCESS){

	if(rtStatus != RT_STATUS_SUCCESS){

		printk( "phy_BB8192S_Config_ParaFile():AGC Table Fail\n");

		printk( "phy_BB8192S_Config_ParaFile():AGC Table Fail\n");

drivers/staging/rtl8192su/r8192S_rtl6052.c

+0 −11
Original line number Original line Diff line number Diff line
@@ -684,21 +684,10 @@ RT_STATUS phy_RF6052_Config_ParaFile(struct net_device* dev) 
		switch(eRFPath)

		switch(eRFPath)

		{

		{

		case RF90_PATH_A:

		case RF90_PATH_A:

#if	RTL8190_Download_Firmware_From_Header

			rtStatus= rtl8192_phy_ConfigRFWithHeaderFile(dev,(RF90_RADIO_PATH_E)eRFPath);

			rtStatus= rtl8192_phy_ConfigRFWithHeaderFile(dev,(RF90_RADIO_PATH_E)eRFPath);

#else

			rtStatus = PHY_ConfigRFWithParaFile(Adapter, (char* )&szRadioAFile, (RF90_RADIO_PATH_E)eRFPath);

#endif

			break;

			break;

		case RF90_PATH_B:

		case RF90_PATH_B:

#if	RTL8190_Download_Firmware_From_Header

			rtStatus= rtl8192_phy_ConfigRFWithHeaderFile(dev,(RF90_RADIO_PATH_E)eRFPath);

			rtStatus= rtl8192_phy_ConfigRFWithHeaderFile(dev,(RF90_RADIO_PATH_E)eRFPath);

#else

			if(priv->rf_type == RF_2T2R_GREEN)

				rtStatus = PHY_ConfigRFWithParaFile(Adapter, (ps1Byte)&szRadioBGMFile, (RF90_RADIO_PATH_E)eRFPath);

			else

				rtStatus = PHY_ConfigRFWithParaFile(Adapter, (char* )&szRadioBFile, (RF90_RADIO_PATH_E)eRFPath);

#endif

			break;

			break;

		case RF90_PATH_C:

		case RF90_PATH_C:

			break;

			break;