From 1651aa0e1349a13f59c2995559117003f691c498 Mon Sep 17 00:00:00 2001 From: "sh.pi" Date: Mon, 27 May 2013 17:55:36 +0900 Subject: [PATCH] Change display operation name from restore to update. Change-Id: I08a0499081c93dfe7b81dc6cac4c7ccc9097c51f Signed-off-by: Krzysztof Sasiak --- src/display/core.c | 14 +++++++------- src/display/key-filter.c | 2 +- src/display/llinterface.c | 8 ++++---- src/display/llinterface.h | 2 +- src/display/lsensor.c | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/display/core.c b/src/display/core.c index 82f9738..ff51681 100644 --- a/src/display/core.c +++ b/src/display/core.c @@ -865,14 +865,14 @@ static int default_action(int timeout) } #ifndef X86 /* Different with ARM FB driver, IA gfx driver is sensitive to the order. */ - backlight_ops.restore(); + backlight_ops.update(); backlight_ops.on(); #else backlight_ops.on(); - backlight_ops.restore(); + backlight_ops.update(); #endif } else if (pm_old_state == S_LCDDIM) - backlight_ops.restore(); + backlight_ops.update(); if (backlight_ops.get_lcd_power() != PM_LCD_POWER_ON) backlight_ops.on(); @@ -1071,7 +1071,7 @@ static void default_saving_mode(int onoff) pm_status_flag &= ~PWRSV_FLAG; } if (pm_cur_state == S_NORMAL) - backlight_ops.restore(); + backlight_ops.update(); } static int poll_callback(int condition, PMMsg *data) @@ -1218,7 +1218,7 @@ static int update_setting(int key_idx, int val) power_saving_display_stat) < 0) { _E("Fail to set display frame rate!"); } - backlight_ops.restore(); + backlight_ops.update(); break; case SETTING_POWER_SAVING_DISPLAY: vconf_get_bool(VCONFKEY_SETAPPL_PWRSV_SYSMODE_STATUS, @@ -1233,7 +1233,7 @@ static int update_setting(int key_idx, int val) PROP_DISPLAY_FRAME_RATE, power_saving_display_stat) < 0) { _E("Fail to set display frame rate!"); } - backlight_ops.restore(); + backlight_ops.update(); } break; case SETTING_POWEROFF: @@ -1289,7 +1289,7 @@ static void check_seed_status(void) pm_status_flag |= LOWBT_FLAG; } } - backlight_ops.restore(); + backlight_ops.update(); /* USB connection check * If connected, add sleep prohibit condition */ diff --git a/src/display/key-filter.c b/src/display/key-filter.c index 24ea6ff..f1d8c53 100644 --- a/src/display/key-filter.c +++ b/src/display/key-filter.c @@ -296,7 +296,7 @@ static void update_brightness(int action) ret = vconf_set_int(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, new_val); if (!ret) { - backlight_ops.restore(); + backlight_ops.update(); _I("brightness is changed! (%d)", new_val); } else { _E("Fail to set brightness!"); diff --git a/src/display/llinterface.c b/src/display/llinterface.c index cb6a2c5..fe6d5e4 100644 --- a/src/display/llinterface.c +++ b/src/display/llinterface.c @@ -345,14 +345,14 @@ static int backlight_dim(void) return ret; } -static int backlight_restore(void) +static int backlight_update(void) { int ret = 0; int val = -1; ret = vconf_get_int(VCONFKEY_PM_CUSTOM_BRIGHTNESS_STATUS, &val); if (ret == 0 && val == VCONFKEY_PM_CUSTOM_BRIGHTNESS_ON) { - _I("custom brightness mode! brt no restored"); + _I("custom brightness mode! brt no updated"); return 0; } if ((pm_status_flag & PWRSV_FLAG) && !(pm_status_flag & BRTCH_FLAG)) { @@ -388,7 +388,7 @@ void _init_ops(void) backlight_ops.off = backlight_off; backlight_ops.dim = backlight_dim; backlight_ops.on = backlight_on; - backlight_ops.restore = backlight_restore; + backlight_ops.update = backlight_update; backlight_ops.set_default_brt = set_default_brt; backlight_ops.get_lcd_power = get_lcd_power; @@ -438,7 +438,7 @@ int exit_sysfs(void) backlight_on(); } - backlight_restore(); + backlight_update(); free(pmsys); pmsys = NULL; if(fd != -1) diff --git a/src/display/llinterface.h b/src/display/llinterface.h index c4e8b06..5211a83 100644 --- a/src/display/llinterface.h +++ b/src/display/llinterface.h @@ -61,7 +61,7 @@ struct _backlight_ops { int (*off)(void); int (*dim)(void); int (*on)(void); - int (*restore)(void); + int (*update)(void); int (*set_default_brt)(int level); int (*get_lcd_power)(void); }; diff --git a/src/display/lsensor.c b/src/display/lsensor.c index bc2a981..ad5a826 100644 --- a/src/display/lsensor.c +++ b/src/display/lsensor.c @@ -73,7 +73,7 @@ static bool alc_handler(void* data) ret = device_get_property(DEVICE_TYPE_DISPLAY, cmd, &tmp_value); if (!ret && (tmp_value != value)) { backlight_ops.set_default_brt(value); - backlight_ops.restore(); + backlight_ops.update(); } _I("load light data : %d, brightness : %d", (int)light_data.values[0], value); } @@ -212,7 +212,7 @@ static int set_alc_function(keynode_t *key_nodes, void *data) } backlight_ops.set_default_brt(default_brt); - backlight_ops.restore(); + backlight_ops.update(); } return 0; -- 2.7.4