Changeset fa09449 in mainline for uspace/srv/kbd/include

Timestamp:

2009-02-15T22:31:07Z (17 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.

Location:

uspace/srv/kbd/include

Files:

• key_buffer.h (modified) (3 diffs)
• keys.h (modified) (1 diff)

uspace/srv/kbd/include/key_buffer.h

@@ -39 +39 @@
 
 #include <sys/types.h>
+#include <kbd/kbd.h>
 
 /** Size of buffer for pressed keys */
@@ -44 +45 @@
 
 typedef struct {
-        int fifo[KEYBUFFER_SIZE];
+        kbd_event_t fifo[KEYBUFFER_SIZE];
         unsigned long head;
         unsigned long tail;
@@ -50 +51 @@
 } keybuffer_t;
 
-void keybuffer_free(keybuffer_t *keybuffer);
-void keybuffer_init(keybuffer_t *keybuffer);
-int keybuffer_available(keybuffer_t *keybuffer);
-int keybuffer_empty(keybuffer_t *keybuffer);
-void keybuffer_push(keybuffer_t *keybuffer, int key);
-int keybuffer_pop(keybuffer_t *keybuffer, int *c);
+extern void keybuffer_free(keybuffer_t *);
+extern void keybuffer_init(keybuffer_t *);
+extern int keybuffer_available(keybuffer_t *);
+extern int keybuffer_empty(keybuffer_t *);
+extern void keybuffer_push(keybuffer_t *, const kbd_event_t *);
+extern void keybuffer_push0(keybuffer_t *, int c);
+extern int keybuffer_pop(keybuffer_t *, kbd_event_t *);
 
 #endif

uspace/srv/kbd/include/keys.h

@@ -38 +38 @@
 #define _KBD_KEYS_H_
 
-#define KBD_PUSHCHAR    1024
-#define KBD_MS_LEFT     1025
-#define KBD_MS_RIGHT    1026
-#define KBD_MS_MIDDLE   1027
-#define KBD_MS_MOVE     1028
+#define KBD_EVENT       1024
+#define KBD_MS_LEFT     1025
+#define KBD_MS_RIGHT    1026
+#define KBD_MS_MIDDLE   1027
+#define KBD_MS_MOVE     1028
 
 #define KBD_KEY_F1      0x3b