display: Move brightness update function plugin to core display module

Remove and redefine backlight_update function.
This function is added below display-backlight.

int display_backlight_update_by_default_brightness(void)
-> This function replaces backlight_update function located in plugins.

Change-Id: I47e2b84a5157beebfc020a62b4508af0f85b52e4
Signed-off-by: Yunhee Seo <yuni.seo@samsung.com>

diff --git a/plugins/iot-headed/display/core.c b/plugins/iot-headed/display/core.c
index b9b762a..de8ccb3 100644 (file)
--- a/plugins/iot-headed/display/core.c
+++ b/plugins/iot-headed/display/core.c
@@ -341,7 +341,7 @@ void lcd_on_procedure(int state, enum device_flags flag)
                if (state == LCD_DIM)
                        display_backlight_set_brightness_by_dim_brightness();
                else if (state == LCD_NORMAL)
-                       backlight_ops->update();
+                       display_backlight_update_by_default_brightness();
        }
 
        if (state == LCD_NORMAL)
@@ -1426,7 +1426,7 @@ static int default_action(int timeout)
                if ((get_pm_old_state() == S_LCDOFF) || (get_pm_old_state() == S_SLEEP))
                        check_lock_screen();
                else if (get_pm_old_state() == S_LCDDIM)
-                       backlight_ops->update();
+                       display_backlight_update_by_default_brightness();
 
                if (check_lcd_is_on() == false)
                        lcd_on_procedure(LCD_NORMAL, NORMAL_MODE);
@@ -1545,7 +1545,7 @@ static void default_saving_mode(int onoff)
                clear_pm_status_flag(PWRSV_FLAG);
 
        if (get_pm_cur_state() == S_NORMAL)
-               backlight_ops->update();
+               display_backlight_update_by_default_brightness();
 }
 
 int poll_callback(int condition, PMMsg *data)
@@ -1881,7 +1881,7 @@ static int battery_health_changed(void *data)
        }
 
        if (backlight_ops->get_lcd_power() == DPMS_ON)
-               backlight_ops->update();
+               display_backlight_update_by_default_brightness();
 
        return 0;
 }

diff --git a/plugins/iot-headed/display/device-interface.c b/plugins/iot-headed/display/device-interface.c
index b7f5dbd..e8cf4fe 100644 (file)
--- a/plugins/iot-headed/display/device-interface.c
+++ b/plugins/iot-headed/display/device-interface.c
@@ -239,26 +239,6 @@ static int set_force_brightness(int level)
        return 0;
 }
 
-static int backlight_update(void)
-{
-       int ret = 0;
-       int brt;
-       bool custom_status;
-
-       display_backlight_get_custom_status(&custom_status);
-       if (custom_status) {
-               _I("custom brightness mode! brt no updated");
-               return 0;
-       }
-       if (display_dimstay_check())
-               ret = display_backlight_set_brightness_by_dim_brightness();
-       else {
-               display_backlight_get_default_brightness(&brt);
-               ret = backlight_ops.set_brightness(brt);
-       }
-       return ret;
-}
-
 static int set_brightness(int val)
 {
        int max, ret;
@@ -417,7 +397,7 @@ static void blink(int timeout)
        }
 
        if (timeout == 0) {
-               backlight_update();
+               display_backlight_update_by_default_brightness();
                return;
        }
 
