[modify] double check battery D-FET state

when D-FET not active we should return not_sure

Signed-off-by: Leo_Tsai <[email protected]>

Author: LeoCX-Tsai

board/hx20/battery.c

@@ -80,19 +80,42 @@ __override void battery_charger_notify(uint8_t flag)
 	}
 }
 
+static int battery_check_disconnect(void)
+{
+	int rv;
+	uint8_t data[6];
+
+	/* Check if battery charging + discharging is disabled. */
+	rv = sb_read_mfgacc(PARAM_OPERATION_STATUS,
+			    SB_ALT_MANUFACTURER_ACCESS, data, sizeof(data));
+	if (rv)
+		return BATTERY_DISCONNECT_ERROR;
+
+	if (data[3] & BATTERY_DISCHARGING_DISABLED)
+		return BATTERY_DISCONNECTED;
+
+
+	return BATTERY_NOT_DISCONNECTED;
+}
+
 enum battery_present battery_is_present(void)
 {
 	enum battery_present bp;
 	int mv;
 
 	mv = adc_read_channel(ADC_VCIN1_BATT_TEMP);
-
-	if (mv == ADC_READ_ERROR)
-		return -1;
-
 	bp = (mv < 3000 ? BP_YES : BP_NO);
 
-	return bp;
+	if (mv == ADC_READ_ERROR)
+		return BP_NO;
+	else if (!bp)
+		return BP_NO;
+	else if (!(charger_current_battery_params()->flags & BATT_FLAG_RESPONSIVE))
+		return BP_NOT_SURE;
+	else if (battery_check_disconnect() != BATTERY_NOT_DISCONNECTED)
+		return BP_NOT_SURE;
+	else
+		return bp;
 }
 
 #ifdef CONFIG_EMI_REGION1

board/hx20/board.h

@@ -161,6 +161,7 @@
 
 #define CONFIG_BATTERY_CUT_OFF
 #define CONFIG_BATTERY_SMART
+#define CONFIG_BATTERY_PRESENT_CUSTOM
 #define CONFIG_BOARD_VERSION_CUSTOM
 #define CONFIG_CHARGE_MANAGER
 /* #define CONFIG_CHARGE_RAMP_SW */

board/hx20/cypress5525.c

@@ -358,7 +358,8 @@ void cypd_update_power(void)
 
 	if (extpower_is_present() ||
 	 (charger_current_battery_params()->flags & BATT_FLAG_RESPONSIVE &&
-		 charger_current_battery_params()->state_of_charge > 0))
+		 charger_current_battery_params()->state_of_charge > 0 &&
+		 battery_is_present() == BP_YES))
 		system_power_present = 1;
 	else
 		system_power_present = 0;
@@ -370,7 +371,8 @@ int cypd_update_power_status(void)
 	int rv = EC_SUCCESS;
 	int power_stat = 0;
 	if (charger_current_battery_params()->flags & BATT_FLAG_RESPONSIVE &&
-		charger_current_battery_params()->state_of_charge > 0) {
+		charger_current_battery_params()->state_of_charge > 0 &&
+		battery_is_present() == BP_YES) {
 		power_stat |= BIT(3);
 	}
 	if (extpower_is_present()) {