Changeset 2595dab in mainline for uspace/lib/libc/generic/io/console.c

Timestamp:

2009-06-03T19:26:28Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d00ae4c

Parents:

ca3ba3a

Message:

I/O subsystem overhaul:

• add more POSIX-like file and stream functions (with real functionality of stdin, stdout, stderr)
• cleanup console access methods (now generic to any console-like device)
• remove unsafe stream functions
• add special open_node(), fd_node(), fd_phone() (file) and fopen_node(), fnode(), fphone() (stream) functions for HelenOS-specific I/O operations

File:

• uspace/lib/libc/generic/io/console.c (moved) (moved from uspace/lib/libc/generic/io/stream.c ) (2 diffs)

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

@@ -2 +2 @@
  * Copyright (c) 2006 Josef Cejka
  * Copyright (c) 2006 Jakub Vana
+ * Copyright (c) 2008 Jiri Svoboda
  * All rights reserved.
  *
@@ -34 +35 @@
  */
 
-#include <io/io.h>
-#include <io/stream.h>
-#include <string.h>
-#include <malloc.h>
 #include <libc.h>
-#include <ipc/ipc.h>
-#include <ipc/ns.h>
-#include <ipc/fb.h>
-#include <ipc/services.h>
+#include <async.h>
+#include <io/console.h>
 #include <ipc/console.h>
-#include <console.h>
-#include <kbd/kbd.h>
-#include <unistd.h>
-#include <async.h>
-#include <sys/types.h>
 
-ssize_t read_stdin(void *buf, size_t count)
+void console_clear(int phone)
 {
-        int cons_phone = console_open(false);
-        
-        if (cons_phone >= 0) {
-                kbd_event_t ev;
-                int rc;
-                size_t i = 0;
-                
-                while (i < count) {
-                        do {
-                                rc = kbd_get_event(&ev);
-                                if (rc < 0) return -1;
-                        } while (ev.c == 0 || ev.type == KE_RELEASE);
-                        
-                        ((char *) buf)[i++] = ev.c;
-                }
-                return i;
-        } else
-                return -1;
+        async_msg_0(phone, CONSOLE_CLEAR);
 }
 
-/** Write a string to klog. */
-int klog_puts(const char *str)
+int console_get_size(int phone, ipcarg_t *rows, ipcarg_t *cols)
 {
-        return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) str, str_size(str));
+        return async_req_0_2(phone, CONSOLE_GET_SIZE, rows, cols);
 }
 
-void klog_update(void)
+void console_set_style(int phone, int style)
 {
-        (void) __SYSCALL3(SYS_KLOG, 1, NULL, 0);
+        async_msg_1(phone, CONSOLE_SET_STYLE, style);
+}
+
+void console_set_color(int phone, int fg_color, int bg_color, int flags)
+{
+        async_msg_3(phone, CONSOLE_SET_COLOR, fg_color, bg_color, flags);
+}
+
+void console_set_rgb_color(int phone, int fg_color, int bg_color)
+{
+        async_msg_2(phone, CONSOLE_SET_RGB_COLOR, fg_color, bg_color);
+}
+
+void console_cursor_visibility(int phone, bool show)
+{
+        async_msg_1(phone, CONSOLE_CURSOR_VISIBILITY, show != false);
+}
+
+void console_kcon_enable(int phone)
+{
+        async_msg_0(phone, CONSOLE_KCON_ENABLE);
+}
+
+void console_goto(int phone, ipcarg_t row, ipcarg_t col)
+{
+        async_msg_2(phone, CONSOLE_GOTO, row, col);
+}
+
+bool console_get_event(int phone, console_event_t *event)
+{
+        ipcarg_t type;
+        ipcarg_t key;
+        ipcarg_t mods;
+        ipcarg_t c;
+        
+        int rc = async_req_0_4(phone, CONSOLE_GET_EVENT, &type, &key, &mods, &c);
+        if (rc < 0)
+                return false;
+        
+        event->type = type;
+        event->key = key;
+        event->mods = mods;
+        event->c = c;
+        
+        return true;
 }