display: headed: Replace shared enum with the libsyscommon

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

diff --git a/plugins/iot-headed/display/key-filter.c b/plugins/iot-headed/display/key-filter.c
index f50af45..14a7e92 100644 (file)
--- a/plugins/iot-headed/display/key-filter.c
+++ b/plugins/iot-headed/display/key-filter.c
@@ -59,10 +59,10 @@
 
 enum key_combination_flags {
        KEY_COMBINATION_STOP            = 0,
-       KEY_COMBINATION_POWERKEY        = BIT(0),
-       KEY_COMBINATION_MENUKEY         = BIT(1),
-       KEY_COMBINATION_VOLUMEUP        = BIT(2),
-       KEY_COMBINATION_VOLUMEDOWN      = BIT(3),
+       KEY_COMBINATION_POWERKEY        = (1 << 0),
+       KEY_COMBINATION_MENUKEY         = (1 << 1),
+       KEY_COMBINATION_VOLUMEUP        = (1 << 2),
+       KEY_COMBINATION_VOLUMEDOWN      = (1 << 3),
 };
 
 enum combination_process {
@@ -247,11 +247,10 @@ static inline void broadcast_lcdoff_by_powerkey(void)
                                        NULL);
 }
 
-static inline bool switch_on_lcd(enum device_flags flags)
+static inline bool switch_on_lcd(enum deviced_event reason)
 {
        int dpms_state;
        int ret;
-       enum deviced_event reason;
 
        if (current_state_in_on())
                return false;
@@ -261,15 +260,12 @@ static inline bool switch_on_lcd(enum device_flags flags)
        if (ret == 0 && dpms_state == SYSCOMMON_DEVICED_DPMS_ON)
                return false;
 
-       if (flags & LCD_ON_BY_POWER_KEY) {
+       if (reason == DEVICED_EVENT_INPUT_POWERKEY)
                broadcast_lcdon_by_powerkey();
-               reason = DEVICED_EVENT_INPUT_POWERKEY;
-       } else if (flags & LCD_ON_BY_TOUCH) {
+       else if (reason == DEVICED_EVENT_TOUCHSCREEN)
                _I("Display on by Touch_wakeup event");
-               reason = DEVICED_EVENT_TOUCHSCREEN;
-       } else {
+       else
                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);
@@ -402,7 +398,7 @@ static int process_menu_key(struct input_event *pinput)
                _D("No lcd-on capability!");
                return true;
        } else if (pinput->value == KEY_PRESSED)
-               switch_on_lcd(LCD_ON_BY_POWER_KEY);
+               switch_on_lcd(DEVICED_EVENT_INPUT_POWERKEY);
 
        return false;
 }
@@ -475,7 +471,7 @@ static int process_back_key(struct input_event *pinput)
        int ignore = true;
 
        if (pinput->value == KEY_PRESSED) {
-               switch_on_lcd(LCD_ON_BY_BACK_KEY);
+               switch_on_lcd(DEVICED_EVENT_INPUT_BACKKEY);
                _I("back key pressed");
                ignore = false;
        }
@@ -521,7 +517,7 @@ static int process_power_key(struct input_event *pinput)
                break;
        case KEY_PRESSED:
                if (check_actor_caps(SYSCOMMON_DEVICED_DISPLAY_ACTOR_POWER_KEY, SYSCOMMON_DEVICED_DISPLAY_CAPA_LCDON)) {
-                       skip_lcd_off = switch_on_lcd(LCD_ON_BY_POWER_KEY);
+                       skip_lcd_off = switch_on_lcd(DEVICED_EVENT_INPUT_POWERKEY);
                } else {
                        _D("No lcdon capability!");
                        skip_lcd_off = false;
@@ -749,7 +745,7 @@ static void check_key_filter(struct timeval time, unsigned short type, unsigned
                        break;
 
                if (current == SYSCOMMON_DEVICED_DISPLAY_STATE_OFF && bezel_wakeup) {
-                       switch_on_lcd(LCD_ON_BY_BEZEL);
+                       switch_on_lcd(DEVICED_EVENT_INPUT_BEZEL);
                        ignore = false;
                } else if (current != SYSCOMMON_DEVICED_DISPLAY_STATE_OFF)
                        ignore = false;
@@ -768,7 +764,7 @@ static void check_key_filter(struct timeval time, unsigned short type, unsigned
 
                update_vital_state(pinput);
                if (pinput->value == KEY_PRESSED) {
-                       switch_on_lcd(LCD_ON_BY_TOUCH);
+                       switch_on_lcd(DEVICED_EVENT_TOUCHSCREEN);
                        ignore = false;
                }