display: Replace backlight_ops with display plugin api

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

diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c
index ecbc24c500f8508b21abe735f39ebac081e14f4c..1382d78fb533ef6516f99b9c79267bf092ed8147 100644 (file)
--- a/plugins/mobile/display/core.c
+++ b/plugins/mobile/display/core.c
@@ -79,7 +79,6 @@
  */
 
 static struct display_plugin *disp_plgn;
-static struct display_backlight_ops *backlight_ops;
 
 static struct syscommon_deviced_display_state_info states[SYSCOMMON_DEVICED_DISPLAY_STATE_END] = {
        { SYSCOMMON_DEVICED_DISPLAY_STATE_START,    "SYSCOMMON_DEVICED_DISPLAY_STATE_START",    NULL,          NULL,           NULL,          NULL            },
@@ -147,7 +146,6 @@ static int display_probe(void *data)
 
        dp->config = &display_conf;
        init_display_states(dp);
-       setup_display_plugin_backlight_ops(dp);
        dp->default_saving_mode = NULL;
        dp->proc_change_state = NULL;
 
@@ -179,10 +177,6 @@ static void __CONSTRUCTOR__ initialize(void)
        disp_plgn = get_var_display_plugin();
        if (!disp_plgn)
                _E("Failed to get display plugin variable.");
-
-       backlight_ops = get_var_backlight_ops();
-       if (!backlight_ops)
-               _E("Failed to get backlight operator variable.");
 }
 /**
  * @}

diff --git a/plugins/mobile/display/device-interface.c b/plugins/mobile/display/device-interface.c
index 58465d8eacc387dd9bd7906a3acafba6f9616b60..f71a0bb494564aed951494c3529a84203af245ac 100644 (file)
--- a/plugins/mobile/display/device-interface.c
+++ b/plugins/mobile/display/device-interface.c
@@ -45,26 +45,8 @@
 #include "power/power-boot.h"
 #include "power/power-suspend.h"
 
-static struct display_backlight_ops backlight_ops;
 static const struct syscommon_deviced_display_config *display_conf;
 
-inline struct display_backlight_ops *get_var_backlight_ops(void)
-{
-       return &backlight_ops;
-}
-
-static struct display_backlight_ops backlight_ops = {
-       .set_brightness = NULL,
-       .get_brightness = NULL,
-};
-
-void setup_display_plugin_backlight_ops(struct display_plugin *dp)
-{
-       assert(dp);
-
-       dp->backlight = &backlight_ops;
-}
-
 static void __CONSTRUCTOR__ initialize(void)
 {
        display_conf = get_var_display_config();

diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c
index b2bc616fba1b07a95cf49ff545ed66d41fd68fd9..b82acc1bc6bb864888a7e5804fac2fa78db1ca55 100644 (file)
--- a/plugins/tv/display/core.c
+++ b/plugins/tv/display/core.c
@@ -78,7 +78,6 @@
  */
 
 static struct display_plugin *disp_plgn;
