Changeset 96b02eb9 in mainline for uspace/lib/c/generic/io

Timestamp:

2010-12-14T12:52:38Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6b10dab

Parents:

554debd

Message:

more unification of basic types

• use sysarg_t and native_t (unsigned and signed variant) in both kernel and uspace
• remove ipcarg_t in favour of sysarg_t

(no change in functionality)

Location:

uspace/lib/c/generic/io

Files:

• console.c (modified) (4 diffs)
• screenbuffer.c (modified) (3 diffs)

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

@@ -45 +45 @@
 }
 
-int console_get_size(int phone, ipcarg_t *cols, ipcarg_t *rows)
+int console_get_size(int phone, sysarg_t *cols, sysarg_t *rows)
 {
         return async_req_0_2(phone, CONSOLE_GET_SIZE, cols, rows);
@@ -71 +71 @@
 }
 
-int console_get_color_cap(int phone, ipcarg_t *ccap)
+int console_get_color_cap(int phone, sysarg_t *ccap)
 {
         return async_req_0_1(phone, CONSOLE_GET_COLOR_CAP, ccap);
@@ -81 +81 @@
 }
 
-int console_get_pos(int phone, ipcarg_t *col, ipcarg_t *row)
+int console_get_pos(int phone, sysarg_t *col, sysarg_t *row)
 {
         return async_req_0_2(phone, CONSOLE_GET_POS, col, row);
 }
 
-void console_set_pos(int phone, ipcarg_t col, ipcarg_t row)
+void console_set_pos(int phone, sysarg_t col, sysarg_t row)
 {
         async_msg_2(phone, CONSOLE_GOTO, col, row);
@@ -93 +93 @@
 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);

uspace/lib/c/generic/io/screenbuffer.c

@@ -67 +67 @@
  *
  */
-screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, ipcarg_t size_x,
-    ipcarg_t size_y)
+screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, sysarg_t size_x,
+    sysarg_t size_y)
 {
         scr->buffer = (keyfield_t *) malloc(sizeof(keyfield_t) * size_x * size_y);
@@ -110 +110 @@
  *
  */
-void screenbuffer_clear_line(screenbuffer_t *scr, ipcarg_t line)
+void screenbuffer_clear_line(screenbuffer_t *scr, sysarg_t line)
 {
-        ipcarg_t x;
+        sysarg_t x;
         
         for (x = 0; x < scr->size_x; x++) {
@@ -141 +141 @@
  *
  */
-void screenbuffer_goto(screenbuffer_t *scr, ipcarg_t x, ipcarg_t y)
+void screenbuffer_goto(screenbuffer_t *scr, sysarg_t x, sysarg_t y)
 {
         scr->position_x = x % scr->size_x;