virtio-keyboard: Modified key conversion routine.

Before delivering scancode, keycodes which are Insert, Delete,
Arrow Keys and etc. have to be converted.

Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index 0e16b9fbc53d2785fe6f2e894a166bc926556cb0..73badc15ad4d72369ed213849b42bc3cf1f52071 100644 (file)
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -271,8 +271,6 @@ void pci_device_hot_add(Monitor *mon, const QDict *qdict)
         dev = qemu_pci_hot_add_storage(mon, pci_addr, opts);
 #ifdef CONFIG_MARU
     } else if (strcmp(type, "keyboard") == 0) {
-        printf("virtio-keyboard: pci_addr %s, type %s, opts %s\n",
-                pci_addr, type, opts);
         dev = qemu_pci_hot_add_keyboard(mon, pci_addr, opts);
 #endif
     } else {

diff --git a/tizen/src/hw/maru_virtio_keyboard.c b/tizen/src/hw/maru_virtio_keyboard.c
index 28ba0d9c664f0fe52b1528f486228233c4bcc28a..4fb894a03af9d06fabb5b4f360a9b35a6838da7b 100644 (file)
--- a/tizen/src/hw/maru_virtio_keyboard.c
+++ b/tizen/src/hw/maru_virtio_keyboard.c
@@ -39,8 +39,8 @@ MULTI_DEBUG_CHANNEL(qemu, virtio-kbd);
 
 typedef struct EmulKbdEvent
 {
-       uint16_t code;
-       uint16_t type;
+    uint16_t code;
+    uint16_t type;
 } EmulKbdEvent;
 
 typedef struct VirtIOKeyboard
@@ -48,96 +48,148 @@ typedef struct VirtIOKeyboard
     VirtIODevice    vdev;
     VirtQueue       *vq;
     DeviceState     *qdev;
-       EmulKbdEvent    kbdevent;
+    EmulKbdEvent    kbdevent;
+    short           extension_key;
 } VirtIOKeyboard;
 
 VirtQueueElement elem;
 
 static void virtio_keyboard_handle (VirtIODevice *vdev, VirtQueue *vq)
 {
-       VirtIOKeyboard *vkbd = (VirtIOKeyboard *)vdev;
+    VirtIOKeyboard *vkbd = (VirtIOKeyboard *)vdev;
 
-       INFO("virtqueue keyboard handler.\n");
-       if (virtio_queue_empty(vkbd->vq)) {
-               INFO("virtio_keyboard: virtqueue is empty.\n");
-               return;
-       }
+    TRACE("virtqueue handler.\n");
+    if (virtio_queue_empty(vkbd->vq)) {
+        INFO("virtio_keyboard: virtqueue is empty.\n");
+        return;
+    }
 
-       /* Get a queue buffer which is written by guest side. */
-       virtqueue_pop(vq, &elem);
+    /* Get a queue buffer which is written by guest side. */
+    virtqueue_pop(vq, &elem);
 }
 
 void virtio_keyboard_notify (void *opaque)
 {
-       VirtIOKeyboard *vkbd = (VirtIOKeyboard *)opaque;
-       int len = 0;
-
-       len = sizeof(EmulKbdEvent);
-
-       INFO("virtio_keyboard_notify: code:%d, type:%d\n",
-               vkbd->kbdevent.code, vkbd->kbdevent.type);
-
-       if (!virtio_queue_ready(vkbd->vq)) {
-               INFO("virtio_keyboard: virtqueue is not ready.\n");
-               return;
-       }
+    VirtIOKeyboard *vkbd = (VirtIOKeyboard *)opaque;
+    int len = sizeof(EmulKbdEvent);
+
+#if 0
+    TRACE("virtio_keyboard_notify: code:%d, type:%d\n",
+        vkbd->kbdevent.code, vkbd->kbdevent.type);
+#endif
+    TRACE("virtqueue notifier.\n");
+    if (!virtio_queue_ready(vkbd->vq)) {
+        INFO("virtio_keyboard: virtqueue is not ready.\n");
+        return;
+    }
 
-       /* Copy keyboard data into guest side. */
-       memcpy(elem.in_sg[0].iov_base, &vkbd->kbdevent, len);
+    /* Copy keyboard data into guest side. */
+    memcpy(elem.in_sg[0].iov_base, &vkbd->kbdevent, len);
 
-       virtqueue_push(vkbd->vq, &elem, len);
-       virtio_notify(&vkbd->vdev, vkbd->vq);
+    virtqueue_push(vkbd->vq, &elem, len);
+    virtio_notify(&vkbd->vdev, vkbd->vq);
 }
 
 static void virtio_keyboard_event (void *opaque, int keycode)
 {
-       VirtIOKeyboard *vkbd = opaque;
-
-       if (!(keycode & 0x80)) {
-               vkbd->kbdevent.type = 1;        /* KEY_PRESSED */
-       } else {
-               vkbd->kbdevent.type = 0;        /* KEY_RELEASED */
-       }
-       vkbd->kbdevent.code = keycode & 0x7f;
-
-       INFO("virito_keycode_event: keycode:%d, type:%d\n",
-               vkbd->kbdevent.code, vkbd->kbdevent.type);
-       
-       mloop_evcmd_keyboard(vkbd);
+    VirtIOKeyboard *vkbd = (VirtIOKeyboard *)opaque;
+
+    TRACE("keyborad input_event handler.\n");
+
+    if (keycode < 0xe0) {
+        if (vkbd->extension_key) {
+            switch(keycode & 0x7f) {
+                case 71:    // Home
+                    vkbd->kbdevent.code = 102;
+                    break;
+                case 72:    // Up
+                    vkbd->kbdevent.code = 103;
+                    break;
+                case 73:    // Page Up
+                    vkbd->kbdevent.code = 104;
+                    break;
+                case 75:    // Left
+                    vkbd->kbdevent.code = 105;
+                    break;
+                case 77:    // Right
+                    vkbd->kbdevent.code = 106;
+                    break;
+                case 79:    // End
+                    vkbd->kbdevent.code = 107;
+                    break;
+                case 80:    // Down
+                    vkbd->kbdevent.code = 108;
+                    break;
+                case 81:    // Page Down
+                    vkbd->kbdevent.code = 109;
+                    break;
+                case 82:    // Insert
+                    vkbd->kbdevent.code = 110;
+                    break;
+                case 83:    // Delete
+                    vkbd->kbdevent.code = 111;
+                    break;
+                default:
+                    WARN("There is no keymap for the keycode %d.\n", keycode);
+            }
+            vkbd->extension_key = 0;
+        } else {
+            vkbd->kbdevent.code = keycode & 0x7f;
+        }
+
+        if (!(keycode & 0x80)) {
+            vkbd->kbdevent.type = 1;    /* KEY_PRESSED */
+        } else {
+            vkbd->kbdevent.type = 0;    /* KEY_RELEASED */
+        }
+    } else {
+        TRACE("Extension key.\n");
+        vkbd->kbdevent.code = keycode;
+        vkbd->extension_key = 1;
+    }
+
+#if 0
+    TRACE("virito_keycode_event: keycode:%d, type:%d\n",
+        vkbd->kbdevent.code, vkbd->kbdevent.type);
+#endif
+
+    mloop_evcmd_keyboard(vkbd);
 }
 
 static uint32_t virtio_keyboard_get_features (VirtIODevice *vdev,
-                                                 uint32_t request_feature)
+                                              uint32_t request_feature)
 {
-       INFO("virito_keycode_get_features.\n");
+    TRACE("virtio_keyboard_get_features.\n");
     return 0;
 }
 
 VirtIODevice *virtio_keyboard_init(DeviceState *dev)
 {
-    VirtIOKeyboard *kbd;
-    INFO("initialize virtio keyboard device\n");
+    VirtIOKeyboard *vkbd;
+    INFO("initialize virtio-keyboard device\n");
 
-    kbd = (VirtIOKeyboard *)virtio_common_init(VIRTIO_KBD_DEVICE_NAME,
-               VIRTIO_ID_KEYBOARD, 0, sizeof(VirtIOKeyboard));
+    vkbd = (VirtIOKeyboard *)virtio_common_init(VIRTIO_KBD_DEVICE_NAME,
+            VIRTIO_ID_KEYBOARD, 0, sizeof(VirtIOKeyboard));
 
-    if (kbd == NULL) {
-        ERR("failed to initialize the touchscreen device\n");
+    if (vkbd == NULL) {
+        ERR("failed to initialize the virtio-keyboard device\n");
         return NULL;
     }
 
-    kbd->vdev.get_features = virtio_keyboard_get_features;
-    kbd->vq = virtio_add_queue(&kbd->vdev, 64, virtio_keyboard_handle);
-    kbd->qdev = dev;
+    vkbd->extension_key = 0;
+
+    vkbd->vdev.get_features = virtio_keyboard_get_features;
+    vkbd->vq = virtio_add_queue(&vkbd->vdev, 64, virtio_keyboard_handle);
+    vkbd->qdev = dev;
 
-       /* register keyboard handler */
-       qemu_add_kbd_event_handler(virtio_keyboard_event, kbd);
+    /* register keyboard handler */
+    qemu_add_kbd_event_handler(virtio_keyboard_event, vkbd);
 
-    return &kbd->vdev;
+    return &vkbd->vdev;
 }
 
 void virtio_keyboard_exit(VirtIODevice *vdev)
 {
-    INFO("destroy virtio keyboard device\n");
+    INFO("destroy virtio-keyboard device\n");
     virtio_cleanup(vdev);
 }

diff --git a/tizen/src/skin/maruskin_operation.c b/tizen/src/skin/maruskin_operation.c
index 6b6e76e0d7ea15c52c14c74952fd57d240762cda..01a2f468cd8c4e47c8b8d2d365a38c1c5c12ce7d 100644 (file)
--- a/tizen/src/skin/maruskin_operation.c
+++ b/tizen/src/skin/maruskin_operation.c
@@ -196,7 +196,6 @@ void do_key_event(int event_type, int keycode, int state_mask, int key_location)
 #endif
 
     scancode = javakeycode_to_scancode(event_type, keycode, state_mask, key_location);
-    TRACE("javakeycode_to_scancode : %d\n", scancode);
 
     if (scancode == -1) {
         INFO("cannot find scancode\n");
@@ -204,10 +203,10 @@ void do_key_event(int event_type, int keycode, int state_mask, int key_location)
     }
 
     if (KEY_PRESSED == event_type) {
-               INFO("key pressed: %d\n", scancode);
+               TRACE("key pressed: %d\n", scancode);
         kbd_put_keycode(scancode);
     } else if (KEY_RELEASED == event_type) {
-               INFO("key released: %d\n", scancode);
+               TRACE("key released: %d\n", scancode);
         kbd_put_keycode(scancode | 0x80);
     }
 }