-static struct display_backlight_ops *backlight_ops;
 
 static struct syscommon_deviced_display_state_info states[SYSCOMMON_DEVICED_DISPLAY_STATE_END] = {
        { SYSCOMMON_DEVICED_DISPLAY_STATE_START,    "SYSCOMMON_DEVICED_DISPLAY_STATE_START",    NULL,          NULL,           NULL,          NULL            },
@@ -146,7 +145,6 @@ static int display_probe(void *data)
 
        dp->config = &display_conf;
        init_display_states(dp);
-       setup_display_plugin_backlight_ops(dp);
        dp->default_saving_mode = NULL;
        dp->proc_change_state = NULL;
 
@@ -178,10 +176,6 @@ static void __CONSTRUCTOR__ initialize(void)
        disp_plgn = get_var_display_plugin();
        if (!disp_plgn)
                _E("Failed to get display plugin variable.");
-
-       backlight_ops = get_var_backlight_ops();
-       if (!backlight_ops)
-               _E("Failed to get backlight operator variable.");
 }
 /**
  * @}

diff --git a/plugins/tv/display/device-interface.c b/plugins/tv/display/device-interface.c
index 23ece3c6cf2433f1b09cc26e2c1bf101fe4b6a08..9e0aa4339e3de7cfc52c9dd60d2b001ac438d205 100644 (file)
--- a/plugins/tv/display/device-interface.c
+++ b/plugins/tv/display/device-interface.c
@@ -44,26 +44,8 @@
 #include "power/power-suspend.h"
 #include "display-lock.h"
 
-static struct display_backlight_ops backlight_ops;
 static const struct syscommon_deviced_display_config *display_conf;
 
-inline struct display_backlight_ops *get_var_backlight_ops(void)
-{
-       return &backlight_ops;
-}
-
-static struct display_backlight_ops backlight_ops = {
-       .set_brightness = NULL,
-       .get_brightness = NULL,
-};
-
-void setup_display_plugin_backlight_ops(struct display_plugin *dp)
-{
-       assert(dp);
-
-       dp->backlight = &backlight_ops;
-}
-
 static void __CONSTRUCTOR__ initialize(void)
 {
        display_conf = get_var_display_config();

diff --git a/plugins/tv/display/key-filter.c b/plugins/tv/display/key-filter.c
index 383782d23826d67dec6fd6b28184e29beb6fecfa..e82e1a9ac7e9f846f7b741f345e974f29100c3e7 100644 (file)
--- a/plugins/tv/display/key-filter.c
+++ b/plugins/tv/display/key-filter.c
@@ -89,7 +89,6 @@ enum combination_process {
 };
 
 static struct display_plugin *disp_plgn;
-static struct display_backlight_ops *backlight_ops;
 static struct timeval pressed_time;
 static guint longkey_timeout_id = 0;
 static guint longkey_restore_id = 0;
@@ -771,10 +770,6 @@ static void __CONSTRUCTOR__ initialize(void)
        if (!disp_plgn)
                _E("Failed to get display plugin variable.");
 
-       backlight_ops = get_var_backlight_ops();
-       if (!backlight_ops)
-               _E("Failed to get backlight operator variable.");
-
        display_add_actor(&display_powerkey_actor);
        display_add_actor(&display_menukey_actor);
 

diff --git a/plugins/wearable/display/auto-brightness-sensorhub.c b/plugins/wearable/display/auto-brightness-sensorhub.c
index 43aadc4fb3d2d41197a52b1f9dbb50b0a8f2edc6..a982af980526e6331d3514d58f823845848abc17 100644 (file)
--- a/plugins/wearable/display/auto-brightness-sensorhub.c
+++ b/plugins/wearable/display/auto-brightness-sensorhub.c
@@ -42,7 +42,6 @@
 #define LOWBATCAPACITY 5
 
 static struct display_plugin *disp_plgn;
-static struct display_backlight_ops *backlight_ops;
 static int auto_brightness_state = SETTING_BRIGHTNESS_AUTOMATIC_OFF;
 static bool lbm, hbm, hold_brt, lowdim;
 
@@ -374,8 +373,4 @@ static void __CONSTRUCTOR__ initialize(void)
        disp_plgn = get_var_display_plugin();
        if (!disp_plgn)
                _E("Failed to get display plugin variable.");
-
-       backlight_ops = get_var_backlight_ops();
-       if (!backlight_ops)
-               _E("Failed to get backlight operator variable.");
 }

diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c
index 2d8da8b1b5cdcecc03e50c012657155d80ef6596..b43ed49a74d49085e3e2de94051ea0a6065e0eed 100644 (file)
--- a/plugins/wearable/display/core.c
+++ b/plugins/wearable/display/core.c
@@ -89,7 +89,6 @@
  */
 
 static struct display_plugin *disp_plgn;
-static struct display_backlight_ops *backlight_ops;
 
 static enum device_ops_status status = DEVICE_OPS_STATUS_UNINIT;
 
@@ -843,7 +842,6 @@ static int display_probe(void *data)
 
        dp->config = &display_conf;
        init_display_states(dp);
