Changeset ba661bc in mainline

Timestamp:

2008-06-03T15:03:23Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

eda8b8b

Parents:

663c5a6

Message:

use klog output until uspace console is available

Location:

uspace/lib/libc

Files:

• generic/io/stream.c (modified) (2 diffs)
• include/io/stream.h (modified) (1 diff)

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

@@ -57 +57 @@
 ssize_t read_stdin(void *buf, size_t count)
 {
-        ipcarg_t r0, r1;
-        size_t i = 0;
-
-        while (i < count) {
-                if (async_req_0_2(console_phone, CONSOLE_GETCHAR, &r0,
-                    &r1) < 0) {
-                        return -1;
+        open_console();
+        if (console_phone >= 0) {
+                ipcarg_t r0, r1;
+                size_t i = 0;
+        
+                while (i < count) {
+                        if (async_req_0_2(console_phone, CONSOLE_GETCHAR, &r0, &r1) < 0)
+                                return -1;
+                        ((char *) buf)[i++] = r0;
                 }
-                ((char *) buf)[i++] = r0;
+                return i;
         }
-        return i;
 }
 
 ssize_t write_stdout(const void *buf, size_t count)
 {
-        int i;
-
-        for (i = 0; i < count; i++)
-                async_msg_1(console_phone, CONSOLE_PUTCHAR,
-                    ((const char *) buf)[i]);
+        open_console();
+        if (console_phone >= 0) {
+                int i;
         
-        return count;
+                for (i = 0; i < count; i++)
+                        async_msg_1(console_phone, CONSOLE_PUTCHAR,
+                            ((const char *) buf)[i]);
+                
+                return count;
+        } else
+                return __SYSCALL3(SYS_IO, 1, (sysarg_t) buf, count);
 }
 
-void open_stdin(void)
+void open_console(void)
 {
         if (console_phone < 0) {
-                while ((console_phone = ipc_connect_me_to(PHONE_NS,
-                    SERVICE_CONSOLE, 0, 0)) < 0) {
-                        usleep(10000);
-                }
-        }
-}
-
-void open_stdout(void)
-{
-        if (console_phone < 0) {
-                while ((console_phone = ipc_connect_me_to(PHONE_NS,
-                    SERVICE_CONSOLE, 0, 0)) < 0) {
-                        usleep(10000);
-                }
+                int phone = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0, 0);
+                if (phone >= 0)
+                        console_phone = phone;
         }
 }
@@ -103 +97 @@
 int get_cons_phone(void)
 {
+        open_console();
         return console_phone;
 }

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

@@ -40 +40 @@
 #define EMFILE -17
 
-extern void open_stdin(void);
-extern void open_stdout(void);
+extern void open_console(void);
 
 extern ssize_t read_stdin(void *, size_t);