display: Move image effect functions from plugins to core display module

Remove and redefine functions related to display image effect.
These functions are added below display-panel.

int display_panel_set_image_effect(enum display_image_effect effect);
int display_panel_get_image_effect(enum display_image_effect *effect);
-> With display_image_effect enum type, it is possible to get and set image effect type.

Change-Id: I479aa296053ef75b18b4e4b2c3f93e40ecc03191
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 8e9ad6b..6510fb1 100644 (file)
--- a/plugins/iot-headed/display/device-interface.c
+++ b/plugins/iot-headed/display/device-interface.c
@@ -449,53 +449,6 @@ static int get_brightness_by_light_sensor(float lmax, float lmin, float light, i
        return 0;
 }
 
-static int get_image_effect(enum display_image_effect *effect)
-{
-       int ret;
-       enum display_image_effect val;
-
-       if (!display_dev_available) {
-               _E("There is no display device.");
-               return -ENOENT;
-       }
-
-       ret = hal_device_display_get_image_effect(&val);
-       if (ret < 0) {
-               if (ret == -ENODEV)
-                       _E("Get image effect is not supported.");
-               else
-                       _E("Failed to get image effect: %d", ret);
-
-               return ret;
-       }
-
-       *effect = val;
-
-       return 0;
-}
-
-static int set_image_effect(enum display_image_effect effect)
-{
-       int ret;
-
-       if (!display_dev_available) {
-               _E("There is no display device.");
-               return -ENOENT;
-       }
-
-       ret = hal_device_display_set_image_effect(effect);
-       if (ret < 0) {
-               if (ret == -ENODEV)
-                       _E("Set image effect is not supported.");
-               else
-                       _E("Failed to set image effect: %d", ret);
-
-               return ret;
-       }
-
-       return 0;
-}
-
 static int get_panel_mode(enum display_panel_mode *mode)
 {
        int ret;
@@ -703,8 +656,6 @@ static struct _backlight_ops backlight_ops = {
        .get_brightness = get_brightness,
        .restore_brightness_func = restore_brightness_func,
        .get_brightness_by_light_sensor = get_brightness_by_light_sensor,
-       .get_image_effect = get_image_effect,
-       .set_image_effect = set_image_effect,
        .get_panel_mode = get_panel_mode,
        .set_panel_mode = set_panel_mode,
        .get_frame_rate = get_frame_rate,

diff --git a/plugins/mobile/display/device-interface.c b/plugins/mobile/display/device-interface.c
index 8ee2752..d29eec4 100644 (file)
--- a/plugins/mobile/display/device-interface.c
+++ b/plugins/mobile/display/device-interface.c
@@ -448,53 +448,6 @@ static int get_brightness_by_light_sensor(float lmax, float lmin, float light, i
        return 0;
 }
 
-static int get_image_effect(enum display_image_effect *effect)
-{
-       int ret;
-       enum display_image_effect val;
-
-       if (!display_dev_available) {
-               _E("There is no display device.");
-               return -ENOENT;
-       }
-
-       ret = hal_device_display_get_image_effect(&val);
-       if (ret < 0) {
-               if (ret == -ENODEV)
-                       _E("Get image effect is not supported.");
-               else
-                       _E("Failed to get image effect: %d", ret);
-
-               return ret;
-       }
-
-       *effect = val;
-
-       return 0;
-}
-
-static int set_image_effect(enum display_image_effect effect)
-{
-       int ret;
-
-       if (!display_dev_available) {
-               _E("There is no display device.");
-               return -ENOENT;
-       }
-
-       ret = hal_device_display_set_image_effect(effect);
-       if (ret < 0) {
-               if (ret == -ENODEV)
-                       _E("Set image effect is not supported.");
-               else
-                       _E("Failed to set image effect: %d", ret);
-
-               return ret;
-       }
-
-       return 0;
-}
-
 static int get_panel_mode(enum display_panel_mode *mode)
 {
        int ret;
@@ -702,8 +655,6 @@ static struct _backlight_ops backlight_ops = {
        .get_brightness = get_brightness,
        .restore_brightness_func = restore_brightness_func,
        .get_brightness_by_light_sensor = get_brightness_by_light_sensor,
-       .get_image_effect = get_image_effect,
-       .set_image_effect = set_image_effect,
        .get_panel_mode = get_panel_mode,
        .set_panel_mode = set_panel_mode,
        .get_frame_rate = get_frame_rate,

diff --git a/plugins/tv/display/device-interface.c b/plugins/tv/display/device-interface.c
index 41eea37..a08e78d 100644 (file)
--- a/plugins/tv/display/device-interface.c
+++ b/plugins/tv/display/device-interface.c
@@ -449,53 +449,6 @@ static int get_brightness_by_light_sensor(float lmax, float lmin, float light, i
        return 0;
 }
 
-static int get_image_effect(enum display_image_effect *effect)
-{
-       int ret;
-       enum display_image_effect val;
-
-       if (!display_dev_available) {
-               _E("There is no display device.");
-               return -ENOENT;
-       }
-
-       ret = hal_device_display_get_image_effect(&val);
-       if (ret < 0) {
-               if (ret == -ENODEV)
-                       _E("Get image effect is not supported.");
-               else
-                       _E("Failed to get image effect: %d", ret);
-
-               return ret;
-       }
-
-       *effect = val;
-
-       return 0;
-}
-
-static int set_image_effect(enum display_image_effect effect)
-{
-       int ret;
-
-       if (!display_dev_available) {
-               _E("There is no display device.");
-               return -ENOENT;
-       }
-
-       ret = hal_device_display_set_image_effect(effect);
-       if (ret < 0) {
-               if (ret == -ENODEV)
-                       _E("Set image effect is not supported.");
-               else
-                       _E("Failed to set image effect: %d", ret);
-
-               return ret;
-       }
-
-       return 0;
-}
-
 static int get_panel_mode(enum display_panel_mode *mode)
 {
        int ret;
@@ -703,8 +656,6 @@ static struct _backlight_ops backlight_ops = {
        .get_brightness = get_brightness,
        .restore_brightness_func = restore_brightness_func,
        .get_brightness_by_light_sensor = get_brightness_by_light_sensor,
-       .get_image_effect = get_image_effect,
-       .set_image_effect = set_image_effect,
        .get_panel_mode = get_panel_mode,
        .set_panel_mode = set_panel_mode,
        .get_frame_rate = get_frame_rate,

diff --git a/plugins/wearable/display/device-interface.c b/plugins/wearable/display/device-interface.c
index 4cd6cb1..f4b152d 100644 (file)
--- a/plugins/wearable/display/device-interface.c
+++ b/plugins/wearable/display/device-interface.c
@@ -461,53 +461,6 @@ static int get_brightness_by_light_sensor(float lmax, float lmin, float light, i
        return 0;
 }
 
-static int get_image_effect(enum display_image_effect *effect)
-{
-       int ret;
-       enum display_image_effect val;
-
-       if (!display_dev_available) {
-               _E("There is no display device.");
-               return -ENOENT;
-       }
-
-       ret = hal_device_display_get_image_effect(&val);
-       if (ret < 0) {
-               if (ret == -ENODEV)
-                       _E("Get image effect is not supported.");
-               else
-                       _E("Failed to get image effect: %d", ret);
-
-               return ret;
-       }
-
-       *effect = val;
-
-       return 0;
-}
-
-static int set_image_effect(enum display_image_effect effect)
-{
-       int ret;
-
-       if (!display_dev_available) {
-               _E("There is no display device.");
-               return -ENOENT;
-       }
-
-       ret = hal_device_display_set_image_effect(effect);
-       if (ret < 0) {
-               if (ret == -ENODEV)
-                       _E("Set image effect is not supported.");
-               else
-                       _E("Failed to set image effect: %d", ret);
-
-               return ret;
-       }
-
-       return 0;
-}
-
 static int get_panel_mode(enum display_panel_mode *mode)
 {
        int ret;
@@ -768,8 +721,6 @@ static struct _backlight_ops backlight_ops = {
        .get_brightness = get_brightness,
        .restore_brightness_func = restore_brightness_func,
        .get_brightness_by_light_sensor = get_brightness_by_light_sensor,
-       .get_image_effect = get_image_effect,
-       .set_image_effect = set_image_effect,
        .get_panel_mode = get_panel_mode,
        .set_panel_mode = set_panel_mode,
        .get_frame_rate = get_frame_rate,

diff --git a/plugins/wearable/display/enhance.c b/plugins/wearable/display/enhance.c
index 56d3a04..21dfb9c 100644 (file)
--- a/plugins/wearable/display/enhance.c
+++ b/plugins/wearable/display/enhance.c
@@ -25,6 +25,7 @@
 
 #include "display/core.h"
 #include "display/display-ops.h"
+#include "display/display-panel.h"
 #include "shared/devices.h"
 #include "core/log.h"
 #include "shared/common.h"
@@ -54,7 +55,7 @@ static int enhance_update_state(void)
        else
                state = DISPLAY_IMAGE_EFFECT_STANDARD;
 
-       backlight_ops->set_image_effect(state);
+       display_panel_set_image_effect(state);
 
        return state;
 }

diff --git a/src/display/device-interface.h b/src/display/device-interface.h
index 759ff50..7e7478f 100644 (file)
--- a/src/display/device-interface.h
+++ b/src/display/device-interface.h
@@ -80,8 +80,6 @@ struct _backlight_ops {
        int (*get_brightness_raw)(int *val);
        void (*restore_brightness_func)(void);
        int (*get_brightness_by_light_sensor)(float lmax, float lmin, float light, int *brt);
-       int (*get_image_effect)(enum display_image_effect *effect);
-       int (*set_image_effect)(enum display_image_effect effect);
        int (*get_panel_mode)(enum display_panel_mode *mode);
        int (*set_panel_mode)(enum display_panel_mode mode);
        int (*get_frame_rate)(int *rate);

diff --git a/src/display/display-panel.c b/src/display/display-panel.c
index ec7d96d..704aa46 100644 (file)
--- a/src/display/display-panel.c
+++ b/src/display/display-panel.c
@@ -111,4 +111,54 @@ int display_panel_get_white_balance(enum hal_display_white_balance white_balance
                _E("Failed to get white balance value.");
 
        return ret;
+}
+
+/* FIXME: This function is used for only wearable profile, should be fixed after plugin refactoring */
+int display_panel_set_image_effect(enum display_image_effect effect)
+{
+       int ret;
+
+       if (!display_is_hal_backend_available()) {
+               _E("There is no display device.");
+               return -ENOENT;
+       }
+
+       ret = hal_device_display_set_image_effect(effect);
+       if (ret < 0) {
+               if (ret == -ENODEV)
+                       _E("Set image effect is not supported.");
+               else
+                       _E("Failed to set image effect: %d", ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+/* FIXME: This function is deprecated, should be fixed after plugin refactoring */
+int display_panel_get_image_effect(enum display_image_effect *effect)
+{
+       int ret;
+       enum display_image_effect val;
+
+       if (!effect)
+               return -EINVAL;
+
+       if (!display_is_hal_backend_available()) {
+               _E("There is no display device.");
+               return -ENOENT;
+       }
+
+       ret = hal_device_display_get_image_effect(&val);
+       if (ret < 0) {
+               if (ret == -ENODEV)
+                       _E("Get image effect is not supported.");
+               else
+                       _E("Failed to get image effect: %d", ret);
+               return ret;
+       }
+
+       *effect = val;
+
+       return 0;
 }
\ No newline at end of file

diff --git a/src/display/display-panel.h b/src/display/display-panel.h
index 7ca5d63..b81d42c 100644 (file)
--- a/src/display/display-panel.h
+++ b/src/display/display-panel.h
@@ -26,5 +26,8 @@
 int display_panel_set_dpms_state(int dpms_on, enum device_flags flags);
 int display_panel_set_white_balance(enum hal_display_white_balance white_balance_type, int value);
 int display_panel_get_white_balance(enum hal_display_white_balance white_balance_type, int* out_val);
+/* Deprecated functions */
+int display_panel_set_image_effect(enum display_image_effect effect);
+int display_panel_get_image_effect(enum display_image_effect *effect);
 
 #endif /* __DISPLAY_PANEL_H__ */
\ No newline at end of file