@@ -450,7 +430,6 @@ static void restore_brightness_func(void)
 }
 
 static struct _backlight_ops backlight_ops = {
-       .update = backlight_update,
        .get_lcd_power = dpms_get_cached_state,
        .get_lcd_power_node = get_lcd_power_node,
        .save_custom_brightness = save_custom_brightness,
@@ -510,7 +489,7 @@ int exit_sysfs(void)
 {
        const struct device_ops *ops = NULL;
 
-       backlight_update();
+       display_backlight_update_by_default_brightness();
 
        dpms_exit();
 

diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c
index 4b97a31..25db558 100644 (file)
--- a/plugins/mobile/display/core.c
+++ b/plugins/mobile/display/core.c
@@ -348,7 +348,7 @@ void lcd_on_procedure(int state, enum device_flags flag)
                if (state == LCD_DIM)
                        display_backlight_set_brightness_by_dim_brightness();
                else if (state == LCD_NORMAL)
-                       backlight_ops->update();
+                       display_backlight_update_by_default_brightness();
        }
 
        if (state == LCD_NORMAL)
@@ -1436,7 +1436,7 @@ static int default_action(int timeout)
                if ((get_pm_old_state() == S_LCDOFF) || (get_pm_old_state() == S_SLEEP))
                        check_lock_screen();
                else if (get_pm_old_state() == S_LCDDIM)
-                       backlight_ops->update();
+                       display_backlight_update_by_default_brightness();
 
                if (check_lcd_is_on() == false)
                        lcd_on_procedure(LCD_NORMAL, NORMAL_MODE);
@@ -1555,7 +1555,7 @@ static void default_saving_mode(int onoff)
                clear_pm_status_flag(PWRSV_FLAG);
 
        if (get_pm_cur_state() == S_NORMAL)
-               backlight_ops->update();
+               display_backlight_update_by_default_brightness();
 }
 
 int poll_callback(int condition, PMMsg *data)
@@ -1891,7 +1891,7 @@ static int battery_health_changed(void *data)
        }
 
        if (backlight_ops->get_lcd_power() == DPMS_ON)
-               backlight_ops->update();
+               display_backlight_update_by_default_brightness();
 
        return 0;
 }

diff --git a/plugins/mobile/display/device-interface.c b/plugins/mobile/display/device-interface.c
index e3da1ed..d9a2a57 100644 (file)
--- a/plugins/mobile/display/device-interface.c
+++ b/plugins/mobile/display/device-interface.c
@@ -238,26 +238,6 @@ static int set_force_brightness(int level)
        return 0;
 }
 
-static int backlight_update(void)
-{
-       int ret = 0;
-       int brt;
-       bool custom_status;
-
-       display_backlight_get_custom_status(&custom_status);
-       if (custom_status) {
-               _I("custom brightness mode! brt no updated");
-               return 0;
-       }
-       if (display_dimstay_check())
-               ret = display_backlight_set_brightness_by_dim_brightness();
-       else {
-               display_backlight_get_default_brightness(&brt);
-               ret = backlight_ops.set_brightness(brt);
-       }
-       return ret;
-}
-
 static int set_brightness(int val)
 {
        int max, ret;
@@ -416,7 +396,7 @@ static void blink(int timeout)
        }
 
        if (timeout == 0) {
-               backlight_update();
+               display_backlight_update_by_default_brightness();
                return;
        }
 
@@ -449,7 +429,6 @@ static void restore_brightness_func(void)
 }
 
 static struct _backlight_ops backlight_ops = {
-       .update = backlight_update,
        .get_lcd_power = dpms_get_cached_state,
        .get_lcd_power_node = get_lcd_power_node,
        .save_custom_brightness = save_custom_brightness,
@@ -525,7 +504,7 @@ int exit_sysfs(void)
 {
        const struct device_ops *ops = NULL;
 
-       backlight_update();
+       display_backlight_update_by_default_brightness();
 
        dpms_exit();
 

diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c
index 5961124..c63d8ee 100644 (file)
--- a/plugins/tv/display/core.c
+++ b/plugins/tv/display/core.c
@@ -341,7 +341,7 @@ void lcd_on_procedure(int state, enum device_flags flag)
                if (state == LCD_DIM)
                        display_backlight_set_brightness_by_dim_brightness();
                else if (state == LCD_NORMAL)
-                       backlight_ops->update();
+                       display_backlight_update_by_default_brightness();
        }
 
        if (state == LCD_NORMAL)
@@ -1426,7 +1426,7 @@ static int default_action(int timeout)
                if ((get_pm_old_state() == S_LCDOFF) || (get_pm_old_state() == S_SLEEP))
                        check_lock_screen();
                else if (get_pm_old_state() == S_LCDDIM)
-                       backlight_ops->update();
+                       display_backlight_update_by_default_brightness();
 
                if (check_lcd_is_on() == false)
                        lcd_on_procedure(LCD_NORMAL, NORMAL_MODE);
@@ -1545,7 +1545,7 @@ static void default_saving_mode(int onoff)
                clear_pm_status_flag(PWRSV_FLAG);
 
        if (get_pm_cur_state() == S_NORMAL)
-               backlight_ops->update();
+               display_backlight_update_by_default_brightness();
 }
 
 int poll_callback(int condition, PMMsg *data)
