WebSVN – HelenOS – Diff – /branches/network/uspace/lib/libc/generic/console.c

 /** @addtogroup libc
  * @{
  */
 /** @file
  */
+#include <libc.h>
 #include <async.h>
 #include <io/stream.h>
 #include <ipc/console.h>
 #include <ipc/services.h>
 #include <errno.h>
 #include <console.h>
 static int console_phone = -1;
 /** Size of cbuffer. */
-#define CBUFFER_SIZE 256
+#define CBUFFER_SIZE  256
 /** Buffer for writing characters to the console. */
 static char cbuffer[CBUFFER_SIZE];
 /** Pointer to end of cbuffer. */
 static char *cbuffer_end = cbuffer + CBUFFER_SIZE;
 /** Pointer to first available field in cbuffer. */
 static char *cbp = cbuffer;
-static ssize_t cons_write(const char *buf, size_t nbyte);
-static void cons_putchar(wchar_t c);
-static void cbuffer_flush(void);
-static void cbuffer_drain(void);
-static inline void cbuffer_putc(int c);
+/** Write one character to the console via IPC. */
-void console_open(bool blocking)
+static void cons_putchar(wchar_t c)
+{
-    if (console_phone < 0) {
+    console_wait();
-        int phone;
-        if (blocking) {
-            phone = ipc_connect_me_to_blocking(PHONE_NS,
-                SERVICE_CONSOLE, 0, 0);
-        } else {
-            phone = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0,
-);
-        }
-        if (phone >= 0)
-            console_phone = phone;
+    async_msg_1(console_phone, CONSOLE_PUTCHAR, c);
-    }
+}
+/** Write characters to the console via IPC or to klog */
-void console_close(void)
+static ssize_t cons_write(const char *buf, size_t size)
+{
+    console_open(false);
     if (console_phone >= 0) {
+        async_serialize_start();
+        ipc_call_t answer;
+        aid_t req = async_send_0(console_phone, CONSOLE_WRITE, &answer);
-        if (ipc_hangup(console_phone) == 0) {
+        ipcarg_t rc = ipc_data_write_start(console_phone, (void *) buf, size);
+        if (rc != EOK) {
+            async_wait_for(req, NULL);
+            async_serialize_end();
-            console_phone = -1;
+            return (ssize_t) rc;
+        }
-    }
-}
-int console_phone_get(bool blocking)
-{
-    if (console_phone < 0)
+        async_wait_for(req, &rc);
-        console_open(blocking);
+        async_serialize_end();
-    return console_phone;
-}
-void console_wait(void)
-{
-    while (console_phone < 0)
+        if (rc == EOK)
-        console_open(true);
-}
-void console_clear(void)
-{
-    int cons_phone = console_phone_get(true);
+            return (ssize_t) IPC_GET_ARG1(answer);
+        else
-    cbuffer_drain();
+            return -1;
-    async_msg_0(cons_phone, CONSOLE_CLEAR);
-}
-void console_goto(int row, int col)
-{
-    int cons_phone = console_phone_get(true);
-    cbuffer_flush();
+    } else
-    async_msg_2(cons_phone, CONSOLE_GOTO, row, col);
+        return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, size);
-}
-void console_putchar(wchar_t c)
-{
-//  cbuffer_putc(c);
-    cbuffer_flush();
-    cons_putchar(c);
+}
 /** Write all data from output buffer to the console. */
 static void cbuffer_flush(void)
+{
-    int rc;
-    int len;
-    len = cbp - cbuffer;
+    size_t len = cbp - cbuffer;
     while (len > 0) {
-        rc = cons_write(cbuffer, cbp - cbuffer);
+        ssize_t rc = cons_write(cbuffer, cbp - cbuffer);
         if (rc < 0)
             return;
         len -= rc;
+    }
     cbp = cbuffer;
+}
 /** Drop all data in console output buffer. */
 static void cbuffer_drain(void)
+{
     cbp = cbuffer;
+}
 /** Write one character to the output buffer. */
