display: Move custom_status getter and setter from plugin to core display module

Remove and redefine custom_status getter/setter.
These functions are added below display-backlight.

void display_backlight_set_custom_status(bool on)
void display_backlight_get_custom_status(bool *on)
-> With these functions, it is possible to get and set custom status.

Change-Id: I353fd29d0d9fcc00504070f42d472c2bb89f3511
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 056371b..b9b762a 100644 (file)
--- a/plugins/iot-headed/display/core.c
+++ b/plugins/iot-headed/display/core.c
@@ -1376,6 +1376,7 @@ static int default_action(int timeout)
        static time_t last_update_time = 0;
        static int last_timeout = 0;
        struct timeval now_tv;
+       bool custom_status;
 
        if (status != DEVICE_OPS_STATUS_START) {
                _E("Display is not started.");
@@ -1432,8 +1433,8 @@ static int default_action(int timeout)
                break;
 
        case S_LCDDIM:
-               if ((get_pm_old_state() == S_NORMAL) &&
-                   backlight_ops->get_custom_status())
+               display_backlight_get_custom_status(&custom_status);
+               if ((get_pm_old_state() == S_NORMAL) && custom_status)
                        backlight_ops->save_custom_brightness();
                /* lcd dim state : dim the brightness */
                display_backlight_set_brightness_by_dim_brightness();
@@ -1662,9 +1663,9 @@ static int update_setting(int key_idx, int val)
                break;
        case SETTING_POWER_CUSTOM_BRIGHTNESS:
                if (val == VCONFKEY_PM_CUSTOM_BRIGHTNESS_ON)
-                       backlight_ops->set_custom_status(true);
+                       display_backlight_set_custom_status(true);
                else
-                       backlight_ops->set_custom_status(false);
+                       display_backlight_set_custom_status(false);
                break;
 
        default:

diff --git a/plugins/iot-headed/display/device-interface.c b/plugins/iot-headed/display/device-interface.c
index d2fe1ba..b7f5dbd 100644 (file)
--- a/plugins/iot-headed/display/device-interface.c
+++ b/plugins/iot-headed/display/device-interface.c
@@ -69,7 +69,6 @@
 #define FREEZER_VITAL_WAKEUP_CGROUP "/sys/fs/cgroup/freezer/vital_wakeup/freezer.state"
 
 static struct _backlight_ops backlight_ops;
-static bool custom_status;
 static int custom_brightness;
 static int force_brightness;
 static int dpms_running_state = DPMS_SETTING_DONE;
@@ -201,17 +200,6 @@ static void change_brightness(int start, int end, int step)
        }
 }
 
