input: Remove _GET_/_SET_ from attribute name

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

diff --git a/src/deviced-input/deviced-input.c b/src/deviced-input/deviced-input.c
index 0c39b848aa5e1a0527017ff3bbb87259a5d3ed95..7495df7cefe9f6f9884750055a4b72a6c67bf6e8 100644 (file)
--- a/src/deviced-input/deviced-input.c
+++ b/src/deviced-input/deviced-input.c
@@ -176,7 +176,7 @@ static int launch_system_app(char *type, int num, ...)
        va_end(args);
 
        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_MISC_POPUP);
 
@@ -199,7 +199,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;
 
@@ -213,7 +213,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;
 
@@ -263,7 +263,7 @@ static int check_actor_caps(int actor_id, unsigned int caps)
 
        ret = syscommon_resman_get_resource_attr_uint64_with_2_user_data(
                SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-               DEVICED_DISPLAY_ATTR_UINT64_GET_ACTOR_CAPABILITY,
+               DEVICED_DISPLAY_ATTR_UINT64_ACTOR_CAPABILITY,
                (u_int64_t *) &actor_id,
                (u_int64_t *) &caps,
                &capability);
@@ -281,7 +281,7 @@ static void longkey_pressed(void)
        if (check_actor_caps(SYSCOMMON_DEVICED_DISPLAY_ACTOR_POWER_KEY, 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);
        }
 
@@ -366,7 +366,7 @@ static inline bool switch_on_lcd(enum deviced_event reason)
                reason = DEVICED_EVENT_UNKNOWN;
 
        syscommon_resman_set_resource_attr_uint64_2(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-               DEVICED_DISPLAY_ATTR_TUPLE2_SET_DISPLAY_DIRECT, SYSCOMMON_DEVICED_DPMS_ON, reason);
+               DEVICED_DISPLAY_ATTR_TUPLE2_DISPLAY_DIRECT, SYSCOMMON_DEVICED_DPMS_ON, reason);
 
        return true;
 }
@@ -387,7 +387,7 @@ static inline void switch_off_lcd(void)
        broadcast_lcdoff_by_powerkey();
 
        syscommon_resman_set_resource_attr_uint64_2(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-               DEVICED_DISPLAY_ATTR_TUPLE2_SET_DISPLAY_DIRECT, SYSCOMMON_DEVICED_DPMS_OFF, DEVICED_EVENT_INPUT_POWERKEY);
+               DEVICED_DISPLAY_ATTR_TUPLE2_DISPLAY_DIRECT, SYSCOMMON_DEVICED_DPMS_OFF, DEVICED_EVENT_INPUT_POWERKEY);
 }
 
 static void check_key_combination(struct input_event *pinput)
@@ -550,12 +550,12 @@ static int lcdoff_powerkey(void)
        if (decide_lcdoff() == true) {
                switch_off_lcd();
                syscommon_resman_set_resource_attr_int(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-                       DEVICED_DISPLAY_ATTR_INT_SET_RELEASE_LOCK_ALL, SYSCOMMON_DEVICED_DISPLAY_STATE_ON);
+                       DEVICED_DISPLAY_ATTR_INT_RELEASE_LOCK_ALL, SYSCOMMON_DEVICED_DISPLAY_STATE_ON);
                syscommon_resman_set_resource_attr_int(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-                       DEVICED_DISPLAY_ATTR_INT_SET_RELEASE_LOCK_ALL, SYSCOMMON_DEVICED_DISPLAY_STATE_DIM);
+                       DEVICED_DISPLAY_ATTR_INT_RELEASE_LOCK_ALL, SYSCOMMON_DEVICED_DISPLAY_STATE_DIM);
                set_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;
@@ -588,12 +588,12 @@ static int process_power_key(struct input_event *pinput)
        int ret;
 
        ret = syscommon_resman_get_resource_attr_int(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-               DEVICED_DISPLAY_ATTR_INT_GET_CONFIG_POWERKEY_DOUBLEPRESS, &powerkey_doublepress);
+               DEVICED_DISPLAY_ATTR_INT_CONFIG_POWERKEY_DOUBLEPRESS, &powerkey_doublepress);
        if (ret < 0) /* TODO : Haven't checked returning false is correct */
                return false;
 
        ret = syscommon_resman_get_resource_attr_double(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-               DEVICED_DISPLAY_ATTR_DOUBLE_GET_CONFIG_LONGPRESS_INTERVAL, &longpress_interval);
+               DEVICED_DISPLAY_ATTR_DOUBLE_CONFIG_LONGPRESS_INTERVAL, &longpress_interval);
        if (ret < 0) /* TODO : Haven't checked returning false is correct */
                return false;
 
@@ -669,14 +669,14 @@ static int process_screenlock_key(struct input_event *pinput)
                return false;
 
        syscommon_resman_set_resource_attr_int(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-               DEVICED_DISPLAY_ATTR_INT_SET_RELEASE_LOCK_ALL, SYSCOMMON_DEVICED_DISPLAY_STATE_ON);
