Changeset fa76f81 in mainline for uspace/srv/hid/console/console.c

Timestamp:

2011-11-14T08:40:44Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

2966122

Parents:

c2245a3 (diff), 612ad864 (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 with mainline

File:

• uspace/srv/hid/console/console.c (modified) (2 diffs)

uspace/srv/hid/console/console.c

@@ -481 +481 @@
                                 event->c = c;
                                 
-                                /* Kernel console does not read events
+                                /*
+                                 * Kernel console does not read events
                                  * from us, so we will redirect them
                                  * to the (last) active userspace console
@@ -487 +488 @@
                                  */
                                 console_t *target_console = cons_get_active_uspace();
-
+                                
                                 prodcons_produce(&target_console->input_pc,
                                     &event->link);