display: Relocate power_saving_func() from plugins to core

power_saving_func() sets PWRSV_FLAG.
Actually, this work should be moved to display.c

This function is added below display.c
- void display_set_power_save_mode_flag(int onoff);
    -> This replaces power_saving_func()

Change-Id: I9e803ab97ab02b9ddf64519aadd6c373167d0aa4
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 47c4c0b..ae08c92 100644 (file)
--- a/plugins/iot-headed/display/core.c
+++ b/plugins/iot-headed/display/core.c
@@ -86,7 +86,6 @@ static struct display_plugin *disp_plgn;
 static struct display_backlight_ops *backlight_ops;
 static struct battery_plugin *battery_plgn;
 static int (*fp_get_charging_status) (int *val);
-static void (*power_saving_func) (int onoff);
 static enum device_ops_status status = DEVICE_OPS_STATUS_UNINIT;
 
 static char *custom_change_name;
@@ -390,17 +389,6 @@ static void sig_hup(int signo)
        pm_save_logdump();
 }
 
-static void default_saving_mode(int onoff)
-{
-       if (onoff)
-               set_pm_status_flag(PWRSV_FLAG);
-       else
-               clear_pm_status_flag(PWRSV_FLAG);
-
-       if (get_pm_cur_state() == S_NORMAL)
-               display_backlight_update_by_default_brightness();
-}
-
 int poll_callback(int condition, PMMsg *data)
 {
        static time_t last_t;
@@ -446,11 +434,11 @@ static int update_setting(int key_idx, int val)
        case SETTING_LOW_BATT:
                if (display_misc_is_low_battery_state(val)) {
                        if (!(get_pm_status_flag() & CHRGR_FLAG))
-                               power_saving_func(true);
+                               display_set_power_save_mode_flag(true);
                        set_pm_status_flag(LOWBT_FLAG);
                } else {
                        if (get_pm_status_flag() & PWRSV_FLAG)
-                               power_saving_func(false);
+                               display_set_power_save_mode_flag(false);
                        clear_pm_status_flag(LOWBT_FLAG);
                        clear_pm_status_flag(BRTCH_FLAG);
                        ret = vconf_set_bool(VCONFKEY_PM_BRIGHTNESS_CHANGED_IN_LPM, false);
@@ -461,7 +449,7 @@ static int update_setting(int key_idx, int val)
        case SETTING_CHARGING:
                if (val) {
                        if (get_pm_status_flag() & LOWBT_FLAG) {
-                               power_saving_func(false);
+                               display_set_power_save_mode_flag(false);
                                clear_pm_status_flag(LOWBT_FLAG);
                        }
                        set_pm_status_flag(CHRGR_FLAG);
@@ -474,7 +462,7 @@ static int update_setting(int key_idx, int val)
                                _E("Failed to get vconf value for battery status low: %d", vconf_get_ext_errno());
                        }
                        if (display_misc_is_low_battery_state(bat_state)) {
-                               power_saving_func(true);
+                               display_set_power_save_mode_flag(true);
                                set_pm_status_flag(LOWBT_FLAG);
                        }
                        clear_pm_status_flag(CHRGR_FLAG);
@@ -560,7 +548,7 @@ static void check_seed_status(void)
        }
        if (display_misc_is_low_battery_state(bat_state)) {
                if (!(get_pm_status_flag() & CHRGR_FLAG)) {
-                       power_saving_func(true);
+                       display_set_power_save_mode_flag(true);
                        set_pm_status_flag(LOWBT_FLAG);
                }
        }
@@ -860,8 +848,6 @@ static void display_init(void *data)
 
        signal(SIGHUP, sig_hup);
 
-       power_saving_func = default_saving_mode;
-
        /* load configutation */
        ret = display_load_config(&display_conf);
        if (ret < 0)

diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c
index 84c7a14..c8a1d31 100644 (file)
--- a/plugins/mobile/display/core.c
+++ b/plugins/mobile/display/core.c
@@ -88,7 +88,6 @@ static struct display_backlight_ops *backlight_ops;
 static struct battery_plugin *battery_plgn;
 static int (*fp_get_charging_status) (int *val);
 
-static void (*power_saving_func) (int onoff);
 static enum device_ops_status status = DEVICE_OPS_STATUS_UNINIT;
 
 static char *custom_change_name;
@@ -399,17 +398,6 @@ static void sig_hup(int signo)
        pm_save_logdump();
 }
 