@@ -1881,7 +1881,7 @@ static int battery_health_changed(void *data)
        }
 
        if (backlight_ops->get_lcd_power() == DPMS_ON)
-               backlight_ops->update();
+               display_backlight_update_by_default_brightness();
 
        return 0;
 }

diff --git a/plugins/tv/display/device-interface.c b/plugins/tv/display/device-interface.c
index 8b0b25d..842be00 100644 (file)
--- a/plugins/tv/display/device-interface.c
+++ b/plugins/tv/display/device-interface.c
@@ -239,26 +239,6 @@ static int set_force_brightness(int level)
        return 0;
 }
 
-static int backlight_update(void)
-{
-       int ret = 0;
-       int brt;
-       bool custom_status;
-
-       display_backlight_get_custom_status(&custom_status);
-       if (custom_status) {
-               _I("custom brightness mode! brt no updated");
-               return 0;
-       }
-       if (display_dimstay_check())
-               ret = display_backlight_set_brightness_by_dim_brightness();
-       else {
-               display_backlight_get_default_brightness(&brt);
-               ret = backlight_ops.set_brightness(brt);
-       }
-       return ret;
-}
-
 static int set_brightness(int val)
 {
        int max, ret;
@@ -417,7 +397,7 @@ static void blink(int timeout)
        }
 
        if (timeout == 0) {
-               backlight_update();
+               display_backlight_update_by_default_brightness();
                return;
        }
 
@@ -450,7 +430,6 @@ static void restore_brightness_func(void)
 }
 
 static struct _backlight_ops backlight_ops = {
-       .update = backlight_update,
        .get_lcd_power = dpms_get_cached_state,
        .get_lcd_power_node = get_lcd_power_node,
        .save_custom_brightness = save_custom_brightness,
@@ -510,7 +489,7 @@ int exit_sysfs(void)
 {
        const struct device_ops *ops = NULL;
 
-       backlight_update();
+       display_backlight_update_by_default_brightness();
 
        dpms_exit();
 

diff --git a/plugins/wearable/display/auto-brightness-sensorhub.c b/plugins/wearable/display/auto-brightness-sensorhub.c
index a2ae6db..6e7226e 100644 (file)
--- a/plugins/wearable/display/auto-brightness-sensorhub.c
+++ b/plugins/wearable/display/auto-brightness-sensorhub.c
@@ -127,7 +127,7 @@ static void set_default_brightness(void)
 
        display_backlight_get_default_brightness(&default_brt);
        display_backlight_set_default_brightness(default_brt);
-       backlight_ops->update();
+       display_backlight_update_by_default_brightness();
 }
 
 static void set_automatic_state_cb(keynode_t *key_nodes, void *data)
@@ -289,7 +289,7 @@ int auto_brightness_control(enum brightness_request_e request, int set_brightnes
        } else if (request == BR_LOWDIM_OFF) {
                if (lowdim) {
                        if (!hbm && !hold_brt && (get_pm_cur_state() == S_NORMAL))
-                               backlight_ops->update();
+                               display_backlight_update_by_default_brightness();
                        change_flag(&lowdim, 0);
                }
        } else if (request == BR_SET_BRIGHTNESS) {
@@ -339,7 +339,7 @@ int auto_brightness_restore(void)
                return 0;
 
        /* update to the default brightness */
-       return backlight_ops->update();
+       return display_backlight_update_by_default_brightness();
 }
 
 int prepare_level_handler(void)

diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c
index ac56de1..8f0edcb 100644 (file)
--- a/plugins/wearable/display/core.c
+++ b/plugins/wearable/display/core.c
@@ -559,7 +559,7 @@ void lcd_on_procedure(int state, enum device_flags flag)
                if (state == LCD_DIM)
                        display_backlight_set_brightness_by_dim_brightness();
                else if (state == LCD_NORMAL)
-                       backlight_ops->update();
+                       display_backlight_update_by_default_brightness();
        }
 
        if (state == LCD_NORMAL)