-       setup_display_plugin_backlight_ops(dp);
        /**
         * FIXME: They should be connected via plugin interfaces
         *
@@ -958,9 +956,6 @@ static void __CONSTRUCTOR__ initialize(void)
        if (!disp_plgn)
                _E("Failed to get display plugin variable.");
 
-       backlight_ops = get_var_backlight_ops();
-       if (!backlight_ops)
-               _E("Failed to get backlight operator variable.");
 }
 
 /**

diff --git a/plugins/wearable/display/device-interface.c b/plugins/wearable/display/device-interface.c
index 9ac48d84f59530b0b77a32a26efc78a29d93a76a..f03dea568a1af71ba42c77d489bae75b8d93eb79 100644 (file)
--- a/plugins/wearable/display/device-interface.c
+++ b/plugins/wearable/display/device-interface.c
@@ -52,17 +52,15 @@
 #include "shared/plugin.h"
 #include "plugin-util.h"
 
-static struct display_backlight_ops backlight_ops;
 static struct battery_plugin *battery_plgn;
 static const struct syscommon_deviced_display_config *display_conf;
 static struct battery_status *battery = NULL;
 static struct battery_status* (*fp_get_var_battery_status)(void);
 
-inline struct display_backlight_ops *get_var_backlight_ops(void)
-{
-       return &backlight_ops;
-}
-
+/**
+ * FIXME: Register it to display plugin interface .set_brightness()
+ */
+__attribute__((unused))
 static int set_brightness(int val)
 {
        int max, ret;
@@ -103,11 +101,6 @@ static int set_brightness(int val)
        return hal_device_display_set_brightness(val);
 }
 
-static struct display_backlight_ops backlight_ops = {
-       .set_brightness = set_brightness,
-       .get_brightness = NULL,
-};
-
 int is_lcdon_blocked(void)
 {
        int state = display_panel_get_dpms_cached_state();
@@ -118,13 +111,6 @@ int is_lcdon_blocked(void)
        return LCDON_BLOCK_NONE;
 }
 