+               DEVICED_DISPLAY_ATTR_INT_RELEASE_LOCK_ALL, SYSCOMMON_DEVICED_DISPLAY_STATE_ON);
        syscommon_resman_set_resource_attr_int(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-               DEVICED_DISPLAY_ATTR_INT_SET_RELEASE_LOCK_ALL, SYSCOMMON_DEVICED_DISPLAY_STATE_DIM);
+               DEVICED_DISPLAY_ATTR_INT_RELEASE_LOCK_ALL, SYSCOMMON_DEVICED_DISPLAY_STATE_DIM);
        set_lcdoff_reason(VCONFKEY_PM_LCDOFF_BY_POWERKEY);
 
        /* 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;
@@ -718,7 +718,7 @@ static void update_vital_state(struct input_event *pinput)
 
        /* Change vital state to  SYSCOMMON_DEVICED_VITAL_EXIT only if vital mode is active */
        ret = syscommon_resman_get_resource_attr_int(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_POWER),
-               DEVICED_POWER_ATTR_INT_GET_VITAL_MODE, &vital_mode);
+               DEVICED_POWER_ATTR_INT_VITAL_MODE, &vital_mode);
        if (ret < 0 || vital_mode != 0)
                return;
 
@@ -798,11 +798,11 @@ static int check_key(struct input_event *pinput)
 #ifdef ENABLE_PM_LOG
        if (pinput->value == KEY_PRESSED)
                syscommon_resman_set_resource_attr_uint64_2(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_POWER),
-                       DEVICED_POWER_ATTR_TUPLE2_SET_HISTORY_LOG,
+                       DEVICED_POWER_ATTR_TUPLE2_HISTORY_LOG,
                        SYSCOMMON_DEVICED_POWER_LOG_TYPE_KEY_PRESS, pinput->code);
        else if (pinput->value == KEY_RELEASED)
                syscommon_resman_set_resource_attr_uint64_2(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_POWER),
-                       DEVICED_POWER_ATTR_TUPLE2_SET_HISTORY_LOG,
+                       DEVICED_POWER_ATTR_TUPLE2_HISTORY_LOG,
                        SYSCOMMON_DEVICED_POWER_LOG_TYPE_KEY_RELEASE, pinput->code);
 #endif
        return ignore;
@@ -857,7 +857,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;
 
@@ -869,12 +869,12 @@ static void check_key_filter(struct timeval time, unsigned short type, unsigned
                break;
        case EV_ABS:
                ret = syscommon_resman_get_resource_attr_int(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-                       DEVICED_DISPLAY_ATTR_INT_GET_TOUCH_EVENT_BLOCKED, &touch_event_blocked);
+                       DEVICED_DISPLAY_ATTR_INT_TOUCH_EVENT_BLOCKED, &touch_event_blocked);
                if (ret < 0)
                        break;
 
                ret = syscommon_resman_get_resource_attr_int(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-                       DEVICED_DISPLAY_ATTR_INT_GET_CONFIG_TOUCH_WAKEUP, &touch_wakeup);
+                       DEVICED_DISPLAY_ATTR_INT_CONFIG_TOUCH_WAKEUP, &touch_wakeup);
                if (ret < 0)
                        break;
 
@@ -908,7 +908,7 @@ static void check_key_filter(struct timeval time, unsigned short type, unsigned
 
        /* lcd on or update lcd timeout */
        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);
 }
 
@@ -938,12 +938,12 @@ static int deviced_input_init(void **data)
         * homekey  := LCDON
         */
        syscommon_resman_set_resource_attr_uint64_3(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-               DEVICED_DISPLAY_ATTR_TUPLE3_SET_ACTOR_CAPABILITY,
+               DEVICED_DISPLAY_ATTR_TUPLE3_ACTOR_CAPABILITY,
                SYSCOMMON_DEVICED_DISPLAY_ACTOR_POWER_KEY,
                (SYSCOMMON_DEVICED_DISPLAY_CAPA_LCDON | SYSCOMMON_DEVICED_DISPLAY_CAPA_LCDOFF | SYSCOMMON_DEVICED_DISPLAY_CAPA_POWEROFF),
                1);
        syscommon_resman_set_resource_attr_uint64_3(SYSCOMMON_RESOURCE_ID(DEVICED_RESOURCE_TYPE_DISPLAY),
-               DEVICED_DISPLAY_ATTR_TUPLE3_SET_ACTOR_CAPABILITY,
+               DEVICED_DISPLAY_ATTR_TUPLE3_ACTOR_CAPABILITY,
                SYSCOMMON_DEVICED_DISPLAY_ACTOR_MENU_KEY,
                SYSCOMMON_DEVICED_DISPLAY_CAPA_LCDON,
                1);