display: Change get_var_display_config return type to const

To prevent modify display config static struct in other file.
If it wanted to be modified later, setter will have to be added.

Change-Id: I477fc8476981f18d92509dfb6b2c0783cc7df734
Signed-off-by: TaeminYeom <taemin.yeom@samsung.com>

diff --git a/plugins/iot-headed/display/core.c b/plugins/iot-headed/display/core.c
index 0a87e479ed27413415c6f6252e0b5b3d71a80669..47e7e0101c83cc6ca77bff51d53a425e843b1e3f 100644 (file)
--- a/plugins/iot-headed/display/core.c
+++ b/plugins/iot-headed/display/core.c
@@ -210,7 +210,7 @@ struct display_function_info display_info = {
        .face_detection                 = NULL,
 };
 
-inline struct display_config* get_var_display_config()
+inline const struct display_config* get_var_display_config()
 {
        return &display_conf;
 }

diff --git a/plugins/iot-headed/display/device-interface.c b/plugins/iot-headed/display/device-interface.c
index ecb5eb24ef8fc36880a583039567c32d0a868571..188f583caf2a46b2e3e6e218f0a809c52be5d502 100644 (file)
--- a/plugins/iot-headed/display/device-interface.c
+++ b/plugins/iot-headed/display/device-interface.c
@@ -76,7 +76,7 @@ static int default_brightness;
 static int dpms_running_state = DPMS_SETTING_DONE;
 static bool display_dev_available = false;
 static guint release_timer;
