display: power: Remove _GET_/_SET_ from attribute name

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

diff --git a/plugins/mobile/battery/battery-notification.c b/plugins/mobile/battery/battery-notification.c
index 358357bf7b8e56f2cbf6f17d273832a8aed2ea34..63c3bdd696ff23c160dc3ea27b40613cad3f812a 100644 (file)
--- a/plugins/mobile/battery/battery-notification.c
+++ b/plugins/mobile/battery/battery-notification.c
@@ -166,7 +166,7 @@ static int launch_lowbat_noti(int capacity, int option)
                else {
                        noti_type = METHOD_LOW_NOTI_ON;
                        syscommon_resman_set_resource_attr_uint64_2(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-                               DEVICED_DISPLAY_ATTR_TUPLE2_SET_CURRENT_STATE,
+                               DEVICED_DISPLAY_ATTR_TUPLE2_CURRENT_STATE,
                                SYSCOMMON_DEVICED_DISPLAY_STATE_ON, DEVICED_EVENT_BATTERY_CAPACITY_LOW);
                }
                prev_level = battery_info.warning;
@@ -208,7 +208,7 @@ static int launch_lowbat_noti(int capacity, int option)
                else {
                        noti_type = METHOD_CRITICAL_NOTI_ON;
                        syscommon_resman_set_resource_attr_uint64_2(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-                               DEVICED_DISPLAY_ATTR_TUPLE2_SET_CURRENT_STATE,
+                               DEVICED_DISPLAY_ATTR_TUPLE2_CURRENT_STATE,
                                SYSCOMMON_DEVICED_DISPLAY_STATE_ON, DEVICED_EVENT_BATTERY_CAPACITY_LOW);
                }
                prev_level = battery_info.critical;

diff --git a/plugins/mobile/display/key-filter.c b/plugins/mobile/display/key-filter.c
index 6b3cf2fb2ad1f2a13042d1c07a7e1f381bebdc74..9d41af9560a41720f51320151988d13420c3aec4 100644 (file)
--- a/plugins/mobile/display/key-filter.c
+++ b/plugins/mobile/display/key-filter.c
@@ -111,7 +111,7 @@ static inline int current_state_in_on(void)
        enum syscommon_deviced_display_state current;
 
        ret = syscommon_resman_get_resource_attr_int(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-               DEVICED_DISPLAY_ATTR_INT_GET_CURRENT_STATE, (int32_t *) &current);
+               DEVICED_DISPLAY_ATTR_INT_CURRENT_STATE, (int32_t *) &current);
        if (ret < 0)
                return 0;
 
@@ -125,7 +125,7 @@ static inline void restore_custom_brightness(void)
        enum syscommon_deviced_display_state current;
 
        ret = syscommon_resman_get_resource_attr_int(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-               DEVICED_DISPLAY_ATTR_INT_GET_CURRENT_STATE, (int32_t *) &current);
+               DEVICED_DISPLAY_ATTR_INT_CURRENT_STATE, (int32_t *) &current);
        if (ret < 0)
                return;
 
@@ -146,7 +146,7 @@ static void longkey_pressed(void)
        if (display_has_caps(caps, SYSCOMMON_DEVICED_DISPLAY_CAPA_LCDON)) {
                /* change state - LCD on */
                syscommon_resman_set_resource_attr_uint64_2(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-                       DEVICED_DISPLAY_ATTR_TUPLE2_SET_CURRENT_STATE,
+                       DEVICED_DISPLAY_ATTR_TUPLE2_CURRENT_STATE,
                        SYSCOMMON_DEVICED_DISPLAY_STATE_ON, DEVICED_EVENT_INPUT_POWERKEY);
        }
 
