Changeset c028b22 in mainline for uspace/srv/hid/console/gcons.c

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/srv/hid/console/gcons.c (modified) (16 diffs)

uspace/srv/hid/console/gcons.c

@@ -35 +35 @@
 #include <ipc/fb.h>
 #include <async.h>
+#include <async_obsolete.h>
 #include <stdio.h>
 #include <sys/mman.h>
@@ -115 +116 @@
 static void vp_switch(int vp)
 {
-        async_msg_1(fbphone, FB_VIEWPORT_SWITCH, vp);
+        async_obsolete_msg_1(fbphone, FB_VIEWPORT_SWITCH, vp);
 }
 
@@ -121 +122 @@
 static int vp_create(sysarg_t x, sysarg_t y, sysarg_t width, sysarg_t height)
 {
-        return async_req_2_0(fbphone, FB_VIEWPORT_CREATE, (x << 16) | y,
+        return async_obsolete_req_2_0(fbphone, FB_VIEWPORT_CREATE, (x << 16) | y,
             (width << 16) | height);
 }
@@ -127 +128 @@
 static void clear(void)
 {
-        async_msg_0(fbphone, FB_CLEAR);
+        async_obsolete_msg_0(fbphone, FB_CLEAR);
 }
 
 static void set_rgb_color(uint32_t fgcolor, uint32_t bgcolor)
 {
-        async_msg_2(fbphone, FB_SET_RGB_COLOR, fgcolor, bgcolor);
+        async_obsolete_msg_2(fbphone, FB_SET_RGB_COLOR, fgcolor, bgcolor);
 }
 
@@ -138 +139 @@
 static void tran_putch(wchar_t ch, sysarg_t col, sysarg_t row)
 {
-        async_msg_3(fbphone, FB_PUTCHAR, ch, col, row);
+        async_obsolete_msg_3(fbphone, FB_PUTCHAR, ch, col, row);
 }
 
@@ -149 +150 @@
         
         if (ic_pixmaps[state] != -1)
-                async_msg_2(fbphone, FB_VP_DRAW_PIXMAP, cstatus_vp[index],
+                async_obsolete_msg_2(fbphone, FB_VP_DRAW_PIXMAP, cstatus_vp[index],
                     ic_pixmaps[state]);
         
@@ -167 +168 @@
 void gcons_change_console(size_t index)
 {
-        if (!use_gcons)
-                return;
+        if (!use_gcons) {
+                active_console = index;
+                return;
+        }
         
         if (active_console == KERNEL_CONSOLE) {
@@ -177 +180 @@
                 
                 if (animation != -1)
-                        async_msg_1(fbphone, FB_ANIM_START, animation);
+                        async_obsolete_msg_1(fbphone, FB_ANIM_START, animation);
         } else {
                 if (console_state[active_console] == CONS_DISCONNECTED_SEL)
@@ -258 +261 @@
 {
         if (animation != -1)
-                async_msg_1(fbphone, FB_ANIM_STOP, animation);
+                async_obsolete_msg_1(fbphone, FB_ANIM_STOP, animation);
         
         active_console = KERNEL_CONSOLE;
@@ -294 +297 @@
         
         if (active_console != KERNEL_CONSOLE)
-                async_msg_2(fbphone, FB_POINTER_MOVE, mouse_x, mouse_y);
+                async_obsolete_msg_2(fbphone, FB_POINTER_MOVE, mouse_x, mouse_y);
 }
 
@@ -374 +377 @@
         
         /* Send area */
-        int rc = async_req_1_0(fbphone, FB_PREPARE_SHM, (sysarg_t) shm);
+        int rc = async_obsolete_req_1_0(fbphone, FB_PREPARE_SHM, (sysarg_t) shm);
         if (rc)
                 goto exit;
         
-        rc = async_share_out_start(fbphone, shm, PROTO_READ);
+        rc = async_obsolete_share_out_start(fbphone, shm, PROTO_READ);
         if (rc)
                 goto drop;
         
         /* Draw logo */
-        async_msg_2(fbphone, FB_DRAW_PPM, x, y);
+        async_obsolete_msg_2(fbphone, FB_DRAW_PPM, x, y);
         
 drop:
         /* Drop area */
-        async_msg_0(fbphone, FB_DROP_SHM);
+        async_obsolete_msg_0(fbphone, FB_DROP_SHM);
         
 exit:
@@ -436 +439 @@
         
         /* Send area */
-        int rc = async_req_1_0(fbphone, FB_PREPARE_SHM, (sysarg_t) shm);
+        int rc = async_obsolete_req_1_0(fbphone, FB_PREPARE_SHM, (sysarg_t) shm);
         if (rc)
                 goto exit;
         
-        rc = async_share_out_start(fbphone, shm, PROTO_READ);
+        rc = async_obsolete_share_out_start(fbphone, shm, PROTO_READ);
         if (rc)
                 goto drop;
         
         /* Obtain pixmap */
-        rc = async_req_0_0(fbphone, FB_SHM2PIXMAP);
+        rc = async_obsolete_req_0_0(fbphone, FB_SHM2PIXMAP);
         if (rc < 0)
                 goto drop;
@@ -453 +456 @@
 drop:
         /* Drop area */
-        async_msg_0(fbphone, FB_DROP_SHM);
+        async_obsolete_msg_0(fbphone, FB_DROP_SHM);
         
 exit:
@@ -464 +467 @@
 static void make_anim(void)
 {
-        int an = async_req_1_0(fbphone, FB_ANIM_CREATE,
+        int an = async_obsolete_req_1_0(fbphone, FB_ANIM_CREATE,
             cstatus_vp[KERNEL_CONSOLE]);
         if (an < 0)
@@ -471 +474 @@
         int pm = make_pixmap(_binary_gfx_anim_1_ppm_start,
             (size_t) &_binary_gfx_anim_1_ppm_size);
-        async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
+        async_obsolete_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
         
         pm = make_pixmap(_binary_gfx_anim_2_ppm_start,
             (size_t) &_binary_gfx_anim_2_ppm_size);
-        async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
+        async_obsolete_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
         
         pm = make_pixmap(_binary_gfx_anim_3_ppm_start,
             (size_t) &_binary_gfx_anim_3_ppm_size);
-        async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
+        async_obsolete_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
         
         pm = make_pixmap(_binary_gfx_anim_4_ppm_start,
             (size_t) &_binary_gfx_anim_4_ppm_size);
-        async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
-        
-        async_msg_1(fbphone, FB_ANIM_START, an);
+        async_obsolete_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
+        
+        async_obsolete_msg_1(fbphone, FB_ANIM_START, an);
         
         animation = an;
@@ -495 +498 @@
         fbphone = phone;
         
-        int rc = async_req_0_2(phone, FB_GET_RESOLUTION, &xres, &yres);
+        int rc = async_obsolete_req_0_2(phone, FB_GET_RESOLUTION, &xres, &yres);
         if (rc)
                 return;