Changeset 04803bf in mainline for uspace/lib/c/include/io/console.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/lib/c/include/io/console.h (moved) (moved from uspace/lib/libc/include/io/console.h ) (3 diffs)

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

@@ -36 +36 @@
 #define LIBC_IO_CONSOLE_H_
 
-#include <ipc/ipc.h>
 #include <bool.h>
 
@@ -44 +43 @@
 } console_ev_type_t;
 
-enum {
+typedef enum {
         CONSOLE_CCAP_NONE = 0,
         CONSOLE_CCAP_STYLE,
         CONSOLE_CCAP_INDEXED,
         CONSOLE_CCAP_RGB
-};
+} console_caps_t;
 
 /** Console event structure. */
@@ -68 +67 @@
 extern void console_clear(int phone);
 
-extern int console_get_size(int phone, ipcarg_t *rows, ipcarg_t *cols);
-extern void console_goto(int phone, ipcarg_t row, ipcarg_t col);
+extern int console_get_size(int phone, sysarg_t *cols, sysarg_t *rows);
+extern int console_get_pos(int phone, sysarg_t *col, sysarg_t *row);
+extern void console_set_pos(int phone, sysarg_t col, sysarg_t row);
 
-extern void console_set_style(int phone, int style);
-extern void console_set_color(int phone, int fg_color, int bg_color, int flags);
-extern void console_set_rgb_color(int phone, int fg_color, int bg_color);
+extern void console_set_style(int phone, uint8_t style);
+extern void console_set_color(int phone, uint8_t fg_color, uint8_t bg_color,
+    uint8_t flags);
+extern void console_set_rgb_color(int phone, uint32_t fg_color, uint32_t bg_color);
 
 extern void console_cursor_visibility(int phone, bool show);
-extern int console_get_color_cap(int phone, int *ccap);
+extern int console_get_color_cap(int phone, sysarg_t *ccap);
 extern void console_kcon_enable(int phone);