Changes in uspace/srv/hid/console/console.c [cccc091:f302586] in mainline

File:

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

uspace/srv/hid/console/console.c

@@ -344 +344 @@
 }
 
+static console_t *cons_get_active_uspace(void)
+{
+        fibril_mutex_lock(&switch_mtx);
+
+        console_t *active_uspace = active_console;
+        if (active_uspace == kernel_console) {
+                active_uspace = prev_console;
+        }
+        assert(active_uspace != kernel_console);
+
+        fibril_mutex_unlock(&switch_mtx);
+
+        return active_uspace;
+}
+
 static ssize_t limit(ssize_t val, ssize_t lo, ssize_t hi)
 {
@@ -466 +481 @@
                                 event->c = c;
                                 
-                                prodcons_produce(&active_console->input_pc, &event->link);
+                                /*
+                                 * Kernel console does not read events
+                                 * from us, so we will redirect them
+                                 * to the (last) active userspace console
+                                 * if necessary.
+                                 */
+                                console_t *target_console = cons_get_active_uspace();
+                                
+                                prodcons_produce(&target_console->input_pc,
+                                    &event->link);
                         }
                         
@@ -801 +825 @@
         
         /* Register server */
-        int rc = loc_server_register(NAME, client_connection);
+        async_set_client_connection(client_connection);
+        int rc = loc_server_register(NAME);
         if (rc < 0) {
                 printf("%s: Unable to register server (%s)\n", NAME,
@@ -904 +929 @@
                 atomic_set(&consoles[i].refcnt, 0);
                 fibril_mutex_initialize(&consoles[i].mtx);
+                prodcons_initialize(&consoles[i].input_pc);
                 
                 if (graphics_state == GRAPHICS_FULL) {
@@ -942 +968 @@
                 }
                 
-                prodcons_initialize(&consoles[i].input_pc);
                 cons_redraw_state(&consoles[i]);