Changeset 965dc18 in mainline for uspace/srv/kbd/arch/mips32/src/kbd.c

Timestamp:

2008-12-05T19:59:03Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

49093a4

Parents:

0258e67

Message:

Merge sparc branch to trunk.

File:

• uspace/srv/kbd/arch/mips32/src/kbd.c (modified) (3 diffs)

uspace/srv/kbd/arch/mips32/src/kbd.c

@@ -35 +35 @@
  */
 #include <arch/kbd.h>
+#include <genarch/nofb.h>
 #include <ipc/ipc.h>
 #include <sysinfo.h>
@@ -100 +101 @@
 */
 
-static int kbd_arch_process_no_fb(keybuffer_t *keybuffer, int scan_code)
-{
-
-        static unsigned long buf = 0;
-        static int count = 0;   
-
-        /* Please preserve this code (it can be used to determine scancodes)
-        
-        keybuffer_push(keybuffer, to_hex((scan_code>>4)&0xf));
-        keybuffer_push(keybuffer, to_hex(scan_code&0xf));
-        keybuffer_push(keybuffer, ' ');
-        keybuffer_push(keybuffer, ' ');
-        
-        return 1;
-        */
-        
-        if(scan_code == 0x7e) {
-                switch (buf) {
-                case MSIM_KEY_F5:
-                        keybuffer_push(keybuffer,FUNCTION_KEYS | 5);
-                        buf = count = 0;
-                        return 1;
-                case MSIM_KEY_F6:
-                        keybuffer_push(keybuffer,FUNCTION_KEYS | 6);
-                        buf = count = 0;
-                        return 1;
-                case MSIM_KEY_F7:
-                        keybuffer_push(keybuffer,FUNCTION_KEYS | 7);
-                        buf = count = 0;
-                        return 1;
-                case MSIM_KEY_F8:
-                        keybuffer_push(keybuffer,FUNCTION_KEYS | 8);
-                        buf = count = 0;
-                        return 1;
-                case MSIM_KEY_F9:
-                        keybuffer_push(keybuffer,FUNCTION_KEYS | 9);
-                        buf = count = 0;
-                        return 1;
-                case MSIM_KEY_F10:
-                        keybuffer_push(keybuffer,FUNCTION_KEYS | 10);
-                        buf = count = 0;
-                        return 1;
-                case MSIM_KEY_F11:
-                        keybuffer_push(keybuffer,FUNCTION_KEYS | 11);
-                        buf = count = 0;
-                        return 1;
-                case MSIM_KEY_F12:
-                        keybuffer_push(keybuffer,FUNCTION_KEYS | 12);
-                        buf = count = 0;
-                        return 1;
-                default:
-                        keybuffer_push(keybuffer, buf & 0xff);
-                        keybuffer_push(keybuffer, (buf >> 8) &0xff);
-                        keybuffer_push(keybuffer, (buf >> 16) &0xff);
-                        keybuffer_push(keybuffer, (buf >> 24) &0xff);
-                        keybuffer_push(keybuffer, scan_code);
-                        buf = count = 0;
-                        return 1;
-                }
-        }
-
-        buf |= ((unsigned long) scan_code)<<(8*(count++));
-        
-        if((buf & 0xff) != (MSIM_KEY_F1 & 0xff)) {
-                keybuffer_push(keybuffer, buf);
-                buf = count = 0;
-                return 1;
-        }
-
-        if (count <= 1) 
-                return 1;
-
-        if ((buf & 0xffff) != (MSIM_KEY_F1 & 0xffff) 
-                && (buf & 0xffff) != (MSIM_KEY_F5 & 0xffff) ) {
-
-                keybuffer_push(keybuffer, buf & 0xff);
-                keybuffer_push(keybuffer, (buf >> 8) &0xff);
-                buf = count = 0;
-                return 1;
-        }
-
-        if (count <= 2) 
-                return 1;
-
-        switch (buf) {
-        case MSIM_KEY_F1:
-                keybuffer_push(keybuffer,FUNCTION_KEYS | 1);
-                buf = count = 0;
-                return 1;
-        case MSIM_KEY_F2:
-                keybuffer_push(keybuffer,FUNCTION_KEYS | 2);
-                buf = count = 0;
-                return 1;
-        case MSIM_KEY_F3:
-                keybuffer_push(keybuffer,FUNCTION_KEYS | 3);
-                buf = count = 0;
-                return 1;
-        case MSIM_KEY_F4:
-                keybuffer_push(keybuffer,FUNCTION_KEYS | 4);
-                buf = count = 0;
-                return 1;
-        }
-
-
-        if((buf & 0xffffff) != (MSIM_KEY_F5 & 0xffffff)
-                && (buf & 0xffffff) != (MSIM_KEY_F9 & 0xffffff)) {
-
-                keybuffer_push(keybuffer, buf & 0xff);
-                keybuffer_push(keybuffer, (buf >> 8) & 0xff);
-                keybuffer_push(keybuffer, (buf >> 16) & 0xff);
-                buf=count=0;
-                return 1;
-        }
-
-        if (count <= 3)
-                return 1;
-        
-        switch (buf) {
-        case MSIM_KEY_F5:
-        case MSIM_KEY_F6:
-        case MSIM_KEY_F7:
-        case MSIM_KEY_F8:
-        case MSIM_KEY_F9:
-        case MSIM_KEY_F10:
-        case MSIM_KEY_F11:
-        case MSIM_KEY_F12:
-                return 1;
-        default:
-                keybuffer_push(keybuffer, buf & 0xff);
-                keybuffer_push(keybuffer, (buf >> 8) &0xff);
-                keybuffer_push(keybuffer, (buf >> 16) &0xff);
-                keybuffer_push(keybuffer, (buf >> 24) &0xff);
-                buf = count = 0;
-                return 1;
-        }
-        return 1;
-}
-
-
-
 static int kbd_arch_process_fb(keybuffer_t *keybuffer, int scan_code)
 {
@@ -372 +233 @@
                 return kbd_arch_process_fb(keybuffer, scan_code);
 
-        return kbd_arch_process_no_fb(keybuffer, scan_code);
+        return kbd_process_no_fb(keybuffer, scan_code);
 }
 /** @}