-void setup_display_plugin_backlight_ops(struct display_plugin *dp)
-{
-       assert(dp);
-
-       dp->backlight = &backlight_ops;
-}
-
 /* FIXME: This batterey plugin handle should be moved while battery backend separation */
 int init_sysfs(unsigned int flags)
 {

diff --git a/plugins/wearable/display/enhance.c b/plugins/wearable/display/enhance.c
index a0d3a8ea88409800a21ef17801dc69ffd3d1b6b4..aba8c6f039c1d708a1af708021d970590e03f5b7 100644 (file)
--- a/plugins/wearable/display/enhance.c
+++ b/plugins/wearable/display/enhance.c
@@ -35,7 +35,6 @@
 #define VCONF_HIGH_CONTRAST            VCONFKEY_SETAPPL_ACCESSIBILITY_HIGH_CONTRAST
 #define VCONF_GREYSCALE                        VCONFKEY_SETAPPL_ACCESSIBILITY_GREYSCALE
 
-static struct display_backlight_ops *backlight_ops;
 static bool negative_status;
 static bool greyscale_status;
 static bool greysacle_setting;
@@ -167,10 +166,3 @@ static const struct display_ops display_enhance_ops = {
 };
 
 DISPLAY_OPS_REGISTER(&display_enhance_ops)
-
-static void __CONSTRUCTOR__ initialize(void)
-{
-       backlight_ops = get_var_backlight_ops();
-       if (!backlight_ops)
-               _E("Failed to get backlight operator variable.");
-}

diff --git a/plugins/wearable/display/key-filter.c b/plugins/wearable/display/key-filter.c
index 4d086143adfcb4a4f8468d6b58a05adf03417ba1..3a374aa7544b9e637a2fa183b4656205d940b940 100644 (file)
--- a/plugins/wearable/display/key-filter.c
+++ b/plugins/wearable/display/key-filter.c
@@ -90,7 +90,6 @@ enum combination_process {
 };
 
 static struct display_plugin *disp_plgn;
-static struct display_backlight_ops *backlight_ops;
 static struct timeval pressed_time;
 static guint longkey_timeout_id = 0;
 static guint longkey_restore_id = 0;
@@ -699,10 +698,6 @@ static void __CONSTRUCTOR__ initialize(void)
        if (!disp_plgn)
                _E("Failed to get display plugin variable.");
 
-       backlight_ops = get_var_backlight_ops();
-       if (!backlight_ops)
-               _E("Failed to get backlight operator variable.");
-
        display_add_actor(&display_powerkey_actor);
        display_add_actor(&display_menukey_actor);
 

diff --git a/plugins/wearable/display/lbm.c b/plugins/wearable/display/lbm.c
index 05ec6b41ac137971390a1a2d165f993d6ccc9c50..d87b81b1895e7b4c8ca074dc86b7a4a3a8ba15b3 100644 (file)
--- a/plugins/wearable/display/lbm.c
+++ b/plugins/wearable/display/lbm.c
@@ -46,12 +46,15 @@ static struct lbm_config lbm_conf = {
        .brt_table = NULL,
 };
 
-static struct display_backlight_ops *backlight_ops;
+static int lbm_state;
 static int lbm_setting_mode;
 static int system_brightness;
 static bool display_dev_available = false;
 
-static int (*origin_set_brightness)(int);
+/**
+ * FIXME: See a comment at lbm_set_state()
+ */
+//static int (*origin_set_brightness)(int);
 
 static void broadcast_lbm_state(int state)
 {
@@ -103,6 +106,10 @@ int lbm_down_brt(int brt)
        return lbm_conf.brt_table[down_level];
 }
 
+/**
+ * FIXME: Register it to display plugin interface, .get_brightness
+ */
+__attribute__((unused))
 static int lbm_get_brightness(int *val)
 {
        *val = system_brightness;
@@ -110,6 +117,10 @@ static int lbm_get_brightness(int *val)
        return 0;
 }
 
+/**
+ * FIXME: Register it to display plugin interface, .set_brightness
+ */
+__attribute__((unused))
 static int lbm_set_brightness(int val)
 {
        int brt = 0;
@@ -132,6 +143,10 @@ static int lbm_set_brightness(int val)
        return hal_device_display_set_brightness(brt);
 }
 
+/**
+ * FIXME: Register it to display plugin interface, .set_brightness_smooth
+ */
+__attribute__((unused))
 static void lbm_change_brightness(int start, int end, int step)
 {
        int diff, val;
@@ -196,6 +211,11 @@ int lbm_set_state(int lbm)
        _I("lbm_set_state, %d", lbm);
 
        broadcast_lbm_state(lbm);
+       lbm_state = lbm;
+       /**
+        * FIXME: This logic should go into interface functions.
+        */
+#if 0
        if (lbm) {
                origin_set_brightness = backlight_ops->set_brightness;
                backlight_ops->set_brightness = lbm_set_brightness;
@@ -206,6 +226,7 @@ int lbm_set_state(int lbm)
                backlight_ops->get_brightness = NULL;
                backlight_ops->transit_brt = NULL;
        }
+#endif
 
        return 0;
 }
@@ -215,7 +236,7 @@ int lbm_get_state(void)
        if (!lbm_conf.support)
                return -ENODEV;
 
-       return backlight_ops->set_brightness == lbm_set_brightness;
+       return lbm_state;
 }
 
 static void lbm_table_load(char *value, struct lbm_config *c)
@@ -348,10 +369,3 @@ static const struct display_ops display_lbm_ops = {
 };
 
 DISPLAY_OPS_REGISTER(&display_lbm_ops)
-
-static void __CONSTRUCTOR__ initialize(void)
-{
-       backlight_ops = get_var_backlight_ops();
-       if (!backlight_ops)
-               _E("Failed to get backlight operator variable.");
-}

diff --git a/plugins/wearable/display/powersaver.c b/plugins/wearable/display/powersaver.c
index f21cbe776a9cf19b2ec6a2856b6522f46f770083..4246739f6121f68a48e7b32608701059b5b8af4e 100644 (file)
--- a/plugins/wearable/display/powersaver.c
+++ b/plugins/wearable/display/powersaver.c
@@ -31,8 +31,6 @@
 #include "powersaver.h"
 #include "setting.h"
 