@@ -1697,7 +1697,7 @@ static int default_action(int timeout)
                if ((get_pm_old_state() == S_LCDOFF) || (get_pm_old_state() == S_SLEEP))
                        check_lock_screen();
                else if (get_pm_old_state() == S_LCDDIM)
-                       backlight_ops->update();
+                       display_backlight_update_by_default_brightness();
 
                if (check_lcd_is_on() == false)
                        lcd_on_procedure(LCD_NORMAL, NORMAL_MODE);
@@ -2148,7 +2148,7 @@ static int battery_health_changed(void *data)
                set_pm_status_flag(BATTERY_FLAG);
                set_pm_status_flag(DIMSTAY_FLAG);
                if (backlight_ops->get_lcd_power() == DPMS_ON)
-                       backlight_ops->update();
+                       display_backlight_update_by_default_brightness();
        }
 
        return 0;

diff --git a/plugins/wearable/display/device-interface.c b/plugins/wearable/display/device-interface.c
index 39453f7..3647d8b 100644 (file)
--- a/plugins/wearable/display/device-interface.c
+++ b/plugins/wearable/display/device-interface.c
@@ -250,26 +250,6 @@ static int set_force_brightness(int level)
        return 0;
 }
 
-static int backlight_update(void)
-{
-       int ret = 0;
-       int brt;
-       bool custom_status;
-
-       display_backlight_get_custom_status(&custom_status);
-       if (custom_status) {
-               _I("custom brightness mode! brt no updated");
-               return 0;
-       }
-       if (display_dimstay_check())
-               ret = display_backlight_set_brightness_by_dim_brightness();
-       else {
-               display_backlight_get_default_brightness(&brt);
-               ret = backlight_ops.set_brightness(brt);
-       }
-       return ret;
-}
-
 static int set_brightness(int val)
 {
        int max, ret;
@@ -482,7 +462,7 @@ static void blink(int timeout)
        }
 
        if (timeout == 0) {
-               backlight_update();
+               display_backlight_update_by_default_brightness();
                return;
        }
 
@@ -515,7 +495,6 @@ static void restore_brightness_func(void)
 }
 
 static struct _backlight_ops backlight_ops = {
-       .update = backlight_update,
        .get_lcd_power = dpms_get_cached_state,
        .get_lcd_power_node = get_lcd_power_node,
        .save_custom_brightness = save_custom_brightness,
@@ -592,7 +571,7 @@ int exit_sysfs(void)
 {
        const struct device_ops *ops = NULL;
 
-       backlight_update();
+       display_backlight_update_by_default_brightness();
 
        dpms_exit();
 

diff --git a/plugins/wearable/display/powersaver.c b/plugins/wearable/display/powersaver.c
index 600671e..e859053 100644 (file)
--- a/plugins/wearable/display/powersaver.c
+++ b/plugins/wearable/display/powersaver.c
@@ -25,6 +25,7 @@
 #include "core/log.h"
 #include "display/core.h"
 #include "display/device-interface.h"
+#include "display/display-backlight.h"
 #include "display/display-ops.h"
 #include "display-info.h"
 #include "powersaver.h"
@@ -54,7 +55,7 @@ static int set_powersaver_mode(int mode)
                hbm_ops->func(HBM_SET_TIMEOUT_STATE, &hss);
        }
 
-       backlight_ops->update();
+       display_backlight_update_by_default_brightness();
        get_run_timeout(&timeout);
        state_st(S_NORMAL)->timeout = timeout;
        state_st(get_pm_cur_state())->trans(EVENT_INPUT);

diff --git a/src/display/auto-brightness.c b/src/display/auto-brightness.c
index 6c9e96a..cdae274 100644 (file)
--- a/src/display/auto-brightness.c
+++ b/src/display/auto-brightness.c
@@ -148,7 +148,7 @@ static void alc_set_brightness(int setting, int value, float light)
                                tmp_value = value;
 
                        display_backlight_set_default_brightness(tmp_value);
-                       backlight_ops->update();
+                       display_backlight_update_by_default_brightness();
                }
                _I("Load light data(%f) auto brt=%d min brightness=%d "
                    "brightness=%d", light, automatic_brt, min_brightness, value);
