From 2be20899f50f81ce736f3ac553a9eda80c965d80 Mon Sep 17 00:00:00 2001 From: Jinhyung Choi Date: Fri, 30 May 2014 14:05:31 +0900 Subject: [PATCH] ecs & skin: removed sensor daemon notification and ecs notification Change-Id: I72124301765b7dbb48fb8bea3b9ea651b8e6bd62 Signed-off-by: Jinhyung Choi --- tizen/src/guest_server.c | 11 +----- .../org/tizen/emulator/skin/EmulatorSkin.java | 30 --------------- .../emulator/skin/comm/ICommunicator.java | 2 - .../skin/comm/sock/SocketCommunicator.java | 36 ++---------------- tizen/src/skin/maruskin_server.c | 38 +------------------ tizen/src/skin/maruskin_server.h | 2 - 6 files changed, 6 insertions(+), 113 deletions(-) diff --git a/tizen/src/guest_server.c b/tizen/src/guest_server.c index e6a91eb9b4..ff004bc38e 100644 --- a/tizen/src/guest_server.c +++ b/tizen/src/guest_server.c @@ -481,16 +481,7 @@ static void command_handler(char* readbuf, struct sockaddr_in* client_addr) TRACE("command:%s\n", command); if (strcmp(command, "2\n" ) == 0) { notify_sdb_daemon_start(); - } else if (strcmp(command, "3\n" ) == 0) { - notify_sensor_daemon_start(); - notify_ecs_server_start(); - } -#if 0 - else if (strcmp(command, "4\n") == 0) { - handle_sdcard(readbuf); - } -#endif - else if (strcmp(command, "5\n") == 0) { + } else if (strcmp(command, "5\n") == 0) { register_sdb_server(readbuf, client_addr); } else if (strcmp(command, "6\n") == 0) { wakeup_guest(); diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java index 92031adfd8..3926af604e 100755 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java @@ -1485,25 +1485,6 @@ public class EmulatorSkin { return; } - if (!communicator.isSensorDaemonStarted()) { - /* roll back a selection */ - item.setSelection(false); - - for (MenuItem m : rotationList) { - short rotationId = (Short) m.getData(); - if (currentState.getCurrentRotationId() == rotationId) { - m.setSelection(true); - break; - } - } - - SkinUtil.openMessage(shell, null, - "Rotation is not ready.\n" - + "Please wait until the emulator is completely boot up.", - SWT.ICON_WARNING, config); - return; - } - final short rotationId = ((Short) item.getData()); shell.getDisplay().syncExec(new Runnable() { @@ -1851,17 +1832,6 @@ public class EmulatorSkin { public void widgetSelected(SelectionEvent e) { logger.info("Control Panel menu is selected"); - if (communicator.isSdbDaemonStarted() == false) { -// || communicator.isEcsServerStarted() == false) { - logger.warning("Control Panel is not ready."); - - SkinUtil.openMessage(shell,null, - "Control Panel is not ready.\n" - + "Please wait until the emulator is completely boot up.", - SWT.ICON_WARNING, config); - return; - } - String ecpPath = SkinUtil.getEcpPath(); File ecpFile = new File(ecpPath); diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/ICommunicator.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/ICommunicator.java index 523bf88a4b..f249795e98 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/ICommunicator.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/ICommunicator.java @@ -46,9 +46,7 @@ public interface ICommunicator extends Runnable { public final static short RECV_HOST_KBD_STATE = 8; public final static short RECV_MULTI_TOUCH_STATE = 9; - public final static short RECV_SENSORD_STARTED = 800; public final static short RECV_SDBD_STARTED = 801; - public final static short RECV_ECS_STARTED = 802; public final static short RECV_DRAW_FRAME = 900; public final static short RECV_DRAW_BLANK_GUIDE = 901; public final static short RECV_EMUL_RESET = 998; diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java index ba62e83e89..2264ed06a2 100755 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java @@ -75,7 +75,7 @@ public class SocketCommunicator implements ICommunicator { private long sleep; private long maxWaitTime; private Timer timer; - + private DataTranfer() { /* do nothing */ } @@ -113,9 +113,7 @@ public class SocketCommunicator implements ICommunicator { private AtomicInteger heartbeatCount; private boolean isTerminated; - private boolean isSensorDaemonStarted; private boolean isSdbDaemonStarted; - private boolean isEcsServerStarted; private boolean isRamdump; private TimerTask heartbeatExecutor; private Timer heartbeatTimer; @@ -417,14 +415,6 @@ public class SocketCommunicator implements ICommunicator { break; } - case RECV_SENSORD_STARTED: { - logger.info("received SENSORD_STARTED from QEMU"); - - synchronized (this) { - isSensorDaemonStarted = true; - } - break; - } case RECV_SDBD_STARTED: { logger.info("received SDBD_STARTED from QEMU"); @@ -433,14 +423,6 @@ public class SocketCommunicator implements ICommunicator { } break; } - case RECV_ECS_STARTED: { - logger.info("received ECS_STARTED from QEMU"); - - synchronized (this) { - isEcsServerStarted = true; - } - break; - } case RECV_DRAW_FRAME: { //logger.info("received DRAW_FRAME from QEMU."); @@ -463,9 +445,7 @@ public class SocketCommunicator implements ICommunicator { logger.info("received EMUL_RESET from QEMU"); synchronized (this) { - isSensorDaemonStarted = false; isSdbDaemonStarted = false; - isEcsServerStarted = false; } // TODO: @@ -594,7 +574,7 @@ public class SocketCommunicator implements ICommunicator { } } } - + private void sendToQEMUInternal(SkinSendData sendData) { if (null == sendData) { return; @@ -677,27 +657,19 @@ public class SocketCommunicator implements ICommunicator { receivedData = dataTranfer.receivedData; dataTranfer.receivedData = null; - + return receivedData; } } - + public Socket getSocket() { return socket; } - public synchronized boolean isSensorDaemonStarted() { - return isSensorDaemonStarted; - } - public synchronized boolean isSdbDaemonStarted() { return isSdbDaemonStarted; } - public synchronized boolean isEcsServerStarted() { - return isEcsServerStarted; - } - public synchronized void setRamdumpFlag(boolean flag) { isRamdump = flag; } diff --git a/tizen/src/skin/maruskin_server.c b/tizen/src/skin/maruskin_server.c index 6767ad2c7f..82ffab706b 100644 --- a/tizen/src/skin/maruskin_server.c +++ b/tizen/src/skin/maruskin_server.c @@ -117,9 +117,7 @@ enum { SEND_HOST_KBD_STATE = 8, SEND_MULTI_TOUCH_STATE = 9, - SEND_SENSORD_STARTED = 800, SEND_SDBD_STARTED = 801, - SEND_ECS_STARTED = 802, SEND_DRAW_FRAME = 900, SEND_DRAW_BLANK_GUIDE = 901, SEND_EMUL_RESET = 998, @@ -133,9 +131,7 @@ static uint16_t svr_port = 0; static int server_sock = 0; static int client_sock = 0; static int stop_server = 0; -static int is_sensord_initialized = 0; static int is_sdbd_initialized = 0; -static int is_ecs_initialized = 0; static int ready_server = 0; static int ignore_heartbeat = 0; static int is_force_close_client = 0; @@ -300,22 +296,6 @@ void notify_draw_blank_guide(void) } } -void notify_ecs_server_start(void) -{ - INFO("notify_ecs_server_start\n"); - - is_ecs_initialized = 1; - if (client_sock) { - if (0 > send_skin_header_only( - client_sock, SEND_ECS_STARTED, 1)) { - - ERR("fail to send SEND_ECS_STARTED to skin\n"); - } - } else { - INFO("skin client socket is not connected yet\n"); - } -} - void notify_sdb_daemon_start(void) { INFO("notify_sdb_daemon_start\n"); @@ -332,22 +312,6 @@ void notify_sdb_daemon_start(void) } } -void notify_sensor_daemon_start(void) -{ - INFO("notify_sensor_daemon_start\n"); - - is_sensord_initialized = 1; - if (client_sock) { - if (0 > send_skin_header_only( - client_sock, SEND_SENSORD_STARTED, 1)) { - - ERR("fail to send SEND_SENSORD_STARTED to skin\n"); - } - } else { - INFO("skin client socket is not connected yet\n"); - } -} - void notify_ramdump_completed(void) { INFO("ramdump completed!\n"); @@ -1014,7 +978,7 @@ static void* run_skin_server(void* args) maru_display_resize(); /* after display resizing */ - if (is_rotate == true && is_sensord_initialized == 1) { + if (is_rotate == true) { do_rotation_event(rotation_type); } diff --git a/tizen/src/skin/maruskin_server.h b/tizen/src/skin/maruskin_server.h index 28da5f6a99..3430fcdc7f 100644 --- a/tizen/src/skin/maruskin_server.h +++ b/tizen/src/skin/maruskin_server.h @@ -35,9 +35,7 @@ void shutdown_skin_server(void); void notify_draw_frame(void); void notify_draw_blank_guide(void); -void notify_ecs_server_start(void); void notify_sdb_daemon_start(void); -void notify_sensor_daemon_start(void); void notify_ramdump_completed(void); void notify_booting_progress(unsigned int layer, int progress_value); void notify_brightness_state(bool on); -- 2.34.1