keyboard: delete unused code

Change-Id: Id848ece229dc5288f4bb407b2c14f8e6a71277a2
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
index cb072198d70a8c25d878cd868090a2abbbd85e86..f36e617632b4056f6263c0d6964def17b316dae3 100644 (file)
--- a/hw/usb/dev-hid.c
+++ b/hw/usb/dev-hid.c
@@ -29,10 +29,6 @@
 #include "qemu/timer.h"
 #include "hw/input/hid.h"
 
-#ifdef CONFIG_MARU
-#include "../tizen/src/mloop_event.h"
-#endif
-
 /* HID interface requests */
 #define GET_REPORT   0xa101
 #define GET_IDLE     0xa102
@@ -565,12 +561,6 @@ static void usb_hid_handle_destroy(USBDevice *dev)
 {
     USBHIDState *us = DO_UPCAST(USBHIDState, dev, dev);
 
-#ifdef CONFIG_MARU
-    if (us->hid.kind == HID_KEYBOARD) {
-        mloop_evcmd_set_usbkbd(NULL);
-    }
-#endif
-
     hid_free(&us->hid);
 }
 
@@ -614,9 +604,6 @@ static int usb_mouse_initfn(USBDevice *dev)
 
 static int usb_keyboard_initfn(USBDevice *dev)
 {
-#ifdef CONFIG_MARU
-    mloop_evcmd_set_usbkbd(dev);
-#endif
     return usb_hid_initfn(dev, HID_KEYBOARD);
 }
 

diff --git a/tizen/src/mloop_event.c b/tizen/src/mloop_event.c
index 57462289e139afed3be40f51a5c88fd48a6be641..c126982992a0d4c8bc200f62cb88da34b4dd2b5e 100644 (file)
--- a/tizen/src/mloop_event.c
+++ b/tizen/src/mloop_event.c
@@ -235,7 +235,6 @@ static int mloop_evsock_send(struct mloop_evsock *ev, struct mloop_evpack *p)
     return ret;
 }
 
-static USBDevice *usbkbd = NULL;
 static USBDevice *usbdisk = NULL;
 #ifdef TARGET_I386
 static PCIDevice *hostkbd = NULL;
@@ -249,13 +248,7 @@ static void mloop_evhandle_usb_add(char *name)
         return;
     }
 
-    if (strcmp(name, "keyboard") == 0) {
-        if (usbkbd == NULL) {
-            usbkbd = usbdevice_create(name);
-        } else if (usbkbd->attached == 0) {
-            usb_device_attach(usbkbd);
-        }
-    } else if (strncmp(name, "disk:", 5) == 0) {
+    if (strncmp(name, "disk:", 5) == 0) {
         if (usbdisk == NULL) {
             usbdisk = usbdevice_create(name);
         }
@@ -271,11 +264,7 @@ static void mloop_evhandle_usb_del(char *name)
         return;
     }
 
-    if (strcmp(name, "keyboard") == 0) {
-        if (usbkbd && usbkbd->attached != 0) {
-            usb_device_detach(usbkbd);
-        }
-    } else if (strncmp(name, "disk:", 5) == 0) {
+    if (strncmp(name, "disk:", 5) == 0) {
         if (usbdisk) {
 //            qdev_free(&usbdisk->qdev);
         }
@@ -574,15 +563,6 @@ void mloop_evcmd_lower_intr(void *irq)
     mloop_evsock_send(&mloop, &pack);
 }
 
-void mloop_evcmd_usbkbd(int on)
-{
-    struct mloop_evpack pack = { MLOOP_EVTYPE_USB_ADD, 13, "keyboard" };
-    if (on == 0) {
-        pack.type = MLOOP_EVTYPE_USB_DEL;
-    }
-    mloop_evsock_send(&mloop, &pack);
-}
-
 void mloop_evcmd_hostkbd(int on)
 {
     struct mloop_evpack pack
@@ -635,16 +615,6 @@ void mloop_evcmd_sdcard(char *img)
     mloop_evsock_send(&mloop, &pack);
 }
 
-int mloop_evcmd_get_usbkbd_status(void)
-{
-    return (usbkbd && usbkbd->attached ? 1 : 0);
-}
-
-void mloop_evcmd_set_usbkbd(void *dev)
-{
-    usbkbd = (USBDevice *)dev;
-}
-
 void mloop_evcmd_set_usbdisk(void *dev)
 {
     usbdisk = (USBDevice *)dev;

diff --git a/tizen/src/skin/maruskin_operation.c b/tizen/src/skin/maruskin_operation.c
index 13d80692931a0843430d8a445d7f9ea634fd00c3..0b55f96cd01b4616f08793916fa3fd8bc972e5c0 100644 (file)
--- a/tizen/src/skin/maruskin_operation.c
+++ b/tizen/src/skin/maruskin_operation.c
@@ -264,13 +264,6 @@ void do_keyboard_key_event(int event_type,
     }
 #endif
 
-#if defined(TARGET_ARM)
-    if (!mloop_evcmd_get_usbkbd_status()) {
-        TRACE("ignore keyboard input because usb keyboard is dettached.\n");
-        return;
-    }
-#endif
-
     scancode = javakeycode_to_scancode(event_type, keycode, state_mask, key_location);
 
     if (scancode == -1) {