From c8ad2609a778897c95ea0fab2cd7711fae74b9f3 Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Thu, 29 May 2014 22:41:41 +0900 Subject: [PATCH] emulator: fix no skin situation Change-Id: I3bc6a9779765f2ea9d0fae42098114f13c034a63 Signed-off-by: SeokYeon Hwang --- tizen/src/emul_state.c | 4 ++-- tizen/src/emul_state.h | 6 +++--- tizen/src/emulator.c | 2 +- tizen/src/maru_sdl.c | 4 ++-- tizen/src/maru_shm.c | 2 +- vl.c | 14 +++++++------- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tizen/src/emul_state.c b/tizen/src/emul_state.c index 614cb5d..7d45b99 100644 --- a/tizen/src/emul_state.c +++ b/tizen/src/emul_state.c @@ -47,12 +47,12 @@ static EmulatorConfigInfo _emul_info = {0,}; static EmulatorConfigState _emul_state; /* start_skin_client or not ? */ -void set_emul_skin_enable(int enable) +void set_emul_skin_enable(bool enable) { _emul_info.skin_enable = enable; } -int get_emul_skin_enable(void) +bool get_emul_skin_enable(void) { return _emul_info.skin_enable; } diff --git a/tizen/src/emul_state.h b/tizen/src/emul_state.h index 97d7d6f..62fe4eb 100644 --- a/tizen/src/emul_state.h +++ b/tizen/src/emul_state.h @@ -81,7 +81,7 @@ enum { typedef struct EmulatorConfigInfo { - int skin_enable; + bool skin_enable; int resolution_w; int resolution_h; int sdl_bpp; @@ -107,7 +107,7 @@ typedef struct EmulatorConfigState { /* setter */ -void set_emul_skin_enable(int enable); +void set_emul_skin_enable(bool enable); void set_emul_resolution(int width, int height); void set_emul_win_scale(double scale); void set_emul_sdl_bpp(int bpp); @@ -124,7 +124,7 @@ void set_emul_num_lock_state(int state); void set_emul_vm_name(char *vm_name); /* getter */ -int get_emul_skin_enable(void); +bool get_emul_skin_enable(void); int get_emul_resolution_width(void); int get_emul_resolution_height(void); double get_emul_win_scale(void); diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c index 7b920cb..082a215 100644 --- a/tizen/src/emulator.c +++ b/tizen/src/emulator.c @@ -142,7 +142,7 @@ static void construct_main_window(int skin_argc, char *skin_argv[], set_emul_num_lock_state(0); /* the next line checks for debugging and etc.. */ - if (get_emul_skin_enable() == 1) { + if (get_emul_skin_enable()) { if (0 > start_skin_client(skin_argc, skin_argv)) { maru_register_exit_msg(MARU_EXIT_SKIN_SERVER_FAILED, NULL); exit(-1); diff --git a/tizen/src/maru_sdl.c b/tizen/src/maru_sdl.c index 42a985f..89eff7a 100644 --- a/tizen/src/maru_sdl.c +++ b/tizen/src/maru_sdl.c @@ -206,14 +206,14 @@ static void qemu_ds_sdl_refresh(DisplayChangeListener *dcl) if (sdl_skip_update && brightness_off) { if (blank_cnt > MAX_BLANK_FRAME_CNT) { #ifdef CONFIG_WIN32 - if (sdl_invalidate && get_emul_skin_enable() != 0) { + if (sdl_invalidate && get_emul_skin_enable()) { draw_image(surface_screen, get_blank_guide_image()); } #endif return; } else if (blank_cnt == MAX_BLANK_FRAME_CNT) { - if (blank_guide_enable == true && get_emul_skin_enable() != 0) { + if (blank_guide_enable == true && get_emul_skin_enable()) { INFO("draw a blank guide image\n"); draw_image(surface_screen, get_blank_guide_image()); diff --git a/tizen/src/maru_shm.c b/tizen/src/maru_shm.c index 86ad700..f4cd4af 100644 --- a/tizen/src/maru_shm.c +++ b/tizen/src/maru_shm.c @@ -170,7 +170,7 @@ static void qemu_ds_shm_refresh(DisplayChangeListener *dcl) if (blank_guide_enable == true) { INFO("draw a blank guide image\n"); - if (get_emul_skin_enable() == 1) { + if (get_emul_skin_enable()) { /* draw guide image */ notify_draw_blank_guide(); } diff --git a/vl.c b/vl.c index a619f4e..cded55c 100644 --- a/vl.c +++ b/vl.c @@ -4083,6 +4083,13 @@ int main(int argc, char **argv, char **envp) // W/A for preserve larger continuous heap for RAM. preallocated_ptr = g_malloc(ram_size); + if (skin_disabled == 1) { + /* do not start skin client process */ + set_emul_skin_enable(false); + } else { + set_emul_skin_enable(true); + } + kernel_cmdline = qemu_opt_get(qemu_get_machine_opts(), "append"); // Returned variable points different address from input variable. kernel_cmdline = prepare_maru(kernel_cmdline); @@ -4587,13 +4594,6 @@ int main(int argc, char **argv, char **envp) #if defined(CONFIG_MARU) case DT_MARU: maru_display_init(ds); - - if (skin_disabled == 1) { - /* do not start skin client process */ - set_emul_skin_enable(0); - } else { - set_emul_skin_enable(1); - } break; #endif #if defined(CONFIG_SDL) -- 2.7.4