From: Youngjae Cho Date: Mon, 3 Feb 2020 07:34:06 +0000 (+0900) Subject: Change powerlock/unlock signal name for consistency X-Git-Tag: accepted/tizen/unified/20200210.131756~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f9d94baeaecd37ac497a65fa2db0b6798dd39a38;p=platform%2Fcore%2Fsystem%2Fdeviced.git Change powerlock/unlock signal name for consistency Change-Id: I7c4c81431511d7aa696220c55b49546d69574f7a Signed-off-by: Youngjae Cho --- diff --git a/plugins/iot/display/core.c b/plugins/iot/display/core.c index 2aeb2bd..68ebd70 100644 --- a/plugins/iot/display/core.c +++ b/plugins/iot/display/core.c @@ -38,7 +38,6 @@ #include #include #include -#include #include "ambient-mode.h" #include "util.h" @@ -1422,7 +1421,7 @@ static void proc_condition_lock(PMMsg *data) int holdkey_block, ret; bool value = true; unsigned int flags; - power_lock_e lock_type; + char *lock_type; state = GET_COND_STATE(data->cond); if (state == S_START) @@ -1463,11 +1462,11 @@ static void proc_condition_lock(PMMsg *data) _I("[%s] locked by %5d with %u ms", states[state].name, pid, data->timeout); /* for debug */ if (state == S_LCDOFF) - lock_type = POWER_LOCK_CPU; + lock_type = PM_LCDOFF_STR; else if (state == S_LCDDIM) - lock_type = POWER_LOCK_DISPLAY_DIM; + lock_type = PM_LCDDIM_STR; else if (state == S_NORMAL) - lock_type = POWER_LOCK_DISPLAY; + lock_type = PM_LCDON_STR; else goto skip_broadcast_signal; @@ -1476,7 +1475,7 @@ static void proc_condition_lock(PMMsg *data) DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "PowerLock", - g_variant_new("(iii)", lock_type, pid, (int)data->timeout)); + g_variant_new("(sii)", lock_type, pid, (int)data->timeout)); if (ret < 0) _E("Failed to send dbus signal PowerLock."); @@ -1497,7 +1496,7 @@ static void proc_condition_unlock(PMMsg *data) bool value = false; unsigned int flags; int ret; - power_lock_e lock_type; + char *lock_type; state = GET_COND_STATE(data->cond); if (!state) @@ -1515,11 +1514,11 @@ static void proc_condition_unlock(PMMsg *data) _I("[%s] unlocked by %5d", states[state].name, pid); /* for debug */ if (state == S_LCDOFF) - lock_type = POWER_LOCK_CPU; + lock_type = PM_LCDOFF_STR; else if (state == S_LCDDIM) - lock_type = POWER_LOCK_DISPLAY_DIM; + lock_type = PM_LCDDIM_STR; else if (state == S_NORMAL) - lock_type = POWER_LOCK_DISPLAY; + lock_type = PM_LCDON_STR; else goto skip_broadcast_signal; @@ -1528,7 +1527,7 @@ static void proc_condition_unlock(PMMsg *data) DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "PowerUnlock", - g_variant_new("(iii)", lock_type, pid, (int)data->timeout)); + g_variant_new("(sii)", lock_type, pid, (int)data->timeout)); if (ret < 0) _E("Failed to send dbus signal PowerUnlock."); diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c index 13d48e2..b145592 100644 --- a/plugins/mobile/display/core.c +++ b/plugins/mobile/display/core.c @@ -38,7 +38,6 @@ #include #include #include -#include #include "ambient-mode.h" #include "util.h" @@ -1432,7 +1431,7 @@ static void proc_condition_lock(PMMsg *data) int holdkey_block,ret; bool value = true; unsigned int flags; - power_lock_e lock_type; + char *lock_type; state = GET_COND_STATE(data->cond); if (state == S_START) @@ -1473,11 +1472,11 @@ static void proc_condition_lock(PMMsg *data) _I("[%s] locked by %5d with %u ms", states[state].name, pid, data->timeout); /* for debug */ if (state == S_LCDOFF) - lock_type = POWER_LOCK_CPU; + lock_type = PM_LCDOFF_STR; else if (state == S_LCDDIM) - lock_type = POWER_LOCK_DISPLAY_DIM; + lock_type = PM_LCDDIM_STR; else if (state == S_NORMAL) - lock_type = POWER_LOCK_DISPLAY; + lock_type = PM_LCDON_STR; else goto skip_broadcast_signal; @@ -1486,7 +1485,7 @@ static void proc_condition_lock(PMMsg *data) DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "PowerLock", - g_variant_new("(iii)", lock_type, pid, (int)data->timeout)); + g_variant_new("(sii)", lock_type, pid, (int)data->timeout)); if (ret < 0) _E("Failed to send dbus signal PowerLock."); @@ -1507,7 +1506,7 @@ static void proc_condition_unlock(PMMsg *data) bool value = false; unsigned int flags; int ret; - power_lock_e lock_type; + char *lock_type; state = GET_COND_STATE(data->cond); if (!state) @@ -1525,11 +1524,11 @@ static void proc_condition_unlock(PMMsg *data) _I("[%s] unlocked by %5d", states[state].name, pid); /* for debug */ if (state == S_LCDOFF) - lock_type = POWER_LOCK_CPU; + lock_type = PM_LCDOFF_STR; else if (state == S_LCDDIM) - lock_type = POWER_LOCK_DISPLAY_DIM; + lock_type = PM_LCDDIM_STR; else if (state == S_NORMAL) - lock_type = POWER_LOCK_DISPLAY; + lock_type = PM_LCDON_STR; else goto skip_broadcast_signal; @@ -1538,7 +1537,7 @@ static void proc_condition_unlock(PMMsg *data) DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "PowerUnlock", - g_variant_new("(iii)", lock_type, pid, (int)data->timeout)); + g_variant_new("(sii)", lock_type, pid, (int)data->timeout)); if (ret < 0) _E("Failed to send dbus signal PowerUnlock."); diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c index a2e3199..4b45c9f 100644 --- a/plugins/tv/display/core.c +++ b/plugins/tv/display/core.c @@ -38,7 +38,6 @@ #include #include #include -#include #include "ambient-mode.h" #include "util.h" @@ -1419,7 +1418,7 @@ static void proc_condition_lock(PMMsg *data) int holdkey_block, ret; bool value = true; unsigned int flags; - power_lock_e lock_type; + char *lock_type; state = GET_COND_STATE(data->cond); if (state == S_START) @@ -1460,11 +1459,11 @@ static void proc_condition_lock(PMMsg *data) _I("[%s] locked by %5d with %u ms", states[state].name, pid, data->timeout); /* for debug */ if (state == S_LCDOFF) - lock_type = POWER_LOCK_CPU; + lock_type = PM_LCDOFF_STR; else if (state == S_LCDDIM) - lock_type = POWER_LOCK_DISPLAY_DIM; + lock_type = PM_LCDDIM_STR; else if (state == S_NORMAL) - lock_type = POWER_LOCK_DISPLAY; + lock_type = PM_LCDON_STR; else goto skip_broadcast_signal; @@ -1473,7 +1472,7 @@ static void proc_condition_lock(PMMsg *data) DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "PowerLock", - g_variant_new("(iii)", lock_type, pid, (int)data->timeout)); + g_variant_new("(sii)", lock_type, pid, (int)data->timeout)); if (ret < 0) _E("Failed to send dbus signal PowerLock."); @@ -1494,7 +1493,7 @@ static void proc_condition_unlock(PMMsg *data) bool value = false; unsigned int flags; int ret; - power_lock_e lock_type; + char *lock_type; state = GET_COND_STATE(data->cond); if (!state) @@ -1512,11 +1511,11 @@ static void proc_condition_unlock(PMMsg *data) _I("[%s] unlocked by %5d", states[state].name, pid); /* for debug */ if (state == S_LCDOFF) - lock_type = POWER_LOCK_CPU; + lock_type = PM_LCDOFF_STR; else if (state == S_LCDDIM) - lock_type = POWER_LOCK_DISPLAY_DIM; + lock_type = PM_LCDDIM_STR; else if (state == S_NORMAL) - lock_type = POWER_LOCK_DISPLAY; + lock_type = PM_LCDON_STR; else goto skip_broadcast_signal; @@ -1525,7 +1524,7 @@ static void proc_condition_unlock(PMMsg *data) DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "PowerUnlock", - g_variant_new("(iii)", lock_type, pid, (int)data->timeout)); + g_variant_new("(sii)", lock_type, pid, (int)data->timeout)); if (ret < 0) _E("Failed to send dbus signal PowerUnlock."); diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c index 4494908..ac135cb 100644 --- a/plugins/wearable/display/core.c +++ b/plugins/wearable/display/core.c @@ -38,7 +38,6 @@ #include #include #include -#include #include "ambient-mode.h" #include "util.h" @@ -1442,7 +1441,7 @@ static void proc_condition_lock(PMMsg *data) int holdkey_block, ret; bool value = true; unsigned int flags; - power_lock_e lock_type; + char *lock_type; state = GET_COND_STATE(data->cond); if (state == S_START) @@ -1483,11 +1482,11 @@ static void proc_condition_lock(PMMsg *data) _I("[%s] locked by %5d with %u ms", states[state].name, pid, data->timeout); /* for debug */ if (state == S_LCDOFF) - lock_type = POWER_LOCK_CPU; + lock_type = PM_LCDOFF_STR; else if (state == S_LCDDIM) - lock_type = POWER_LOCK_DISPLAY_DIM; + lock_type = PM_LCDDIM_STR; else if (state == S_NORMAL) - lock_type = POWER_LOCK_DISPLAY; + lock_type = PM_LCDON_STR; else goto skip_broadcast_signal; @@ -1496,7 +1495,7 @@ static void proc_condition_lock(PMMsg *data) DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "PowerLock", - g_variant_new("(iii)", lock_type, pid, (int)data->timeout)); + g_variant_new("(sii)", lock_type, pid, (int)data->timeout)); if (ret < 0) _E("Failed to send dbus signal PowerLock."); @@ -1517,7 +1516,7 @@ static void proc_condition_unlock(PMMsg *data) bool value = false; unsigned int flags; int ret; - power_lock_e lock_type; + char *lock_type; state = GET_COND_STATE(data->cond); if (!state) @@ -1535,11 +1534,11 @@ static void proc_condition_unlock(PMMsg *data) _I("[%s] unlocked by %5d", states[state].name, pid); /* for debug */ if (state == S_LCDOFF) - lock_type = POWER_LOCK_CPU; + lock_type = PM_LCDOFF_STR; else if (state == S_LCDDIM) - lock_type = POWER_LOCK_DISPLAY_DIM; + lock_type = PM_LCDDIM_STR; else if (state == S_NORMAL) - lock_type = POWER_LOCK_DISPLAY; + lock_type = PM_LCDON_STR; else goto skip_broadcast_signal; @@ -1548,7 +1547,7 @@ static void proc_condition_unlock(PMMsg *data) DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "PowerUnlock", - g_variant_new("(iii)", lock_type, pid, (int)data->timeout)); + g_variant_new("(sii)", lock_type, pid, (int)data->timeout)); if (ret < 0) _E("Failed to send dbus signal PowerUnlock.");