display: backlight: Remove restore_brightness_func() to reduce plugin duplication.

restore_brightness_func() was used only for wearable plugin.
It changed set/get/change_brightness functions in backlight_ops depends on lbm mode.

To remove duplicated and redundant code, this functions is removed.
Also, add function changing code to wearable plugin profile.

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

diff --git a/plugins/iot-headed/display/device-interface.c b/plugins/iot-headed/display/device-interface.c
index a46ca4d..6f68ec7 100644 (file)
--- a/plugins/iot-headed/display/device-interface.c
+++ b/plugins/iot-headed/display/device-interface.c
@@ -131,18 +131,10 @@ static int backlight_transit_state(int state)
        return 0;
 }
 
-static void restore_brightness_func(void)
-{
-       backlight_ops.set_brightness = NULL;
-       backlight_ops.get_brightness = NULL;
-       backlight_ops.transit_brt = NULL;
-}
-
 static struct _backlight_ops backlight_ops = {
        .get_lcd_power = dpms_get_cached_state,
        .set_brightness = NULL,
        .get_brightness = NULL,
-       .restore_brightness_func = restore_brightness_func,
        .transit_state = backlight_transit_state,
        .transit_brt = NULL,
 };

diff --git a/plugins/mobile/display/device-interface.c b/plugins/mobile/display/device-interface.c
index fb2abbf..b92bdcd 100644 (file)
--- a/plugins/mobile/display/device-interface.c
+++ b/plugins/mobile/display/device-interface.c
@@ -130,18 +130,10 @@ static int backlight_transit_state(int state)
        return 0;
 }
 
-static void restore_brightness_func(void)
-{
-       backlight_ops.set_brightness = NULL;
-       backlight_ops.get_brightness = NULL;
-       backlight_ops.transit_brt = NULL;
-}
-
 static struct _backlight_ops backlight_ops = {
        .get_lcd_power = dpms_get_cached_state,
        .set_brightness = NULL,
        .get_brightness = NULL,
-       .restore_brightness_func = restore_brightness_func,
        .transit_state = backlight_transit_state,
        .transit_brt = NULL,
 };

diff --git a/plugins/tv/display/device-interface.c b/plugins/tv/display/device-interface.c
index 1caaa12..1756de5 100644 (file)
--- a/plugins/tv/display/device-interface.c
+++ b/plugins/tv/display/device-interface.c
@@ -131,18 +131,10 @@ static int backlight_transit_state(int state)
        return 0;
 }
 
-static void restore_brightness_func(void)
-{
-       backlight_ops.set_brightness = NULL;
-       backlight_ops.get_brightness = NULL;
-       backlight_ops.transit_brt = NULL;
-}
-
 static struct _backlight_ops backlight_ops = {
        .get_lcd_power = dpms_get_cached_state,
        .set_brightness = NULL,
        .get_brightness = NULL,
-       .restore_brightness_func = restore_brightness_func,
        .transit_state = backlight_transit_state,
        .transit_brt = NULL,
 };

diff --git a/plugins/wearable/display/device-interface.c b/plugins/wearable/display/device-interface.c
index 6f84242..0df0fdf 100644 (file)
--- a/plugins/wearable/display/device-interface.c
+++ b/plugins/wearable/display/device-interface.c
@@ -232,18 +232,10 @@ static int backlight_transit_state(int state)
        return 0;
 }
 
-static void restore_brightness_func(void)
-{
-       backlight_ops.set_brightness = set_brightness;
-       backlight_ops.get_brightness = NULL;
-       backlight_ops.transit_brt = NULL;
-}
-
 static struct _backlight_ops backlight_ops = {
        .get_lcd_power = dpms_get_cached_state,
        .set_brightness = set_brightness,
        .get_brightness = NULL,
-       .restore_brightness_func = restore_brightness_func,
        .transit_state = backlight_transit_state,
        .transit_brt = NULL,
 };

diff --git a/plugins/wearable/display/lbm.c b/plugins/wearable/display/lbm.c
index f256247..f7f5fbd 100644 (file)
--- a/plugins/wearable/display/lbm.c
+++ b/plugins/wearable/display/lbm.c
@@ -53,6 +53,8 @@ static int lbm_setting_mode;
 static int system_brightness;
 static bool display_dev_available = false;
 
+static int (*origin_set_brightness)(int);
+
 static void broadcast_lbm_state(int state)
 {
        char *str;
@@ -197,11 +199,14 @@ int lbm_set_state(int lbm)
 
        broadcast_lbm_state(lbm);
        if (lbm) {
+               origin_set_brightness = backlight_ops->set_brightness;
                backlight_ops->set_brightness = lbm_set_brightness;
                backlight_ops->get_brightness = lbm_get_brightness;
                backlight_ops->transit_brt = lbm_change_brightness;
        } else {
-               backlight_ops->restore_brightness_func();
+               backlight_ops->set_brightness = origin_set_brightness;
+               backlight_ops->get_brightness = NULL;
+               backlight_ops->transit_brt = NULL;
        }
 
        return 0;

diff --git a/src/display/device-interface.h b/src/display/device-interface.h
index 70d2592..6fb6581 100644 (file)
--- a/src/display/device-interface.h
+++ b/src/display/device-interface.h
@@ -64,7 +64,6 @@ struct _backlight_ops {
        int (*get_lcd_power)(void);
        int (*set_brightness)(int val);
        int (*get_brightness)(int *val);
-       void (*restore_brightness_func)(void);
        int (*transit_state)(int state);
        void (*transit_brt)(int start, int end, int step);
 };

diff --git a/src/display/display-backlight.c b/src/display/display-backlight.c
index 538a1da..8579e36 100644 (file)
--- a/src/display/display-backlight.c
+++ b/src/display/display-backlight.c
@@ -110,8 +110,10 @@ int display_backlight_get_normalized_brightness(int raw_brightness,
 int display_backlight_set_brightness(int brightness)
 {
        int max_brightness, ret;
-       int default_brightness = display_backlight_get_default_brightness();
-       int force_brightness = display_backlight_get_force_brightness();
+       int default_brightness, force_brightness;
+
+       display_backlight_get_default_brightness(&default_brightness);
+       display_backlight_get_force_brightness(&force_brightness);
 
        if (backlight_ops && backlight_ops->set_brightness)
                return backlight_ops->set_brightness(brightness);
@@ -239,12 +241,6 @@ void display_backlight_change_brightness(int start, int end, int step)
        }
 }
 
-void display_backlight_restore_brightness_funcs(void)
-{
-       if (backlight_ops && backlight_ops->restore_brightness_func)
-               return backlight_ops->restore_brightness_func();
-}
-
 int display_backlight_set_default_brightness(int brightness)
 {
        if (brightness < PM_MIN_BRIGHTNESS || brightness > PM_MAX_BRIGHTNESS) {