@@ -444,7 +444,7 @@ static int set_autobrightness_state(int status)
                }
 
                display_backlight_set_default_brightness(default_brt);
-               backlight_ops->update();
+               display_backlight_update_by_default_brightness();
        }
 
        return 0;

diff --git a/src/display/device-interface.h b/src/display/device-interface.h
index f0fa27d..f5010f1 100644 (file)
--- a/src/display/device-interface.h
+++ b/src/display/device-interface.h
@@ -61,7 +61,6 @@ int display_service_load(void);
 int display_service_free(void);
 
 struct _backlight_ops {
-       int (*update)(void);
        int (*get_lcd_power)(void);
        int (*get_lcd_power_node)(void);
        int (*save_custom_brightness)(void);

diff --git a/src/display/display-backlight.c b/src/display/display-backlight.c
index f4abc22..379c7f5 100644 (file)
--- a/src/display/display-backlight.c
+++ b/src/display/display-backlight.c
@@ -29,7 +29,7 @@ static const struct display_config *display_conf;
 static struct _backlight_ops *backlight_ops;
 
 static int default_brightness;
-static bool custom_status;
+static bool g_custom_status;
 
 /* FIXME: This function is for temporary use, should be fixed after plugin refactoring */
 int display_backlight_get_max_brightness(int *max_brightness)
@@ -133,16 +133,39 @@ int display_backlight_set_brightness_by_dim_brightness(void)
        return ret;
 }
 
+/* FIXME: display_dimstay_check function should be changed to plugin api call */
+int display_backlight_update_by_default_brightness(void)
+{
+       int ret = 0;
+       int default_brightness;
+       bool custom_status;
+
+       display_backlight_get_custom_status(&custom_status);
+       if (custom_status) {
+               _I("Custom brightness mode, no update brightness");
+               return 0;
+       }
+
+       if (display_dimstay_check()) {
+               ret = display_backlight_set_brightness_by_dim_brightness();
+       } else {
+               display_backlight_get_default_brightness(&default_brightness);
+               ret = backlight_ops->set_brightness(default_brightness);
+       }
+
+       return ret;
+}
+
 /* FIXME: This custom_status policy can be changed, after plugin refactoting*/
 void display_backlight_set_custom_status(bool on)
 {
-       custom_status = on;
+       g_custom_status = on;
 }
 
 /* FIXME: This custom_status policy can be changed, after plugin refactoting*/
 void display_backlight_get_custom_status(bool *on)
 {
-       *on = custom_status;
+       *on = g_custom_status;
 }
 
 /* FIXME: This code structure should be changed to plugin api call, after plugin refactoting*/

diff --git a/src/display/display-backlight.h b/src/display/display-backlight.h
index f85cf1e..61f3095 100644 (file)
--- a/src/display/display-backlight.h
+++ b/src/display/display-backlight.h
@@ -24,6 +24,7 @@ int display_backlight_get_normalized_brightness(int raw_brightness,
                                                int *normalized_brightness);
 int display_backlight_set_default_brightness(int brightness);
 int display_backlight_get_default_brightness(int *brightness);
+int display_backlight_update_by_default_brightness(void);
 int display_backlight_set_brightness_by_dim_brightness(void);
 void display_backlight_set_custom_status(bool on);
 void display_backlight_get_custom_status(bool *on);

diff --git a/src/display/display-dbus.c b/src/display/display-dbus.c
index c2384f7..a67860a 100644 (file)
--- a/src/display/display-dbus.c
+++ b/src/display/display-dbus.c
@@ -1184,7 +1184,7 @@ static GVariant *dbus_dimstay_control(GDBusConnection *conn,
        }
 
        if (get_pm_cur_state() == S_NORMAL)
-               backlight_ops->update();
+               display_backlight_update_by_default_brightness();
 
 out:
        return g_variant_new("(i)", ret);