Changeset d900699 in mainline for uspace/srv/hid/console/gcons.c

Timestamp:

2011-06-17T16:48:53Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

f3a605be

Parents:

df8110d3 (diff), 98caf49 (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/gcons.c (modified) (1 diff)

uspace/srv/hid/console/gcons.c

@@ -168 +168 @@
 void gcons_change_console(size_t index)
 {
-        if (!use_gcons)
-                return;
+        if (!use_gcons) {
+                active_console = index;
+                return;
+        }
         
         if (active_console == KERNEL_CONSOLE) {