Changeset e795203 in mainline for uspace/srv/kbd

Timestamp:

2009-08-09T15:57:43Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a4885a42

Parents:

c145bc2

Message:

Move keybuffer code to console as it is not used in keyboard driver.

Location:

uspace/srv/kbd

Files:

• Makefile (modified) (1 diff)
• generic/kbd.c (modified) (4 diffs)
• include/kbd.h (modified) (1 diff)

uspace/srv/kbd/Makefile

@@ -46 +46 @@
         generic/kbd.c \
         genarch/gsp.c \
-        genarch/stroke.c \
-        generic/keybuffer.c
+        genarch/stroke.c
 
 ARCH_SOURCES =

uspace/srv/kbd/generic/kbd.c

@@ -38 +38 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/kbd.h>
 #include <sysinfo.h>
 #include <stdio.h>
@@ -51 +52 @@
 
 #include <kbd.h>
-#include <keybuffer.h>
 #include <kbd_port.h>
 #include <kbd_ctl.h>
@@ -60 +60 @@
 int cons_connected = 0;
 int phone2cons = -1;
-keybuffer_t keybuffer;
 
 /** Currently active modifiers. */
@@ -242 +241 @@
         layout[active_layout]->reset();
         
-        /* Initialize key buffer */
-        keybuffer_init(&keybuffer);
-        
         async_set_client_connection(console_connection);
 

uspace/srv/kbd/include/kbd.h

@@ -38 +38 @@
 #define KBD_KBD_H_
 
-#include <keybuffer.h>
-#include <ipc/ipc.h>
-
-#define KBD_EVENT      1024
-#define KBD_MS_LEFT    1025
-#define KBD_MS_RIGHT   1026
-#define KBD_MS_MIDDLE  1027
-#define KBD_MS_MOVE    1028
-
-typedef enum {
-        KBD_YIELD = IPC_FIRST_USER_METHOD,
-        KBD_RECLAIM
-} kbd_request_t;
-
 extern int cir_service;
 extern int cir_phone;