Changeset b50b5af2 in mainline for uspace/srv/kbd/generic/kbd.c

Timestamp:

2009-08-22T10:48:00Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/kbd/generic/kbd.c (modified) (5 diffs)

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. */
@@ -125 +124 @@
                         mods = mods ^ (mod_mask & ~lock_keys);
                         lock_keys = lock_keys | mod_mask;
+
+                        /* Update keyboard lock indicator lights. */
+                        kbd_ctl_set_ind(mods);
                 } else {
                         lock_keys = lock_keys & ~mod_mask;
@@ -239 +241 @@
         layout[active_layout]->reset();
         
-        /* Initialize key buffer */
-        keybuffer_init(&keybuffer);
-        
         async_set_client_connection(console_connection);