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

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/generic/io/console.c (moved) (moved from uspace/lib/libc/generic/io/console.c ) (3 diffs)

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

@@ -45 +45 @@
 }
 
-int console_get_size(int phone, ipcarg_t *rows, ipcarg_t *cols)
+int console_get_size(int phone, sysarg_t *cols, sysarg_t *rows)
 {
-        return async_req_0_2(phone, CONSOLE_GET_SIZE, rows, cols);
+        return async_req_0_2(phone, CONSOLE_GET_SIZE, cols, rows);
 }
 
-void console_set_style(int phone, int style)
+void console_set_style(int phone, uint8_t style)
 {
         async_msg_1(phone, CONSOLE_SET_STYLE, style);
 }
 
-void console_set_color(int phone, int fg_color, int bg_color, int flags)
+void console_set_color(int phone, uint8_t fg_color, uint8_t bg_color,
+    uint8_t flags)
 {
         async_msg_3(phone, CONSOLE_SET_COLOR, fg_color, bg_color, flags);
 }
 
-void console_set_rgb_color(int phone, int fg_color, int bg_color)
+void console_set_rgb_color(int phone, uint32_t fg_color, uint32_t bg_color)
 {
         async_msg_2(phone, CONSOLE_SET_RGB_COLOR, fg_color, bg_color);
@@ -67 +68 @@
 void console_cursor_visibility(int phone, bool show)
 {
-        async_msg_1(phone, CONSOLE_CURSOR_VISIBILITY, show != false);
+        async_msg_1(phone, CONSOLE_CURSOR_VISIBILITY, (show != false));
 }
 
-int console_get_color_cap(int phone, int *ccap)
+int console_get_color_cap(int phone, sysarg_t *ccap)
 {
-        ipcarg_t ccap_tmp;
-        int rc;
-
-        rc = async_req_0_1(phone, CONSOLE_GET_COLOR_CAP, &ccap_tmp);
-        *ccap = ccap_tmp;
-
-        return rc;
+        return async_req_0_1(phone, CONSOLE_GET_COLOR_CAP, ccap);
 }
 
@@ -86 +81 @@
 }
 
-void console_goto(int phone, ipcarg_t row, ipcarg_t col)
+int console_get_pos(int phone, sysarg_t *col, sysarg_t *row)
 {
-        async_msg_2(phone, CONSOLE_GOTO, row, col);
+        return async_req_0_2(phone, CONSOLE_GET_POS, col, row);
+}
+
+void console_set_pos(int phone, sysarg_t col, sysarg_t row)
+{
+        async_msg_2(phone, CONSOLE_GOTO, col, row);
 }
 
 bool console_get_event(int phone, console_event_t *event)
 {
-        ipcarg_t type;
-        ipcarg_t key;
-        ipcarg_t mods;
-        ipcarg_t c;
+        sysarg_t type;
+        sysarg_t key;
+        sysarg_t mods;
+        sysarg_t c;
         
         int rc = async_req_0_4(phone, CONSOLE_GET_EVENT, &type, &key, &mods, &c);