Changeset 7c014d1 in mainline for uspace/lib/c

Timestamp:

2011-09-09T15:46:21Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c69646f8

Parents:

14a60e3

Message:

console and framebuffer server rewrite

Location:

uspace/lib/c

Files:

• Makefile (modified) (1 diff)
• generic/io/console.c (modified) (4 diffs)
• generic/io/screenbuffer.c (deleted)
• include/io/color.h (modified) (1 diff)
• include/io/console.h (modified) (3 diffs)
• include/io/screenbuffer.h (deleted)
• include/ipc/fb.h (deleted)
• include/ipc/services.h (modified) (1 diff)

uspace/lib/c/Makefile

@@ -93 +93 @@
         generic/io/printf_core.c \
         generic/io/console.c \
-        generic/io/screenbuffer.c \
         generic/malloc.c \
         generic/sysinfo.c \

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

@@ -87 +87 @@
 {
         async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
-        async_msg_0(exch, CONSOLE_CLEAR);
+        async_req_0_0(exch, CONSOLE_CLEAR);
         async_exchange_end(exch);
 }
@@ -103 +103 @@
 {
         async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
-        async_msg_1(exch, CONSOLE_SET_STYLE, style);
-        async_exchange_end(exch);
-}
-
-void console_set_color(console_ctrl_t *ctrl, uint8_t fg_color, uint8_t bg_color,
+        async_req_1_0(exch, CONSOLE_SET_STYLE, style);
+        async_exchange_end(exch);
+}
+
+void console_set_color(console_ctrl_t *ctrl, uint8_t bgcolor, uint8_t fgcolor,
     uint8_t flags)
 {
         async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
-        async_msg_3(exch, CONSOLE_SET_COLOR, fg_color, bg_color, flags);
-        async_exchange_end(exch);
-}
-
-void console_set_rgb_color(console_ctrl_t *ctrl, uint32_t fg_color,
-    uint32_t bg_color)
-{
-        async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
-        async_msg_2(exch, CONSOLE_SET_RGB_COLOR, fg_color, bg_color);
+        async_req_3_0(exch, CONSOLE_SET_COLOR, bgcolor, fgcolor, flags);
+        async_exchange_end(exch);
+}
+
+void console_set_rgb_color(console_ctrl_t *ctrl, uint32_t bgcolor,
+    uint32_t fgcolor)
+{
+        async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
+        async_req_2_0(exch, CONSOLE_SET_RGB_COLOR, bgcolor, fgcolor);
         async_exchange_end(exch);
 }
@@ -126 +126 @@
 {
         async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
-        async_msg_1(exch, CONSOLE_CURSOR_VISIBILITY, (show != false));
+        async_req_1_0(exch, CONSOLE_CURSOR_VISIBILITY, (show != false));
         async_exchange_end(exch);
 }
@@ -151 +151 @@
 {
         async_exch_t *exch = async_exchange_begin(ctrl->output_sess);
-        async_msg_2(exch, CONSOLE_GOTO, col, row);
+        async_req_2_0(exch, CONSOLE_GOTO, col, row);
         async_exchange_end(exch);
 }

uspace/lib/c/include/io/color.h

@@ -44 +44 @@
         COLOR_MAGENTA = 5,
         COLOR_YELLOW  = 6,
-        COLOR_WHITE   = 7,
-        
-        CATTR_BRIGHT  = 8,
-        CATTR_BLINK   = 8
+        COLOR_WHITE   = 7
 } console_color_t;
+
+typedef enum {
+        CATTR_NORMAL = 0,
+        CATTR_BRIGHT = 8,
+        CATTR_BLINK  = 16
+} console_color_attr_t;
 
 #endif

uspace/lib/c/include/io/console.h

@@ -37 +37 @@
 
 #include <sys/time.h>
+#include <io/keycode.h>
 #include <async.h>
 #include <bool.h>
@@ -42 +43 @@
 
 typedef enum {
-        CONSOLE_CCAP_NONE = 0,
-        CONSOLE_CCAP_STYLE,
-        CONSOLE_CCAP_INDEXED,
-        CONSOLE_CCAP_RGB
+        CONSOLE_CAP_NONE = 0,
+        CONSOLE_CAP_STYLE = 1,
+        CONSOLE_CAP_INDEXED = 2,
+        CONSOLE_CAP_RGB = 4
 } console_caps_t;
 
@@ -76 +77 @@
 /** Console event structure. */
 typedef struct {
+        /** List handle */
+        link_t link;
+        
         /** Press or release event. */
         kbd_event_type_t type;
         
         /** Keycode of the key that was pressed or released. */
-        unsigned int key;
+        keycode_t key;
         
         /** Bitmask of modifiers held. */
-        unsigned int mods;
+        keymod_t mods;
         
         /** The character that was generated or '\0' for none. */

uspace/lib/c/include/ipc/services.h

@@ -43 +43 @@
         SERVICE_NONE       = 0,
         SERVICE_LOAD       = FOURCC('l', 'o', 'a', 'd'),
-        SERVICE_VIDEO      = FOURCC('v', 'i', 'd', ' '),
         SERVICE_VFS        = FOURCC('v', 'f', 's', ' '),
         SERVICE_LOC        = FOURCC('l', 'o', 'c', ' '),