WebSVN – HelenOS-historic – Diff – /uspace/trunk/kbd/arch/ia32/src/kbd.c

 /*
  * Copyright (C) 2001-2004 Jakub Jermar
  * Copyright (C) 2006 Josef Cejka
  * 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.
  */
 #include <arch/kbd.h>
-#include <key_buffer.h>
 #include <ipc/ipc.h>
 #define SPECIAL     '?'
 #define KEY_RELEASE 0x80
 /**
  * These codes read from i8042 data register are silently ignored.
  */
 #define IGNORE_CODE 0x7f
 #define PRESSED_SHIFT       (1<<0)
 #define PRESSED_CAPSLOCK    (1<<1)
 #define LOCKED_CAPSLOCK     (1<<0)
 /** Scancodes. */
 #define SC_ESC      0x01
 #define SC_BACKSPACE    0x0e
 #define SC_LSHIFT   0x2a
 #define SC_RSHIFT   0x36
 #define SC_CAPSLOCK 0x3a
 #define SC_SPEC_ESCAPE  0xe0
 #define SC_LEFTARR      0x4b
 #define SC_RIGHTARR     0x4d
 #define SC_UPARR        0x48
 #define SC_DOWNARR      0x50
 #define SC_DELETE       0x53
 #define SC_HOME         0x47
 #define SC_END          0x4f
 static volatile int keyflags;       /**< Tracking of multiple keypresses. */
 static volatile int lockflags;      /**< Tracking of multiple keys lockings. */
 /** Primary meaning of scancodes. */
 static char sc_primary_map[] = {
     SPECIAL, /* 0x00 */
     SPECIAL, /* 0x01 - Esc */
     '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=',
     '\b', /* 0x0e - Backspace */
     '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n',
     SPECIAL, /* 0x1d - LCtrl */
     'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'',
     '`',
     SPECIAL, /* 0x2a - LShift */
     '\\',
     'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/',
     SPECIAL, /* 0x36 - RShift */
     '*',
     SPECIAL, /* 0x38 - LAlt */
     ' ',
     SPECIAL, /* 0x3a - CapsLock */
+x3b, /* 0x3b - F1 */
-    SPECIAL, /* 0x3b - F1 */
+//  SPECIAL, /* 0x3b - F1 */
+x3c, /* 0x3c - F2 */
-    SPECIAL, /* 0x3c - F2 */
+//  SPECIAL, /* 0x3c - F2 */
+x3d, /* 0x3d - F3 */
-    SPECIAL, /* 0x3d - F3 */
+//  SPECIAL, /* 0x3d - F3 */
+x3e, /* 0x3e - F4 */
-    SPECIAL, /* 0x3e - F4 */
+//  SPECIAL, /* 0x3e - F4 */
-    SPECIAL, /* 0x3f - F5 */
+//  SPECIAL, /* 0x3f - F5 */
+x3f, /* 0x3f - F5 */
-    SPECIAL, /* 0x40 - F6 */
+//  SPECIAL, /* 0x40 - F6 */
+x40, /* 0x40 - F6 */
-    SPECIAL, /* 0x41 - F7 */
+//  SPECIAL, /* 0x41 - F7 */
+x41, /* 0x41 - F7 */
-    SPECIAL, /* 0x42 - F8 */
+//  SPECIAL, /* 0x42 - F8 */
+x42, /* 0x42 - F8 */
-    SPECIAL, /* 0x43 - F9 */
+//  SPECIAL, /* 0x43 - F9 */
+x43, /* 0x43 - F9 */
-    SPECIAL, /* 0x44 - F10 */
+//  SPECIAL, /* 0x44 - F10 */
+x44, /* 0x44 - F10 */
     SPECIAL, /* 0x45 - NumLock */
     SPECIAL, /* 0x46 - ScrollLock */
     '7', '8', '9', '-',
     '4', '5', '6', '+',
     '1', '2', '3',
     '0', '.',
     SPECIAL, /* 0x54 - Alt-SysRq */
     SPECIAL, /* 0x55 - F11/F12/PF1/FN */
     SPECIAL, /* 0x56 - unlabelled key next to LAlt */
     SPECIAL, /* 0x57 - F11 */
     SPECIAL, /* 0x58 - F12 */
     SPECIAL, /* 0x59 */
     SPECIAL, /* 0x5a */
     SPECIAL, /* 0x5b */
     SPECIAL, /* 0x5c */
     SPECIAL, /* 0x5d */
     SPECIAL, /* 0x5e */
     SPECIAL, /* 0x5f */
     SPECIAL, /* 0x60 */
     SPECIAL, /* 0x61 */
     SPECIAL, /* 0x62 */
     SPECIAL, /* 0x63 */
     SPECIAL, /* 0x64 */
     SPECIAL, /* 0x65 */
     SPECIAL, /* 0x66 */
     SPECIAL, /* 0x67 */
     SPECIAL, /* 0x68 */
     SPECIAL, /* 0x69 */
     SPECIAL, /* 0x6a */
     SPECIAL, /* 0x6b */
     SPECIAL, /* 0x6c */
     SPECIAL, /* 0x6d */
     SPECIAL, /* 0x6e */
     SPECIAL, /* 0x6f */
     SPECIAL, /* 0x70 */
     SPECIAL, /* 0x71 */
     SPECIAL, /* 0x72 */
     SPECIAL, /* 0x73 */
     SPECIAL, /* 0x74 */
     SPECIAL, /* 0x75 */
     SPECIAL, /* 0x76 */
     SPECIAL, /* 0x77 */
     SPECIAL, /* 0x78 */
     SPECIAL, /* 0x79 */
     SPECIAL, /* 0x7a */
     SPECIAL, /* 0x7b */
     SPECIAL, /* 0x7c */
     SPECIAL, /* 0x7d */
     SPECIAL, /* 0x7e */
     SPECIAL, /* 0x7f */
 };
 /** Secondary meaning of scancodes. */
 static char sc_secondary_map[] = {
     SPECIAL, /* 0x00 */
     SPECIAL, /* 0x01 - Esc */
     '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+',
     SPECIAL, /* 0x0e - Backspace */
     '\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', '\n',
     SPECIAL, /* 0x1d - LCtrl */
     'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"',
     '~',
     SPECIAL, /* 0x2a - LShift */
     '|',
     'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?',
     SPECIAL, /* 0x36 - RShift */
     '*',
     SPECIAL, /* 0x38 - LAlt */
     ' ',
     SPECIAL, /* 0x3a - CapsLock */
+x3b, /* 0x3b - F1 */
+x3c, /* 0x3c - F2 */
+x3d, /* 0x3d - F3 */
+x3e, /* 0x3e - F4 */
+x3f, /* 0x3f - F5 */
+x40, /* 0x40 - F6 */
+x41, /* 0x41 - F7 */
+x42, /* 0x42 - F8 */
+x43, /* 0x43 - F9 */
+x44, /* 0x44 - F10 */
-    SPECIAL, /* 0x3b - F1 */
+//  SPECIAL, /* 0x3b - F1 */
-    SPECIAL, /* 0x3c - F2 */
+//  SPECIAL, /* 0x3c - F2 */
-    SPECIAL, /* 0x3d - F3 */
+//  SPECIAL, /* 0x3d - F3 */
-    SPECIAL, /* 0x3e - F4 */
+//  SPECIAL, /* 0x3e - F4 */
-    SPECIAL, /* 0x3f - F5 */
+//  SPECIAL, /* 0x3f - F5 */
-    SPECIAL, /* 0x40 - F6 */
+//  SPECIAL, /* 0x40 - F6 */
-    SPECIAL, /* 0x41 - F7 */
+//  SPECIAL, /* 0x41 - F7 */
-    SPECIAL, /* 0x42 - F8 */
+//  SPECIAL, /* 0x42 - F8 */
-    SPECIAL, /* 0x43 - F9 */
+//  SPECIAL, /* 0x43 - F9 */
-    SPECIAL, /* 0x44 - F10 */
+//  SPECIAL, /* 0x44 - F10 */
     SPECIAL, /* 0x45 - NumLock */
     SPECIAL, /* 0x46 - ScrollLock */
     '7', '8', '9', '-',
     '4', '5', '6', '+',
     '1', '2', '3',
     '0', '.',
     SPECIAL, /* 0x54 - Alt-SysRq */
     SPECIAL, /* 0x55 - F11/F12/PF1/FN */
     SPECIAL, /* 0x56 - unlabelled key next to LAlt */
     SPECIAL, /* 0x57 - F11 */
     SPECIAL, /* 0x58 - F12 */
     SPECIAL, /* 0x59 */
     SPECIAL, /* 0x5a */
     SPECIAL, /* 0x5b */
     SPECIAL, /* 0x5c */
     SPECIAL, /* 0x5d */
     SPECIAL, /* 0x5e */
     SPECIAL, /* 0x5f */
     SPECIAL, /* 0x60 */
     SPECIAL, /* 0x61 */
     SPECIAL, /* 0x62 */
     SPECIAL, /* 0x63 */
     SPECIAL, /* 0x64 */
     SPECIAL, /* 0x65 */
     SPECIAL, /* 0x66 */
     SPECIAL, /* 0x67 */
     SPECIAL, /* 0x68 */
     SPECIAL, /* 0x69 */
     SPECIAL, /* 0x6a */
     SPECIAL, /* 0x6b */
     SPECIAL, /* 0x6c */
     SPECIAL, /* 0x6d */
     SPECIAL, /* 0x6e */
     SPECIAL, /* 0x6f */
     SPECIAL, /* 0x70 */
     SPECIAL, /* 0x71 */
     SPECIAL, /* 0x72 */
     SPECIAL, /* 0x73 */
     SPECIAL, /* 0x74 */
     SPECIAL, /* 0x75 */
     SPECIAL, /* 0x76 */
     SPECIAL, /* 0x77 */
     SPECIAL, /* 0x78 */
     SPECIAL, /* 0x79 */
     SPECIAL, /* 0x7a */
     SPECIAL, /* 0x7b */
     SPECIAL, /* 0x7c */
     SPECIAL, /* 0x7d */
     SPECIAL, /* 0x7e */
     SPECIAL, /* 0x7f */
 };
 irq_cmd_t i8042_cmds[1] = {
     { CMD_PORT_READ_1, (void *)0x60, 0 }
 };
 irq_code_t i8042_kbd = {
 ,
     i8042_cmds
 };