-static struct display_backlight_ops *backlight_ops;
-
 static int set_powersaver_mode(int mode)
 {
        int timeout;
@@ -157,10 +155,3 @@ static const struct device_ops powersaver_device_ops = {
 };
 
 DEVICE_OPS_REGISTER(&powersaver_device_ops)
-
-static void __CONSTRUCTOR__ initialize(void)
-{
-       backlight_ops = get_var_backlight_ops();
-       if (!backlight_ops)
-               _E("Failed to get backlight operator variable.");
-}

diff --git a/plugins/wearable/display/swim.c b/plugins/wearable/display/swim.c
index d4fbd67ba236b175e9c1f020b8ff67150c2e4db9..af0cb0da00d50b32b2b6f0c672a54a5d9bc12e9c 100644 (file)
--- a/plugins/wearable/display/swim.c
+++ b/plugins/wearable/display/swim.c
@@ -36,7 +36,6 @@
 #define DBUS_SWIMMODE_MEMBER_STATUS            "status"
 
 static struct display_plugin *disp_plgn;
-static struct display_backlight_ops *backlight_ops;
 static const struct device_ops *touchscreen_ops;
 static int swimmode_status;
 
@@ -154,8 +153,4 @@ static void __CONSTRUCTOR__ initialize(void)
        disp_plgn = get_var_display_plugin();
        if (!disp_plgn)
                _E("Failed to get display plugin variable.");
-
-       backlight_ops = get_var_backlight_ops();
-       if (!backlight_ops)
-               _E("Failed to get backlight operator variable.");
 }

