# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1603428748 0
# Node ID 032a561fab2b98099ce056952270ff3eee7f2415
# Parent  77321341946c0f72c127c6f0f14dfe0aef63eaaf
GPF-Riviera sync: make MMI task startup wait for FCHG

diff -r 77321341946c -r 032a561fab2b src/cs/drivers/drv_app/fchg/fchg_task.c
--- a/src/cs/drivers/drv_app/fchg/fchg_task.c	Fri Oct 23 03:39:22 2020 +0000
+++ b/src/cs/drivers/drv_app/fchg/fchg_task.c	Fri Oct 23 04:52:28 2020 +0000
@@ -9,6 +9,9 @@
 #include "rvm/rvm_use_id_list.h"
 #include "abb/abb.h"
 
+/* startup synchronization with MMI task in GPF land */
+int fchg_is_running;
+
 static void set_initial_state(void)
 {
 	SYS_UWORD16 abb_status;
@@ -34,6 +37,7 @@
 	pwr_load_ffs_charging_config();
 	set_initial_state();
 	pwr_init_discharge();
+	fchg_is_running = 1;
 
 	/* loop to process messages */
 	while (error_occured == FALSE)
diff -r 77321341946c -r 032a561fab2b src/g23m-aci/aci/aci_pei.c
--- a/src/g23m-aci/aci/aci_pei.c	Fri Oct 23 03:39:22 2020 +0000
+++ b/src/g23m-aci/aci/aci_pei.c	Fri Oct 23 04:52:28 2020 +0000
@@ -155,7 +155,7 @@
 extern const char firmware_version_str[];
 
 #if (MMI != 0)
-extern int r2d_is_running;
+extern int fchg_is_running, r2d_is_running;
 #endif
 
 
@@ -1389,8 +1389,9 @@
 #endif /* TI_PS_HCOMM_CHANGE */
 
 /* FreeCalypso addition to fix R2D start race condition */
+/* wait for FCHG too now that MFW depends on it */
 #if (MMI != 0)
-  if (!r2d_is_running)
+  if (!fchg_is_running || !r2d_is_running)
     return PEI_ERROR;
 #endif