Changeset 566f4cfb in mainline for uspace/lib/libc/generic/io/io.c

Timestamp:

2009-04-24T08:01:05Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

402de0c

Parents:

ab1861a

Message:

use buffering for klog output (this can be used to avoid the ugly usleeps while starting tasks)
unify and cleanup console.c and related files

File:

• uspace/lib/libc/generic/io/io.c (modified) (7 diffs)

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

@@ -39 +39 @@
 #include <string.h>
 #include <errno.h>
+#include <console.h>
 
 const static char nl = '\n';
@@ -50 +51 @@
         
         for (count = 0; str[count] != 0; count++);
-        if (write_stdout((void *) str, count) == count) {
-                if (write_stdout(&nl, 1) == 1)
+        
+        if (console_write((void *) str, count) == count) {
+                if (console_write(&nl, 1) == 1)
                         return 0;
         }
@@ -65 +67 @@
 int putnchars(const char *buf, size_t count)
 {
-        if (write_stdout((void *) buf, count) == count)
+        if (console_write((void *) buf, count) == count)
                 return 0;
         
@@ -82 +84 @@
 
         for (count = 0; str[count] != 0; count++);
-        if (write_stdout((void *) str, count) == count)
+        if (console_write((void *) str, count) == count)
                 return 0;
         
@@ -97 +99 @@
                 return EOF;
 
-        if (write_stdout((void *) buf, offs) == offs)
+        if (console_write((void *) buf, offs) == offs)
                 return c;
 
@@ -106 +108 @@
 {
         unsigned char c;
-
-        flush_stdout();
+        
+        console_flush();
         if (read_stdin((void *) &c, 1) == 1)
                 return c;
@@ -116 +118 @@
 int fflush(FILE *f)
 {
+        /* Dummy implementation */
         (void) f;
-        return flush_stdout();
+        console_flush();
+        return 0;
 }