@@ -400,7 +400,7 @@ static int lcdoff_powerkey(void)
                display_lock_release_lock_all(SYSCOMMON_DEVICED_DISPLAY_STATE_DIM);
                display_state_transition_update_lcdoff_reason(VCONFKEY_PM_LCDOFF_BY_POWERKEY);
                syscommon_resman_set_resource_attr_uint64_2(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-                       DEVICED_DISPLAY_ATTR_TUPLE2_SET_CURRENT_STATE,
+                       DEVICED_DISPLAY_ATTR_TUPLE2_CURRENT_STATE,
                        SYSCOMMON_DEVICED_DISPLAY_STATE_OFF, DEVICED_EVENT_INPUT_POWERKEY);
        } else {
                ignore = false;
@@ -554,7 +554,7 @@ static int process_screenlock_key(struct input_event *pinput)
 
        /* LCD off forcly */
        syscommon_resman_set_resource_attr_uint64_2(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-               DEVICED_DISPLAY_ATTR_TUPLE2_SET_CURRENT_STATE,
+               DEVICED_DISPLAY_ATTR_TUPLE2_CURRENT_STATE,
                SYSCOMMON_DEVICED_DISPLAY_STATE_OFF, DEVICED_EVENT_INPUT_POWERKEY);
 
        return true;
@@ -724,7 +724,7 @@ static void check_key_filter(struct timeval time, unsigned short type, unsigned
                break;
        case EV_REL:
                ret = syscommon_resman_get_resource_attr_int(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-                       DEVICED_DISPLAY_ATTR_INT_GET_CURRENT_STATE, (int32_t *) &current);
+                       DEVICED_DISPLAY_ATTR_INT_CURRENT_STATE, (int32_t *) &current);
                if (ret < 0)
                        break;
 

diff --git a/plugins/tv/display/key-filter.c b/plugins/tv/display/key-filter.c
index 0160ab440790747b114ec02de866ba3df4898396..68cd5704811d3e3fd8c65719560331b926b0b6f8 100644 (file)
--- a/plugins/tv/display/key-filter.c
+++ b/plugins/tv/display/key-filter.c
@@ -110,7 +110,7 @@ static inline int current_state_in_on(void)
        enum syscommon_deviced_display_state current;
 
        ret = syscommon_resman_get_resource_attr_int(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-               DEVICED_DISPLAY_ATTR_INT_GET_CURRENT_STATE, (int32_t *) &current);
+               DEVICED_DISPLAY_ATTR_INT_CURRENT_STATE, (int32_t *) &current);
        if (ret < 0)
                return 0;
 
@@ -124,7 +124,7 @@ static inline void restore_custom_brightness(void)
        enum syscommon_deviced_display_state current;
 
        ret = syscommon_resman_get_resource_attr_int(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-               DEVICED_DISPLAY_ATTR_INT_GET_CURRENT_STATE, (int32_t *) &current);
+               DEVICED_DISPLAY_ATTR_INT_CURRENT_STATE, (int32_t *) &current);
        if (ret < 0)
                return;
 
@@ -154,7 +154,7 @@ static void longkey_pressed(void)
        if (display_has_caps(caps, SYSCOMMON_DEVICED_DISPLAY_CAPA_LCDON)) {
                /* change state - LCD on */
                syscommon_resman_set_resource_attr_uint64_2(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-                       DEVICED_DISPLAY_ATTR_TUPLE2_SET_CURRENT_STATE,
+                       DEVICED_DISPLAY_ATTR_TUPLE2_CURRENT_STATE,
                        SYSCOMMON_DEVICED_DISPLAY_STATE_ON, DEVICED_EVENT_INPUT_POWERKEY);
        }
 
