Changeset 578aebf7 in mainline

Timestamp:

2006-02-25T14:02:28Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

085434a

Parents:

68656282

Message:

Active keyboard read for ia32

Files:

• arch/ia32/src/drivers/i8042.c (modified) (5 diffs)
• generic/include/mm/asid.h (modified) (1 diff)

arch/ia32/src/drivers/i8042.c

@@ -48 +48 @@
 #define i8042_DATA              0x60
 #define i8042_STATUS            0x64
+#define i8042_BUFFER_FULL_MASK          0x01
 
 
@@ -80 +81 @@
 static void key_released(__u8 sc);
 static void key_pressed(__u8 sc);
+static char key_read(chardev_t *d);
 
 #define PRESSED_SHIFT           (1<<0)
@@ -85 +87 @@
 #define LOCKED_CAPSLOCK         (1<<0)
 
+#define ACTIVE_READ_BUFF_SIZE 16 /*Must be power of 2*/
+
+
+__u8 active_read_buff[ACTIVE_READ_BUFF_SIZE]={0};
+
 SPINLOCK_INITIALIZE(keylock);           /**< keylock protects keyflags and lockflags. */
 static volatile int keyflags;           /**< Tracking of multiple keypresses. */
@@ -95 +102 @@
 static chardev_operations_t ops = {
         .suspend = i8042_suspend,
-        .resume = i8042_resume
+        .resume = i8042_resume,
+        .read = key_read
 };
 
@@ -397 +405 @@
 {
 }
+
+
+static __u8 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(__u8 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_readed_key_pressed(__u8 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 ch;        
+        
+
+        while(!(ch=active_read_buff_read()))
+        {
+                __u8 x;
+                while (!((x=inb(i8042_STATUS))&i8042_BUFFER_FULL_MASK));
+                x = inb(i8042_DATA);
+                if (x & KEY_RELEASE)
+                        key_released(x ^ KEY_RELEASE);
+                else
+                        active_readed_key_pressed(x);
+        }
+        return ch;
+}
+
+

generic/include/mm/asid.h

@@ -55 +55 @@
 extern link_t as_with_asid_head;
 
-extern asid_t asid_get(void);
+extern asid_t asid_get(void);        /*This is in collision with ia32 macro*/
 extern void asid_put(asid_t asid);