-static void default_saving_mode(int onoff)
-{
-       if (onoff)
-               set_pm_status_flag(PWRSV_FLAG);
-       else
-               clear_pm_status_flag(PWRSV_FLAG);
-
-       if (get_pm_cur_state() == S_NORMAL)
-               display_backlight_update_by_default_brightness();
-}
-
 int poll_callback(int condition, PMMsg *data)
 {
        static time_t last_t;
@@ -455,11 +443,11 @@ static int update_setting(int key_idx, int val)
        case SETTING_LOW_BATT:
                if (display_misc_is_low_battery_state(val)) {
                        if (!(get_pm_status_flag() & CHRGR_FLAG))
-                               power_saving_func(true);
+                               display_set_power_save_mode_flag(true);
                        set_pm_status_flag(LOWBT_FLAG);
                } else {
                        if (get_pm_status_flag() & PWRSV_FLAG)
-                               power_saving_func(false);
+                               display_set_power_save_mode_flag(false);
                        clear_pm_status_flag(LOWBT_FLAG);
                        clear_pm_status_flag(BRTCH_FLAG);
                        ret = vconf_set_bool(VCONFKEY_PM_BRIGHTNESS_CHANGED_IN_LPM, false);
@@ -470,7 +458,7 @@ static int update_setting(int key_idx, int val)
        case SETTING_CHARGING:
                if (val) {
                        if (get_pm_status_flag() & LOWBT_FLAG) {
-                               power_saving_func(false);
+                               display_set_power_save_mode_flag(false);
                                clear_pm_status_flag(LOWBT_FLAG);
                        }
                        set_pm_status_flag(CHRGR_FLAG);
@@ -483,7 +471,7 @@ static int update_setting(int key_idx, int val)
                                _E("Failed to get vconf value for battery status low: %d", vconf_get_ext_errno());
                        }
                        if (display_misc_is_low_battery_state(bat_state)) {
-                               power_saving_func(true);
+                               display_set_power_save_mode_flag(true);
                                set_pm_status_flag(LOWBT_FLAG);
                        }
                        clear_pm_status_flag(CHRGR_FLAG);
@@ -569,7 +557,7 @@ static void check_seed_status(void)
        }
        if (display_misc_is_low_battery_state(bat_state)) {
                if (!(get_pm_status_flag() & CHRGR_FLAG)) {
-                       power_saving_func(true);
+                       display_set_power_save_mode_flag(true);
                        set_pm_status_flag(LOWBT_FLAG);
                }
        }
@@ -865,8 +853,6 @@ static void display_init(void *data)
 
        signal(SIGHUP, sig_hup);
 
-       power_saving_func = default_saving_mode;
-
        /* load configutation */
        ret = display_load_config(&display_conf);
        if (ret < 0)

diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c
index f479c10..b7b624f 100644 (file)
--- a/plugins/tv/display/core.c
+++ b/plugins/tv/display/core.c
@@ -86,7 +86,6 @@ static struct display_backlight_ops *backlight_ops;
 static struct battery_plugin *battery_plgn;
 static int (*fp_get_charging_status) (int *val);
 
-static void (*power_saving_func) (int onoff);
 static enum device_ops_status status = DEVICE_OPS_STATUS_UNINIT;
 
 static char *custom_change_name;
@@ -389,17 +388,6 @@ static void sig_hup(int signo)
        pm_save_logdump();
 }
 
