display: Remove enum LCD_PANEL_OFF_MODE

No need to take care LCD_PANEL_OFF_MODE flag via parameter throughout
display on/off subroutines. Whenever it is required, just enquire
and get the value using display_panel_get_lcd_paneloff_mode().

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

diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c
index 84c77bdc9882ed1cfc953c1131fb8f5d09877b87..e345f1fee98d6d82da91094540ac2b5661c30d89 100644 (file)
--- a/plugins/wearable/display/core.c
+++ b/plugins/wearable/display/core.c
@@ -160,15 +160,9 @@ static int get_device_flags(unsigned long *device_flags)
                return -EINVAL;
 
        *device_flags = NORMAL_MODE;
-       bool lcd_paneloff_mode = false;
        bool stay_touchscreen_off = false;
-       display_panel_get_lcd_paneloff_mode(&lcd_paneloff_mode);
        display_misc_get_stay_touchscreen_off(&stay_touchscreen_off);
 
-       if (lcd_paneloff_mode) {
-               *device_flags |= LCD_PANEL_OFF_MODE;
-       }
-
        if (stay_touchscreen_off) {
                *device_flags |= TOUCH_SCREEN_OFF_MODE;
        }
@@ -927,12 +921,18 @@ static void display_exit(void *data)
 
 static int display_start(enum device_flags flags)
 {
-       if (flags & LCD_PANEL_OFF_MODE)
+       bool lcd_paneloff_mode = false;
+
+       display_panel_get_lcd_paneloff_mode(&lcd_paneloff_mode);
+
+       if (lcd_paneloff_mode) {
                /* standby on */
                display_panel_set_panel_state_by_standby_state(true);
-       else
-               /* normal lcd on */
-               display_panel_set_panel_state_by_on_state(flags);
+               return 0;
+       }
+
+       /* normal lcd on */
+       display_panel_set_panel_state_by_on_state(flags);
 
        return 0;
 }

diff --git a/src/display/display-util.c b/src/display/display-util.c
index 83a71aa163f965eab771fc520cb519e357b49164..ad47fd545cf0a87c287c4ad81e6ef226efffbb7a 100644 (file)
--- a/src/display/display-util.c
+++ b/src/display/display-util.c
@@ -52,7 +52,6 @@ int display_util_get_device_flags_name(enum device_flags flags, const char **fla
 
 int display_util_get_device_flags(unsigned long *device_flags)
 {
-       bool lcd_paneloff_mode = false;
        bool stay_touchscreen_off = false;
 
        if (!device_flags)
@@ -62,12 +61,8 @@ int display_util_get_device_flags(unsigned long *device_flags)
                return display_plugin_get_device_flags(device_flags);
 
        *device_flags = NORMAL_MODE;
-       display_panel_get_lcd_paneloff_mode(&lcd_paneloff_mode);
        display_misc_get_stay_touchscreen_off(&stay_touchscreen_off);
 
-       if (lcd_paneloff_mode)
-               *device_flags |= LCD_PANEL_OFF_MODE;
-
        if (stay_touchscreen_off)
                *device_flags |= TOUCH_SCREEN_OFF_MODE;
 

diff --git a/src/display/display.c b/src/display/display.c
index cfcfbd67fcd895bef75f9180e110ac1e483ef336..42bb7f572c742c5b6e545325c0ec1f78d4a2437e 100644 (file)
--- a/src/display/display.c
+++ b/src/display/display.c
@@ -724,12 +724,18 @@ static void display_exit(void *data)
 
 static int display_start(enum device_flags flags)
 {
-       if (flags & LCD_PANEL_OFF_MODE)
+       bool lcd_paneloff_mode = false;
+
+
+       display_panel_get_lcd_paneloff_mode(&lcd_paneloff_mode);
+       if (lcd_paneloff_mode) {
                /* standby on */
                display_panel_set_panel_state_by_standby_state(true);
-       else
-               /* normal lcd on */
-               display_panel_set_panel_state_by_on_state(flags);
+               return 0;
+       }
+
+       /* normal lcd on */
+       display_panel_set_panel_state_by_on_state(flags);
 
        return 0;
 }

diff --git a/src/shared/devices.h b/src/shared/devices.h
index 837637429e71ded0a70e34600781bc9619af33de..d3c1a3e89c6d60c2217b4e7dd3c4bcd7476629f3 100644 (file)
--- a/src/shared/devices.h
+++ b/src/shared/devices.h
@@ -43,7 +43,6 @@
 enum device_flags {
        NORMAL_MODE                   = 0x00000001,
        TOUCH_SCREEN_OFF_MODE         = 0x00002000,
-       LCD_PANEL_OFF_MODE            = 0x00004000,
        LCD_ON_BY_GESTURE             = 0x00010000,
        LCD_ON_BY_POWER_KEY           = 0x00020000,
        LCD_ON_BY_BACK_KEY            = 0x00040000,