From: giwoong.kim <giwoong.kim@samsung.com>
Date: Mon, 23 Jul 2012 06:38:59 +0000 (+0900)
Subject: [Title] define DT_MARU for display type
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1528^2~69
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b54baab3962ec3c8ead929a4eb7583c05a6d8735;p=sdk%2Femulator%2Fqemu.git

[Title] define DT_MARU for display type
[Type]
[Module] Emulator / display
[Priority] major
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
---

diff --git a/sysemu.h b/sysemu.h
index 0362e5f5b7..338a073356 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -82,6 +82,9 @@ typedef enum DisplayType
     DT_CURSES,
     DT_SDL,
     DT_NOGRAPHIC,
+#ifdef CONFIG_MARU
+    DT_MARU,
+#endif
     DT_NONE,
 } DisplayType;
 
diff --git a/vl.c b/vl.c
index 2a7795677c..da0c5184aa 100644
--- a/vl.c
+++ b/vl.c
@@ -3563,7 +3563,10 @@ int main(int argc, char **argv, char **envp)
     if (using_spice)
         display_remote++;
     if (display_type == DT_DEFAULT && !display_remote) {
-#if defined(CONFIG_SDL) || defined(CONFIG_COCOA)
+#if defined(CONFIG_MARU)
+        /* maru display */
+        display_type = DT_MARU;
+#elif defined(CONFIG_SDL) || defined(CONFIG_COCOA)
         display_type = DT_SDL;
 #elif defined(CONFIG_VNC)
         vnc_display = "localhost:0,to=99";
@@ -3585,24 +3588,22 @@ int main(int argc, char **argv, char **envp)
 #endif
 #if defined(CONFIG_SDL)
     case DT_SDL:
-#if defined(CONFIG_MARU)
-            /* use tizen qemu sdl */
-            maruskin_display_init(ds);
-
-            if (skin_disabled == 1) {
-                //do not start skin client process
-                set_emul_skin_enable(0);
-            } else {
-                set_emul_skin_enable(1);
-            }
-#else
-            sdl_display_init(ds, full_screen, no_frame);
-#endif
+        sdl_display_init(ds, full_screen, no_frame);
         break;
 #elif defined(CONFIG_COCOA)
     case DT_SDL:
         cocoa_display_init(ds, full_screen);
         break;
+#endif
+#if defined(CONFIG_MARU)
+    case DT_MARU:
+        maruskin_display_init(ds);
+        if (skin_disabled == 1) {
+            set_emul_skin_enable(0);
+        } else {
+            set_emul_skin_enable(1);
+        }
+        break;
 #endif
     default:
         break;