Changeset 416abec in mainline

Timestamp:

2009-03-20T20:58:21Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e622f0a8

Parents:

db90860

Message:

Improve the console library functions.

Location:

uspace

Files:

• app/tetris/input.c (modified) (1 diff)
• lib/libc/generic/console.c (modified) (11 diffs)
• lib/libc/generic/io/stream.c (modified) (2 diffs)
• lib/libc/generic/kbd.c (modified) (1 diff)
• lib/libc/include/console.h (modified) (1 diff)

uspace/app/tetris/input.c

@@ -116 +116 @@
 again:
                 if (!getchar_inprog) {
-                        cons_phone = console_phone_get();
+                        cons_phone = console_phone_get(true);
                         getchar_inprog = async_send_2(cons_phone,
                             CONSOLE_GETKEY, 0, 0, &charcall);

uspace/lib/libc/generic/console.c

@@ -43 +43 @@
 static int console_phone = -1;
 
-void console_open(void)
+void console_open(bool blocking)
 {
         if (console_phone < 0) {
-                int phone = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0, 0);
+                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,
+                            0);
+                }
                 if (phone >= 0)
                         console_phone = phone;
@@ -61 +68 @@
 }
 
-int console_phone_get(void)
+int console_phone_get(bool blocking)
 {
         if (console_phone < 0)
-                console_open();
+                console_open(blocking);
         
         return console_phone;
@@ -72 +79 @@
 {
         while (console_phone < 0)
-                console_open();
+                console_open(true);
 }
 
 void console_clear(void)
 {
-        int cons_phone = console_phone_get();
+        int cons_phone = console_phone_get(true);
         async_msg_0(cons_phone, CONSOLE_CLEAR);
 }
@@ -83 +90 @@
 void console_goto(int row, int col)
 {
-        int cons_phone = console_phone_get();
+        int cons_phone = console_phone_get(true);
         async_msg_2(cons_phone, CONSOLE_GOTO, row, col);
 }
@@ -89 +96 @@
 void console_putchar(int c)
 {
-        int cons_phone = console_phone_get();
+        int cons_phone = console_phone_get(true);
         async_msg_1(cons_phone, CONSOLE_PUTCHAR, c);
 }
@@ -95 +102 @@
 void console_flush(void)
 {
-        int cons_phone = console_phone_get();
+        int cons_phone = console_phone_get(true);
         async_msg_0(cons_phone, CONSOLE_FLUSH);
 }
@@ -101 +108 @@
 int console_get_size(int *rows, int *cols)
 {
-        int cons_phone = console_phone_get();
+        int cons_phone = console_phone_get(true);
         ipcarg_t r, c;
         int rc;
@@ -115 +122 @@
 void console_set_style(int style)
 {
-        int cons_phone = console_phone_get();
+        int cons_phone = console_phone_get(true);
         async_msg_1(cons_phone, CONSOLE_SET_STYLE, style);
 }
@@ -121 +128 @@
 void console_set_color(int fg_color, int bg_color, int flags)
 {
-        int cons_phone = console_phone_get();
+        int cons_phone = console_phone_get(true);
         async_msg_3(cons_phone, CONSOLE_SET_COLOR, fg_color, bg_color, flags);
 }
@@ -127 +134 @@
 void console_set_rgb_color(int fg_color, int bg_color)
 {
-        int cons_phone = console_phone_get();
+        int cons_phone = console_phone_get(true);
         async_msg_2(cons_phone, CONSOLE_SET_RGB_COLOR, fg_color, bg_color);
 }
@@ -133 +140 @@
 void console_cursor_visibility(int show)
 {
-        int cons_phone = console_phone_get();
+        int cons_phone = console_phone_get(true);
         async_msg_1(cons_phone, CONSOLE_CURSOR_VISIBILITY, show != 0);
 }

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

@@ -57 +57 @@
 ssize_t read_stdin(void *buf, size_t count)
 {
-        int cons_phone = console_phone_get();
+        int cons_phone = console_phone_get(false);
 
         if (cons_phone >= 0) {
@@ -80 +80 @@
 ssize_t write_stdout(const void *buf, size_t count)
 {
-        int cons_phone = console_phone_get();
+        int cons_phone = console_phone_get(false);
 
         if (cons_phone >= 0) {

uspace/lib/libc/generic/kbd.c

@@ -43 +43 @@
 int kbd_get_event(kbd_event_t *ev)
 {
-        int cons_phone = console_phone_get();
+        int cons_phone = console_phone_get(true);
         ipcarg_t r0, r1, r2, r3;
         int rc;
-
-        if (cons_phone < 0)
-                return -1;
 
         rc = async_req_0_4(cons_phone, CONSOLE_GETKEY, &r0, &r1, &r2, &r3);

uspace/lib/libc/include/console.h

@@ -38 +38 @@
 #include <console/style.h>
 #include <console/color.h>
+#include <bool.h>
 
-extern void console_open(void);
+extern void console_open(bool);
 extern void console_close(void);
 
-extern int console_phone_get(void);
+extern int console_phone_get(bool);
 extern void console_wait(void);