WebSVN – HelenOS – Diff – /trunk/kernel/genarch/src/kbrd/kbrd.c

 /*
  * Copyright (c) 2009 Jakub Jermar
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * - Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  * - Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
  * - The name of the author may not be used to endorse or promote products
  *   derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /** @addtogroup genarch
  * @{
  */
 /**
  * @file
  * @brief Keyboard processing.
  */
 #include <genarch/kbrd/kbrd.h>
 #include <genarch/kbrd/scanc.h>
 #ifdef CONFIG_PC_KBD
 #include <genarch/kbrd/scanc_pc.h>
 #endif
 #ifdef CONFIG_SUN_KBD
 #include <genarch/kbrd/scanc_sun.h>
 #endif
 #include <synch/spinlock.h>
 #include <console/chardev.h>
 #include <console/console.h>
 #include <proc/thread.h>
 #include <arch.h>
 #include <macros.h>
-#ifdef CONFIG_SUN_KBD
-    #define IGNORE_CODE  0x7f
+#define IGNORE_CODE  0x7f
-#endif
 #define KEY_RELEASE  0x80
 #define PRESSED_SHIFT     (1 << 0)
 #define PRESSED_CAPSLOCK  (1 << 1)
 #define LOCKED_CAPSLOCK   (1 << 0)
 static indev_t kbrdout;
 indev_operations_t kbrdout_ops = {
     .poll = NULL
 };
 SPINLOCK_INITIALIZE(keylock);   /**< keylock protects keyflags and lockflags. */
 static volatile int keyflags;   /**< Tracking of multiple keypresses. */
 static volatile int lockflags;  /**< Tracking of multiple keys lockings. */
-static void key_released(uint8_t);
-static void key_pressed(uint8_t);
-static void kkbrd(void *arg)
-{
-    indev_t *in = (indev_t *) arg;
-    while (true) {
-        uint8_t sc = _getc(in);
-#ifdef CONFIG_SUN_KBD
-        if (sc == IGNORE_CODE)
-            continue;
-#endif
-        if (sc & KEY_RELEASE)
-            key_released(sc ^ KEY_RELEASE);
-        else
-            key_pressed(sc);
-    }
-}
-void kbrd_init(indev_t *devin)
-{
-    indev_initialize("kbrd", &kbrdout, &kbrdout_ops);
-    thread_t *thread
-        = thread_create(kkbrd, devin, TASK, 0, "kkbrd", false);
-    if (thread) {
-        stdin = &kbrdout;
-        thread_ready(thread);
-    }
-}
 /** Process release of key.
+ *
  * @param sc Scancode of the key being released.
  */
-void key_released(uint8_t sc)
+static void key_released(wchar_t sc)
+{
     spinlock_lock(&keylock);
     switch (sc) {
     case SC_LSHIFT:
     case SC_RSHIFT:
         keyflags &= ~PRESSED_SHIFT;
         break;
     case SC_CAPSLOCK:
         keyflags &= ~PRESSED_CAPSLOCK;
         if (lockflags & LOCKED_CAPSLOCK)
             lockflags &= ~LOCKED_CAPSLOCK;
         else
             lockflags |= LOCKED_CAPSLOCK;
         break;
     default:
         break;
+    }
     spinlock_unlock(&keylock);
+}
 /** Process keypress.
+ *
  * @param sc Scancode of the key being pressed.
  */
-void key_pressed(uint8_t sc)
+static void key_pressed(wchar_t sc)
+{
-    char *map = sc_primary_map;
+    bool letter;
-    char ascii = sc_primary_map[sc];
-    bool shift, capslock;
+    bool shift;
-    bool letter = false;
+    bool capslock;
     spinlock_lock(&keylock);
     switch (sc) {
     case SC_LSHIFT:
     case SC_RSHIFT:
         keyflags |= PRESSED_SHIFT;
         break;
     case SC_CAPSLOCK:
         keyflags |= PRESSED_CAPSLOCK;
         break;
-    case SC_SPEC_ESCAPE:
+    case SC_SCAN_ESCAPE:
-        break;
-    case SC_LEFTARR:
-        indev_push_character(stdin, 0x1b);
-        indev_push_character(stdin, 0x5b);
-        indev_push_character(stdin, 0x44);
-        break;
-    case SC_RIGHTARR:
-        indev_push_character(stdin, 0x1b);
-        indev_push_character(stdin, 0x5b);
-        indev_push_character(stdin, 0x43);
-        break;
-    case SC_UPARR:
-        indev_push_character(stdin, 0x1b);
-        indev_push_character(stdin, 0x5b);
-        indev_push_character(stdin, 0x41);
-        break;
-    case SC_DOWNARR:
-        indev_push_character(stdin, 0x1b);
-        indev_push_character(stdin, 0x5b);
-        indev_push_character(stdin, 0x42);
-        break;
-    case SC_HOME:
-        indev_push_character(stdin, 0x1b);
-        indev_push_character(stdin, 0x4f);
-        indev_push_character(stdin, 0x48);
-        break;
-    case SC_END:
-        indev_push_character(stdin, 0x1b);
-        indev_push_character(stdin, 0x4f);
-        indev_push_character(stdin, 0x46);
-        break;
-    case SC_DELETE:
-        indev_push_character(stdin, 0x1b);
-        indev_push_character(stdin, 0x5b);
-        indev_push_character(stdin, 0x33);
-        indev_push_character(stdin, 0x7e);
         break;
     default:
-        letter = islower(ascii);
+        letter = islower(sc_primary_map[sc]);
+        shift = keyflags & PRESSED_SHIFT;
         capslock = (keyflags & PRESSED_CAPSLOCK) ||
             (lockflags & LOCKED_CAPSLOCK);
-        shift = keyflags & PRESSED_SHIFT;
-        if (letter && capslock)
+        if ((letter) && (capslock))
             shift = !shift;
         if (shift)
-            map = sc_secondary_map;
+            indev_push_character(stdin, sc_secondary_map[sc]);
+        else
-        indev_push_character(stdin, map[sc]);
+            indev_push_character(stdin, sc_primary_map[sc]);
         break;
+    }
     spinlock_unlock(&keylock);
+}
+static void kkbrd(void *arg)
+{
+    indev_t *in = (indev_t *) arg;
+    while (true) {
+        wchar_t sc = _getc(in);
+        if ((sc == IGNORE_CODE) || (sc >= SCANCODES))
+            continue;
+        if (sc & KEY_RELEASE)
+            key_released(sc ^ KEY_RELEASE);
+        else
+            key_pressed(sc);
+    }
+}
+void kbrd_init(indev_t *devin)
+{
+    indev_initialize("kbrd", &kbrdout, &kbrdout_ops);
+    thread_t *thread
+        = thread_create(kkbrd, devin, TASK, 0, "kkbrd", false);
+    if (thread) {
+        stdin = &kbrdout;
+        thread_ready(thread);
+    }
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/trunk/kernel/genarch/src/kbrd/kbrd.c – Rev 4092 → 4223