Changeset 6843a9c in mainline for uspace/srv/hid/console/console.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/srv/hid/console/console.c (modified) (3 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);
@@ -824 +825 @@
         
         /* Register server */
-        int rc = loc_server_register(NAME, client_connection);
-        if (rc < 0) {
+        async_set_client_connection(client_connection);
+        int rc = loc_server_register(NAME);
+        if (rc != EOK) {
                 printf("%s: Unable to register server (%s)\n", NAME,
                     str_error(rc));