From: munkyu.im <munkyu.im@samsung.com>
Date: Fri, 21 Sep 2012 07:47:26 +0000 (+0900)
Subject: device: fix hanging devices when boot emulator
X-Git-Tag: TizenStudio_2.0_p2.3~1298
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d02cfe66652aacbaf615832e73a739a1b3ddd9ce;p=sdk%2Femulator%2Fqemu.git

device: fix hanging devices when boot emulator

The problem was that display initialzing routine was wrong due to
using wrong definitions

Singed-off-by: Munkyu Im <munkyu.im@samsung.com>
---

diff --git a/vl.c b/vl.c
index 53abfd1..a8b495c 100644
--- a/vl.c
+++ b/vl.c
@@ -3611,16 +3611,15 @@ fprintf(stdout, "kernel command : %s\n", kernel_cmdline);
     if (using_spice)
         display_remote++;
     if (display_type == DT_DEFAULT && !display_remote) {
-#if defined(CONFIG_MARU)
-        /* maru display */
-        display_type = DT_MARU;
-#elif defined(CONFIG_SDL) || defined(CONFIG_COCOA)
+#if defined(CONFIG_SDL) || defined(CONFIG_COCOA)
         display_type = DT_SDL;
 #elif defined(CONFIG_VNC)
         vnc_display = "localhost:0,to=99";
         show_vnc_port = 1;
+#elif defined(CONFIG_MARU) && defined (__APPLE__)
+        display_type = DT_MARU;
 #else
-        display_type = DT_NONE;
+	display_type = DT_NONE;
 #endif
     }
 
@@ -3636,25 +3635,38 @@ fprintf(stdout, "kernel command : %s\n", kernel_cmdline);
 #endif
 #if defined(CONFIG_SDL)
     case DT_SDL:
-        sdl_display_init(ds, full_screen, no_frame);
+#if defined(CONFIG_MARU)
+            /* use tizen qemu sdl */
+            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);
+            }
+#else
+            sdl_display_init(ds, full_screen, no_frame);
+#endif
         break;
 #elif defined(CONFIG_COCOA)
     case DT_SDL:
         cocoa_display_init(ds, full_screen);
         break;
 #endif
-#if defined(CONFIG_MARU)
+#if defined(CONFIG_MARU) && defined(__APPLE__)
     case DT_MARU:
-        maru_display_init(ds);
-        if (skin_disabled == 1) {
-            set_emul_skin_enable(0);
-        } else {
-            set_emul_skin_enable(1);
-        }
-        break;
+      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
     default:
-        break;
+  break;
     }
 
     /* must be after terminal init, SDL library changes signal handlers */