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

Timestamp:

2009-02-15T22:31:07Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

6cd9aa6

Parents:

76dd25b

Message:

Keycodes, keyboard events, kbd_event_get(). Keyboard driver now (formally) produces kbd events (press/release, keycode, mods, char) instead of just characters. In reality, the driver and client are only hacked to work with the new interface atm.

File:

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

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

@@ -108 +108 @@
         /* 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, ' ');
+        keybuffer_push0(keybuffer, to_hex((scan_code>>4)&0xf));
+        keybuffer_push0(keybuffer, to_hex(scan_code&0xf));
+        keybuffer_push0(keybuffer, ' ');
+        keybuffer_push0(keybuffer, ' ');
         
         return 1;
@@ -123 +123 @@
         
         if ((buf & 0xff) != (GXEMUL_KEY_F1 & 0xff)) {
-                keybuffer_push(keybuffer, buf);
+                keybuffer_push0(keybuffer, buf);
                 buf = count = 0;
                 return 1;
@@ -132 +132 @@
 
         if ((buf & 0xffff) != (GXEMUL_KEY_F1 & 0xffff)) {
-                keybuffer_push(keybuffer, buf & 0xff);
-                keybuffer_push(keybuffer, (buf >> 8) &0xff);
+                keybuffer_push0(keybuffer, buf & 0xff);
+                keybuffer_push0(keybuffer, (buf >> 8) &0xff);
                 buf = count = 0;
                 return 1;
@@ -146 +146 @@
                 && (buf & 0xffffff) != (GXEMUL_KEY_F9 & 0xffffff)) {
 
-                keybuffer_push(keybuffer, buf & 0xff);
-                keybuffer_push(keybuffer, (buf >> 8) & 0xff);
-                keybuffer_push(keybuffer, (buf >> 16) & 0xff);
+                keybuffer_push0(keybuffer, buf & 0xff);
+                keybuffer_push0(keybuffer, (buf >> 8) & 0xff);
+                keybuffer_push0(keybuffer, (buf >> 16) & 0xff);
                 buf = count = 0;
                 return 1;
@@ -159 +159 @@
         switch (buf) {
         case GXEMUL_KEY_F1:
-                keybuffer_push(keybuffer,FUNCTION_KEYS | 1 );
+                keybuffer_push0(keybuffer,FUNCTION_KEYS | 1 );
                 buf=count=0;
                 return 1;
         case GXEMUL_KEY_F2:
-                keybuffer_push(keybuffer,FUNCTION_KEYS | 2 );
+                keybuffer_push0(keybuffer,FUNCTION_KEYS | 2 );
                 buf=count=0;
                 return 1;
         case GXEMUL_KEY_F3:
-                keybuffer_push(keybuffer,FUNCTION_KEYS | 3 );
+                keybuffer_push0(keybuffer,FUNCTION_KEYS | 3 );
                 buf=count=0;
                 return 1;
         case GXEMUL_KEY_F4:
-                keybuffer_push(keybuffer,FUNCTION_KEYS | 4 );
+                keybuffer_push0(keybuffer,FUNCTION_KEYS | 4 );
                 buf=count=0;
                 return 1;
         case GXEMUL_KEY_F5:
-                keybuffer_push(keybuffer,FUNCTION_KEYS | 5 );
+                keybuffer_push0(keybuffer,FUNCTION_KEYS | 5 );
                 buf=count=0;
                 return 1;
         case GXEMUL_KEY_F6:
-                keybuffer_push(keybuffer,FUNCTION_KEYS | 6 );
+                keybuffer_push0(keybuffer,FUNCTION_KEYS | 6 );
                 buf=count=0;
                 return 1;
         case GXEMUL_KEY_F7:
-                keybuffer_push(keybuffer,FUNCTION_KEYS | 7 );
+                keybuffer_push0(keybuffer,FUNCTION_KEYS | 7 );
                 buf=count=0;
                 return 1;
         case GXEMUL_KEY_F8:
-                keybuffer_push(keybuffer,FUNCTION_KEYS | 8 );
+                keybuffer_push0(keybuffer,FUNCTION_KEYS | 8 );
                 buf=count=0;
                 return 1;
         case GXEMUL_KEY_F9:
-                keybuffer_push(keybuffer,FUNCTION_KEYS | 9 );
+                keybuffer_push0(keybuffer,FUNCTION_KEYS | 9 );
                 buf=count=0;
                 return 1;
         case GXEMUL_KEY_F10:
-                keybuffer_push(keybuffer,FUNCTION_KEYS | 10 );
+                keybuffer_push0(keybuffer,FUNCTION_KEYS | 10 );
                 buf=count=0;
                 return 1;
         case GXEMUL_KEY_F11:
-                keybuffer_push(keybuffer,FUNCTION_KEYS | 11 );
+                keybuffer_push0(keybuffer,FUNCTION_KEYS | 11 );
                 buf=count=0;
                 return 1;
         case GXEMUL_KEY_F12:
-                keybuffer_push(keybuffer,FUNCTION_KEYS | 12 );
+                keybuffer_push0(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_push0(keybuffer, buf & 0xff );
+                keybuffer_push0(keybuffer, (buf >> 8) &0xff );
+                keybuffer_push0(keybuffer, (buf >> 16) &0xff );
+                keybuffer_push0(keybuffer, (buf >> 24) &0xff );
                 buf=count=0;
                 return 1;