@@ -410,7 +410,7 @@ static int lcdoff_powerkey(void)
                display_lock_release_lock_all(SYSCOMMON_DEVICED_DISPLAY_STATE_DIM);
                display_state_transition_update_lcdoff_reason(VCONFKEY_PM_LCDOFF_BY_POWERKEY);
                syscommon_resman_set_resource_attr_uint64_2(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-                       DEVICED_DISPLAY_ATTR_TUPLE2_SET_CURRENT_STATE,
+                       DEVICED_DISPLAY_ATTR_TUPLE2_CURRENT_STATE,
                        SYSCOMMON_DEVICED_DISPLAY_STATE_OFF, DEVICED_EVENT_INPUT_POWERKEY);
        } else {
                ignore = false;
@@ -522,7 +522,7 @@ static int process_screenlock_key(struct input_event *pinput)
 
        /* LCD off forcly */
        syscommon_resman_set_resource_attr_uint64_2(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-               DEVICED_DISPLAY_ATTR_TUPLE2_SET_CURRENT_STATE,
+               DEVICED_DISPLAY_ATTR_TUPLE2_CURRENT_STATE,
                SYSCOMMON_DEVICED_DISPLAY_STATE_OFF, DEVICED_EVENT_INPUT_POWERKEY);
 
        return true;
@@ -692,7 +692,7 @@ static void check_key_filter(struct timeval time, unsigned short type, unsigned
                break;
        case EV_REL:
                ret = syscommon_resman_get_resource_attr_int(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-                       DEVICED_DISPLAY_ATTR_INT_GET_CURRENT_STATE, (int32_t *) &current);
+                       DEVICED_DISPLAY_ATTR_INT_CURRENT_STATE, (int32_t *) &current);
                if (ret < 0)
                        break;
 

diff --git a/plugins/wearable/display/device-interface.c b/plugins/wearable/display/device-interface.c
index c7b872c4a9c8a2c6be66229242bd1b36e1f2a1d9..9ca5aeb3c53f902d59ccf6461c65ec5ebaf71bae 100644 (file)
--- a/plugins/wearable/display/device-interface.c
+++ b/plugins/wearable/display/device-interface.c
@@ -82,7 +82,7 @@ static int set_brightness(int val)
        }
 
        ret = syscommon_resman_get_resource_attr_int(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-               DEVICED_DISPLAY_ATTR_INT_GET_MAX_BRIGHTNESS, &max);
+               DEVICED_DISPLAY_ATTR_INT_MAX_BRIGHTNESS, &max);
        if (ret < 0) {
                _E("Failed to get max brightness.");
                return ret;

diff --git a/src/battery/power-supply.c b/src/battery/power-supply.c
index 8c87bf5f851b51dfe5187370279eda2abf6fc5a6..6014a6fd29e165fe422562d085ac4dae88b57a7a 100644 (file)
--- a/src/battery/power-supply.c
+++ b/src/battery/power-supply.c
@@ -666,7 +666,7 @@ static void notify_charger_event(int notifier)
                        if (event_handlers[i]->wakelock_duration)
                                syscommon_resman_set_resource_attr_uint64_2(
                                        SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_POWER),
-                                       DEVICED_POWER_ATTR_TUPLE2_SET_WAKELOCK,
+                                       DEVICED_POWER_ATTR_TUPLE2_WAKELOCK,
                                        event_handlers[i]->id,
                                        event_handlers[i]->wakelock_duration);
 

diff --git a/src/display/display-panel.c b/src/display/display-panel.c
index a0513abca5968b8e5c8a63ecbc22b5c686601497..a75ea81049eb1ffb33c54950d8728a342542a970 100644 (file)
--- a/src/display/display-panel.c
+++ b/src/display/display-panel.c
@@ -344,7 +344,7 @@ void display_panel_lcd_on_direct(enum device_flags flags)
                reason = HAL_DEVICE_POWER_TRANSITION_REASON_UNKNOWN;
 
        syscommon_resman_set_resource_attr_uint64_4(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_POWER),
-               DEVICED_POWER_ATTR_SET_UINT64_4_CURRENT_STATE,
+               DEVICED_POWER_ATTR_UINT64_4_CURRENT_STATE,
                DEVICED_POWER_STATE_SLEEP, DEVICED_POWER_STATE_NORMAL, reason, 0);
 
        set_pm_cur_state(SYSCOMMON_DEVICED_DISPLAY_STATE_ON);

diff --git a/src/display/display-state-transition.c b/src/display/display-state-transition.c
index 37810a0a19c1cbf40193ec6c5164487f9de9aece..64176e5ffb06bb1624fb01b22e11987368d67499 100644 (file)
--- a/src/display/display-state-transition.c
+++ b/src/display/display-state-transition.c
@@ -722,7 +722,7 @@ static int display_state_transition_do_state_action(int timeout)
                syscommon_resman_get_resource_attr_int(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_POWER),
                        DEVICED_POWER_ATTR_INT_WAKEUP_REASON, &wakeup_reason);
                syscommon_resman_set_resource_attr_uint64_4(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_POWER),
-                       DEVICED_POWER_ATTR_SET_UINT64_4_CURRENT_STATE,
+                       DEVICED_POWER_ATTR_UINT64_4_CURRENT_STATE,
                        DEVICED_POWER_STATE_SLEEP, DEVICED_POWER_STATE_NORMAL, wakeup_reason, 0);
 
                set_setting_pmstate(current);
