Merge pull request #454 from FrameworkComputer/hx30.fix_ac_power_on

hx30: modify power on by AC

Author: kiram9

.vscode/settings.json

@@ -1,2 +1,6 @@
 {
+    "files.associations": {
+        "*.inc": "c",
+        "battery_smart.h": "c"
+    }
 }

board/hx30/board.c

@@ -369,6 +369,23 @@ void board_reset_pd_mcu(void)
 
 }
 
+/**
+ * Check the plug-in AC then power on system setting.
+ */
+bool ac_poweron_check(void)
+{
+	uint8_t memcap;
+
+	system_get_bbram(SYSTEM_BBRAM_IDX_AC_BOOT, &memcap);
+
+	return memcap ? true : false;
+}
+
+int poweron_reason_acin(void)
+{
+	return extpower_is_present() && ac_poweron_check();
+}
+
 static int power_button_pressed_on_boot;
 int poweron_reason_powerbtn(void)
 {

board/hx30/board.h

@@ -772,6 +772,7 @@ void thm_ft5399m_set_timeout_en(void);
 void update_me_change(int change);
 
 int poweron_reason_powerbtn(void);
+int poweron_reason_acin(void);
 
 #ifdef CONFIG_EMI_REGION1
 void power_state_clear(int state);

board/hx30/power_button_x86.c

@@ -261,18 +261,6 @@ int power_button_batt_cutoff(void)
 	return power_button_battery_cutoff;
 }
 
-/**
- * Check the plug-in AC then power on system setting.
- */
-bool ac_poweron_check(void)
-{
-	uint8_t memcap;
-
-	system_get_bbram(SYSTEM_BBRAM_IDX_AC_BOOT, &memcap);
-
-	return memcap ? true : false;
-}
-
 /**
  * Power button state machine.
  *
@@ -396,9 +384,8 @@ static void state_machine(uint64_t tnow)
 			tnext_state = tnow + PWRBTN_DELAY_INITIAL;
 			initial_delay--;
 		} else {
-			if ((poweron_reason_powerbtn() || (system_get_reset_flags() &
-				EC_RESET_FLAG_HARD) == EC_RESET_FLAG_HARD) ||
-				(extpower_is_present() && ac_poweron_check())) {
+			if (poweron_reason_powerbtn() || poweron_reason_acin() ||
+			 ((system_get_reset_flags() & EC_RESET_FLAG_HARD) == EC_RESET_FLAG_HARD)) {
 
 				reset_diagnostics();
 
@@ -429,8 +416,8 @@ static void state_machine(uint64_t tnow)
 		 * button until it's released, so that holding down the
 		 * recovery combination doesn't cause the chipset to shut back
 		 * down. */
-		if (poweron_reason_powerbtn() || (system_get_reset_flags() &
-			EC_RESET_FLAG_HARD) == EC_RESET_FLAG_HARD)
+		if (poweron_reason_powerbtn() || poweron_reason_acin() ||
+			((system_get_reset_flags() & EC_RESET_FLAG_HARD) == EC_RESET_FLAG_HARD))
 			set_pwrbtn_to_pch(1, 1);
 
 		if (power_button_is_pressed())