From: SeokYeon Hwang Date: Mon, 3 Aug 2015 07:55:49 +0000 (+0900) Subject: emulator: removed unused variables X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~40^2~232 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ad3f49b7081a2f54b4d920e947aceab8f3b140db;p=sdk%2Femulator%2Fqemu.git emulator: removed unused variables Removed unused variables. Removed unused QEMU arguments. Cleaned some logics up related with JAVA UI. Change-Id: I6304a747f4b8c1d83964b872162dc0b7cda93109 Signed-off-by: SeokYeon Hwang --- diff --git a/qemu-options.hx b/qemu-options.hx index 9ffd903655..e8f08b8778 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2929,14 +2929,6 @@ libEGL, libGLES_CM and libGLESv2 to be installed on the guest OS. Corresponding EGL and openGLES calls on target system are translated to host openGL calls. ETEXI -DEF("yagl-backend", HAS_ARG, QEMU_OPTION_yagl_backend, - "-yagl-backend offscreen|vigs Select YaGL backend, default is offscreen\n", QEMU_ARCH_ALL) -STEXI -@item -yagl-backend @var{backend} -@findex -yagl-backend -Use @var{backend} as YaGL backend. -ETEXI - DEF("enable-vigs", 0, QEMU_OPTION_enable_vigs, \ "-enable-vigs enable VIGS support\n", QEMU_ARCH_ALL) STEXI diff --git a/tizen/src/display/maru_sdl.c b/tizen/src/display/maru_sdl.c index 053564056b..766ca088f4 100644 --- a/tizen/src/display/maru_sdl.c +++ b/tizen/src/display/maru_sdl.c @@ -220,14 +220,14 @@ static void qemu_ds_sdl_refresh(DisplayChangeListener *dcl) if (sdl_skip_update && display_off) { if (blank_cnt > MAX_BLANK_FRAME_CNT) { #ifdef CONFIG_WIN32 - if (sdl_invalidate && get_emul_skin_enable()) { + if (sdl_invalidate && is_skin_enabled()) { 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()) { + if (blank_guide_enable == true && is_skin_enabled()) { INFO("draw a blank guide image\n"); draw_image(surface_screen, get_blank_guide_image()); diff --git a/tizen/src/display/maru_shm.c b/tizen/src/display/maru_shm.c index ea076509b7..f7dc615d1e 100644 --- a/tizen/src/display/maru_shm.c +++ b/tizen/src/display/maru_shm.c @@ -154,7 +154,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()) { + if (is_skin_enabled()) { /* draw guide image */ notify_draw_blank_guide(); } diff --git a/tizen/src/emul_state.c b/tizen/src/emul_state.c index 71deae3c0f..eae6bc9cb7 100644 --- a/tizen/src/emul_state.c +++ b/tizen/src/emul_state.c @@ -105,18 +105,6 @@ const char *get_log_path(void) return log_path; } - -/* start_skin_client or not ? */ -void set_emul_skin_enable(bool enable) -{ - _emul_info.skin_enable = enable; -} - -bool get_emul_skin_enable(void) -{ - return _emul_info.skin_enable; -} - /* display screen resolution */ void set_emul_resolution(int width, int height) { @@ -682,3 +670,17 @@ const char *get_vm_data_path(void) return vm_data_path; } +#ifdef CONFIG_JAVA_UI +/* skin enabled */ +static bool skin_enabled = true; + +void set_skin_enabled(bool enabled) +{ + skin_enabled = enabled; +} + +bool is_skin_enabled(void) +{ + return skin_enabled; +} +#endif diff --git a/tizen/src/emul_state.h b/tizen/src/emul_state.h index ef0c231ca6..9fb1a8e726 100644 --- a/tizen/src/emul_state.h +++ b/tizen/src/emul_state.h @@ -33,8 +33,8 @@ #ifndef __EMUL_STATE_H__ #define __EMUL_STATE_H__ - #include "display/maru_finger.h" +#include "config-host.h" #define SUPPORT_LEGACY_ARGS #define MAX_ADDR_LEN 256 @@ -133,7 +133,6 @@ char const *get_bin_path(void); char const *get_log_path(void); /* setter */ -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); @@ -155,7 +154,6 @@ void set_emuld_connection(bool connected); void set_sdb_connection(bool connected); /* getter */ -bool get_emul_skin_enable(void); int get_emul_resolution_width(void); int get_emul_resolution_height(void); double get_emul_win_scale(void); @@ -203,5 +201,9 @@ const char *get_vm_data_path(void); #ifdef SUPPORT_LEGACY_ARGS void set_vm_data_path(const char *path); #endif +#ifdef CONFIG_JAVA_UI +void set_skin_enabled(bool enabled); +bool is_skin_enabled(void); +#endif #endif /* __EMUL_STATE_H__ */ diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c index c4d6e9b429..531d95300c 100644 --- a/tizen/src/emulator.c +++ b/tizen/src/emulator.c @@ -66,12 +66,6 @@ char *maru_kernel_cmdline; char tizen_target_path[PATH_MAX]; -#ifdef CONFIG_YAGL -extern bool yagl_enabled(void); -#endif /* CONFIG_YAGL */ - -int enable_spice = 0; - #if defined(CONFIG_JAVA_UI) int _skin_argc; char **_skin_argv; @@ -85,7 +79,8 @@ void emulator_add_exit_notifier(Notifier *notify) } #if defined(CONFIG_JAVA_UI) -static void construct_main_window(int skin_argc, char *skin_argv[], +static void construct_main_window(bool skin_enabled, + int skin_argc, char *skin_argv[], int qemu_argc, char *qemu_argv[]) { LOG_INFO("construct main window\n"); @@ -95,8 +90,11 @@ static void construct_main_window(int skin_argc, char *skin_argv[], set_emul_caps_lock_state(0); set_emul_num_lock_state(0); + set_skin_enabled(skin_enabled); + + /* do not start skin client process if skin is disabled*/ /* the next line checks for debugging and etc.. */ - if (get_emul_skin_enable()) { + if (skin_enabled) { if (0 > start_skin_client(skin_argc, skin_argv)) { error_report(FAILED_TO_INITIALIZE_SKIN); exit(1); @@ -240,11 +238,12 @@ void prepare_maru_after_device_init(void) } #if defined(CONFIG_JAVA_UI) -void start_skin(void) +void start_skin(bool skin_enabled) { LOG_INFO("Start skin\n"); - construct_main_window(_skin_argc, _skin_argv, _qemu_argc, _qemu_argv); + construct_main_window(skin_enabled, + _skin_argc, _skin_argv, _qemu_argc, _qemu_argv); } #endif diff --git a/tizen/src/emulator.h b/tizen/src/emulator.h index b4ff368b01..f01981d477 100644 --- a/tizen/src/emulator.h +++ b/tizen/src/emulator.h @@ -48,7 +48,7 @@ void print_system_info(void); void emulator_add_exit_notifier(Notifier *notify); #if defined(CONFIG_JAVA_UI) -void start_skin(void); +void start_skin(bool skin_enabled); #endif #endif /* __EMULATOR_H__ */ diff --git a/tizen/src/emulator_legacy.c b/tizen/src/emulator_legacy.c index 6092e61dc4..b11cd55aaf 100644 --- a/tizen/src/emulator_legacy.c +++ b/tizen/src/emulator_legacy.c @@ -75,9 +75,6 @@ extern gchar maru_kernel_cmdline[LEN_MARU_KERNEL_CMDLINE]; extern char tizen_target_path[PATH_MAX]; -extern int enable_yagl; -extern int enable_spice; - #if defined(CONFIG_JAVA_UI) extern int _skin_argc; extern char **_skin_argv; diff --git a/vl.c b/vl.c index bbbe0f69e6..6e92b5a0dc 100644 --- a/vl.c +++ b/vl.c @@ -143,27 +143,6 @@ int qemu_main(int argc, char **argv, char **envp); #define MAX_VIRTIO_CONSOLES 1 #define MAX_SCLP_CONSOLES 1 -#ifdef CONFIG_YAGL -static int enable_yagl = 0; -static const char *yagl_backend = NULL; - -bool yagl_enabled(void); /* prototype to make gcc happy */ -bool yagl_enabled(void) -{ - return enable_yagl; -} -#endif /* CONFIG_YAGL */ - -#ifdef CONFIG_VIGS -static int enable_vigs = 0; -static char *vigs_backend = NULL; -#endif /* CONFIG_VIGS */ - -#ifdef CONFIG_MARU -int skin_disabled = 0; -extern int enable_spice; -#endif - static const char *data_dir[16]; static int data_dir_idx; const char *bios_name = NULL; @@ -2872,6 +2851,16 @@ int main(int argc, char **argv, char **envp) uint64_t ram_slots = 0; FILE *vmstate_dump_file = NULL; Error *main_loop_err = NULL; +#ifdef CONFIG_YAGL + static bool yagl_enabled = false; +#endif /* CONFIG_YAGL */ +#ifdef CONFIG_VIGS + static bool vigs_enabled = false; + static char *vigs_backend = NULL; +#endif /* CONFIG_VIGS */ +#if defined(CONFIG_MARU) && defined(CONFIG_JAVA_UI) + static bool skin_enabled = true; +#endif /* CONFIG_MARU */ atexit(qemu_run_exit_notifiers); error_set_progname(argv[0]); @@ -3617,23 +3606,15 @@ int main(int argc, char **argv, char **envp) break; case QEMU_OPTION_enable_yagl: #if defined(CONFIG_YAGL) - enable_yagl = 1; + yagl_enabled = true; #else fprintf(stderr, "YaGL openGLES passthrough support is disabled," " ignoring -enable-yagl\n"); -#endif - break; - case QEMU_OPTION_yagl_backend: -#if defined(CONFIG_YAGL) - yagl_backend = optarg; -#else - fprintf(stderr, "YaGL openGLES passthrough support is disabled," - " ignoring -yagl-backend\n"); #endif break; case QEMU_OPTION_enable_vigs: #if defined(CONFIG_VIGS) - enable_vigs = 1; + vigs_enabled = true; #else fprintf(stderr, "VIGS support is disabled," " ignoring -enable-vigs\n"); @@ -3863,9 +3844,6 @@ int main(int argc, char **argv, char **envp) fprintf(stderr, "spice is not supported by this qemu build.\n"); exit(1); } -#ifdef CONFIG_MARU - enable_spice = 1; -#endif opts = qemu_opts_parse(olist, optarg, 0); if (!opts) { exit(1); @@ -3918,9 +3896,9 @@ int main(int argc, char **argv, char **envp) exit(1); #endif break; -#ifdef CONFIG_MARU +#if defined(CONFIG_MARU) && defined(CONFIG_JAVA_UI) case QEMU_OPTION_disable_skin: - skin_disabled = 1; + skin_enabled = false; break; case QEMU_OPTION_enable_suspend: ecs_set_suspend_state(SUSPEND_UNLOCK); @@ -4477,7 +4455,7 @@ int main(int argc, char **argv, char **envp) #endif #ifdef CONFIG_VIGS // To support legacy VIGS options - if (enable_vigs) { + if (vigs_enabled) { PCIBus *pci_bus = (PCIBus *) object_resolve_path_type("", TYPE_PCI_BUS, NULL); PCIDevice *pci_dev = pci_create(pci_bus, -1, "vigs"); if (vigs_backend) { @@ -4491,10 +4469,10 @@ int main(int argc, char **argv, char **envp) #endif #ifdef CONFIG_YAGL // To support legacy YaGL options - if (yagl_enabled()) { + if (yagl_enabled) { PCIBus *pci_bus = (PCIBus *) object_resolve_path_type("", TYPE_PCI_BUS, NULL); PCIDevice *pci_dev = pci_create(pci_bus, -1, "yagl"); - if (enable_vigs) { + if (vigs_enabled) { qdev_prop_set_string(&pci_dev->qdev, "wsi", "wsi0"); } qdev_init_nofail(&pci_dev->qdev); @@ -4537,13 +4515,7 @@ int main(int argc, char **argv, char **envp) case DT_MARU_SDL: case DT_MARU_SHM: maru_display_init(ds, display_type, full_screen); - if (skin_disabled == 1) { - /* do not start skin client process */ - set_emul_skin_enable(false); - } else { - set_emul_skin_enable(true); - } - start_skin(); + start_skin(skin_enabled); break; #endif #if defined(CONFIG_QT)