summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyotaek Shim <hyotaek.shim@samsung.com>2019-09-05 21:25:51 +0900
committerHyotaek Shim <hyotaek.shim@samsung.com>2019-09-05 21:31:02 +0900
commit4918525509e25f6e2e2f174f3fce465f4f9611d6 (patch)
tree968fc2187e5a7430e12cc891eadddad275be2e10
parent969f118ba47bac5443fd048a278c72636148ce90 (diff)
downloaddeviced-submit/tizen/20190905.124442.tar.gz
deviced-submit/tizen/20190905.124442.tar.bz2
deviced-submit/tizen/20190905.124442.zip
Change-Id: I86f09c9fcfe0e1da0ab798242777c8fc5469c702 Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>
-rw-r--r--plugins/iot/display/core.c10
-rw-r--r--plugins/mobile/display/core.c10
-rw-r--r--plugins/tv/display/core.c10
-rw-r--r--plugins/wearable/display/core.c10
-rw-r--r--src/display/core.h1
5 files changed, 29 insertions, 12 deletions
diff --git a/plugins/iot/display/core.c b/plugins/iot/display/core.c
index a93cf4b8..260327d4 100644
--- a/plugins/iot/display/core.c
+++ b/plugins/iot/display/core.c
@@ -226,7 +226,7 @@ struct display_config display_conf = {
.lcdoff_timeout = LCDOFF_TIMEOUT,
.brightness_change_step = BRIGHTNESS_CHANGE_STEP,
.lcd_always_on = LCD_ALWAYS_ON,
- .dimming = 1,
+ .dimming = 1,
.framerate_app = {0, 0, 0, 0},
.control_display = 0,
.powerkey_doublepress = 0,
@@ -236,8 +236,9 @@ struct display_config display_conf = {
.input_support = true,
.lockcheck_timeout = 600,
.aod_enter_level = 40,
- .aod_tsp = true,
+ .aod_tsp = true,
.touch_wakeup = false,
+ .sleep_support = true,
};
struct display_function_info display_info = {
@@ -1968,7 +1969,7 @@ static int default_action(int timeout)
return -EINVAL;
}
- if (pm_cur_state != S_SLEEP) {
+ if (pm_cur_state != S_SLEEP && !(pm_cur_state == S_LCDOFF && display_conf.sleep_support == false)) {
if (pm_cur_state == S_NORMAL &&
lcdon_tv.tv_sec != 0) {
gettimeofday(&now_tv, NULL);
@@ -2608,6 +2609,9 @@ static int display_load_config(struct parse_result *result, void *user_data)
} else if (MATCH(result->name, "AODTSP")) {
c->aod_tsp = (MATCH(result->value, "yes") ? true : false);
_D("TSP control at is %d at aod", c->aod_tsp);
+ } else if (MATCH(result->name, "SleepSupport")) {
+ c->sleep_support = (MATCH(result->value, "yes") ? true : false);
+ _D("SleepSupport is %d", c->sleep_support);
}
return 0;
diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c
index 820aa9e7..af2a4af4 100644
--- a/plugins/mobile/display/core.c
+++ b/plugins/mobile/display/core.c
@@ -228,7 +228,7 @@ struct display_config display_conf = {
.lcdoff_timeout = LCDOFF_TIMEOUT,
.brightness_change_step = BRIGHTNESS_CHANGE_STEP,
.lcd_always_on = LCD_ALWAYS_ON,
- .dimming = 1,
+ .dimming = 1,
.framerate_app = {0, 0, 0, 0},
.control_display = 0,
.powerkey_doublepress = 0,
@@ -238,8 +238,9 @@ struct display_config display_conf = {
.input_support = true,
.lockcheck_timeout = 600,
.aod_enter_level = 40,
- .aod_tsp = true,
+ .aod_tsp = true,
.touch_wakeup = false,
+ .sleep_support = true,
};
struct display_function_info display_info = {
@@ -1980,7 +1981,7 @@ static int default_action(int timeout)
return -EINVAL;
}
- if (pm_cur_state != S_SLEEP) {
+ if (pm_cur_state != S_SLEEP && !(pm_cur_state == S_LCDOFF && display_conf.sleep_support == false)) {
if (pm_cur_state == S_NORMAL &&
lcdon_tv.tv_sec != 0) {
gettimeofday(&now_tv, NULL);
@@ -2620,6 +2621,9 @@ static int display_load_config(struct parse_result *result, void *user_data)
} else if (MATCH(result->name, "AODTSP")) {
c->aod_tsp = (MATCH(result->value, "yes") ? true : false);
_D("TSP control at is %d at aod", c->aod_tsp);
+ } else if (MATCH(result->name, "SleepSupport")) {
+ c->sleep_support = (MATCH(result->value, "yes") ? true : false);
+ _D("SleepSupport is %d", c->sleep_support);
}
return 0;
diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c
index 0fa9df09..24bcb4bb 100644
--- a/plugins/tv/display/core.c
+++ b/plugins/tv/display/core.c
@@ -226,7 +226,7 @@ struct display_config display_conf = {
.lcdoff_timeout = LCDOFF_TIMEOUT,
.brightness_change_step = BRIGHTNESS_CHANGE_STEP,
.lcd_always_on = LCD_ALWAYS_ON,
- .dimming = 1,
+ .dimming = 1,
.framerate_app = {0, 0, 0, 0},
.control_display = 0,
.powerkey_doublepress = 0,
@@ -236,8 +236,9 @@ struct display_config display_conf = {
.input_support = true,
.lockcheck_timeout = 600,
.aod_enter_level = 40,
- .aod_tsp = true,
+ .aod_tsp = true,
.touch_wakeup = false,
+ .sleep_support = true,
};
struct display_function_info display_info = {
@@ -1968,7 +1969,7 @@ static int default_action(int timeout)
return -EINVAL;
}
- if (pm_cur_state != S_SLEEP) {
+ if (pm_cur_state != S_SLEEP && !(pm_cur_state == S_LCDOFF && display_conf.sleep_support == false)) {
if (pm_cur_state == S_NORMAL &&
lcdon_tv.tv_sec != 0) {
gettimeofday(&now_tv, NULL);
@@ -2608,6 +2609,9 @@ static int display_load_config(struct parse_result *result, void *user_data)
} else if (MATCH(result->name, "AODTSP")) {
c->aod_tsp = (MATCH(result->value, "yes") ? true : false);
_D("TSP control at is %d at aod", c->aod_tsp);
+ } else if (MATCH(result->name, "SleepSupport")) {
+ c->sleep_support = (MATCH(result->value, "yes") ? true : false);
+ _D("SleepSupport is %d", c->sleep_support);
}
return 0;
diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c
index a72733c3..1273f43b 100644
--- a/plugins/wearable/display/core.c
+++ b/plugins/wearable/display/core.c
@@ -227,7 +227,7 @@ struct display_config display_conf = {
.lcdoff_timeout = LCDOFF_TIMEOUT,
.brightness_change_step = BRIGHTNESS_CHANGE_STEP,
.lcd_always_on = LCD_ALWAYS_ON,
- .dimming = 1,
+ .dimming = 1,
.framerate_app = {0, 0, 0, 0},
.control_display = 0,
.powerkey_doublepress = 0,
@@ -237,8 +237,9 @@ struct display_config display_conf = {
.input_support = true,
.lockcheck_timeout = 600,
.aod_enter_level = 40,
- .aod_tsp = true,
+ .aod_tsp = true,
.touch_wakeup = false,
+ .sleep_support = true,
};
struct display_function_info display_info = {
@@ -1990,7 +1991,7 @@ static int default_action(int timeout)
return -EINVAL;
}
- if (pm_cur_state != S_SLEEP) {
+ if (pm_cur_state != S_SLEEP && !(pm_cur_state == S_LCDOFF && display_conf.sleep_support == false)) {
if (pm_cur_state == S_NORMAL &&
lcdon_tv.tv_sec != 0) {
gettimeofday(&now_tv, NULL);
@@ -2634,6 +2635,9 @@ static int display_load_config(struct parse_result *result, void *user_data)
} else if (MATCH(result->name, "AODTSP")) {
c->aod_tsp = (MATCH(result->value, "yes") ? true : false);
_D("TSP control at is %d at aod", c->aod_tsp);
+ } else if (MATCH(result->name, "SleepSupport")) {
+ c->sleep_support = (MATCH(result->value, "yes") ? true : false);
+ _D("SleepSupport is %d", c->sleep_support);
}
return 0;
diff --git a/src/display/core.h b/src/display/core.h
index 166eb2ab..6ab0f09c 100644
--- a/src/display/core.h
+++ b/src/display/core.h
@@ -140,6 +140,7 @@ struct display_config {
bool timeout_enable;
bool input_support;
bool touch_wakeup;
+ bool sleep_support;
};
/*