From: Youngjae Cho Date: Tue, 11 Jun 2024 04:29:14 +0000 (+0900) Subject: display: Remove enum LCD_PANEL_OFF_MODE X-Git-Tag: accepted/tizen/unified/20240618.060038~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=533bc60b69cfec954dd448afc11110e98c67adf1;p=platform%2Fcore%2Fsystem%2Fdeviced.git 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 --- diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c index 84c77bdc..e345f1fe 100644 --- 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 83a71aa1..ad47fd54 100644 --- 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 cfcfbd67..42bb7f57 100644 --- 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 83763742..d3c1a3e8 100644 --- 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,