-static void default_saving_mode(int onoff)
-{
-       if (onoff)
-               set_pm_status_flag(PWRSV_FLAG);
-       else
-               clear_pm_status_flag(PWRSV_FLAG);
-
-       if (get_pm_cur_state() == S_NORMAL)
-               display_backlight_update_by_default_brightness();
-}
-
 int poll_callback(int condition, PMMsg *data)
 {
        static time_t last_t;
@@ -445,11 +433,11 @@ static int update_setting(int key_idx, int val)
        case SETTING_LOW_BATT:
                if (display_misc_is_low_battery_state(val)) {
                        if (!(get_pm_status_flag() & CHRGR_FLAG))
-                               power_saving_func(true);
+                               display_set_power_save_mode_flag(true);
                        set_pm_status_flag(LOWBT_FLAG);
                } else {
                        if (get_pm_status_flag() & PWRSV_FLAG)
-                               power_saving_func(false);
+                               display_set_power_save_mode_flag(false);
                        clear_pm_status_flag(LOWBT_FLAG);
                        clear_pm_status_flag(BRTCH_FLAG);
                        ret = vconf_set_bool(VCONFKEY_PM_BRIGHTNESS_CHANGED_IN_LPM, false);
@@ -460,7 +448,7 @@ static int update_setting(int key_idx, int val)
        case SETTING_CHARGING:
                if (val) {
                        if (get_pm_status_flag() & LOWBT_FLAG) {
-                               power_saving_func(false);
+                               display_set_power_save_mode_flag(false);
                                clear_pm_status_flag(LOWBT_FLAG);
                        }
                        set_pm_status_flag(CHRGR_FLAG);
@@ -473,7 +461,7 @@ static int update_setting(int key_idx, int val)
                                _E("Failed to get vconf value for battery status low: %d", vconf_get_ext_errno());
                        }
                        if (display_misc_is_low_battery_state(bat_state)) {
-                               power_saving_func(true);
+                               display_set_power_save_mode_flag(true);
                                set_pm_status_flag(LOWBT_FLAG);
                        }
                        clear_pm_status_flag(CHRGR_FLAG);
@@ -559,7 +547,7 @@ static void check_seed_status(void)
        }
        if (display_misc_is_low_battery_state(bat_state)) {
                if (!(get_pm_status_flag() & CHRGR_FLAG)) {
-                       power_saving_func(true);
+                       display_set_power_save_mode_flag(true);
                        set_pm_status_flag(LOWBT_FLAG);
                }
        }
@@ -856,8 +844,6 @@ static void display_init(void *data)
 
        signal(SIGHUP, sig_hup);
 
-       power_saving_func = default_saving_mode;
-
        /* load configutation */
        ret = display_load_config(&display_conf);
        if (ret < 0)

diff --git a/src/display/display.c b/src/display/display.c
index 0bf003b..6239bd9 100644 (file)
--- a/src/display/display.c
+++ b/src/display/display.c
@@ -213,6 +213,17 @@ int display_get_display_ops_status(enum device_ops_status *dev_ops_status)
        return 0;
 }
 
+void display_set_power_save_mode_flag(int onoff)
+{
+       if (onoff)
+               set_pm_status_flag(PWRSV_FLAG);
+       else
+               clear_pm_status_flag(PWRSV_FLAG);
+
+       if (get_pm_cur_state() == S_NORMAL)
+               display_backlight_update_by_default_brightness();
+}
+
 static int power_resume_from_echomem_callback(void *data)
 {
        display_plugin_set_system_wakeup_flag(true);

diff --git a/src/display/display.h b/src/display/display.h
index d54fd31..a2b6e35 100644 (file)
--- a/src/display/display.h
+++ b/src/display/display.h
@@ -59,5 +59,6 @@ bool display_dimstay_check(void);
 int display_initialize_display_state_timeout_from_setting(void);
 void display_set_display_ops_status(enum device_ops_status dev_ops_status);
 int display_get_display_ops_status(enum device_ops_status *dev_ops_status);
+void display_set_power_save_mode_flag(int onoff);
 
 #endif //__DISPLAY_H__