WebSVN – HelenOS – Diff – /trunk/uspace/kbd/arch/arm32/src/kbd_gxemul.c

 #include <kbd.h>
 #include <keys.h>
 #include <bool.h>
+/* GXemul key codes in no-framebuffer mode. */
 #define GXEMUL_KEY_F1  0x504f1bL
 #define GXEMUL_KEY_F2  0x514f1bL
 #define GXEMUL_KEY_F3  0x524f1bL
 #define GXEMUL_KEY_F4  0x534f1bL
 #define GXEMUL_KEY_F5  0x35315b1bL
 #define GXEMUL_KEY_F9  0x30325b1bL
 #define GXEMUL_KEY_F10 0x31325b1bL
 #define GXEMUL_KEY_F11 0x33325d1bL
 #define GXEMUL_KEY_F12 0x34325b1bL
+/** Start code of F5-F12 keys. */
+#define GXEMUL_KEY_F5_F12_START_CODE 0x7e
+/* GXemul key codes in framebuffer mode. */
 #define GXEMUL_FB_KEY_F1 0x504f5b1bL
 #define GXEMUL_FB_KEY_F2 0x514f5b1bL
 #define GXEMUL_FB_KEY_F3 0x524f5b1bL
 #define GXEMUL_FB_KEY_F4 0x534f5b1bL
 #define GXEMUL_FB_KEY_F5 0x35315b1bL
 */
 /** Process data sent when a key is pressed (in no-framebuffer mode).
+ *
- *  @param keybuffer Buffer of scan codes.
+ *  @param keybuffer Buffer of pressed key.
  *  @param scan_code Scan code.
+ *
- *  @return Code of the pressed key.
+ *  @return Always 1.
  */
