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

Timestamp:

2009-04-24T08:01:05Z (15 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/stream.c (modified) (2 diffs)

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

@@ -50 +50 @@
 #include <sys/types.h>
 
-ssize_t write_stderr(const void *buf, size_t count)
-{
-        return count;
-}
-
 ssize_t read_stdin(void *buf, size_t count)
 {
-        int cons_phone = console_phone_get(false);
-
+        int cons_phone = console_open(false);
+        
         if (cons_phone >= 0) {
                 kbd_event_t ev;
                 int rc;
                 size_t i = 0;
-        
+                
                 while (i < count) {
                         do {
@@ -69 +64 @@
                                 if (rc < 0) return -1;
                         } while (ev.c == 0 || ev.type == KE_RELEASE);
-
+                        
                         ((char *) buf)[i++] = ev.c;
                 }
                 return i;
-        } else {
+        } else
                 return -1;
-        }
-}
-
-ssize_t write_stdout(const void *buf, size_t count)
-{
-        int cons_phone = console_phone_get(false);
-        int left, rc;
-
-        if (cons_phone >= 0) {
-                int i;
-
-                left = count;
-                while (left > 0) {
-                        rc = console_write(buf, left);
-                        if (rc < 0)
-                                break;
-                        buf += rc;
-                        left -= rc;
-                }
-
-                return count;
-        } else
-                return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, count);
-}
-
-int flush_stdout(void)
-{
-        console_flush();
-        return 0;
 }