From 9427315f31b80604e4185f54c249e0db85684f4c Mon Sep 17 00:00:00 2001 From: Jeong Donghwan Date: Tue, 8 Nov 2016 14:26:25 +0900 Subject: [PATCH] poll: modify internal poll request id It does not know change or lock reason of logdump. Also, if the moudle requested lock using deviced pid, it can be released by another module. So all request should be assigned internal value. Change-Id: I98028bd2fbf876c48549e89b8fb5ef33458da69d Signed-off-by: Jeong Donghwan --- src/battery/lowbat-handler.c | 2 +- src/battery/power-supply.c | 10 +++++----- src/display/core.c | 4 ++-- src/display/key-filter.c | 4 ++-- src/display/poll.h | 5 +++++ src/extcon/cradle.c | 8 ++++---- src/extcon/earjack.c | 2 +- src/extcon/hdmi.c | 2 +- src/power/power-handler.c | 4 ++-- 9 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/battery/lowbat-handler.c b/src/battery/lowbat-handler.c index 572c8d0..71cc0b7 100644 --- a/src/battery/lowbat-handler.c +++ b/src/battery/lowbat-handler.c @@ -301,7 +301,7 @@ direct_launch: if ((r_disturb != 0 && r_block != 0) || (s_disturb == 0 && s_block == 0) || lowbat_popup_option == LOWBAT_OPT_CHARGEERR) - pm_change_internal(getpid(), LCD_NORMAL); + pm_change_internal(INTERNAL_LOCK_LOWBAT, LCD_NORMAL); else _I("block LCD"); diff --git a/src/battery/power-supply.c b/src/battery/power-supply.c index dcd632f..9e11bc6 100644 --- a/src/battery/power-supply.c +++ b/src/battery/power-supply.c @@ -95,7 +95,7 @@ static void pm_check_and_change(int bInserted) if (old == bInserted) return; old = bInserted; - pm_change_internal(getpid(), LCD_NORMAL); + pm_change_internal(INTERNAL_LOCK_POPUP, LCD_NORMAL); } static int changed_battery_cf(enum present_type status) @@ -141,7 +141,7 @@ static Eina_Bool health_timer_cb(void *data) _I("popup - Battery health status is not good"); device_notify(DEVICE_NOTIFIER_BATTERY_HEALTH, (void *)HEALTH_BAD); - pm_change_internal(getpid(), LCD_NORMAL); + pm_change_internal(INTERNAL_LOCK_POPUP, LCD_NORMAL); pm_lock_internal(INTERNAL_LOCK_POPUP, LCD_DIM, STAY_CUR_STATE, 0); if (battery.temp == TEMP_LOW) battery_charge_err_low_act(NULL); @@ -389,7 +389,7 @@ static void update_present(enum battery_noti_status status) return; _I("charge %d present %d", battery.charge_now, battery.present); old = status; - pm_change_internal(getpid(), LCD_NORMAL); + pm_change_internal(INTERNAL_LOCK_POPUP, LCD_NORMAL); if (status == DEVICE_NOTI_ON) { present = PRESENT_ABNORMAL; device_notify(DEVICE_NOTIFIER_BATTERY_PRESENT, (void *)PRESENT_ABNORMAL); @@ -411,7 +411,7 @@ static void update_health(enum battery_noti_status status) _I("charge %d health %d", battery.charge_now, battery.health); old = status; - pm_change_internal(getpid(), LCD_NORMAL); + pm_change_internal(INTERNAL_LOCK_POPUP, LCD_NORMAL); if (status == DEVICE_NOTI_ON) { _I("popup - Battery health status is not good"); device_notify(DEVICE_NOTIFIER_BATTERY_HEALTH, (void *)HEALTH_BAD); @@ -436,7 +436,7 @@ static void update_ovp(enum battery_noti_status status) return; _I("charge %d ovp %d", battery.charge_now, battery.ovp); old = status; - pm_change_internal(getpid(), LCD_NORMAL); + pm_change_internal(INTERNAL_LOCK_POPUP, LCD_NORMAL); if (status == DEVICE_NOTI_ON) device_notify(DEVICE_NOTIFIER_BATTERY_OVP, (void *)OVP_ABNORMAL); else diff --git a/src/display/core.c b/src/display/core.c index cf890e5..8a1d1c4 100644 --- a/src/display/core.c +++ b/src/display/core.c @@ -918,7 +918,7 @@ static void proc_condition_lock(PMMsg *data) if (state == S_LCDOFF && pm_cur_state == S_SLEEP) - proc_change_state(data->cond, getpid()); + proc_change_state(data->cond, INTERNAL_LOCK_PM); if (data->timeout > 0) { /* To pass a pid_t data through the timer infrastructure @@ -1701,7 +1701,7 @@ static int update_setting(int key_idx, int val) if (pm_cur_state == S_NORMAL || pm_cur_state == S_LCDDIM) states[pm_cur_state].trans(EVENT_INPUT); else if (pm_cur_state == S_SLEEP && hallic_open) - proc_change_state(S_LCDOFF, getpid()); + proc_change_state(S_LCDOFF, INTERNAL_LOCK_HALLIC); break; case SETTING_LOW_BATT: if (low_battery_state(val)) { diff --git a/src/display/key-filter.c b/src/display/key-filter.c index 410c830..5e87b6c 100644 --- a/src/display/key-filter.c +++ b/src/display/key-filter.c @@ -122,7 +122,7 @@ static void longkey_pressed() if (display_has_caps(caps, DISPLAY_CAPA_LCDON)) { /* change state - LCD on */ - pm_change_internal(getpid(), LCD_NORMAL); + pm_change_internal(INTERNAL_LOCK_POWERKEY, LCD_NORMAL); (*pm_callback)(INPUT_POLL_EVENT, NULL); } @@ -329,7 +329,7 @@ static int lcdoff_powerkey(void) delete_condition(S_NORMAL); delete_condition(S_LCDDIM); update_lcdoff_source(VCONFKEY_PM_LCDOFF_BY_POWERKEY); - pm_change_internal(getpid(), LCD_OFF); + pm_change_internal(INTERNAL_LOCK_POWERKEY, LCD_OFF); } } else { ignore = false; diff --git a/src/display/poll.h b/src/display/poll.h index 7beb910..2f236b6 100644 --- a/src/display/poll.h +++ b/src/display/poll.h @@ -56,6 +56,11 @@ enum { INTERNAL_LOCK_SUSPEND, INTERNAL_LOCK_COOL_DOWN, INTERNAL_LOCK_LOWBAT, + INTERNAL_LOCK_CRADLE, + INTERNAL_LOCK_EARJACK, + INTERNAL_LOCK_POWERKEY, + INTERNAL_LOCK_PM, + INTERNAL_LOCK_HALLIC, }; #define SIGNAL_NAME_LCD_CONTROL "lcdcontol" diff --git a/src/extcon/cradle.c b/src/extcon/cradle.c index 9b83013..84e25a7 100644 --- a/src/extcon/cradle.c +++ b/src/extcon/cradle.c @@ -53,7 +53,7 @@ static void cradle_send_broadcast(int status) static int cradle_update(int status) { _I("jack - cradle changed %d", status); - pm_change_internal(getpid(), LCD_NORMAL); + pm_change_internal(INTERNAL_LOCK_CRADLE, LCD_NORMAL); cradle_send_broadcast(status); if (vconf_set_int(VCONFKEY_SYSMAN_CRADLE_STATUS, status) != 0) { _E("failed to set vconf status"); @@ -61,9 +61,9 @@ static int cradle_update(int status) } if (status == DOCK_SOUND) - pm_lock_internal(getpid(), LCD_DIM, STAY_CUR_STATE, 0); + pm_lock_internal(INTERNAL_LOCK_CRADLE, LCD_DIM, STAY_CUR_STATE, 0); else if (status == DOCK_NONE) - pm_unlock_internal(getpid(), LCD_DIM, PM_SLEEP_MARGIN); + pm_unlock_internal(INTERNAL_LOCK_CRADLE, LCD_DIM, PM_SLEEP_MARGIN); return 0; } @@ -82,7 +82,7 @@ static int display_changed(void *data) cradle = cradle_extcon_ops.status; if (cradle == DOCK_SOUND) { - pm_lock_internal(getpid(), LCD_DIM, STAY_CUR_STATE, 0); + pm_lock_internal(INTERNAL_LOCK_CRADLE, LCD_DIM, STAY_CUR_STATE, 0); _I("sound dock is connected! dim lock is on."); } diff --git a/src/extcon/earjack.c b/src/extcon/earjack.c index eb73b22..204004f 100644 --- a/src/extcon/earjack.c +++ b/src/extcon/earjack.c @@ -70,7 +70,7 @@ static int earjack_update(int status) earjack_send_broadcast(status); earjack_send_system_event(status); if (status != 0) - pm_change_internal(getpid(), LCD_NORMAL); + pm_change_internal(INTERNAL_LOCK_EARJACK, LCD_NORMAL); return 0; } diff --git a/src/extcon/hdmi.c b/src/extcon/hdmi.c index 9cdfb48..8340d3b 100644 --- a/src/extcon/hdmi.c +++ b/src/extcon/hdmi.c @@ -50,7 +50,7 @@ static void hdmi_send_broadcast(int status) static int hdmi_update(int status) { _I("jack - hdmi changed %d", status); - pm_change_internal(getpid(), LCD_NORMAL); + pm_change_internal(INTERNAL_LOCK_HDMI, LCD_NORMAL); vconf_set_int(VCONFKEY_SYSMAN_HDMI, status); hdmi_send_broadcast(status); diff --git a/src/power/power-handler.c b/src/power/power-handler.c index b2679d5..d6ba1b8 100644 --- a/src/power/power-handler.c +++ b/src/power/power-handler.c @@ -273,7 +273,7 @@ static int poweroff(void) FIND_DEVICE_INT(display_device_ops, "display"); - pm_change_internal(getpid(), LCD_NORMAL); + pm_change_internal(INTERNAL_LOCK_POWEROFF, LCD_NORMAL); display_device_ops->exit(NULL); sync(); @@ -302,7 +302,7 @@ static int power_reboot(void) FIND_DEVICE_INT(display_device_ops, "display"); - pm_change_internal(getpid(), LCD_NORMAL); + pm_change_internal(INTERNAL_LOCK_POWEROFF, LCD_NORMAL); display_device_ops->exit(NULL); sync(); -- 2.7.4