-static inline void cbuffer_putc(int c)
+static inline void cbuffer_putc(char c)
+{
     if (cbp == cbuffer_end)
         cbuffer_flush();
     *cbp++ = c;
     if (c == '\n')
         cbuffer_flush();
+}
-/** Write one character to the console via IPC. */
-static void cons_putchar(wchar_t c)
+int console_open(bool blocking)
+{
-    int cons_phone = console_phone_get(true);
+    if (console_phone < 0) {
-    async_msg_1(cons_phone, CONSOLE_PUTCHAR, c);
+        int phone;
-}
-/** Write characters to the console via IPC. */
+        if (blocking)
-static ssize_t cons_write(const char *buf, size_t nbyte)
+            phone = ipc_connect_me_to_blocking(PHONE_NS,
-{
-    int cons_phone = console_phone_get(true);
+                SERVICE_CONSOLE, 0, 0);
-    ipcarg_t rc;
+        else
-    ipc_call_t answer;
+            phone = ipc_connect_me_to(PHONE_NS,
-    aid_t req;
-    async_serialize_start();
+                SERVICE_CONSOLE, 0, 0);
-    req = async_send_0(cons_phone, CONSOLE_WRITE, &answer);
-    rc = ipc_data_write_start(cons_phone, (void *) buf, nbyte);
-    if (rc != EOK) {
+        if (phone >= 0)
-        async_wait_for(req, NULL);
+            console_phone = phone;
-        async_serialize_end();
-        return (ssize_t) rc;
+    }
-    async_wait_for(req, &rc);
-    async_serialize_end();
-    if (rc == EOK)
-        return (ssize_t) IPC_GET_ARG1(answer);
-    else
-        return -1;
+    return console_phone;
+}
-/** Write characters to the console. */
+void console_close(void)
-ssize_t console_write(const char *buf, size_t nbyte)
+{
-    size_t left;
-    left = nbyte;
-    while (left > 0) {
+    if (console_phone >= 0) {
-        cbuffer_putc(*buf++);
+        if (ipc_hangup(console_phone) == 0)
-        --left;
+            console_phone = -1;
+    }
-    return nbyte;
+}
-/** Write a NULL-terminated string to the console. */
-void console_putstr(const char *s)
+void console_wait(void)
+{
-    size_t len;
-    ssize_t rc;
-    len = strlen(s);
-    while (len > 0) {
+    while (console_phone < 0)
-        rc = console_write(s, len);
+        console_open(true);
-        if (rc < 0)
-            return; /* Error */
-        s += rc;
-        len -= rc;
-    }
+}
-/** Flush all output to the console. */
-void console_flush(void)
+void console_clear(void)
+{
-    int cons_phone = console_phone_get(false);
+    console_wait();
-    cbuffer_flush();
+    cbuffer_drain();
-    async_msg_0(cons_phone, CONSOLE_FLUSH);
+    async_msg_0(console_phone, CONSOLE_CLEAR);
+}
 int console_get_size(int *rows, int *cols)
+{
-    int cons_phone = console_phone_get(true);
+    console_wait();
-    ipcarg_t r, c;
+    ipcarg_t r;
-    int rc;
+    ipcarg_t c;
-    rc = async_req_0_2(cons_phone, CONSOLE_GETSIZE, &r, &c);
+    int rc = async_req_0_2(console_phone, CONSOLE_GETSIZE, &r, &c);
     *rows = (int) r;
     *cols = (int) c;
     return rc;
+}
 void console_set_style(int style)
+{
-    int cons_phone = console_phone_get(true);
+    console_wait();
     cbuffer_flush();
-    async_msg_1(cons_phone, CONSOLE_SET_STYLE, style);
+    async_msg_1(console_phone, CONSOLE_SET_STYLE, style);
+}
 void console_set_color(int fg_color, int bg_color, int flags)
+{
-    int cons_phone = console_phone_get(true);
+    console_wait();
     cbuffer_flush();
-    async_msg_3(cons_phone, CONSOLE_SET_COLOR, fg_color, bg_color, flags);
+    async_msg_3(console_phone, CONSOLE_SET_COLOR, fg_color, bg_color, flags);
+}
 void console_set_rgb_color(int fg_color, int bg_color)
+{
-    int cons_phone = console_phone_get(true);
+    console_wait();
     cbuffer_flush();
-    async_msg_2(cons_phone, CONSOLE_SET_RGB_COLOR, fg_color, bg_color);
+    async_msg_2(console_phone, CONSOLE_SET_RGB_COLOR, fg_color, bg_color);
+}
 void console_cursor_visibility(int show)
+{
-    int cons_phone = console_phone_get(true);
+    console_wait();
     cbuffer_flush();
-    async_msg_1(cons_phone, CONSOLE_CURSOR_VISIBILITY, show != 0);
+    async_msg_1(console_phone, CONSOLE_CURSOR_VISIBILITY, show != 0);
+}
 void console_kcon_enable(void)
+{
+    console_wait();
+    cbuffer_flush();
-    int cons_phone = console_phone_get(true);
+    async_msg_0(console_phone, CONSOLE_KCON_ENABLE);
+}
+void console_goto(int row, int col)
+{
+    console_wait();
+    cbuffer_flush();
+    async_msg_2(console_phone, CONSOLE_GOTO, row, col);
+}
+void console_putchar(wchar_t c)
+{
+    console_wait();
+    cbuffer_flush();
+    cons_putchar(c);
+}
+/** Write characters to the console. */
+ssize_t console_write(const char *buf, size_t size)
+{
+    size_t left = size;
+    while (left > 0) {
+        cbuffer_putc(*buf++);
+        left--;
+    }
+    return size;
+}
+/** Write a NULL-terminated string to the console. */
+void console_putstr(const char *str)
+{
+    size_t left = str_size(str);
+    while (left > 0) {
+        ssize_t rc = console_write(str, left);
+        if (rc < 0) {
+            /* Error */
+            return;
+        }
+        str += rc;
+        left -= rc;
+    }
+}
+/** Flush all output to the console or klog. */
+void console_flush(void)
+{
     cbuffer_flush();
+    if (console_phone >= 0)
-    async_msg_0(cons_phone, CONSOLE_KCON_ENABLE);
+        async_msg_0(console_phone, CONSOLE_FLUSH);
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/network/uspace/lib/libc/generic/console.c – Rev 4263 → 4327