Changeset 7bdcc45 in mainline for uspace/lib/c/generic/io

Timestamp:

2010-12-16T16:38:49Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/generic/io

Files:

• console.c (modified) (4 diffs)
• klog.c (modified) (1 diff)
• printf_core.c (modified) (5 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/klog.c

@@ -52 +52 @@
 void klog_update(void)
 {
-        (void) __SYSCALL3(SYS_KLOG, 1, NULL, 0);
+        (void) __SYSCALL3(SYS_KLOG, 1, (uintptr_t) NULL, 0);
 }
 

uspace/lib/c/generic/io/printf_core.c

@@ -82 +82 @@
         PrintfQualifierLong,
         PrintfQualifierLongLong,
-        PrintfQualifierPointer
+        PrintfQualifierPointer,
+        PrintfQualifierSize
 } qualifier_t;
 
@@ -552 +553 @@
  *  - ""   Signed or unsigned int (default value).@n
  *  - "l"  Signed or unsigned long int.@n
- *         If conversion is "c", the character is wchar_t (wide character).@n
+ *         If conversion is "c", the character is wint_t (wide character).@n
  *         If conversion is "s", the string is wchar_t * (wide string).@n
  *  - "ll" Signed or unsigned long long int.@n
+ *  - "z"  Signed or unsigned ssize_t or site_t.@n
  *
  * CONVERSION:@n
@@ -736 +738 @@
                                 }
                                 break;
+                        case 'z':
+                                qualifier = PrintfQualifierSize;
+                                i = nxt;
+                                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                                break;
                         default:
                                 /* Default type */
@@ -763 +770 @@
                         case 'c':
                                 if (qualifier == PrintfQualifierLong)
-                                        retval = print_wchar(va_arg(ap, wchar_t), width, flags, ps);
+                                        retval = print_wchar(va_arg(ap, wint_t), width, flags, ps);
                                 else
                                         retval = print_char(va_arg(ap, unsigned int), width, flags, ps);
@@ -849 +856 @@
                                 precision = size << 1;
                                 number = (uint64_t) (uintptr_t) va_arg(ap, void *);
+                                break;
+                        case PrintfQualifierSize:
+                                size = sizeof(size_t);
+                                number = (uint64_t) va_arg(ap, size_t);
                                 break;
                         default:

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;