change heart beat operation

diff --git a/tizen/distrib/temp/run_emulator.sh b/tizen/distrib/temp/run_emulator.sh
index 8e903f3932aad6d06782e4e9d7888172553539ae..c78f4f68fca8fcc3e61c7804a50434c232e182ef 100755 (executable)
--- a/tizen/distrib/temp/run_emulator.sh
+++ b/tizen/distrib/temp/run_emulator.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-./qemu-system-i386 --skin-args a --qemu-args -drive file=emulimg.x86,if=virtio -boot c -append "console=ttyS0 video=uvesafb:ywrap,480x800-32@60 proxy= dns1=168.126.63.1 sdb_port=26100 dpi=2070 root=/dev/vda rw ip=10.0.2.16::10.0.2.2:255.255.255.0::eth0:none 5" -serial file:emulator.klog -m 512 -M maru-x86-machine -net nic,model=virtio -soundhw all -usb -usbdevice maru-touchscreen -vga maru -bios bios.bin -L . -kernel bzImage -usbdevice keyboard -net user -rtc base=utc -enable-kvm -redir tcp:1202:10.0.2.16:22 
+./qemu-system-i386 --skin-args test.hb.ignore=true --qemu-args -drive file=emulimg.x86,if=virtio -boot c -append "console=ttyS0 video=uvesafb:ywrap,480x800-32@60 proxy= dns1=168.126.63.1 sdb_port=26100 dpi=2070 root=/dev/vda rw ip=10.0.2.16::10.0.2.2:255.255.255.0::eth0:none 5" -serial file:emulator.klog -m 512 -M maru-x86-machine -net nic,model=virtio -soundhw all -usb -usbdevice maru-touchscreen -vga maru -bios bios.bin -L . -kernel bzImage -usbdevice keyboard -net user -rtc base=utc -enable-kvm -redir tcp:1202:10.0.2.16:22 

diff --git a/tizen/src/skin/maruskin_server.c b/tizen/src/skin/maruskin_server.c
index 7c90b8360bc87c5e965fd18597bb8c9371230e7e..ef229e4c143109c5b372ebfd9a6b8c4379400234 100644 (file)
--- a/tizen/src/skin/maruskin_server.c
+++ b/tizen/src/skin/maruskin_server.c
@@ -68,8 +68,7 @@ enum {
     RECV_CHANGE_LCD_STATE = 13,
     RECV_OPEN_SHELL = 14,
     RECV_USB_KBD = 15,
-    RECV_HEART_BEAT = 900,
-    RECV_RESPONSE_HEART_BEAT = 901,
+    RECV_RESPONSE_HEART_BEAT = 900,
     RECV_CLOSE = 998,
     RECV_RESPONSE_SHUTDOWN = 999,
 };
@@ -441,13 +440,6 @@ static void* run_skin_server( void* args ) {
                     }
                     break;
                 }
-                case RECV_HEART_BEAT: {
-                    TRACE( "RECV_HEART_BEAT\n" );
-                    if ( 0 > send_skin( client_sock, SEND_HEART_BEAT_RESPONSE ) ) {
-                        ERR( "Fail to send a response of heartbeat to skin.\n" );
-                    }
-                    break;
-                }
                 case RECV_RESPONSE_HEART_BEAT: {
                     TRACE( "RECV_RESPONSE_HEART_BEAT\n" );
                     pthread_mutex_lock( &mutex_recv_heartbeat_count );