-static int set_custom_status(bool on)
-{
-       custom_status = on;
-       return 0;
-}
-
-static bool get_custom_status(void)
-{
-       return custom_status;
-}
-
 static int save_custom_brightness(void)
 {
        int ret, brightness;
@@ -255,8 +243,10 @@ static int backlight_update(void)
 {
        int ret = 0;
        int brt;
+       bool custom_status;
 
-       if (get_custom_status()) {
+       display_backlight_get_custom_status(&custom_status);
+       if (custom_status) {
                _I("custom brightness mode! brt no updated");
                return 0;
        }
@@ -463,8 +453,6 @@ static struct _backlight_ops backlight_ops = {
        .update = backlight_update,
        .get_lcd_power = dpms_get_cached_state,
        .get_lcd_power_node = get_lcd_power_node,
-       .set_custom_status = set_custom_status,
-       .get_custom_status = get_custom_status,
        .save_custom_brightness = save_custom_brightness,
        .custom_update = custom_backlight_update,
        .set_force_brightness = set_force_brightness,

diff --git a/plugins/iot-headed/display/key-filter.c b/plugins/iot-headed/display/key-filter.c
index 7b75ac7..cd22e66 100644 (file)
--- a/plugins/iot-headed/display/key-filter.c
+++ b/plugins/iot-headed/display/key-filter.c
@@ -32,6 +32,7 @@
 #include "core.h"
 #include "poll.h"
 #include "display-actor.h"
+#include "display-backlight.h"
 #include "display-ops.h"
 #include "shared/common.h"
 #include "shared/devices.h"
@@ -112,8 +113,10 @@ static inline int current_state_in_on(void)
 
 static inline void restore_custom_brightness(void)
 {
-       if ((get_pm_cur_state() == S_LCDDIM) &&
-           backlight_ops->get_custom_status())
+       bool custom_status;
+
+       display_backlight_get_custom_status(&custom_status);
+       if ((get_pm_cur_state() == S_LCDDIM) && custom_status)
                backlight_ops->custom_update();
 }
 

diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c
index 9e2fae7..4b97a31 100644 (file)
--- a/plugins/mobile/display/core.c
+++ b/plugins/mobile/display/core.c
@@ -1386,6 +1386,7 @@ static int default_action(int timeout)
        static time_t last_update_time = 0;
        static int last_timeout = 0;
        struct timeval now_tv;
+       bool custom_status;
 
        if (status != DEVICE_OPS_STATUS_START) {
                _E("Display is not started.");
@@ -1442,8 +1443,8 @@ static int default_action(int timeout)
                break;
 
        case S_LCDDIM:
-               if ((get_pm_old_state() == S_NORMAL) &&
-                   backlight_ops->get_custom_status())
+               display_backlight_get_custom_status(&custom_status);
+               if ((get_pm_old_state() == S_NORMAL) && custom_status)
                        backlight_ops->save_custom_brightness();
                /* lcd dim state : dim the brightness */
                display_backlight_set_brightness_by_dim_brightness();
@@ -1672,9 +1673,9 @@ static int update_setting(int key_idx, int val)
                break;
        case SETTING_POWER_CUSTOM_BRIGHTNESS:
                if (val == VCONFKEY_PM_CUSTOM_BRIGHTNESS_ON)
-                       backlight_ops->set_custom_status(true);
+                       display_backlight_set_custom_status(true);
                else
-                       backlight_ops->set_custom_status(false);
+                       display_backlight_set_custom_status(false);
                break;
 
        default:

diff --git a/plugins/mobile/display/device-interface.c b/plugins/mobile/display/device-interface.c
index 9cc68ae..e3da1ed 100644 (file)
--- a/plugins/mobile/display/device-interface.c
+++ b/plugins/mobile/display/device-interface.c
@@ -68,7 +68,6 @@
 #define UNKNOWN_STR                    "unknown"
 
 static struct _backlight_ops backlight_ops;
-static bool custom_status;
 static int custom_brightness;
 static int force_brightness;
 static int dpms_running_state = DPMS_SETTING_DONE;
@@ -200,17 +199,6 @@ static void change_brightness(int start, int end, int step)
        }
 }
 
-static int set_custom_status(bool on)
-{
-       custom_status = on;
-       return 0;
-}
-
-static bool get_custom_status(void)
-{
-       return custom_status;
-}
-
 static int save_custom_brightness(void)
 {
        int ret, brightness;
@@ -254,8 +242,10 @@ static int backlight_update(void)
 {
        int ret = 0;
        int brt;
+       bool custom_status;
 
-       if (get_custom_status()) {
+       display_backlight_get_custom_status(&custom_status);
+       if (custom_status) {
                _I("custom brightness mode! brt no updated");
                return 0;
        }
@@ -462,8 +452,6 @@ static struct _backlight_ops backlight_ops = {
        .update = backlight_update,
        .get_lcd_power = dpms_get_cached_state,
        .get_lcd_power_node = get_lcd_power_node,
-       .set_custom_status = set_custom_status,
-       .get_custom_status = get_custom_status,
        .save_custom_brightness = save_custom_brightness,
        .custom_update = custom_backlight_update,
        .set_force_brightness = set_force_brightness,

diff --git a/plugins/mobile/display/key-filter.c b/plugins/mobile/display/key-filter.c
index b8fb9ca..128dbd8 100644 (file)
--- a/plugins/mobile/display/key-filter.c
+++ b/plugins/mobile/display/key-filter.c
@@ -32,6 +32,7 @@
 #include "core.h"
 #include "poll.h"
 #include "display-actor.h"
+#include "display-backlight.h"
 #include "display-ops.h"
 #include "shared/common.h"
 #include "shared/devices.h"
@@ -112,8 +113,10 @@ static inline int current_state_in_on(void)
 
 static inline void restore_custom_brightness(void)
 {
-       if ((get_pm_cur_state() == S_LCDDIM) &&
-           backlight_ops->get_custom_status())
+       bool custom_status;
+
+       display_backlight_get_custom_status(&custom_status);
+       if ((get_pm_cur_state() == S_LCDDIM) && custom_status)
                backlight_ops->custom_update();
 }
 

diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c
index a489846..5961124 100644 (file)
--- a/plugins/tv/display/core.c
+++ b/plugins/tv/display/core.c
@@ -1376,6 +1376,7 @@ static int default_action(int timeout)
        static time_t last_update_time = 0;
        static int last_timeout = 0;
        struct timeval now_tv;
+       bool custom_status;
 
        if (status != DEVICE_OPS_STATUS_START) {
                _E("Display is not started.");
@@ -1432,8 +1433,8 @@ static int default_action(int timeout)
                break;
 
        case S_LCDDIM:
-               if ((get_pm_old_state() == S_NORMAL) &&
-                   backlight_ops->get_custom_status())
+               display_backlight_get_custom_status(&custom_status);
+               if ((get_pm_old_state() == S_NORMAL) && custom_status)
                        backlight_ops->save_custom_brightness();
                /* lcd dim state : dim the brightness */
                display_backlight_set_brightness_by_dim_brightness();
@@ -1662,9 +1663,9 @@ static int update_setting(int key_idx, int val)
                break;
        case SETTING_POWER_CUSTOM_BRIGHTNESS:
                if (val == VCONFKEY_PM_CUSTOM_BRIGHTNESS_ON)
-                       backlight_ops->set_custom_status(true);
+                       display_backlight_set_custom_status(true);
                else
-                       backlight_ops->set_custom_status(false);
+                       display_backlight_set_custom_status(false);
                break;
 
        default:

diff --git a/plugins/tv/display/device-interface.c b/plugins/tv/display/device-interface.c
index e3952a7..8b0b25d 100644 (file)
--- a/plugins/tv/display/device-interface.c
+++ b/plugins/tv/display/device-interface.c
@@ -69,7 +69,6 @@
 #define FREEZER_VITAL_WAKEUP_CGROUP "/sys/fs/cgroup/freezer/vital_wakeup/freezer.state"
 
 static struct _backlight_ops backlight_ops;
-static bool custom_status;
 static int custom_brightness;
 static int force_brightness;
 static int dpms_running_state = DPMS_SETTING_DONE;
@@ -201,17 +200,6 @@ static void change_brightness(int start, int end, int step)
        }
 }
 
-static int set_custom_status(bool on)
-{
-       custom_status = on;
-       return 0;
-}
-
-static bool get_custom_status(void)
-{
-       return custom_status;
-}
-
 static int save_custom_brightness(void)
 {
        int ret, brightness;
@@ -255,8 +243,10 @@ static int backlight_update(void)
 {
        int ret = 0;
        int brt;
+       bool custom_status;
 
-       if (get_custom_status()) {
+       display_backlight_get_custom_status(&custom_status);
+       if (custom_status) {
                _I("custom brightness mode! brt no updated");
                return 0;
        }
@@ -463,8 +453,6 @@ static struct _backlight_ops backlight_ops = {
        .update = backlight_update,
        .get_lcd_power = dpms_get_cached_state,
        .get_lcd_power_node = get_lcd_power_node,
-       .set_custom_status = set_custom_status,
-       .get_custom_status = get_custom_status,
        .save_custom_brightness = save_custom_brightness,
        .custom_update = custom_backlight_update,
        .set_force_brightness = set_force_brightness,

diff --git a/plugins/tv/display/key-filter.c b/plugins/tv/display/key-filter.c
index e3b3cdf..5da93d1 100644 (file)
--- a/plugins/tv/display/key-filter.c
+++ b/plugins/tv/display/key-filter.c
@@ -32,6 +32,7 @@
 #include "core.h"
 #include "poll.h"
 #include "display-actor.h"
+#include "display-backlight.h"
 #include "display-ops.h"
 #include "shared/common.h"
 #include "shared/devices.h"
@@ -112,8 +113,10 @@ static inline int current_state_in_on(void)
 
 static inline void restore_custom_brightness(void)
 {
-       if ((get_pm_cur_state() == S_LCDDIM) &&
-           backlight_ops->get_custom_status())
+       bool custom_status;
+
+       display_backlight_get_custom_status(&custom_status);
+       if ((get_pm_cur_state() == S_LCDDIM) && custom_status)
                backlight_ops->custom_update();
 }
 

diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c
index 59cc552..ac56de1 100644 (file)
--- a/plugins/wearable/display/core.c
+++ b/plugins/wearable/display/core.c
@@ -1636,6 +1636,7 @@ static int default_action(int timeout)
        static time_t last_update_time = 0;
        static int last_timeout = 0;
        struct timeval now_tv;
+       bool custom_status;
 
        if (status != DEVICE_OPS_STATUS_START) {
                _E("Display is not started.");
@@ -1703,8 +1704,8 @@ static int default_action(int timeout)
                break;
 
        case S_LCDDIM:
-               if ((get_pm_old_state() == S_NORMAL) &&
-                   backlight_ops->get_custom_status())
+               display_backlight_get_custom_status(&custom_status);
+               if ((get_pm_old_state() == S_NORMAL) && custom_status)
                        backlight_ops->save_custom_brightness();
                /* lcd dim state : dim the brightness */
                display_backlight_set_brightness_by_dim_brightness();
@@ -1929,9 +1930,9 @@ static int update_setting(int key_idx, int val)
                break;
        case SETTING_POWER_CUSTOM_BRIGHTNESS:
                if (val == VCONFKEY_PM_CUSTOM_BRIGHTNESS_ON)
-                       backlight_ops->set_custom_status(true);
+                       display_backlight_set_custom_status(true);
                else
-                       backlight_ops->set_custom_status(false);
+                       display_backlight_set_custom_status(false);
                break;
 
        default:

diff --git a/plugins/wearable/display/device-interface.c b/plugins/wearable/display/device-interface.c
index 0fbab8d..39453f7 100644 (file)
--- a/plugins/wearable/display/device-interface.c
+++ b/plugins/wearable/display/device-interface.c
@@ -75,7 +75,6 @@
 
 static struct _backlight_ops backlight_ops;
 static struct battery_plugin *battery_plgn;
-static bool custom_status;
 static int custom_brightness;
 static int force_brightness;
 static int dpms_running_state = DPMS_SETTING_DONE;
@@ -212,17 +211,6 @@ static void change_brightness(int start, int end, int step)
        }
 }
 
-static int set_custom_status(bool on)
-{
-       custom_status = on;
-       return 0;
-}
-
-static bool get_custom_status(void)
-{
-       return custom_status;
-}
-
 static int save_custom_brightness(void)
 {
        int ret, brightness;
@@ -266,8 +254,10 @@ static int backlight_update(void)
 {
        int ret = 0;
        int brt;
+       bool custom_status;
 
-       if (get_custom_status()) {
+       display_backlight_get_custom_status(&custom_status);
+       if (custom_status) {
                _I("custom brightness mode! brt no updated");
                return 0;
        }
@@ -528,8 +518,6 @@ static struct _backlight_ops backlight_ops = {
        .update = backlight_update,
        .get_lcd_power = dpms_get_cached_state,
        .get_lcd_power_node = get_lcd_power_node,
-       .set_custom_status = set_custom_status,
-       .get_custom_status = get_custom_status,
        .save_custom_brightness = save_custom_brightness,
        .custom_update = custom_backlight_update,
        .set_force_brightness = set_force_brightness,

diff --git a/plugins/wearable/display/key-filter.c b/plugins/wearable/display/key-filter.c
index 65ba5ab..4ca88d8 100644 (file)
--- a/plugins/wearable/display/key-filter.c
+++ b/plugins/wearable/display/key-filter.c
@@ -33,6 +33,7 @@
 #include "poll.h"
 #include "display-actor.h"
 #include "display-ops.h"
+#include "display-backlight.h"
 #include "shared/common.h"
 #include "shared/devices.h"
 #include "shared/device-notifier.h"
@@ -111,8 +112,10 @@ static inline int current_state_in_on(void)
 
 static inline void restore_custom_brightness(void)
 {
-       if ((get_pm_cur_state() == S_LCDDIM) &&
-           backlight_ops->get_custom_status())
+       bool custom_status;
+
+       display_backlight_get_custom_status(&custom_status);
+       if ((get_pm_cur_state() == S_LCDDIM) && custom_status)
                backlight_ops->custom_update();
 }
 

diff --git a/src/display/device-interface.h b/src/display/device-interface.h
index 4ae9033..f0fa27d 100644 (file)
--- a/src/display/device-interface.h
+++ b/src/display/device-interface.h
@@ -64,8 +64,6 @@ struct _backlight_ops {
        int (*update)(void);
        int (*get_lcd_power)(void);
        int (*get_lcd_power_node)(void);
-       int (*set_custom_status)(bool on);
-       bool (*get_custom_status)(void);
        int (*save_custom_brightness)(void);
        int (*custom_update)(void);
        int (*set_force_brightness)(int level);

diff --git a/src/display/display-backlight.c b/src/display/display-backlight.c
index bceb279..f4abc22 100644 (file)
--- a/src/display/display-backlight.c
+++ b/src/display/display-backlight.c
@@ -29,6 +29,7 @@ static const struct display_config *display_conf;
 static struct _backlight_ops *backlight_ops;
 
 static int default_brightness;
+static bool custom_status;
 
 /* FIXME: This function is for temporary use, should be fixed after plugin refactoring */
 int display_backlight_get_max_brightness(int *max_brightness)
@@ -132,6 +133,18 @@ int display_backlight_set_brightness_by_dim_brightness(void)
        return ret;
 }
 
+/* FIXME: This custom_status policy can be changed, after plugin refactoting*/
+void display_backlight_set_custom_status(bool on)
+{
+       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;
+}
+
 /* FIXME: This code structure should be changed to plugin api call, after plugin refactoting*/
 static void __CONSTRUCTOR__ initialize(void)
 {

diff --git a/src/display/display-backlight.h b/src/display/display-backlight.h
index 326aa94..f85cf1e 100644 (file)
--- a/src/display/display-backlight.h
+++ b/src/display/display-backlight.h
@@ -25,5 +25,7 @@ int display_backlight_get_normalized_brightness(int raw_brightness,
 int display_backlight_set_default_brightness(int brightness);
 int display_backlight_get_default_brightness(int *brightness);
 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);
 
 #endif /* __DISPLAY_BACKLIGHT_H__ */
\ No newline at end of file

diff --git a/src/display/display-dbus.c b/src/display/display-dbus.c
index 87a397e..c2384f7 100644 (file)
--- a/src/display/display-dbus.c
+++ b/src/display/display-dbus.c
@@ -981,8 +981,10 @@ static GVariant *dbus_getcustombrightness(GDBusConnection *conn,
        GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        int status = 0;
+       bool custom_status;
 
-       status = backlight_ops->get_custom_status();
+       display_backlight_get_custom_status(&custom_status);
+       status = custom_status;
 
        return g_variant_new("(i)", status);
 }