@@ -808,7 +808,7 @@ go_suspend:
        pm_history_save(SYSCOMMON_DEVICED_POWER_LOG_TYPE_SLEEP, current);
 #endif
        syscommon_resman_set_resource_attr_uint64_4(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_POWER),
-               DEVICED_POWER_ATTR_SET_UINT64_4_CURRENT_STATE,
+               DEVICED_POWER_ATTR_UINT64_4_CURRENT_STATE,
                DEVICED_POWER_STATE_ALL, DEVICED_POWER_STATE_SLEEP,
                HAL_DEVICE_POWER_TRANSITION_REASON_DISPLAY_OFF_TIMEOUT, 0);
 

diff --git a/src/display/display.c b/src/display/display.c
index 1c1055fbc59d137f90524669f59b1341d5e982cf..2e3c1a2de038078ed687e971e6e8e8fc3a584fb0 100644 (file)
--- a/src/display/display.c
+++ b/src/display/display.c
@@ -636,7 +636,7 @@ static void display_init(void *data)
        if (flags & WITHOUT_STARTNOTI) {        /* start without noti */
                _I("Start Power managing without noti");
                syscommon_resman_set_resource_attr_uint64_4(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_POWER),
-                       DEVICED_POWER_ATTR_SET_UINT64_4_CURRENT_STATE,
+                       DEVICED_POWER_ATTR_UINT64_4_CURRENT_STATE,
                        DEVICED_POWER_STATE_SLEEP, DEVICED_POWER_STATE_NORMAL,
                        HAL_DEVICE_POWER_TRANSITION_REASON_UNKNOWN, 0);
 

diff --git a/src/display/resource-display.c b/src/display/resource-display.c
index e10ab4c29d4353ecb277c6f76121b1fc2fbcebe8..299048a1acc820bef02869f27827e5b395f57a5d 100644 (file)
--- a/src/display/resource-display.c
+++ b/src/display/resource-display.c
@@ -78,7 +78,7 @@ static int set_display_attr_data(int resource_id,
                        return 0;
                }
                break;
