Skip to contentSkip to conversation

staging: rtl8723bs: remove RTL8188E references

PATCH In review Nikunj Kantaria 2 participants 2 messages Feb 27 – Feb 28 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtl8723bs: remove RTL8188E references

Remove all references to RTL8188E chip from the driver code. This includes renaming variables, deleting unused macros and struct members, and updating comments to reflect that this driver is specifically for RTL8723BS.

This addresses the TODO item to remove leftover code for other chips.

---
 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c   | 16 ++++++++--------
 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.h   |  2 +-
 drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c     |  2 +-
 drivers/staging/rtl8723bs/hal/odm.h              |  3 ---
 drivers/staging/rtl8723bs/include/hal_com_reg.h  |  4 ++--
 drivers/staging/rtl8723bs/include/rtw_mlme_ext.h |  4 +++-
 6 files changed, 15 insertions(+), 16 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +8 -8
index 9df3274c1..f2e19e044 100644
@@ -23,14 +23,14 @@
 
 /*---------------------------Define Local Constant---------------------------*/
 
-/* In the case that we fail to read TxPowerTrack.txt, we use the table for
- * 88E as the default table.
+/* In the case that we fail to read TxPowerTrack.txt, we use the default
+ * delta swing table.
  */
-static u8 DeltaSwingTableIdx_2GA_N_8188E[] = {
+static u8 DeltaSwingTableIdx_2GA_N_8723B[] = {
 	0, 0, 0, 2, 2, 3, 3, 4,  4,  4,  4,  5,  5,  6,  6,
 	7, 7, 7, 7, 8, 8, 9, 9, 10, 10, 10, 11, 11, 11, 11
 };
-static u8 DeltaSwingTableIdx_2GA_P_8188E[] = {
+static u8 DeltaSwingTableIdx_2GA_P_8723B[] = {
 	0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 4, 4,
 	4, 4, 4, 5, 5, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9
 };
@@ -326,10 +326,10 @@ static void GetDeltaSwingTable_8723B(
 			*TemperatureDOWN_B = pRFCalibrateInfo->DeltaSwingTableIdx_2GB_N;
 		}
 	} else {
-		*TemperatureUP_A   = (u8 *)DeltaSwingTableIdx_2GA_P_8188E;
-		*TemperatureDOWN_A = (u8 *)DeltaSwingTableIdx_2GA_N_8188E;
-		*TemperatureUP_B   = (u8 *)DeltaSwingTableIdx_2GA_P_8188E;
-		*TemperatureDOWN_B = (u8 *)DeltaSwingTableIdx_2GA_N_8188E;
+		*TemperatureUP_A   = (u8 *)DeltaSwingTableIdx_2GA_P_8723B;
+		*TemperatureDOWN_A = (u8 *)DeltaSwingTableIdx_2GA_N_8723B;
+		*TemperatureUP_B   = (u8 *)DeltaSwingTableIdx_2GA_P_8723B;
+		*TemperatureDOWN_B = (u8 *)DeltaSwingTableIdx_2GA_N_8723B;
 	}
 }
 
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.h +1 -1
index c83442917..a21764adb 100644
@@ -65,4 +65,4 @@ void _PHY_MACSettingCalibration_8723B(
 	struct adapter *padapter, u32 *MACReg, u32 *MACBackup
 );
 
-#endif /*  #ifndef __HAL_PHY_RF_8188E_H__ */
+#endif /*  #ifndef __HAL_PHY_RF_8723B_H__ */
drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c +1 -1
index 86404b5e6..7f57ae017 100644
@@ -26,7 +26,7 @@ Major Change History:
 
 /*  */
 /*  Description: */
-/*  This routine deal with the Power Configuration CMDs parsing for RTL8723/RTL8188E Series IC. */
+/*  This routine deals with the Power Configuration CMDs parsing for RTL8723 Series IC. */
 /*  */
 /*  Assumption: */
 /*  We should follow specific format which was released from HW SD. */
drivers/staging/rtl8723bs/hal/odm.h +0 -3
index 1c929d88e..c4fce230c 100644
@@ -203,7 +203,6 @@ struct odm_rate_adaptive {
 /*  Declare for common info */
 /*  */
 #define MAX_PATH_NUM_92CS		2
-#define MAX_PATH_NUM_8188E		1
 #define MAX_PATH_NUM_8192E		2
 #define MAX_PATH_NUM_8723B		1
 #define MAX_PATH_NUM_8812A		2
@@ -538,8 +537,6 @@ struct odm_rf_cal_t { /* ODM_RF_Calibration_Structure */
 	u8 DeltaSwingTableIdx_2GA_N[DELTA_SWINGIDX_SIZE];
 	u8 DeltaSwingTableIdx_2GB_P[DELTA_SWINGIDX_SIZE];
 	u8 DeltaSwingTableIdx_2GB_N[DELTA_SWINGIDX_SIZE];
-	u8 DeltaSwingTableIdx_2GA_P_8188E[DELTA_SWINGIDX_SIZE];
-	u8 DeltaSwingTableIdx_2GA_N_8188E[DELTA_SWINGIDX_SIZE];
 
 	/*  */
 
drivers/staging/rtl8723bs/include/hal_com_reg.h +2 -2
index cf5c15dc2..a1cfe2f7d 100644
@@ -202,7 +202,7 @@
 #define WCAMI					REG_CAMWRITE	/*  Software write CAM input content */
 
 /*  */
-/*        8723/8188E Host System Interrupt Status Register (offset 0x5C, 32 byte) */
+/*        8723 Host System Interrupt Status Register (offset 0x5C, 32 byte) */
 /*  */
 #define HSISR_GPIO12_0_INT				BIT0
 #define HSISR_SPS_OCP_INT				BIT5
@@ -539,7 +539,7 @@
 
 #define SDIO_HIMR_DISABLED			0
 
-/*  RTL8723/RTL8188E SDIO Host Interrupt Mask Register */
+/*  RTL8723 SDIO Host Interrupt Mask Register */
 #define SDIO_HIMR_RX_REQUEST_MSK		BIT0
 #define SDIO_HIMR_AVAL_MSK			BIT1
 
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +3 -1
index afa5631a4..a8ebcb314 100644
@@ -10,7 +10,9 @@
 
 /* 	Commented by Albert 20101105 */
 /* 	Increase the SURVEY_TO value from 100 to 150  (100ms to 150ms) */
-/* 	The Realtek 8188CE SoftAP will spend around 100ms to send the probe response after receiving the probe request. */
+/*  The Realtek SoftAP will spend around 100ms to send the probe response
+ *  after receiving the probe request.
+ */
 /* 	So, this driver tried to extend the dwell time for each scanning channel. */
 /* 	This will increase the chance to receive the probe response from SoftAP. */
 
Signature · 1 line
2.43.0
#1 lore raw
Quoted 11 lines · Nikunj Kantaria

Remove all references to RTL8188E chip from the driver code. This includes renaming variables, deleting unused macros and struct members, and updating comments to reflect that this driver is specifically for RTL8723BS.

This addresses the TODO item to remove leftover code for other chips.

---

Just have one SOB which is your real name. Also, this looks like the same diff you sent before but you didn't version it. Look at this resource on how to make a v2:

https://staticthinking.wordpress.com/2022/07/27/how-to-send-a-v2-patch/

Thanks,

ET