diff --git a/src/display/device-interface.h b/src/display/device-interface.h
index 51b67a82029195c36bdf726be33877e19e3c5831..e6a8fee0b67fb0f89786edb29d347c65d51852e9 100644 (file)
--- a/src/display/device-interface.h
+++ b/src/display/device-interface.h
@@ -57,8 +57,6 @@ enum {
 
 int init_sysfs(unsigned int);
 
-struct display_backlight_ops *get_var_backlight_ops(void);
-
 void dpms_set_running_state(int val);
 
 enum lcdon_block_state {
@@ -66,7 +64,6 @@ enum lcdon_block_state {
        LCDON_BLOCK_WHEN_DISPLAY_DETACHED,
        LCDON_BLOCK_DURING_SILENT_BOOT,
 };
-void setup_display_plugin_backlight_ops(struct display_plugin *dp);
 
 #endif
 

diff --git a/src/display/display-backlight.c b/src/display/display-backlight.c
index 6a73c95a145fda4694b81caf0e936f897e158339..d575fc84f23e836dfc62bfc87a0addd08d6361ac 100644 (file)
--- a/src/display/display-backlight.c
+++ b/src/display/display-backlight.c
@@ -115,9 +115,17 @@ int display_backlight_set_brightness(int brightness)
        display_backlight_get_default_brightness(&default_brightness);
        display_backlight_get_force_brightness(&force_brightness);
 
-       ret = display_plugin_backlight_set_brightness(brightness);
-       if (ret == 0)
+       ret = syscommon_plugin_deviced_display_set_brightness(brightness);
+       if (ret == -ENOTSUP) {
+               _D("Take default operation as there is no found plugin backend");
+       } else if (ret == -EOPNOTSUPP) {
+               _D("Take default operation as there is no found plugin backend operation");
+       } else if (ret < 0) {
+               _E("Failed to plugin operation, ret=%d", ret);
+               return ret;
+       } else {
                return 0;
+       }
 
        if (!display_is_hal_backend_available()) {
                _E("There is no display device.");
@@ -152,9 +160,17 @@ int display_backlight_get_brightness(int *brightness)
 {
        int brt = 0, ret = 0;
 
-       ret = display_plugin_backlight_get_brightness(brightness);
-       if (ret == 0)
+       ret = syscommon_plugin_deviced_display_get_brightness(brightness);
+       if (ret == -ENOTSUP) {
+               _D("Take default operation as there is no found plugin backend");
+       } else if (ret == -EOPNOTSUPP) {
+               _D("Take default operation as there is no found plugin backend operation");
+       } else if (ret < 0) {
+               _E("Failed to plugin operation, ret=%d", ret);
+               return ret;
+       } else {
                return 0;
+       }
 
        if (!display_is_hal_backend_available()) {
                _E("There is no display device.");
@@ -186,9 +202,17 @@ void display_backlight_change_brightness(int start, int end, int step)
        int ret = -1;
        int prev;
 
-       ret = display_plugin_backlight_transit_brightness(start, end, step);
-       if (ret == 0)
+       ret = syscommon_plugin_deviced_display_set_brightness_smooth(start, end, step);
+       if (ret == -ENOTSUP) {
+               _D("Take default operation as there is no found plugin backend");
+       } else if (ret == -EOPNOTSUPP) {
+               _D("Take default operation as there is no found plugin backend operation");
+       } else if (ret < 0) {
+               _E("Failed to plugin operation, ret=%d", ret);
                return;
+       } else {
+               return;
+       }
 
        if (display_dimstay_check())
                return;

diff --git a/src/display/display-backlight.h b/src/display/display-backlight.h
index 2634e19edee6d2210f14aa6f0eb40f5eb53069f6..87c7be1feaf201ef39f206e517c4b6047d3e587e 100644 (file)
--- a/src/display/display-backlight.h
+++ b/src/display/display-backlight.h
@@ -22,12 +22,6 @@
 #include <system/syscommon-plugin-deviced-display-interface.h>
 #include "display-panel.h"
 
-struct display_backlight_ops {
-       int (*set_brightness)(int val);
-       int (*get_brightness)(int *val);
-       void (*transit_brt)(int start, int end, int step);
-};
-
 int display_backlight_get_max_brightness(int *max_brightness);
 int display_backlight_get_normalized_brightness(int raw_brightness,
                                                int *normalized_brightness);

diff --git a/src/display/display-plugin.c b/src/display/display-plugin.c
index e8e6eb67ae542ce4172fc717f05155825ed07f65..ceace0abb793b98cd277db2ba26240b6f2ab3cb2 100644 (file)
--- a/src/display/display-plugin.c
+++ b/src/display/display-plugin.c
@@ -55,32 +55,6 @@ int display_plugin_set_power_save_mode_flag(int onoff)
        return -EOPNOTSUPP;
 }
 
-int display_plugin_backlight_set_brightness(int brightness)
-{
-       if (g_display_plugin.backlight && g_display_plugin.backlight->set_brightness)
-               return g_display_plugin.backlight->set_brightness(brightness);
-
-       return -EOPNOTSUPP;
-}
-
-int display_plugin_backlight_get_brightness(int *brightness)
-{
-       if (g_display_plugin.backlight && g_display_plugin.backlight->get_brightness)
-               return g_display_plugin.backlight->get_brightness(brightness);
-
-       return -EOPNOTSUPP;
-}
-
-int display_plugin_backlight_transit_brightness(int start, int end, int step)
-{
-       if (g_display_plugin.backlight && g_display_plugin.backlight->transit_brt) {
-               g_display_plugin.backlight->transit_brt(start, end, step);
-               return 0;
-       }
-
-       return -EOPNOTSUPP;
-}
-
 /* FIXME: Below functions are temorary to separtate display state transition functions */
 int display_plugin_state_do_default_trans(enum syscommon_deviced_display_state state, int evt)
 {

diff --git a/src/display/display-plugin.h b/src/display/display-plugin.h
index b431759b83b590460fa3c4ef7220a24e20d8a325..7b7ac13d9fd10dbcca0d59edf09332d762690692 100644 (file)
--- a/src/display/display-plugin.h
+++ b/src/display/display-plugin.h
@@ -65,7 +65,6 @@ struct display_plugin {
                                        const gchar *unique_name, gpointer data);
 
        struct syscommon_deviced_display_config *config;
-       struct display_backlight_ops *backlight;
        struct syscommon_deviced_display_state_info* display_states[SYSCOMMON_DEVICED_DISPLAY_STATE_END];
 };
 extern struct display_plugin g_display_plugin;
@@ -75,10 +74,6 @@ int display_plugin_set_system_wakeup_flag(bool flag);
 int display_plugin_auto_brightness_control(enum brightness_request_e request, int set_brightness);
 int display_plugin_set_power_save_mode_flag(int onoff);
 
-int display_plugin_backlight_set_brightness(int brightness);
-int display_plugin_backlight_get_brightness(int *brightness);
-int display_plugin_backlight_transit_brightness(int start, int end, int step);
-
 /* FIXME: function names will be redefined */
 int display_plugin_state_do_default_trans(enum syscommon_deviced_display_state state, int evt);
 bool display_plugin_state_is_there_default_trans(enum syscommon_deviced_display_state state);