-static struct display_config *display_conf;
+static const struct display_config *display_conf;
 
 inline struct _backlight_ops *get_var_backlight_ops(void)
 {

diff --git a/plugins/iot-headed/display/key-filter.c b/plugins/iot-headed/display/key-filter.c
index db9a338ea19a5f0ab44cb377e9e2268ebd3d535f..7b75ac790e28da44785603e56b5f43ec675b78d2 100644 (file)
--- a/plugins/iot-headed/display/key-filter.c
+++ b/plugins/iot-headed/display/key-filter.c
@@ -430,7 +430,7 @@ static int process_power_key(struct input_event *pinput)
        int ignore = true;
        static int value = KEY_RELEASED;
        unsigned int caps;
-       struct display_config *display_conf = get_var_display_config();
+       const struct display_config *display_conf = get_var_display_config();
        if (!display_conf) {
                _E("Failed to get display configuration variable.");
                return ignore;

diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c
index 794827834a474db5547cb590e63682723a9ed926..4927f70df0f7cb18e444e443d736558d26ba2f95 100644 (file)
--- a/plugins/mobile/display/core.c
+++ b/plugins/mobile/display/core.c
@@ -212,7 +212,7 @@ struct display_function_info display_info = {
        .face_detection                 = NULL,
 };
 
-inline struct display_config* get_var_display_config()
+inline const struct display_config* get_var_display_config()
 {
        return &display_conf;
 }

diff --git a/plugins/mobile/display/device-interface.c b/plugins/mobile/display/device-interface.c
index cef8002f175cea05c98957855439861fdddf5cff..d7d79db4b379b47b25ac718180bcc049657f027c 100644 (file)
--- a/plugins/mobile/display/device-interface.c
+++ b/plugins/mobile/display/device-interface.c
@@ -75,7 +75,7 @@ static int default_brightness;
 static int dpms_running_state = DPMS_SETTING_DONE;
 static bool display_dev_available = false;
 static guint release_timer;
-static struct display_config *display_conf;
+static const struct display_config *display_conf;
 
 inline struct _backlight_ops *get_var_backlight_ops(void)
 {

diff --git a/plugins/mobile/display/key-filter.c b/plugins/mobile/display/key-filter.c
index 1e56db1c9ca42343a474b79d0feed51596aa6331..b8fb9ca21a72739717110c28a27fa010dd6bde31 100644 (file)
--- a/plugins/mobile/display/key-filter.c
+++ b/plugins/mobile/display/key-filter.c
@@ -449,7 +449,7 @@ static int process_power_key(struct input_event *pinput)
        int ignore = true;
        static int value = KEY_RELEASED;
        unsigned int caps;
-       struct display_config *display_conf = get_var_display_config();
+       const struct display_config *display_conf = get_var_display_config();
        if (!display_conf) {
                _E("Failed to get display configuration variable.");
                return ignore;

diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c
index f9655cdd55d7b3e51c52ed1596d2e9f5b9dc0b63..a596b621ab77ee128b6a28149229d5a01250a676 100644 (file)
--- a/plugins/tv/display/core.c
+++ b/plugins/tv/display/core.c
@@ -210,7 +210,7 @@ struct display_function_info display_info = {
        .face_detection                 = NULL,
 };
 
-inline struct display_config* get_var_display_config()
+inline const struct display_config* get_var_display_config()
 {
        return &display_conf;
 }

diff --git a/plugins/tv/display/device-interface.c b/plugins/tv/display/device-interface.c
index 8c1cd1c87459c9ad9aaccaff3f8e0ad5e6de7c4d..128b637f81ab9edb4b557143169b5670bb5581ae 100644 (file)
--- a/plugins/tv/display/device-interface.c
+++ b/plugins/tv/display/device-interface.c
@@ -76,7 +76,7 @@ static int default_brightness;
 static int dpms_running_state = DPMS_SETTING_DONE;
 static bool display_dev_available = false;
 static guint release_timer;
-static struct display_config *display_conf;
+static const struct display_config *display_conf;
 
 inline struct _backlight_ops *get_var_backlight_ops(void)
 {

diff --git a/plugins/tv/display/key-filter.c b/plugins/tv/display/key-filter.c
index 42851ce176ff3bc4ca0dea0d4a6626558bbe4ab6..e3b3cdf8498f94092c8596a49bde0c711a1887c9 100644 (file)
--- a/plugins/tv/display/key-filter.c
+++ b/plugins/tv/display/key-filter.c
@@ -430,7 +430,7 @@ static int process_power_key(struct input_event *pinput)
        int ignore = true;
        static int value = KEY_RELEASED;
        unsigned int caps;
-       struct display_config *display_conf = get_var_display_config();
+       const struct display_config *display_conf = get_var_display_config();
        if(!display_conf) {
                _E("Failed to get display configuration variable.");
                return ignore;

diff --git a/plugins/wearable/display/auto-brightness-sensorhub.c b/plugins/wearable/display/auto-brightness-sensorhub.c
index 9eda1a1ec2b8c3d1c3d80e0f35cb55b54ae6a302..51950bfefb5996a52107498d3e9460f8bcd99d3b 100644 (file)
--- a/plugins/wearable/display/auto-brightness-sensorhub.c
+++ b/plugins/wearable/display/auto-brightness-sensorhub.c
@@ -43,7 +43,7 @@ static bool lbm, hbm, hold_brt, lowdim;
 
 static void change_brightness_transit(int start, int end)
 {
-       struct display_config *display_conf = get_var_display_config();
+       const struct display_config *display_conf = get_var_display_config();
        if(!display_conf) {
                _E("Failed to get display configuration variable.");
                return ;

diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c
index 293206dac86827468a04be521221beea1f3627e6..de4d504ce3136e125940a7f75086689888f0a212 100644 (file)
--- a/plugins/wearable/display/core.c
+++ b/plugins/wearable/display/core.c
@@ -235,7 +235,7 @@ struct display_function_info display_info = {
        .face_detection                 = NULL,
 };
 
-inline struct display_config *get_var_display_config()
+inline const struct display_config *get_var_display_config()
 {
        return &display_conf;
 }

diff --git a/plugins/wearable/display/device-interface.c b/plugins/wearable/display/device-interface.c
index 9689dd0eb944b143f4b55dc6d2381edc012409a4..4683490935b68e56c2cc75964f97038f3e09a2a2 100644 (file)
--- a/plugins/wearable/display/device-interface.c
+++ b/plugins/wearable/display/device-interface.c
@@ -86,7 +86,7 @@ static int aod_max_level = -1;
 static int aod_normal_level = -1;
 static int aod_min_level = -1;
 static int aod_charging_level = -1;
-static struct display_config *display_conf;
+static const struct display_config *display_conf;
 static struct battery_status *battery = NULL;
 static struct battery_status* (*fp_get_var_battery_status)(void);
 

diff --git a/plugins/wearable/display/key-filter.c b/plugins/wearable/display/key-filter.c
index ab4b47cdf9ed10831997f87805a17f69b0767fd1..65ba5abb45910b43522e4cec0c38451c6dcd466e 100644 (file)
--- a/plugins/wearable/display/key-filter.c
+++ b/plugins/wearable/display/key-filter.c
@@ -426,7 +426,7 @@ static int process_power_key(struct input_event *pinput)
        int ignore = true;
        static int value = KEY_RELEASED;
        unsigned int caps;
-       struct display_config *display_conf = get_var_display_config();
+       const struct display_config *display_conf = get_var_display_config();
        if (!display_conf) {
                _E("Failed to get display configuration variable.");
                return ignore;

diff --git a/src/display/auto-brightness.c b/src/display/auto-brightness.c
index 9b00ecf40fade2f5bef37bb5e85e6501021824f1..d7a740d3075bb395f69f629a8ac23952e3c36fec 100644 (file)
--- a/src/display/auto-brightness.c
+++ b/src/display/auto-brightness.c
@@ -73,7 +73,7 @@ static char *min_brightness_name = 0;
 
 /* light sensor */
 static float lmax, lmin;
-static struct display_config *display_conf;
+static const struct display_config *display_conf;
 
 static bool update_working_position(void)
 {

diff --git a/src/display/core.h b/src/display/core.h
index fb52ede3d86725b04af1f8fe0d26fa20a842d5cb..34b6c94d74e5e5436af3f5355e1dbabad8741c03 100644 (file)
--- a/src/display/core.h
+++ b/src/display/core.h
@@ -127,7 +127,7 @@ struct display_config {
  * Global variables
  *   display_conf : configuration of display
  */
-struct display_config* get_var_display_config();
+const struct display_config* get_var_display_config();
 
 /*
  * @brief Display Extension features

diff --git a/src/display/display-dbus.c b/src/display/display-dbus.c
index 5c92a43783d801c18344cb13067b834e057986db..19c30f2eba305ce5c8d4f5d6c07da125ccfacdb9 100644 (file)
--- a/src/display/display-dbus.c
+++ b/src/display/display-dbus.c
@@ -73,7 +73,7 @@
 
 static struct display_plugin *disp_plgn;
 static struct _backlight_ops *backlight_ops;
-static struct display_config *display_conf;
+static const struct display_config *display_conf;
 
 static GVariant *dbus_start(GDBusConnection *conn,
        const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,

diff --git a/src/display/display-input.c b/src/display/display-input.c
index 05fcde6372fb8404cd68e72f7a37c026a4813cd1..df63a542172141fec24d2d434d6e8bd7a2660902 100644 (file)
--- a/src/display/display-input.c
+++ b/src/display/display-input.c
@@ -38,7 +38,7 @@ static void process_input(struct libinput_event *ev)
        struct libinput_event_keyboard *k;
        unsigned int time;
        int fd = 0;
-       struct display_config *display_conf = get_var_display_config();
+       const struct display_config *display_conf = get_var_display_config();
        if(!display_conf) {
                _E("Failed to get display configuration variable.");
                return;

diff --git a/src/display/display-lock.c b/src/display/display-lock.c
index 265fd09e0cc54419f334435dd4ca7e1744ceed90..bfdd7e9ffdf501b6934fde8960222a5f420f2b39 100644 (file)
--- a/src/display/display-lock.c
+++ b/src/display/display-lock.c
@@ -42,7 +42,7 @@ static struct _backlight_ops *backlight_ops;
 static GList *cond_head[S_END];
 static int trans_condition;
 
-static struct display_config *display_conf;
+static const struct display_config *display_conf;
 
 bool check_lock_state(int state)
 {

diff --git a/src/display/setting.c b/src/display/setting.c
index 0b0ebb2f78b07393325668ca9ce3a553a2c92dff..cc695ff1b91884e681352343b6abbf1a9db2771c 100644 (file)
--- a/src/display/setting.c
+++ b/src/display/setting.c
@@ -48,7 +48,7 @@ static int force_lcdtimeout = 0;
 static int custom_on_timeout = 0;
 static int custom_normal_timeout = 0;
 static int custom_dim_timeout = 0;
-static struct display_config *display_conf;
+static const struct display_config *display_conf;
 
 int (*update_pm_setting) (int key_idx, int val);