WebSVN – HelenOS – Diff – /trunk/kernel/genarch/src/kbd/z8530.c

  * and z8530-irrelevant constants, code and comments.
  * Still it miraculously works.
  */
 #include <genarch/kbd/z8530.h>
+#include <genarch/kbd/key.h>
 #include <genarch/kbd/scanc.h>
 #include <genarch/kbd/scanc_sun.h>
 #include <arch/drivers/z8530.h>
 #include <arch/interrupt.h>
 #include <cpu.h>
 #include <arch/asm.h>
 #include <arch.h>
-#include <synch/spinlock.h>
 #include <typedefs.h>
 #include <console/chardev.h>
 #include <console/console.h>
-#include <macros.h>
 #include <interrupt.h>
 /* Keyboard commands. */
 #define KBD_ENABLE  0xf4
 #define KBD_DISABLE 0xf5
 #define z8530_BUFFER_FULL_MASK  0x01
 #define z8530_WAIT_MASK     0x02
 #define z8530_MOUSE_DATA        0x20
-#define KEY_RELEASE 0x80
 /*
  * These codes read from z8530 data register are silently ignored.
  */
 #define IGNORE_CODE 0x7f        /* all keys up */
-static void key_released(uint8_t sc);
-static void key_pressed(uint8_t sc);
-static char key_read(chardev_t *d);
-#define PRESSED_SHIFT       (1<<0)
-#define PRESSED_CAPSLOCK    (1<<1)
-#define LOCKED_CAPSLOCK     (1<<0)
-#define ACTIVE_READ_BUFF_SIZE 16    /* Must be power of 2 */
-static uint8_t active_read_buff[ACTIVE_READ_BUFF_SIZE];
-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 z8530_suspend(chardev_t *);
 static void z8530_resume(chardev_t *);
-static chardev_t kbrd;
+chardev_t kbrd;
 static chardev_operations_t ops = {
     .suspend = z8530_suspend,
     .resume = z8530_resume,
     .read = key_read
 };
     while (z8530_status_read() & z8530_WAIT_MASK) {
         /* wait */
+    }
+}
-/** Process release of key.
- *
- * @param sc Scancode of the key being released.
- */
-void key_released(uint8_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)
-{
-    char *map = sc_primary_map;
-    char ascii = sc_primary_map[sc];
-    bool shift, capslock;
-    bool letter = false;
-    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:
-        break;
-    case SC_LEFTARR:
-        chardev_push_character(&kbrd, 0x1b);
-        chardev_push_character(&kbrd, 0x5b);
-        chardev_push_character(&kbrd, 0x44);
-        break;
-    case SC_RIGHTARR:
-        chardev_push_character(&kbrd, 0x1b);
-        chardev_push_character(&kbrd, 0x5b);
-        chardev_push_character(&kbrd, 0x43);
-        break;
-    case SC_UPARR:
-        chardev_push_character(&kbrd, 0x1b);
-        chardev_push_character(&kbrd, 0x5b);
-        chardev_push_character(&kbrd, 0x41);
-        break;
-    case SC_DOWNARR:
-        chardev_push_character(&kbrd, 0x1b);
-        chardev_push_character(&kbrd, 0x5b);
-        chardev_push_character(&kbrd, 0x42);
-        break;
-    case SC_HOME:
-        chardev_push_character(&kbrd, 0x1b);
-        chardev_push_character(&kbrd, 0x4f);
-        chardev_push_character(&kbrd, 0x48);
-        break;
-    case SC_END:
-        chardev_push_character(&kbrd, 0x1b);
-        chardev_push_character(&kbrd, 0x4f);
-        chardev_push_character(&kbrd, 0x46);
-        break;
-    case SC_DELETE:
-        chardev_push_character(&kbrd, 0x1b);
-        chardev_push_character(&kbrd, 0x5b);
-        chardev_push_character(&kbrd, 0x33);
-        chardev_push_character(&kbrd, 0x7e);
-        break;
-    default:
-            letter = is_lower(ascii);
-        capslock = (keyflags & PRESSED_CAPSLOCK) || (lockflags & LOCKED_CAPSLOCK);
-        shift = keyflags & PRESSED_SHIFT;
-        if (letter && capslock)
-            shift = !shift;
-        if (shift)
-            map = sc_secondary_map;
-        chardev_push_character(&kbrd, map[sc]);
-        break;
-    }
-    spinlock_unlock(&keylock);
-}
 /* Called from getc(). */
 void z8530_resume(chardev_t *d)
+{
+}
 /* Called from getc(). */
 void z8530_suspend(chardev_t *d)
+{
+}
-static uint8_t active_read_buff_read(void)
-{
-    static int i=0;
-    i &= (ACTIVE_READ_BUFF_SIZE-1);
-    if(!active_read_buff[i]) {
-        return 0;
-    }
-    return active_read_buff[i++];
-}
-static void active_read_buff_write(uint8_t ch)
-{
-    static int i=0;
-    active_read_buff[i] = ch;
-    i++;
-    i &= (ACTIVE_READ_BUFF_SIZE-1);
-    active_read_buff[i]=0;
-}
-static void active_read_key_pressed(uint8_t sc)
-{
-    char *map = sc_primary_map;
-    char ascii = sc_primary_map[sc];
-    bool shift, capslock;
-    bool letter = false;
-    /*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:
-        break;
-    case SC_LEFTARR:
-        active_read_buff_write(0x1b);
-        active_read_buff_write(0x5b);
-        active_read_buff_write(0x44);
-        break;
-    case SC_RIGHTARR:
-        active_read_buff_write(0x1b);
-        active_read_buff_write(0x5b);
-        active_read_buff_write(0x43);
-        break;
-    case SC_UPARR:
-        active_read_buff_write(0x1b);
-        active_read_buff_write(0x5b);
-        active_read_buff_write(0x41);
-        break;
-    case SC_DOWNARR:
-        active_read_buff_write(0x1b);
-        active_read_buff_write(0x5b);
-        active_read_buff_write(0x42);
-        break;
-    case SC_HOME:
-        active_read_buff_write(0x1b);
-        active_read_buff_write(0x4f);
-        active_read_buff_write(0x48);
-        break;
-    case SC_END:
-        active_read_buff_write(0x1b);
-        active_read_buff_write(0x4f);
-        active_read_buff_write(0x46);
-        break;
-    case SC_DELETE:
-        active_read_buff_write(0x1b);
-        active_read_buff_write(0x5b);
-        active_read_buff_write(0x33);
-        active_read_buff_write(0x7e);
-        break;
-    default:
-            letter = is_lower(ascii);
-        capslock = (keyflags & PRESSED_CAPSLOCK) || (lockflags & LOCKED_CAPSLOCK);
-        shift = keyflags & PRESSED_SHIFT;
-        if (letter && capslock)
-            shift = !shift;
-        if (shift)
-            map = sc_secondary_map;
-        active_read_buff_write(map[sc]);
-        break;
-    }
-    /*spinlock_unlock(&keylock);*/
-}
-static char key_read(chardev_t *d)
+char key_read(chardev_t *d)
+{
     char ch;
     while(!(ch = active_read_buff_read())) {
         uint8_t x;

Subversion Repositories HelenOS

(root)/trunk/kernel/genarch/src/kbd/z8530.c @ 2071 – Rev 1842 → 1843