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

Timestamp:

2011-07-12T03:00:14Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

6817eba

Parents:

eca52a8 (diff), 026793d (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) (3 diffs)

uspace/srv/hid/console/console.c

@@ -357 +357 @@
                 console_serialize_end();
                 
-                if (__SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE)) {
+                if (console_kcon()) {
                         prev_console = active_console;
                         active_console = kernel_console;
@@ -711 +711 @@
                         console_serialize_start();
                         continue;
-                case CONSOLE_KCON_ENABLE:
-                        change_console(kernel_console);
-                        break;
                 }
                 async_answer_3(callid, EOK, arg1, arg2, arg3);
@@ -833 +830 @@
         }
         
-        /* Disable kernel output to the console */
-        __SYSCALL0(SYS_DEBUG_DISABLE_CONSOLE);
-        
         /* Initialize the screen */
         console_serialize_start();