-       case DEVICED_DISPLAY_ATTR_INT_SET_RELEASE_LOCK_ALL:
+       case DEVICED_DISPLAY_ATTR_INT_RELEASE_LOCK_ALL:
                {
                        enum syscommon_deviced_display_state state = *(enum syscommon_deviced_display_state *) data;
                        display_lock_release_lock_all(state);
@@ -100,7 +100,7 @@ static int set_tuple2_display_attr_data(int resource_id,
                return -EINVAL;
 
        switch (attr->id) {
-       case DEVICED_DISPLAY_ATTR_TUPLE2_SET_CURRENT_STATE:
+       case DEVICED_DISPLAY_ATTR_TUPLE2_CURRENT_STATE:
                {
                        enum syscommon_deviced_display_state state = *(enum syscommon_deviced_display_state *) data1;
                        enum deviced_event event = *(enum deviced_event *) data2;
@@ -113,7 +113,7 @@ static int set_tuple2_display_attr_data(int resource_id,
                        else
                                return display_state_transition_do_state_transition(state, EVENT_INPUT);
                }
-       case DEVICED_DISPLAY_ATTR_TUPLE2_SET_DISPLAY_DIRECT:
+       case DEVICED_DISPLAY_ATTR_TUPLE2_DISPLAY_DIRECT:
                {
                        enum syscommon_deviced_dpms_state state = *(enum syscommon_deviced_dpms_state *) data1;
                        enum deviced_event reason = *(enum deviced_event *) data2;
@@ -151,7 +151,7 @@ static int set_tuple3_display_attr_data(int resource_id,
                return -EINVAL;
 
        switch (attr->id) {
-       case DEVICED_DISPLAY_ATTR_TUPLE3_SET_ACTOR_CAPABILITY:
+       case DEVICED_DISPLAY_ATTR_TUPLE3_ACTOR_CAPABILITY:
                {
                        enum syscommon_deviced_display_actor_id id = *(enum syscommon_deviced_display_actor_id *) data1;
                        unsigned int caps = *(unsigned int *) data2;
@@ -190,10 +190,10 @@ static int get_display_attr_data(int resource_id,
                return -EINVAL;
 
        switch (attr->id) {
-       case DEVICED_DISPLAY_ATTR_INT_GET_MAX_BRIGHTNESS:
+       case DEVICED_DISPLAY_ATTR_INT_MAX_BRIGHTNESS:
                ret = display_backlight_get_max_brightness(&attr_data.i32);
                break;
-       case DEVICED_DISPLAY_ATTR_INT_GET_CURRENT_STATE:
+       case DEVICED_DISPLAY_ATTR_INT_CURRENT_STATE:
                ret = display_state_get_current((enum syscommon_deviced_display_state *) &attr_data.i32);
                break;
        case DEVICED_DISPLAY_ATTR_INT_DPMS_STATE:
@@ -202,10 +202,10 @@ static int get_display_attr_data(int resource_id,
        case DEVICED_DISPLAY_ATTR_INT_CUSTOM_BRIGHTNESS:
                display_backlight_get_custom_status(&attr_data.b);
                break;
-       case DEVICED_DISPLAY_ATTR_INT_GET_TOUCH_EVENT_BLOCKED:
+       case DEVICED_DISPLAY_ATTR_INT_TOUCH_EVENT_BLOCKED:
                attr_data.i32 = display_misc_is_touch_event_blocked();
                break;
-       case DEVICED_DISPLAY_ATTR_INT_GET_CONFIG_POWERKEY_DOUBLEPRESS:
+       case DEVICED_DISPLAY_ATTR_INT_CONFIG_POWERKEY_DOUBLEPRESS:
                /**
                 * FIXME: Directly access extern g_display_plugin. Fix it not to directly access
                 *        variable via extern.
@@ -215,7 +215,7 @@ static int get_display_attr_data(int resource_id,
                else
                        attr_data.i32 = g_display_plugin.config->powerkey_doublepress;
                break;
-       case DEVICED_DISPLAY_ATTR_DOUBLE_GET_CONFIG_LONGPRESS_INTERVAL:
+       case DEVICED_DISPLAY_ATTR_DOUBLE_CONFIG_LONGPRESS_INTERVAL:
                /**
                 * FIXME: Directly access extern g_display_plugin. Fix it not to directly access
                 *        variable via extern.
@@ -225,7 +225,7 @@ static int get_display_attr_data(int resource_id,
                else
                        attr_data.d = g_display_plugin.config->longpress_interval;
                break;
-       case DEVICED_DISPLAY_ATTR_INT_GET_CONFIG_TOUCH_WAKEUP:
+       case DEVICED_DISPLAY_ATTR_INT_CONFIG_TOUCH_WAKEUP:
                /**
                 * FIXME: Directly access extern g_display_plugin. Fix it not to directly access
                 *        variable via extern.
@@ -283,7 +283,7 @@ static int get_display_attr_data_with_2_user_data(int resource_id,
                return -EINVAL;
 
        switch (attr->id) {
-       case DEVICED_DISPLAY_ATTR_UINT64_GET_ACTOR_CAPABILITY:
+       case DEVICED_DISPLAY_ATTR_UINT64_ACTOR_CAPABILITY:
                {
                        enum syscommon_deviced_display_actor_id id;
                        unsigned int caps;
@@ -341,8 +341,8 @@ static int get_display_attr_data_with_2_user_data(int resource_id,
 
 static const struct syscommon_resman_resource_attribute display_attrs[] = {
        {
-               .name = "DEVICED_DISPLAY_ATTR_INT_GET_MAX_BRIGHTNESS",
-               .id = DEVICED_DISPLAY_ATTR_INT_GET_MAX_BRIGHTNESS,
+               .name = "DEVICED_DISPLAY_ATTR_INT_MAX_BRIGHTNESS",
+               .id = DEVICED_DISPLAY_ATTR_INT_MAX_BRIGHTNESS,
                .type = SYSCOMMON_RESMAN_DATA_TYPE_INT,
                .flag = SYSCOMMON_RESMAN_RESOURCE_FLAG_PUBLIC,
                .ops = {
@@ -350,8 +350,8 @@ static const struct syscommon_resman_resource_attribute display_attrs[] = {
                        .is_supported = syscommon_resman_resource_attr_supported_always,
                },
        }, {
-               .name = "DEVICED_DISPLAY_ATTR_INT_GET_CURRENT_STATE",
-               .id = DEVICED_DISPLAY_ATTR_INT_GET_CURRENT_STATE,
+               .name = "DEVICED_DISPLAY_ATTR_INT_CURRENT_STATE",
+               .id = DEVICED_DISPLAY_ATTR_INT_CURRENT_STATE,
                .type = SYSCOMMON_RESMAN_DATA_TYPE_INT,
                .flag = SYSCOMMON_RESMAN_RESOURCE_FLAG_PUBLIC,
                .ops = {
@@ -359,8 +359,8 @@ static const struct syscommon_resman_resource_attribute display_attrs[] = {
                        .is_supported = syscommon_resman_resource_attr_supported_always,
                },
        }, {
-               .name = "DEVICED_DISPLAY_ATTR_TUPLE2_SET_CURRENT_STATE",
-               .id = DEVICED_DISPLAY_ATTR_TUPLE2_SET_CURRENT_STATE,
+               .name = "DEVICED_DISPLAY_ATTR_TUPLE2_CURRENT_STATE",
+               .id = DEVICED_DISPLAY_ATTR_TUPLE2_CURRENT_STATE,
                .type = SYSCOMMON_RESMAN_DATA_TYPE_2_UINT64,
                .flag = SYSCOMMON_RESMAN_RESOURCE_FLAG_PUBLIC,
                .ops = {
@@ -378,8 +378,8 @@ static const struct syscommon_resman_resource_attribute display_attrs[] = {
                        .is_supported = syscommon_resman_resource_attr_supported_always,
                },
        }, {
-               .name = "DEVICED_DISPLAY_ATTR_TUPLE2_SET_DISPLAY_DIRECT",
-               .id = DEVICED_DISPLAY_ATTR_TUPLE2_SET_DISPLAY_DIRECT,
+               .name = "DEVICED_DISPLAY_ATTR_TUPLE2_DISPLAY_DIRECT",
+               .id = DEVICED_DISPLAY_ATTR_TUPLE2_DISPLAY_DIRECT,
                .type = SYSCOMMON_RESMAN_DATA_TYPE_2_UINT64,
                .flag = SYSCOMMON_RESMAN_RESOURCE_FLAG_PUBLIC,
                .ops = {
@@ -397,8 +397,8 @@ static const struct syscommon_resman_resource_attribute display_attrs[] = {
                        .is_supported = syscommon_resman_resource_attr_supported_always,
                },
        }, {
-               .name = "DEVICED_DISPLAY_ATTR_UINT64_GET_ACTOR_CAPABILITY",
-               .id = DEVICED_DISPLAY_ATTR_UINT64_GET_ACTOR_CAPABILITY,
+               .name = "DEVICED_DISPLAY_ATTR_UINT64_ACTOR_CAPABILITY",
+               .id = DEVICED_DISPLAY_ATTR_UINT64_ACTOR_CAPABILITY,
                .type = SYSCOMMON_RESMAN_DATA_TYPE_UINT64_WITH_2_USER_DATA,
                .flag = SYSCOMMON_RESMAN_RESOURCE_FLAG_PUBLIC,
                .ops = {
@@ -406,8 +406,8 @@ static const struct syscommon_resman_resource_attribute display_attrs[] = {
                        .is_supported = syscommon_resman_resource_attr_supported_always,
                },
        }, {
-               .name = "DEVICED_DISPLAY_ATTR_TUPLE3_SET_ACTOR_CAPABILITY",
-               .id = DEVICED_DISPLAY_ATTR_TUPLE3_SET_ACTOR_CAPABILITY,
+               .name = "DEVICED_DISPLAY_ATTR_TUPLE3_ACTOR_CAPABILITY",
+               .id = DEVICED_DISPLAY_ATTR_TUPLE3_ACTOR_CAPABILITY,
                .type = SYSCOMMON_RESMAN_DATA_TYPE_3_UINT64,
                .flag = SYSCOMMON_RESMAN_RESOURCE_FLAG_PUBLIC,
                .ops = {
@@ -415,8 +415,8 @@ static const struct syscommon_resman_resource_attribute display_attrs[] = {
                        .is_supported = syscommon_resman_resource_attr_supported_always,
                },
        }, {
-               .name = "DEVICED_DISPLAY_ATTR_INT_GET_TOUCH_EVENT_BLOCKED",
-               .id = DEVICED_DISPLAY_ATTR_INT_GET_TOUCH_EVENT_BLOCKED,
+               .name = "DEVICED_DISPLAY_ATTR_INT_TOUCH_EVENT_BLOCKED",
+               .id = DEVICED_DISPLAY_ATTR_INT_TOUCH_EVENT_BLOCKED,
                .flag = SYSCOMMON_RESMAN_RESOURCE_FLAG_PUBLIC,
                .type = SYSCOMMON_RESMAN_DATA_TYPE_INT,
                .ops = {
@@ -424,8 +424,8 @@ static const struct syscommon_resman_resource_attribute display_attrs[] = {
                        .is_supported = syscommon_resman_resource_attr_supported_always,
                },
        }, {
-               .name = "DEVICED_DISPLAY_ATTR_INT_SET_RELEASE_LOCK_ALL",
-               .id = DEVICED_DISPLAY_ATTR_INT_SET_RELEASE_LOCK_ALL,
+               .name = "DEVICED_DISPLAY_ATTR_INT_RELEASE_LOCK_ALL",
+               .id = DEVICED_DISPLAY_ATTR_INT_RELEASE_LOCK_ALL,
                .flag = SYSCOMMON_RESMAN_RESOURCE_FLAG_PUBLIC,
                .type = SYSCOMMON_RESMAN_DATA_TYPE_INT,
                .ops = {
@@ -433,8 +433,8 @@ static const struct syscommon_resman_resource_attribute display_attrs[] = {
                        .is_supported = syscommon_resman_resource_attr_supported_always,
                },
        }, {
-               .name = "DEVICED_DISPLAY_ATTR_INT_GET_CONFIG_POWERKEY_DOUBLEPRESS",
-               .id = DEVICED_DISPLAY_ATTR_INT_GET_CONFIG_POWERKEY_DOUBLEPRESS,
+               .name = "DEVICED_DISPLAY_ATTR_INT_CONFIG_POWERKEY_DOUBLEPRESS",
+               .id = DEVICED_DISPLAY_ATTR_INT_CONFIG_POWERKEY_DOUBLEPRESS,
                .flag = SYSCOMMON_RESMAN_RESOURCE_FLAG_PUBLIC,
                .type = SYSCOMMON_RESMAN_DATA_TYPE_INT,
                .ops = {
@@ -442,8 +442,8 @@ static const struct syscommon_resman_resource_attribute display_attrs[] = {
                        .is_supported = syscommon_resman_resource_attr_supported_always,
                },
        }, {
-               .name = "DEVICED_DISPLAY_ATTR_DOUBLE_GET_CONFIG_LONGPRESS_INTERVAL",
-               .id = DEVICED_DISPLAY_ATTR_DOUBLE_GET_CONFIG_LONGPRESS_INTERVAL,
+               .name = "DEVICED_DISPLAY_ATTR_DOUBLE_CONFIG_LONGPRESS_INTERVAL",
+               .id = DEVICED_DISPLAY_ATTR_DOUBLE_CONFIG_LONGPRESS_INTERVAL,
                .flag = SYSCOMMON_RESMAN_RESOURCE_FLAG_PUBLIC,
                .type = SYSCOMMON_RESMAN_DATA_TYPE_DOUBLE,
                .ops = {
@@ -451,8 +451,8 @@ static const struct syscommon_resman_resource_attribute display_attrs[] = {
                        .is_supported = syscommon_resman_resource_attr_supported_always,
                },
        }, {
-               .name = "DEVICED_DISPLAY_ATTR_INT_GET_CONFIG_TOUCH_WAKEUP",
-               .id = DEVICED_DISPLAY_ATTR_INT_GET_CONFIG_TOUCH_WAKEUP,
+               .name = "DEVICED_DISPLAY_ATTR_INT_CONFIG_TOUCH_WAKEUP",
+               .id = DEVICED_DISPLAY_ATTR_INT_CONFIG_TOUCH_WAKEUP,
                .flag = SYSCOMMON_RESMAN_RESOURCE_FLAG_PUBLIC,
                .type = SYSCOMMON_RESMAN_DATA_TYPE_INT,
                .ops = {

diff --git a/src/power/resource-power.c b/src/power/resource-power.c
index b817e998a3c93c59d80715e01c40c63937e06304..ad521f906b8c92391ed89390467687ad9b8e56ab 100644 (file)
--- a/src/power/resource-power.c
+++ b/src/power/resource-power.c
@@ -69,7 +69,7 @@ static int set_tuple2_power_attr_data(int resource_id,
                return -EINVAL;
 
        switch (attr->id) {
-       case DEVICED_POWER_ATTR_TUPLE2_SET_HISTORY_LOG:
+       case DEVICED_POWER_ATTR_TUPLE2_HISTORY_LOG:
                {
                        enum syscommon_deviced_power_log_type type = *(enum syscommon_deviced_power_log_type *) data1;
                        int code = *(int *) data2;
@@ -107,7 +107,7 @@ static int get_power_attr_data(int resource_id,
                        attr_data.i32 = power_get_wakeup_reason();
                }
                break;
-       case DEVICED_POWER_ATTR_INT_GET_VITAL_MODE:
+       case DEVICED_POWER_ATTR_INT_VITAL_MODE:
                {
                        attr_data.i32 = vital_mode();
                }
@@ -195,8 +195,8 @@ static int set_wakelock(int resource_id, const struct syscommon_resman_resource_
 
 static const struct syscommon_resman_resource_attribute power_attrs[] = {
        {
-               .name = "DEVICED_POWER_ATTR_SET_UINT64_4_CURRENT_STATE",
-               .id = DEVICED_POWER_ATTR_SET_UINT64_4_CURRENT_STATE,
+               .name = "DEVICED_POWER_ATTR_UINT64_4_CURRENT_STATE",
+               .id = DEVICED_POWER_ATTR_UINT64_4_CURRENT_STATE,
                .type = SYSCOMMON_RESMAN_DATA_TYPE_4_UINT64,
                .flag = SYSCOMMON_RESMAN_RESOURCE_FLAG_PUBLIC,
                .ops = {
@@ -222,8 +222,8 @@ static const struct syscommon_resman_resource_attribute power_attrs[] = {
                        .is_supported = syscommon_resman_resource_attr_supported_always,
                },
        }, {
-               .name = "DEVICED_POWER_ATTR_TUPLE2_SET_WAKELOCK",
-               .id = DEVICED_POWER_ATTR_TUPLE2_SET_WAKELOCK,
+               .name = "DEVICED_POWER_ATTR_TUPLE2_WAKELOCK",
+               .id = DEVICED_POWER_ATTR_TUPLE2_WAKELOCK,
                .type = SYSCOMMON_RESMAN_DATA_TYPE_2_UINT64,
                .flag = SYSCOMMON_RESMAN_RESOURCE_FLAG_PUBLIC,
                .ops = {
@@ -231,8 +231,8 @@ static const struct syscommon_resman_resource_attribute power_attrs[] = {
                        .is_supported = syscommon_resman_resource_attr_supported_always,
                },
        }, {
-               .name = "DEVICED_POWER_ATTR_INT_GET_VITAL_MODE",
-               .id = DEVICED_POWER_ATTR_INT_GET_VITAL_MODE,
+               .name = "DEVICED_POWER_ATTR_INT_VITAL_MODE",
+               .id = DEVICED_POWER_ATTR_INT_VITAL_MODE,
                .type = SYSCOMMON_RESMAN_DATA_TYPE_INT,
                .flag = SYSCOMMON_RESMAN_RESOURCE_FLAG_PUBLIC,
                .ops = {
@@ -240,8 +240,8 @@ static const struct syscommon_resman_resource_attribute power_attrs[] = {
                        .is_supported = syscommon_resman_resource_attr_supported_always,
                },
        }, {
-               .name = "DEVICED_POWER_ATTR_TUPLE2_SET_HISTORY_LOG",
-               .id = DEVICED_POWER_ATTR_TUPLE2_SET_HISTORY_LOG,
+               .name = "DEVICED_POWER_ATTR_TUPLE2_HISTORY_LOG",
+               .id = DEVICED_POWER_ATTR_TUPLE2_HISTORY_LOG,
                .type = SYSCOMMON_RESMAN_DATA_TYPE_2_UINT64,
                .flag = SYSCOMMON_RESMAN_RESOURCE_FLAG_PUBLIC,
                .ops = {