Changeset 1db44ea in mainline for uspace/srv/hid/console/console.c

Timestamp:

2011-09-25T18:46:45Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

36cb22f

Parents:

dcc44ca1 (diff), f9d8c3a (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/hid/console/console.c (modified) (4 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);
                         }
                         
@@ -904 +927 @@
                 atomic_set(&consoles[i].refcnt, 0);
                 fibril_mutex_initialize(&consoles[i].mtx);
+                prodcons_initialize(&consoles[i].input_pc);
                 
                 if (graphics_state == GRAPHICS_FULL) {
@@ -942 +966 @@
                 }
                 
-                prodcons_initialize(&consoles[i].input_pc);
                 cons_redraw_state(&consoles[i]);