Changeset 085bd54 in mainline for console/gcons.c

Timestamp:

2006-06-06T15:16:08Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

63bb83e

Parents:

d7eafd8

Message:

Revised ipc. Now it is preferrable to use only functions from async.h, they
take care of correct buffering, waiting for answers etc.

File:

• console/gcons.c (modified) (8 diffs)

console/gcons.c

@@ -76 +76 @@
 static void vp_switch(int vp)
 {
-        nsend_call(fbphone,FB_VIEWPORT_SWITCH, vp);
+        async_msg(fbphone,FB_VIEWPORT_SWITCH, vp);
 }
 
@@ -91 +91 @@
 static void clear(void)
 {
-        nsend_call(fbphone, FB_CLEAR, 0);
+        async_msg(fbphone, FB_CLEAR, 0);
         
 }
@@ -97 +97 @@
 static void set_style(int fgcolor, int bgcolor)
 {
-        nsend_call_2(fbphone, FB_SET_STYLE, fgcolor, bgcolor);
+        async_msg_2(fbphone, FB_SET_STYLE, fgcolor, bgcolor);
 }
 
@@ -103 +103 @@
 static void tran_putch(char c, int row, int col)
 {
-        nsend_call_3(fbphone, FB_TRANS_PUTCHAR, c, row, col);
+        async_msg_3(fbphone, FB_TRANS_PUTCHAR, c, row, col);
 }
 
@@ -115 +115 @@
         vp_switch(cstatus_vp[consnum]);
         if (ic_pixmaps[state] != -1)
-                nsend_call_2(fbphone, FB_VP_DRAW_PIXMAP, cstatus_vp[consnum], ic_pixmaps[state]);
+                async_msg_2(fbphone, FB_VP_DRAW_PIXMAP, cstatus_vp[consnum], ic_pixmaps[state]);
 
         if (state != CONS_DISCONNECTED && state != CONS_KERNEL && state != CONS_DISCONNECTED_SEL) {
@@ -239 +239 @@
         memcpy(shm, logo, size);
         /* Send area */
-        rc = sync_send_2(fbphone, FB_PREPARE_SHM, (ipcarg_t)shm, 0, NULL, NULL);
+        rc = async_req_2(fbphone, FB_PREPARE_SHM, (ipcarg_t)shm, 0, NULL, NULL);
         if (rc)
                 goto exit;
-        rc = sync_send_3(fbphone, IPC_M_AS_AREA_SEND, (ipcarg_t)shm, 0, PROTO_READ, NULL, NULL, NULL);
+        rc = async_req_3(fbphone, IPC_M_AS_AREA_SEND, (ipcarg_t)shm, 0, PROTO_READ, NULL, NULL, NULL);
         if (rc)
                 goto drop;
         /* Draw logo */
-        nsend_call_2(fbphone, FB_DRAW_PPM, x, y);
+        async_msg_2(fbphone, FB_DRAW_PPM, x, y);
 drop:
         /* Drop area */
-        nsend_call(fbphone, FB_DROP_SHM, 0);
+        async_msg(fbphone, FB_DROP_SHM, 0);
 exit:       
         /* Remove area */
@@ -298 +298 @@
         memcpy(shm, data, size);
         /* Send area */
-        rc = sync_send_2(fbphone, FB_PREPARE_SHM, (ipcarg_t)shm, 0, NULL, NULL);
+        rc = async_req_2(fbphone, FB_PREPARE_SHM, (ipcarg_t)shm, 0, NULL, NULL);
         if (rc)
                 goto exit;
-        rc = sync_send_3(fbphone, IPC_M_AS_AREA_SEND, (ipcarg_t)shm, 0, PROTO_READ, NULL, NULL, NULL);
+        rc = async_req_3(fbphone, IPC_M_AS_AREA_SEND, (ipcarg_t)shm, 0, PROTO_READ, NULL, NULL, NULL);
         if (rc)
                 goto drop;
 
         /* Obtain pixmap */
-        rc = sync_send(fbphone, FB_SHM2PIXMAP, 0, NULL);
+        rc = async_req(fbphone, FB_SHM2PIXMAP, 0, NULL);
         if (rc < 0)
                 goto drop;
@@ -312 +312 @@
 drop:
         /* Drop area */
-        nsend_call(fbphone, FB_DROP_SHM, 0);
+        async_msg(fbphone, FB_DROP_SHM, 0);
 exit:       
         /* Remove area */