-static int key_released(unsigned char key)
+static int key_released(keybuffer_t *keybuffer, unsigned char key)
+{
     switch (key) {
         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;
+    }
+}
-static int key_pressed(unsigned char key)
+static int key_pressed(keybuffer_t *keybuffer, unsigned char key)
+{
     char *map = sc_primary_map;
     char ascii = sc_primary_map[key];
     char shift, capslock;
     char letter = 0;
     switch (key) {
         case SC_LSHIFT:
         case SC_RSHIFT:
                 keyflags |= PRESSED_SHIFT;
             break;
         case SC_CAPSLOCK:
             keyflags |= PRESSED_CAPSLOCK;
             break;
         case SC_SPEC_ESCAPE:
             break;
         case SC_LEFTARR:
-            if (key_buffer_available() >= 3) {
+            if (keybuffer_available(keybuffer) >= 3) {
-                key_buffer_push(0x1b);
+                keybuffer_push(keybuffer, 0x1b);
-                key_buffer_push(0x5b);
+                keybuffer_push(keybuffer, 0x5b);
-                key_buffer_push(0x44);
+                keybuffer_push(keybuffer, 0x44);
+            }
             break;
         case SC_RIGHTARR:
-            if (key_buffer_available() >= 3) {
+            if (keybuffer_available(keybuffer) >= 3) {
-                key_buffer_push(0x1b);
+                keybuffer_push(keybuffer, 0x1b);
-                key_buffer_push(0x5b);
+                keybuffer_push(keybuffer, 0x5b);
-                key_buffer_push(0x43);
+                keybuffer_push(keybuffer, 0x43);
+            }
             break;
         case SC_UPARR:
-            if (key_buffer_available() >= 3) {
+            if (keybuffer_available(keybuffer) >= 3) {
-                key_buffer_push(0x1b);
+                keybuffer_push(keybuffer, 0x1b);
-                key_buffer_push(0x5b);
+                keybuffer_push(keybuffer, 0x5b);
-                key_buffer_push(0x41);
+                keybuffer_push(keybuffer, 0x41);
+            }
             break;
         case SC_DOWNARR:
-            if (key_buffer_available() >= 3) {
+            if (keybuffer_available(keybuffer) >= 3) {
-                key_buffer_push(0x1b);
+                keybuffer_push(keybuffer, 0x1b);
-                key_buffer_push(0x5b);
+                keybuffer_push(keybuffer, 0x5b);
-                key_buffer_push(0x42);
+                keybuffer_push(keybuffer, 0x42);
+            }
             break;
         case SC_HOME:
-            if (key_buffer_available() >= 3) {
+            if (keybuffer_available(keybuffer) >= 3) {
-                key_buffer_push(0x1b);
+                keybuffer_push(keybuffer, 0x1b);
-                key_buffer_push(0x4f);
+                keybuffer_push(keybuffer, 0x4f);
-                key_buffer_push(0x48);
+                keybuffer_push(keybuffer, 0x48);
+            }
             break;
         case SC_END:
-            if (key_buffer_available() >= 3) {
+            if (keybuffer_available(keybuffer) >= 3) {
-                key_buffer_push(0x1b);
+                keybuffer_push(keybuffer, 0x1b);
-                key_buffer_push(0x4f);
+                keybuffer_push(keybuffer, 0x4f);
-                key_buffer_push(0x46);
+                keybuffer_push(keybuffer, 0x46);
+            }
             break;
         case SC_DELETE:
-            if (key_buffer_available() >= 4) {
+            if (keybuffer_available(keybuffer) >= 4) {
-                key_buffer_push(0x1b);
+                keybuffer_push(keybuffer, 0x1b);
-                key_buffer_push(0x5b);
+                keybuffer_push(keybuffer, 0x5b);
-                key_buffer_push(0x33);
+                keybuffer_push(keybuffer, 0x33);
-                key_buffer_push(0x7e);
+                keybuffer_push(keybuffer, 0x7e);
+            }
             break;
         default:
                 letter = ((ascii >= 'a') && (ascii <= 'z'));
             capslock = (keyflags & PRESSED_CAPSLOCK) || (lockflags & LOCKED_CAPSLOCK);
             shift = keyflags & PRESSED_SHIFT;
             if (letter && capslock)
                 shift = !shift;
             if (shift)
                 map = sc_secondary_map;
-            key_buffer_push(map[key]);
+            keybuffer_push(keybuffer, map[key]);
             break;
+    }
+}
 /** Register uspace irq handler
  * @return
  */
 int kbd_arch_init(void)
+{
     return !(ipc_register_irq(1, &i8042_kbd));
+}
-int kbd_arch_process(int scan_code)
+int kbd_arch_process(keybuffer_t *keybuffer, int scan_code)
+{
     if (scan_code != IGNORE_CODE) {
         if (scan_code & KEY_RELEASE)
-            key_released(scan_code ^ KEY_RELEASE);
+            key_released(keybuffer, scan_code ^ KEY_RELEASE);
         else
-            key_pressed(scan_code);
+            key_pressed(keybuffer, scan_code);
+    }
     return  1;
+}

Subversion Repositories HelenOS-historic

(root)/uspace/trunk/kbd/arch/ia32/src/kbd.c @ 1707 – Rev 1353 → 1451