From: Kitae Kim Date: Thu, 29 Nov 2012 12:32:16 +0000 (+0900) Subject: ARM: Use usb keyboard instead of virtio keyboard. X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1321 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=05d61d7488904ad96b6909958dfff3ab6b701734;p=sdk%2Femulator%2Fqemu.git ARM: Use usb keyboard instead of virtio keyboard. As ARM emulator cannot support pci hotplug feature at the moment, modified skin server source to eanble usb keyboard instead of virtio keyboard. Signed-off-by: Kitae Kim --- 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 bebe7f0907..f7c961dce4 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java @@ -1899,54 +1899,6 @@ public class EmulatorSkin { } } ); - /* - // USB Keyboard menu - final MenuItem usbKeyboardItem = new MenuItem(menu, SWT.CASCADE); - usbKeyboardItem.setText("&USB Keyboard"); - usbKeyboardItem.setImage(imageRegistry.getIcon(IconName.USB_KEYBOARD)); - - Menu usbKeyBoardMenu = new Menu(shell, SWT.DROP_DOWN); - - final MenuItem usbOnItem = new MenuItem(usbKeyBoardMenu, SWT.RADIO); - usbOnItem.setText("On"); - usbOnItem.setSelection( isOnKbd ); - - final MenuItem usbOffItem = new MenuItem(usbKeyBoardMenu, SWT.RADIO); - usbOffItem.setText("Off"); - usbOffItem.setSelection(!isOnKbd); - - SelectionAdapter usbSelectionAdaptor = new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - if (!communicator.isSensorDaemonStarted()) { - SkinUtil.openMessage(shell, null, - "USB is not ready.\nPlease wait until the emulator is completely boot up.", - SWT.ICON_WARNING, config); - usbOnItem.setSelection(isOnKbd); - usbOffItem.setSelection(!isOnKbd); - - return; - } - - MenuItem item = (MenuItem) e.getSource(); - if ( item.getSelection() ) { - boolean on = item.equals(usbOnItem); - isOnKbd = on; - logger.info("USB keyboard " + isOnKbd); - - communicator.sendToQEMU( - SendCommand.USB_KBD, new BooleanData(on, SendCommand.USB_KBD.toString())); - } - - } - }; - - usbOnItem.addSelectionListener(usbSelectionAdaptor); - usbOffItem.addSelectionListener(usbSelectionAdaptor); - - usbKeyboardItem.setMenu(usbKeyBoardMenu); - */ - // VirtIO Keyboard Menu final MenuItem hostKeyboardItem = new MenuItem(menu, SWT.CASCADE); hostKeyboardItem.setText("&Host Keyboard"); 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 66b4c4da7a..f57edc790b 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 @@ -202,12 +202,11 @@ public interface ICommunicator extends Runnable { SEND_HARD_KEY_EVENT( (short)12 ), CHANGE_LCD_STATE( (short)13 ), OPEN_SHELL( (short)14 ), - USB_KBD( (short)15 ), + HOST_KBD( (short)15 ), SCREEN_SHOT( (short)16 ), DETAIL_INFO( (short)17 ), RAM_DUMP( (short)18 ), GUEST_DUMP( (short)19 ), - HOST_KBD( (short)20 ), RESPONSE_HEART_BEAT( (short)900 ), CLOSE( (short)998 ), diff --git a/tizen/src/skin/maruskin_operation.c b/tizen/src/skin/maruskin_operation.c index 01f9fa61cb..a3f1b92b3c 100644 --- a/tizen/src/skin/maruskin_operation.c +++ b/tizen/src/skin/maruskin_operation.c @@ -136,7 +136,7 @@ void do_mouse_event(int button_type, int event_type, ERR("undefined mouse event type passed:%d\n", event_type); break; } - + #if 0 #ifdef CONFIG_WIN32 Sleep(1); @@ -189,7 +189,7 @@ void do_key_event(int event_type, int keycode, int state_mask, int key_location) } #endif -#if 0 +#if defined(TARGET_ARM) if (!mloop_evcmd_get_usbkbd_status()) { TRACE("ignore keyboard input because usb keyboard is dettached.\n"); return; @@ -418,16 +418,14 @@ void open_shell( void ) { INFO("open shell\n"); } -void onoff_usb_kbd(int on) -{ - INFO("usb kbd on/off:%d\n", on); - mloop_evcmd_usbkbd(on); -} - void onoff_host_kbd(int on) { INFO("host kbd on/off: %d.\n", on); +#if defined(TARGET_ARM) + mloop_evcmd_usbkbd(on); +#elif defined(TARGET_I386) mloop_evcmd_hostkbd(on); +#endif } #define MAX_PATH 256 @@ -441,7 +439,7 @@ static void dump_ram( void ) char* dump_path = g_path_get_dirname(get_logpath()); - sprintf(dump_filename, "0x%08x%s0x%08x%s", rm->ram_addr, "-", + sprintf(dump_filename, "0x%08x%s0x%08x%s", rm->ram_addr, "-", rm->ram_addr + size, "_RAM.dump"); sprintf(dump_fullpath, "%s/%s", dump_path, dump_filename); free(dump_path); diff --git a/tizen/src/skin/maruskin_operation.h b/tizen/src/skin/maruskin_operation.h index 3197cfa923..ba9690f94d 100644 --- a/tizen/src/skin/maruskin_operation.h +++ b/tizen/src/skin/maruskin_operation.h @@ -69,8 +69,6 @@ void free_screenshot_info(QemuSurfaceInfo *); void open_shell(void); -void onoff_usb_kbd(int on); - void onoff_host_kbd(int on); void ram_dump(void); diff --git a/tizen/src/skin/maruskin_server.c b/tizen/src/skin/maruskin_server.c index 48bde10b27..f038a2df14 100644 --- a/tizen/src/skin/maruskin_server.c +++ b/tizen/src/skin/maruskin_server.c @@ -99,12 +99,11 @@ enum { RECV_HARD_KEY_EVENT = 12, RECV_CHANGE_LCD_STATE = 13, RECV_OPEN_SHELL = 14, - RECV_USB_KBD = 15, + RECV_HOST_KBD = 15, RECV_SCREEN_SHOT = 16, RECV_DETAIL_INFO = 17, RECV_RAM_DUMP = 18, RECV_GUESTMEMORY_DUMP = 19, - RECV_HOST_KBD = 20, RECV_RESPONSE_HEART_BEAT = 900, RECV_CLOSE = 998, RECV_RESPONSE_SHUTDOWN = 999, @@ -811,21 +810,6 @@ static void* run_skin_server( void* args ) { open_shell(); break; } - case RECV_USB_KBD: { - char on = 0; - - log_cnt += sprintf(log_buf + log_cnt, "RECV_USB_KBD ==\n"); - TRACE(log_buf); - - if (length <= 0) { - INFO("there is no data looking at 0 length.\n"); - continue; - } - - memcpy(&on, recvbuf, sizeof(on)); - onoff_usb_kbd(on); - break; - } case RECV_HOST_KBD: { char on = 0;