From: GiWoong Kim Date: Mon, 9 Jun 2014 11:22:52 +0000 (+0900) Subject: display: modified varable name X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~352^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fcbc9f95dbd0362bd1d62f43738d4a8b3c59de49;p=sdk%2Femulator%2Fqemu.git display: modified varable name brightness_off -> display_off Change-Id: I3460bcc28f0fc2b29604ca45c373fca08ed40ba7 Signed-off-by: GiWoong Kim --- diff --git a/tizen/src/hw/maru_brightness.c b/tizen/src/hw/maru_brightness.c index f084ad006f..3d04d6c4cc 100644 --- a/tizen/src/hw/maru_brightness.c +++ b/tizen/src/hw/maru_brightness.c @@ -57,7 +57,7 @@ enum { }; uint32_t brightness_level = BRIGHTNESS_MAX; -uint32_t brightness_off; +bool display_off; pixman_color_t level_color; pixman_image_t *brightness_image; @@ -74,7 +74,7 @@ uint8_t brightness_tbl[] = {155, /* level 0 : for dimming */ /* level 81 ~ 90 */ 29, 27, 26, 24, 23, 21, 20, 18, 17, 15, /* level 91 ~ 99 */ 14, 12, 11, 9, 8, 6, 5, 3, 2, 0}; -QEMUBH *bh; +QEMUBH *display_bh; static uint64_t brightness_reg_read(void *opaque, hwaddr addr, @@ -85,8 +85,8 @@ static uint64_t brightness_reg_read(void *opaque, INFO("current brightness level = %lu\n", brightness_level); return brightness_level; case BRIGHTNESS_OFF: - INFO("device is turned %s\n", brightness_off ? "off" : "on"); - return brightness_off; + INFO("device is turned %s\n", display_off ? "off" : "on"); + return display_off; default: ERR("wrong brightness register read - addr : %d\n", (int)addr); break; @@ -129,20 +129,21 @@ static void brightness_reg_write(void *opaque, } return; case BRIGHTNESS_OFF: - if (brightness_off == val) { + if (display_off == val) { return; } INFO("status changes: %s\n", val ? "OFF" : "ON"); - brightness_off = val; - if (brightness_off) { + + display_off = val; + if (display_off) { maru_pixman_image_set_alpha(0xFF); /* set black */ } else { maru_pixman_image_set_alpha(brightness_tbl[brightness_level]); } /* notify to skin process */ - qemu_bh_schedule(bh); + qemu_bh_schedule(display_bh); return; default: @@ -161,8 +162,8 @@ static void brightness_exitfn(PCIDevice *dev) { BrightnessState *s = DO_UPCAST(BrightnessState, dev, dev); - if (bh) { - qemu_bh_delete(bh); + if (display_bh) { + qemu_bh_delete(display_bh); } if (brightness_image) { pixman_image_unref(brightness_image); @@ -173,13 +174,9 @@ static void brightness_exitfn(PCIDevice *dev) INFO("finalize maru-brightness device\n"); } -static void maru_brightness_bh(void *opaque) +static void maru_display_bh(void *opaque) { - if (brightness_off == 0) { - notify_brightness_state(true); - } else { - notify_brightness_state(false); - } + notify_display_power(!display_off); } static int brightness_initfn(PCIDevice *dev) @@ -195,7 +192,7 @@ static int brightness_initfn(PCIDevice *dev) "maru-brightness-mmio", BRIGHTNESS_REG_SIZE); pci_register_bar(&s->dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->mmio_addr); - bh = qemu_bh_new(maru_brightness_bh, s); + display_bh = qemu_bh_new(maru_display_bh, s); brightness_level = BRIGHTNESS_MAX; level_color.alpha = 0x0000; level_color.red = 0x0000; diff --git a/tizen/src/hw/maru_brightness.h b/tizen/src/hw/maru_brightness.h index 2c0449f03f..96f081a4c4 100644 --- a/tizen/src/hw/maru_brightness.h +++ b/tizen/src/hw/maru_brightness.h @@ -39,7 +39,7 @@ #define BRIGHTNESS_MAX (100) extern uint32_t brightness_level; -extern uint32_t brightness_off; +extern bool display_off; extern uint8_t brightness_tbl[]; extern pixman_image_t *brightness_image; diff --git a/tizen/src/maru_sdl.c b/tizen/src/maru_sdl.c index 2eb7fb5746..35be462273 100644 --- a/tizen/src/maru_sdl.c +++ b/tizen/src/maru_sdl.c @@ -203,7 +203,7 @@ static void qemu_ds_sdl_refresh(DisplayChangeListener *dcl) } /* draw cover image */ - if (sdl_skip_update && brightness_off) { + if (sdl_skip_update && display_off) { if (blank_cnt > MAX_BLANK_FRAME_CNT) { #ifdef CONFIG_WIN32 if (sdl_invalidate && get_emul_skin_enable()) { @@ -243,7 +243,7 @@ static void qemu_ds_sdl_refresh(DisplayChangeListener *dcl) /* Usually, continuously updated. When the display is turned off, ten more updates the screen for a black screen. */ - if (brightness_off) { + if (display_off) { if (++sdl_skip_count > 10) { sdl_skip_update = 1; } else { diff --git a/tizen/src/maru_shm.c b/tizen/src/maru_shm.c index f4cd4afb85..4d5d3acbd2 100644 --- a/tizen/src/maru_shm.c +++ b/tizen/src/maru_shm.c @@ -162,7 +162,7 @@ static void qemu_ds_shm_refresh(DisplayChangeListener *dcl) { /* If the display is turned off, the screen does not update until the it is turned on */ - if (shm_skip_update && brightness_off) { + if (shm_skip_update && display_off) { if (blank_cnt > MAX_BLANK_FRAME_CNT) { /* do nothing */ return; @@ -194,7 +194,7 @@ static void qemu_ds_shm_refresh(DisplayChangeListener *dcl) /* Usually, continuously updated. But when the display is turned off, ten more updates the surface for a black screen. */ - if (brightness_off) { + if (display_off) { if (++shm_skip_count > 10) { shm_skip_update = 1; } else { diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java index 92031adfd8..2225e3d0ee 100755 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java @@ -1323,7 +1323,7 @@ public class EmulatorSkin { }); } - public void updateBrightness(final boolean on) { + public void updateDisplayPower(final boolean on) { getShell().getDisplay().asyncExec(new Runnable() { @Override public void run() { diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/ICommunicator.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/ICommunicator.java index 523bf88a4b..b9762b7787 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/ICommunicator.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/ICommunicator.java @@ -42,7 +42,7 @@ public interface ICommunicator extends Runnable { public final static short RECV_DETAIL_INFO_DATA = 3; public final static short RECV_RAMDUMP_COMPLETED = 4; public final static short RECV_BOOTING_PROGRESS = 5; - public final static short RECV_BRIGHTNESS_STATE = 6; + public final static short RECV_DISPLAY_POWER = 6; public final static short RECV_HOST_KBD_STATE = 8; public final static short RECV_MULTI_TOUCH_STATE = 9; diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java index ba62e83e89..82377faa67 100755 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java @@ -339,8 +339,8 @@ public class SocketCommunicator implements ICommunicator { break; } - case RECV_BRIGHTNESS_STATE: { - //logger.info("received BRIGHTNESS_STATE from QEMU"); + case RECV_DISPLAY_POWER: { + //logger.info("received DISPLAY_POWER from QEMU"); resetDataTransfer(miscDataTransfer); receiveData(sockInputStream, miscDataTransfer, header.length); @@ -357,9 +357,9 @@ public class SocketCommunicator implements ICommunicator { } if (value == 0) { - skin.updateBrightness(false); + skin.updateDisplayPower(false); } else { - skin.updateBrightness(true); + skin.updateDisplayPower(true); } } diff --git a/tizen/src/skin/maruskin_operation.c b/tizen/src/skin/maruskin_operation.c index 3d849af213..44993f2587 100644 --- a/tizen/src/skin/maruskin_operation.c +++ b/tizen/src/skin/maruskin_operation.c @@ -105,7 +105,7 @@ void do_grabbing_enable(bool on) void do_mouse_event(int button_type, int event_type, int origin_x, int origin_y, int x, int y, int z) { - if (brightness_off) { + if (display_off) { if (button_type == 0) { INFO("auto mouse release\n"); virtio_touchscreen_event(0, 0, 0, 0); @@ -417,7 +417,7 @@ Framebuffer *request_screenshot(void) /* If display has been turned off, return empty buffer. Because the empty buffer is seen as a black. */ - if (brightness_off == 0) { + if (!display_off) { pthread_mutex_lock(&mutex_screenshot); MaruScreenShot* screenshot = get_screenshot(); diff --git a/tizen/src/skin/maruskin_server.c b/tizen/src/skin/maruskin_server.c index 9de293df22..b673ffa2fb 100644 --- a/tizen/src/skin/maruskin_server.c +++ b/tizen/src/skin/maruskin_server.c @@ -113,7 +113,7 @@ enum { SEND_DETAIL_INFO_DATA = 3, SEND_RAMDUMP_COMPLETED = 4, SEND_BOOTING_PROGRESS = 5, - SEND_BRIGHTNESS_STATE = 6, + SEND_DISPLAY_POWER = 6, SEND_HOST_KBD_STATE = 8, SEND_MULTI_TOUCH_STATE = 9, @@ -388,25 +388,25 @@ void notify_booting_progress(unsigned int layer, int progress_value) } } -void notify_brightness_state(bool on) +void notify_display_power(bool on) { -#define BRIGHTNESS_DATA_LENGTH 2 - char brightness_data[BRIGHTNESS_DATA_LENGTH] = { 0, }; +#define DISPLAY_POWER_DATA_LENGTH 2 + char power_data[DISPLAY_POWER_DATA_LENGTH] = { 0, }; if (on == false) { - snprintf(brightness_data, BRIGHTNESS_DATA_LENGTH, "0"); + snprintf(power_data, DISPLAY_POWER_DATA_LENGTH, "0"); } else { - snprintf(brightness_data, BRIGHTNESS_DATA_LENGTH, "1"); + snprintf(power_data, DISPLAY_POWER_DATA_LENGTH, "1"); } - TRACE("notify brightness state : %s\n", brightness_data); + TRACE("notify display power : %s\n", power_data); if (client_sock) { if (0 > send_skin_data(client_sock, - SEND_BRIGHTNESS_STATE, - (unsigned char *)brightness_data, BRIGHTNESS_DATA_LENGTH, 0)) { + SEND_DISPLAY_POWER, + (unsigned char *)power_data, DISPLAY_POWER_DATA_LENGTH, 0)) { - ERR("fail to send SEND_BRIGHTNESS_STATE to skin\n"); + ERR("fail to send SEND_DISPLAY_POWER to skin\n"); } } else { INFO("skin client socket is not connected yet\n"); diff --git a/tizen/src/skin/maruskin_server.h b/tizen/src/skin/maruskin_server.h index 28da5f6a99..17aafd4866 100644 --- a/tizen/src/skin/maruskin_server.h +++ b/tizen/src/skin/maruskin_server.h @@ -40,7 +40,7 @@ void notify_sdb_daemon_start(void); void notify_sensor_daemon_start(void); void notify_ramdump_completed(void); void notify_booting_progress(unsigned int layer, int progress_value); -void notify_brightness_state(bool on); +void notify_display_power(bool on); void notify_host_kbd_state(bool on); void notify_multi_touch_state(bool on); void notify_emul_reset(void);