From: Youngjae Cho <y0.cho@samsung.com>
Date: Mon, 17 Jun 2024 11:21:07 +0000 (+0900)
Subject: display: Change system_wakeup_flag from plugin to misc function
X-Git-Tag: accepted/tizen/unified/20240701.055750~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c0d238f61fb3978048abcbfb943d0dadbf45af1;p=platform%2Fcore%2Fsystem%2Fdeviced.git

display: Change system_wakeup_flag from plugin to misc function

The system_wakeup_flag has nothing to do with plugin but, rather, a
runtime information that controlled by battery module. Therefore, it
is proper that the deviced core manages the value.

Change-Id: I62849c827aa688733da8689a37d1fb5c0ad22b37
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>
---

diff --git a/src/battery/battery-time.c b/src/battery/battery-time.c
index 35cfcf91..5969622b 100644
--- a/src/battery/battery-time.c
+++ b/src/battery/battery-time.c
@@ -28,7 +28,7 @@
 #include "shared/devices.h"
 #include "core/log.h"
 #include "display-ops.h"
-#include "display-plugin.h"
+#include "display-misc.h"
 #include "power-supply.h"
 #include "shared/plugin.h"
 
@@ -305,10 +305,10 @@ static int battinfo_calculation(void)
 		update_time(A_TIMETOFULL, estimated_time);
 	} else {
 		del_all_batt_node(B_CHARGING);
-		display_plugin_get_system_wakeup_flag(&system_wakeup_flag);
+		display_misc_get_system_wakeup_flag(&system_wakeup_flag);
 		if (system_wakeup_flag == true) {
 			del_all_batt_node(B_UNCHARGING);
-			display_plugin_set_system_wakeup_flag(false);
+			display_misc_set_system_wakeup_flag(false);
 		}
 		if (batt_head[B_UNCHARGING] == NULL) {
 			add_batt_node(B_UNCHARGING, clock, capacity);
diff --git a/src/display/display-misc.c b/src/display/display-misc.c
index bcfbba79..05c73aa3 100644
--- a/src/display/display-misc.c
+++ b/src/display/display-misc.c
@@ -41,6 +41,21 @@
 
 static bool stay_touchscreen_off = false;
 static bool touch_event_blocked = false;
+static bool system_wakeup_flag = false;
+
+int display_misc_get_system_wakeup_flag(bool *flag)
+{
+	*flag = system_wakeup_flag;
+
+	return 0;
+}
+
+int display_misc_set_system_wakeup_flag(bool flag)
+{
+	system_wakeup_flag = flag;
+
+	return 0;
+}
 
 /* FIXME: This fucntion should be relocated under the battery module */
 bool display_misc_is_low_battery_state(int val)
diff --git a/src/display/display-misc.h b/src/display/display-misc.h
index afacf7bd..6bc8f16c 100644
--- a/src/display/display-misc.h
+++ b/src/display/display-misc.h
@@ -27,6 +27,8 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
+int display_misc_get_system_wakeup_flag(bool *flag);
+int display_misc_set_system_wakeup_flag(bool flag);
 bool display_misc_is_low_battery_state(int val);
 void display_misc_get_process_name(pid_t pid, char *pname);
 void display_misc_set_stay_touchscreen_off(bool on);
diff --git a/src/display/display-plugin.c b/src/display/display-plugin.c
index 6716a7c4..cb423ad7 100644
--- a/src/display/display-plugin.c
+++ b/src/display/display-plugin.c
@@ -23,20 +23,6 @@
 
 struct display_plugin g_display_plugin;
 
-int display_plugin_get_system_wakeup_flag(bool *flag)
-{
-	*flag = g_display_plugin.system_wakeup_flag;
-
-	return 0;
-}
-
-int display_plugin_set_system_wakeup_flag(bool flag)
-{
-	g_display_plugin.system_wakeup_flag = flag;
-
-	return 0;
-}
-
 /* FIXME: Below functions are temorary to separtate display state transition functions */
 int display_plugin_state_do_default_trans(enum syscommon_deviced_display_state state, int evt)
 {
diff --git a/src/display/display-plugin.h b/src/display/display-plugin.h
index f55a99ac..779fa98a 100644
--- a/src/display/display-plugin.h
+++ b/src/display/display-plugin.h
@@ -29,7 +29,6 @@
 #include "shared/devices.h"
 
 struct display_plugin {
-	bool system_wakeup_flag;
 	int (*proc_change_state) (unsigned int cond, pid_t pid);
 
 	struct syscommon_deviced_display_config *config;
@@ -37,9 +36,6 @@ struct display_plugin {
 };
 extern struct display_plugin g_display_plugin;
 
-int display_plugin_get_system_wakeup_flag(bool *flag);
-int display_plugin_set_system_wakeup_flag(bool flag);
-
 /* FIXME: function names will be redefined */
 int display_plugin_state_do_default_trans(enum syscommon_deviced_display_state state, int evt);
 bool display_plugin_state_is_there_default_trans(enum syscommon_deviced_display_state state);
diff --git a/src/display/display.c b/src/display/display.c
index e19ae13d..801f29c4 100644
--- a/src/display/display.c
+++ b/src/display/display.c
@@ -252,7 +252,7 @@ static int power_resume_from_echomem_callback(void *data)
 	if (ret < 0)
 		return ret;
 
-	display_plugin_set_system_wakeup_flag(true);
+	display_misc_set_system_wakeup_flag(true);
 	if (check_wakeup_src() == EVENT_DEVICE)
 		/* system waked up by devices */
 		display_state_transition_do_state_transition(current, EVENT_DEVICE);