remove testchip support

2024-11-22 13:24:36 +00:00 · 2020-03-08 00:10:02 +00:00 · 2020-03-08 00:10:02 +00:00 · da4b1aef7a
commit da4b1aef7a
parent 86d2fd5519
6 changed files with 7 additions and 68 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -25,21 +25,21 @@ matrix:
            - sourceline: "ppa:ubuntu-toolchain-r/test"
          packages:
            - gcc-9
-      env: COMPILER=gcc-9 KVER=5.5.1
+      env: COMPILER=gcc-9 KVER=5.6-rc4
    - compiler: gcc
      addons:
        apt:
          packages:
            - gcc-8
-      env: COMPILER=gcc-8 KVER=5.5.1
+      env: COMPILER=gcc-8 KVER=5.6-rc4
    - compiler: gcc
-      env: COMPILER=gcc-7 KVER=5.5.1
+      env: COMPILER=gcc-7 KVER=5.6-rc4
    - compiler: gcc
      addons:
        apt:
          packages:
            - gcc-6
-      env: COMPILER=gcc-6 KVER=5.5.1
+      env: COMPILER=gcc-6 KVER=5.6-rc4
    - compiler: gcc
      addons:
        apt:
--- a/hal/phydm/phydm.c
+++ b/hal/phydm/phydm.c
@ -2084,10 +2084,6 @@ void odm_cmn_info_init(struct dm_struct *dm, enum odm_cmninfo cmn_info,
 		dm->support_interface = (u8)value;
 		break;

-	case ODM_CMNINFO_MP_TEST_CHIP:
-		dm->is_mp_chip = (u8)value;
-		break;
-
 	case ODM_CMNINFO_IC_TYPE:
 		dm->support_ic_type = (u32)value;
 		break;
--- a/hal/phydm/phydm.h
+++ b/hal/phydm/phydm.h
@ -829,7 +829,6 @@ struct dm_struct {
 	u8			rssi_max;
 	u8			rssi_max_macid;
 	u8			rssi_min_by_path;
-	boolean			is_mp_chip;
 	boolean			is_one_entry_only;
 	u32			one_entry_macid;
 	u32			one_entry_tp;
--- a/hal/phydm/phydm_debug.c
+++ b/hal/phydm/phydm_debug.c
@ -2409,9 +2409,6 @@ void phydm_basic_profile(void *dm_void, u32 *_used, char *output, u32 *_out_len)
 		release_ver = RELEASE_VERSION_8812F;
 	}
 #endif
-	PDM_SNPF(out_len, used, output + used, out_len - used,
-		 "  %-35s: %s (MP Chip: %s)\n", "IC type", ic_type,
-		 dm->is_mp_chip ? "Yes" : "No");

 	if (dm->cut_version == ODM_CUT_A)
 		cut = "A";
--- a/hal/phydm/phydm_hwconfig.c
+++ b/hal/phydm/phydm_hwconfig.c
@ -33,26 +33,12 @@
 #define READ_AND_CONFIG_MP(ic, txt) (odm_read_and_config_mp_##ic##txt(dm))
 #define READ_AND_CONFIG_TC(ic, txt) (odm_read_and_config_tc_##ic##txt(dm))

-#if (PHYDM_TESTCHIP_SUPPORT == 1)
-#define READ_AND_CONFIG(ic, txt)                     \
-	do {                                         \
-		if (dm->is_mp_chip)                  \
-			READ_AND_CONFIG_MP(ic, txt); \
-		else                                 \
-			READ_AND_CONFIG_TC(ic, txt); \
-	} while (0)
-#else
 #define READ_AND_CONFIG READ_AND_CONFIG_MP
-#endif

 #define GET_VERSION_MP(ic, txt) (odm_get_version_mp_##ic##txt())
 #define GET_VERSION_TC(ic, txt) (odm_get_version_tc_##ic##txt())

-#if (PHYDM_TESTCHIP_SUPPORT == 1)
-#define GET_VERSION(ic, txt) (dm->is_mp_chip ? GET_VERSION_MP(ic, txt) : GET_VERSION_TC(ic, txt))
-#else
 #define GET_VERSION(ic, txt) GET_VERSION_MP(ic, txt)
-#endif

 enum hal_status
 odm_config_rf_with_header_file(struct dm_struct *dm,
@ -65,8 +51,6 @@ odm_config_rf_with_header_file(struct dm_struct *dm,
 #endif
 	enum hal_status result = HAL_STATUS_SUCCESS;

-	PHYDM_DBG(dm, ODM_COMP_INIT, "===>%s (%s)\n", __func__,
-		  (dm->is_mp_chip) ? "MPChip" : "TestChip");
 	PHYDM_DBG(dm, ODM_COMP_INIT,
 		  "support_platform: 0x%X, support_interface: 0x%X, board_type: 0x%X\n",
 		  dm->support_platform, dm->support_interface, dm->board_type);
@ -470,8 +454,6 @@ odm_config_rf_with_header_file(struct dm_struct *dm,
 enum hal_status
 odm_config_rf_with_tx_pwr_track_header_file(struct dm_struct *dm)
 {
-	PHYDM_DBG(dm, ODM_COMP_INIT, "===>%s (%s)\n", __func__,
-		  (dm->is_mp_chip) ? "MPChip" : "TestChip");
 	PHYDM_DBG(dm, ODM_COMP_INIT,
 		  "support_platform: 0x%X, support_interface: 0x%X, board_type: 0x%X\n",
 		  dm->support_platform, dm->support_interface, dm->board_type);
@ -493,10 +475,7 @@ odm_config_rf_with_tx_pwr_track_header_file(struct dm_struct *dm)
 		if (dm->support_interface == ODM_ITRF_PCIE)
 			READ_AND_CONFIG_MP(8812a, _txpowertrack_pcie);
 		else if (dm->support_interface == ODM_ITRF_USB) {
-			if (dm->rfe_type == 3 && dm->is_mp_chip)
-				READ_AND_CONFIG_MP(8812a, _txpowertrack_rfe3);
-			else
-				READ_AND_CONFIG_MP(8812a, _txpowertrack_usb);
+			READ_AND_CONFIG_MP(8812a, _txpowertrack_usb);
 		}
 	}
 #endif
@ -793,24 +772,7 @@ odm_config_bb_with_header_file(struct dm_struct *dm,
 		else if (config_type == CONFIG_BB_AGC_TAB)
 			READ_AND_CONFIG_MP(8812a, _agc_tab);
 		else if (config_type == CONFIG_BB_PHY_REG_PG) {
-			if (dm->rfe_type == 3 && dm->is_mp_chip)
-				READ_AND_CONFIG_MP(8812a, _phy_reg_pg_asus);
-#if (DM_ODM_SUPPORT_TYPE & ODM_WIN)
-			else if (mgnt_info->CustomerID == RT_CID_WNC_NEC && dm->is_mp_chip)
-				READ_AND_CONFIG_MP(8812a, _phy_reg_pg_nec);
-#if RT_PLATFORM == PLATFORM_MACOSX
-			/*@{1827}{1024} for BUFFALO power by rate table. Isaiah 2013-11-29*/
-			else if (mgnt_info->CustomerID == RT_CID_DNI_BUFFALO)
-				READ_AND_CONFIG_MP(8812a, _phy_reg_pg_dni);
-			/* TP-Link T4UH, Isaiah 2015-03-16*/
-			else if (mgnt_info->CustomerID == RT_CID_TPLINK_HPWR) {
-				pr_debug("RT_CID_TPLINK_HPWR:: _PHY_REG_PG_TPLINK\n");
-				READ_AND_CONFIG_MP(8812a, _phy_reg_pg_tplink);
-			}
-#endif
-#endif
-			else
-				READ_AND_CONFIG_MP(8812a, _phy_reg_pg);
+			READ_AND_CONFIG_MP(8812a, _phy_reg_pg);
 		} else if (config_type == CONFIG_BB_PHY_REG_MP)
 			READ_AND_CONFIG_MP(8812a, _phy_reg_mp);
 		else if (config_type == CONFIG_BB_AGC_TAB_DIFF) {
@ -838,16 +800,6 @@ odm_config_bb_with_header_file(struct dm_struct *dm,
 				READ_AND_CONFIG_MP(8821a, _phy_reg_pg_e202_sa);
 			else
 #endif
-#if (RT_PLATFORM == PLATFORM_MACOSX)
-				/*@  for BUFFALO pwr by rate table */
-				if (mgnt_info->CustomerID == RT_CID_DNI_BUFFALO) {
-				/*@  for BUFFALO pwr by rate table (JP/US)*/
-				if (mgnt_info->ChannelPlan == RT_CHANNEL_DOMAIN_US_2G_CANADA_5G)
-					READ_AND_CONFIG_MP(8821a, _phy_reg_pg_dni_us);
-				else
-					READ_AND_CONFIG_MP(8821a, _phy_reg_pg_dni_jp);
-			} else
-#endif
 #endif
 				READ_AND_CONFIG_MP(8821a, _phy_reg_pg);
 		}
@ -1184,8 +1136,6 @@ odm_config_mac_with_header_file(struct dm_struct *dm)
 {
 	enum hal_status result = HAL_STATUS_SUCCESS;

-	PHYDM_DBG(dm, ODM_COMP_INIT, "===>%s (%s)\n", __func__,
-		  (dm->is_mp_chip) ? "MPChip" : "TestChip");
 	PHYDM_DBG(dm, ODM_COMP_INIT,
 		  "support_platform: 0x%X, support_interface: 0x%X, board_type: 0x%X\n",
 		  dm->support_platform, dm->support_interface, dm->board_type);
--- a/hal/phydm/phydm_phystatus.c
+++ b/hal/phydm/phydm_phystatus.c
@ -1228,10 +1228,7 @@ void phydm_rx_physts_1st_type(struct dm_struct *dm,
 	/* @== [PWDB] ========================================================*/

 		/*@(Avg PWDB calculated by hardware*/
-		if (!dm->is_mp_chip) /*@8812, 8821*/
-			val = phy_sts->pwdb_all;
-		else
-			val = phy_sts->pwdb_all >> 1; /*old fomula*/
+		val = phy_sts->pwdb_all >> 1; /*old fomula*/

 		rx_pwr_db = (val & 0x7f) - 110;
 		phy_info->rx_pwdb_all = phydm_pwr_2_percent(rx_pwr_db);