Changeset 4c84ada5 in mainline for uspace/lib/c/include

Timestamp:

2012-08-25T19:53:04Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

7ff35c7

Parents:

16e9d4df (diff), 5d94b16c (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

Location:

uspace/lib/c/include

Files:

• io/con_srv.h (added)
• io/concaps.h (added)
• io/console.h (modified) (2 diffs)
• ipc/console.h (modified) (1 diff)

uspace/lib/c/include/io/console.h

@@ -37 +37 @@
 
 #include <sys/time.h>
+#include <io/concaps.h>
 #include <io/kbd_event.h>
 #include <io/keycode.h>
@@ -42 +43 @@
 #include <bool.h>
 #include <stdio.h>
-
-typedef enum {
-        CONSOLE_CAP_NONE = 0,
-        CONSOLE_CAP_STYLE = 1,
-        CONSOLE_CAP_INDEXED = 2,
-        CONSOLE_CAP_RGB = 4
-} console_caps_t;
 
 /** Console control structure. */

uspace/lib/c/include/ipc/console.h

@@ -43 +43 @@
         CONSOLE_GET_EVENT,
         CONSOLE_GET_POS,
-        CONSOLE_GOTO,
+        CONSOLE_SET_POS,
         CONSOLE_CLEAR,
         CONSOLE_SET_STYLE,
         CONSOLE_SET_COLOR,
         CONSOLE_SET_RGB_COLOR,
-        CONSOLE_CURSOR_VISIBILITY
+        CONSOLE_SET_CURSOR_VISIBILITY
 } console_request_t;