-static int gxemul_process_no_fb(keybuffer_t *keybuffer, int scan_code)
+static int gxemul_kbd_process_no_fb(keybuffer_t *keybuffer, int scan_code)
+{
+    // holds at most 4 latest scan codes
     static unsigned long buf = 0;
+    // number of scan codes in #buf
     static int count = 0;
+    /*
     // Preserve for detecting scan codes.
-    // keybuffer_push(keybuffer, to_hex((scan_code>>4)&0xf));
+    keybuffer_push(keybuffer, to_hex((scan_code>>4)&0xf));
-    // keybuffer_push(keybuffer, to_hex(scan_code&0xf));
+    keybuffer_push(keybuffer, to_hex(scan_code&0xf));
-    // keybuffer_push(keybuffer, 'X');
+    keybuffer_push(keybuffer, 'X');
-    // keybuffer_push(keybuffer, 'Y');
+    keybuffer_push(keybuffer, 'Y');
-    // return 1;
+    return 1;
+    */
-    if (scan_code == '\r')
+    if (scan_code == '\r') {
         scan_code = '\n';
+    }
-    if(scan_code == 0x7e) {
+    if (scan_code == GXEMUL_KEY_F5_F12_START_CODE) {
         switch (buf) {
         case GXEMUL_KEY_F5:
             keybuffer_push(keybuffer,FUNCTION_KEYS | 5);
             buf = count = 0;
             return 1;
             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 >> 8)  & 0xff);
-            keybuffer_push(keybuffer, (buf >> 16) &0xff);
+            keybuffer_push(keybuffer, (buf >> 16) & 0xff);
-            keybuffer_push(keybuffer, (buf >> 24) &0xff);
+            keybuffer_push(keybuffer, (buf >> 24) & 0xff);
             keybuffer_push(keybuffer, scan_code);
             buf = count = 0;
             return 1;
+        }
+    }
+    // add to buffer
-    buf |= ((unsigned long) scan_code)<<(8*(count++));
+    buf |= ((unsigned long) scan_code) << (8 * (count++));
-    if((buf & 0xff) != (GXEMUL_KEY_F1 & 0xff)) {
+    if ((buf & 0xff) != (GXEMUL_KEY_F1 & 0xff)) {
         keybuffer_push(keybuffer, buf);
         buf = count = 0;
         return 1;
+    }
-    if (count <= 1)
+    if (count <= 1) {
         return 1;
+    }
     if ((buf & 0xffff) != (GXEMUL_KEY_F1 & 0xffff)
         && (buf & 0xffff) != (GXEMUL_KEY_F5 & 0xffff) ) {
         keybuffer_push(keybuffer, buf & 0xff);
         keybuffer_push(keybuffer, (buf >> 8) &0xff);
         buf = count = 0;
         return 1;
+    }
-    if (count <= 2)
+    if (count <= 2) {
         return 1;
+    }
     switch (buf) {
     case GXEMUL_KEY_F1:
         keybuffer_push(keybuffer,FUNCTION_KEYS | 1);
         buf = count = 0;
         buf = count = 0;
         return 1;
+    }
-    if((buf & 0xffffff) != (GXEMUL_KEY_F5 & 0xffffff)
+    if ((buf & 0xffffff) != (GXEMUL_KEY_F5 & 0xffffff)
         && (buf & 0xffffff) != (GXEMUL_KEY_F9 & 0xffffff)) {
         keybuffer_push(keybuffer, buf & 0xff);
         keybuffer_push(keybuffer, (buf >> 8) & 0xff);
         keybuffer_push(keybuffer, (buf >> 16) & 0xff);
-        buf=count=0;
+        buf = count = 0;
         return 1;
+    }
-    if (count <= 3)
+    if (count <= 3) {
         return 1;
+    }
     switch (buf) {
     case GXEMUL_KEY_F5:
     case GXEMUL_KEY_F6:
     case GXEMUL_KEY_F7:
     case GXEMUL_KEY_F11:
     case GXEMUL_KEY_F12:
         return 1;
     default:
         keybuffer_push(keybuffer, buf & 0xff);
-        keybuffer_push(keybuffer, (buf >> 8) &0xff);
+        keybuffer_push(keybuffer, (buf >> 8)  & 0xff);
-        keybuffer_push(keybuffer, (buf >> 16) &0xff);
+        keybuffer_push(keybuffer, (buf >> 16) & 0xff);
-        keybuffer_push(keybuffer, (buf >> 24) &0xff);
+        keybuffer_push(keybuffer, (buf >> 24) & 0xff);
         buf = count = 0;
         return 1;
+    }
     return 1;
+}
 /** Process data sent when a key is pressed (in framebuffer mode).
+ *
- *  @param keybuffer Buffer of scan codes.
+ *  @param keybuffer Buffer of pressed keys.
  *  @param scan_code Scan code.
+ *
- *  @return Code of the pressed key.
+ *  @return Always 1.
  */
-static int gxemul_process_fb(keybuffer_t *keybuffer, int scan_code)
+static int gxemul_kbd_process_fb(keybuffer_t *keybuffer, int scan_code)
+{
+    // holds at most 4 latest scan codes
     static unsigned long buf = 0;
-    static int count = 0;
-    /* Please preserve this code (it can be used to determine scancodes)
+    // number of scan codes in #buf
+    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 == '\r')
+    if (scan_code == '\r') {
         scan_code = '\n';
+    }
+    // add to buffer
-    buf |= ((unsigned long) scan_code)<<(8*(count++));
+    buf |= ((unsigned long) scan_code) << (8*(count++));
     if ((buf & 0xff) != (GXEMUL_FB_KEY_F1 & 0xff)) {
         keybuffer_push(keybuffer, buf);
         buf = count = 0;
         return 1;
+    }
-    if (count <= 1)
+    if (count <= 1) {
         return 1;
+    }
     if ((buf & 0xffff) != (GXEMUL_FB_KEY_F1 & 0xffff)) {
         keybuffer_push(keybuffer, buf & 0xff);
         keybuffer_push(keybuffer, (buf >> 8) &0xff);
         buf = count = 0;
         return 1;
+    }
-    if (count <= 2)
+    if (count <= 2) {
         return 1;
+    }
     if ((buf & 0xffffff) != (GXEMUL_FB_KEY_F1 & 0xffffff)
         && (buf & 0xffffff) != (GXEMUL_FB_KEY_F5 & 0xffffff)
         && (buf & 0xffffff) != (GXEMUL_FB_KEY_F9 & 0xffffff)) {
         keybuffer_push(keybuffer, (buf >> 16) & 0xff);
         buf = count = 0;
         return 1;
+    }
-    if ( count <= 3 )
+    if (count <= 3) {
         return 1;
+    }
     switch (buf) {
     case GXEMUL_FB_KEY_F1:
         keybuffer_push(keybuffer,FUNCTION_KEYS | 1 );
-        buf=count=0;
+        buf = count = 0;
         return 1;
     case GXEMUL_FB_KEY_F2:
         keybuffer_push(keybuffer,FUNCTION_KEYS | 2 );
-        buf=count=0;
+        buf = count = 0;
         return 1;
     case GXEMUL_FB_KEY_F3:
         keybuffer_push(keybuffer,FUNCTION_KEYS | 3 );
-        buf=count=0;
+        buf = count = 0;
         return 1;
     case GXEMUL_FB_KEY_F4:
         keybuffer_push(keybuffer,FUNCTION_KEYS | 4 );
-        buf=count=0;
+        buf = count = 0;
         return 1;
     case GXEMUL_FB_KEY_F5:
         keybuffer_push(keybuffer,FUNCTION_KEYS | 5 );
-        buf=count=0;
+        buf = count = 0;
         return 1;
     case GXEMUL_FB_KEY_F6:
         keybuffer_push(keybuffer,FUNCTION_KEYS | 6 );
-        buf=count=0;
+        buf = count = 0;
         return 1;
     case GXEMUL_FB_KEY_F7:
         keybuffer_push(keybuffer,FUNCTION_KEYS | 7 );
-        buf=count=0;
+        buf = count = 0;
         return 1;
     case GXEMUL_FB_KEY_F8:
         keybuffer_push(keybuffer,FUNCTION_KEYS | 8 );
-        buf=count=0;
+        buf = count = 0;
         return 1;
     case GXEMUL_FB_KEY_F9:
         keybuffer_push(keybuffer,FUNCTION_KEYS | 9 );
-        buf=count=0;
+        buf = count = 0;
         return 1;
     case GXEMUL_FB_KEY_F10:
         keybuffer_push(keybuffer,FUNCTION_KEYS | 10 );
-        buf=count=0;
+        buf = count = 0;
         return 1;
     case GXEMUL_FB_KEY_F11:
         keybuffer_push(keybuffer,FUNCTION_KEYS | 11 );
-        buf=count=0;
+        buf = count = 0;
         return 1;
     case GXEMUL_FB_KEY_F12:
         keybuffer_push(keybuffer,FUNCTION_KEYS | 12 );
-        buf=count=0;
+        buf = count = 0;
         return 1;
     default:
         keybuffer_push(keybuffer, buf & 0xff );
-        keybuffer_push(keybuffer, (buf >> 8) &0xff );
+        keybuffer_push(keybuffer, (buf >> 8)  & 0xff);
-        keybuffer_push(keybuffer, (buf >> 16) &0xff );
+        keybuffer_push(keybuffer, (buf >> 16) & 0xff);
-        keybuffer_push(keybuffer, (buf >> 24) &0xff );
+        keybuffer_push(keybuffer, (buf >> 24) & 0xff);
-        buf=count=0;
+        buf = count = 0;
         return 1;
+    }
     return 1;
+}
 /** Initializes keyboard handler. */
+}
 /** Process data sent when a key is pressed.
+ *
- *  @param keybuffer Buffer of scan codes.
+ *  @param keybuffer Buffer of pressed keys.
  *  @param call      IPC call.
+ *
- *  @return Code of the pressed key.
+ *  @return Always 1.
  */
 int kbd_arch_process(keybuffer_t *keybuffer, ipc_call_t *call)
+{
     int scan_code = IPC_GET_ARG2(*call);
-    static int esc_count = 0;
-    if (scan_code == 0x1b) {
-        esc_count++;
-        if (esc_count == 3) {
-            __SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE);
-        }
-    } else {
-        esc_count = 0;
-    }
     if (fb) {
-        return gxemul_process_fb(keybuffer, scan_code);
+        return gxemul_kbd_process_fb(keybuffer, scan_code);
     } else {
-        return gxemul_process_no_fb(keybuffer, scan_code);
+        return gxemul_kbd_process_no_fb(keybuffer, scan_code);
+    }
+}
 /** @}

Subversion Repositories HelenOS

(root)/trunk/uspace/kbd/arch/arm32/src/kbd_gxemul.c @ 2465 – Rev 2360 → 2409