From dd0200ffc360d6738c5cef93d60a290030255389 Mon Sep 17 00:00:00 2001 From: Youngjae Cho Date: Tue, 28 Mar 2023 14:39:41 +0900 Subject: [PATCH] power: Rename enable/disable autosleep to init/exit The functions below has been renamed: - power_enable_autosleep() => power_init_autosleep() - power_disable_autosleep() => power_exit_autosleep() Those functions are only executed once, after booting done and before shutting down. Therefore the name init/exit is much proper than enable/disable. In addition, for the power_init_autosleep(), it has changed to acquire mainlock before writing "mem" on the /sys/power/autosleep. This prevents system from going suspend just after the writing "mem" on /sys/power/autosleep. Change-Id: Iafe5b4a3507ef983edaaa68735858c57577e24f8 Signed-off-by: Youngjae Cho --- src/power/power-off.c | 2 +- src/power/power-suspend.c | 9 +++++---- src/power/power-suspend.h | 4 ++-- src/power/power.c | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/power/power-off.c b/src/power/power-off.c index 9c454dd..a42261f 100644 --- a/src/power/power-off.c +++ b/src/power/power-off.c @@ -311,7 +311,7 @@ void poweroff_prepare(uint64_t state) if (ret < 0) _W("Failed to set vconf value for power off status: %d", vconf_get_ext_errno()); - power_disable_autosleep(); + power_exit_autosleep(); device_notify_once(DEVICE_NOTIFIER_POWEROFF_TRIGGERED, (void *)(intptr_t) vconf); /* Poweroff event broadcasting */ diff --git a/src/power/power-suspend.c b/src/power/power-suspend.c index 12ec794..850dc52 100644 --- a/src/power/power-suspend.c +++ b/src/power/power-suspend.c @@ -253,15 +253,16 @@ int vital_state_changed(void *data) return 0; } -int power_enable_autosleep(void) +int power_init_autosleep(void) { - _I("System autosleep enabled."); + _I("System autosleep init."); + sys_set_str("/sys/power/wake_lock", "mainlock"); return sys_set_str(POWER_AUTOSLEEP_PATH, "mem"); } -int power_disable_autosleep(void) +int power_exit_autosleep(void) { - _I("System autosleep disabled."); + _I("System autosleep exit."); return sys_set_str(POWER_AUTOSLEEP_PATH, "off"); } diff --git a/src/power/power-suspend.h b/src/power/power-suspend.h index 3fac1a3..abdcf9d 100644 --- a/src/power/power-suspend.h +++ b/src/power/power-suspend.h @@ -75,8 +75,8 @@ void pm_history_print(int fd, int count); #endif bool vital_mode(void); int vital_state_changed(void *data); -int power_enable_autosleep(void); -int power_disable_autosleep(void); +int power_init_autosleep(void); +int power_exit_autosleep(void); int power_acquire_wakelock(void); int power_release_wakelock(void); int pm_get_power_lock(void); diff --git a/src/power/power.c b/src/power/power.c index f6f05e9..6682617 100644 --- a/src/power/power.c +++ b/src/power/power.c @@ -789,7 +789,7 @@ static int delayed_init_callback(void *data) trigger_transition(); } - power_enable_autosleep(); + power_init_autosleep(); return 0; } -- 2.7.4