Changeset 262cd01 in mainline

Timestamp:

2009-09-10T21:38:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ac2c2ea7

Parents:

6b89868 (diff), 8be2833 (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 small console API fixes from ~jsvoboda/helenos/console.

Location:

uspace

Files:

• app/tetris/screen.h (modified) (1 diff)
• lib/libc/generic/io/console.c (modified) (2 diffs)
• lib/libc/include/io/console.h (modified) (1 diff)

uspace/app/tetris/screen.h

@@ -51 +51 @@
 
 typedef struct {
-        ipcarg_t ws_row;
-        ipcarg_t ws_col;
+        int ws_row;
+        int ws_col;
 } winsize_t;
 

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

@@ -45 +45 @@
 }
 
-int console_get_size(int phone, ipcarg_t *rows, ipcarg_t *cols)
+int console_get_size(int phone, int *cols, int *rows)
 {
-        return async_req_0_2(phone, CONSOLE_GET_SIZE, rows, cols);
+        ipcarg_t cols_v;
+        ipcarg_t rows_v;
+        int rc;
+
+        rc = async_req_0_2(phone, CONSOLE_GET_SIZE, &cols_v, &rows_v);
+
+        *cols = (int) cols_v;
+        *rows = (int) rows_v;
+        return rc;
 }
 
@@ -86 +94 @@
 }
 
-void console_goto(int phone, ipcarg_t row, ipcarg_t col)
+void console_goto(int phone, int col, int row)
 {
-        async_msg_2(phone, CONSOLE_GOTO, row, col);
+        async_msg_2(phone, CONSOLE_GOTO, col, row);
 }
 

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

@@ -68 +68 @@
 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, int *cols, int *rows);
+extern void console_goto(int phone, int col, int row);
 
 extern void console_set_style(int phone, int style);