Changeset 03362fbd in mainline for uspace/lib/c/generic/io/console.c

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/lib/c/generic/io/console.c (modified) (3 diffs)

uspace/lib/c/generic/io/console.c

@@ -38 +38 @@
 #include <async.h>
 #include <errno.h>
-#include <stdio.h>
 #include <malloc.h>
 #include <vfs/vfs_sess.h>
@@ -126 +125 @@
 {
         async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
-        async_req_1_0(exch, CONSOLE_CURSOR_VISIBILITY, (show != false));
+        async_req_1_0(exch, CONSOLE_SET_CURSOR_VISIBILITY, (show != false));
         async_exchange_end(exch);
 }
@@ -151 +150 @@
 {
         async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
-        async_req_2_0(exch, CONSOLE_GOTO, col, row);
+        async_req_2_0(exch, CONSOLE_SET_POS, col, row);
         async_exchange_end(exch);
 }