Changeset 085bd54 in mainline for console/console.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/console.c (modified) (17 diffs)

console/console.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+/* TODO: remove */
+#include <stdio.h>
 
 
@@ -92 +94 @@
 static void clrscr(void)
 {
-        nsend_call(fb_info.phone, FB_CLEAR, 0);
+        async_msg(fb_info.phone, FB_CLEAR, 0);
 }
 
 static void curs_visibility(int v)
 {
-        send_call(fb_info.phone, FB_CURSOR_VISIBILITY, v); 
+        async_msg(fb_info.phone, FB_CURSOR_VISIBILITY, v); 
 }
 
 static void curs_goto(int row, int col)
 {
-        nsend_call_2(fb_info.phone, FB_CURSOR_GOTO, row, col); 
+        async_msg_2(fb_info.phone, FB_CURSOR_GOTO, row, col); 
         
 }
@@ -108 +110 @@
 static void set_style(style_t *style)
 {
-        nsend_call_2(fb_info.phone, FB_SET_STYLE, style->fg_color, style->bg_color); 
+        async_msg_2(fb_info.phone, FB_SET_STYLE, style->fg_color, style->bg_color); 
 }
 
 static void set_style_col(int fgcolor, int bgcolor)
 {
-        nsend_call_2(fb_info.phone, FB_SET_STYLE, fgcolor, bgcolor); 
+        async_msg_2(fb_info.phone, FB_SET_STYLE, fgcolor, bgcolor); 
 }
 
 static void prtchr(char c, int row, int col)
 {
-        nsend_call_3(fb_info.phone, FB_PUTCHAR, c, row, col);
+        async_msg_3(fb_info.phone, FB_PUTCHAR, c, row, col);
         
 }
@@ -166 +168 @@
                 screenbuffer_clear_line(scr, scr->top_line++);
                 if (console == active_console)
-                        nsend_call(fb_info.phone, FB_SCROLL, 1);
+                        async_msg(fb_info.phone, FB_SCROLL, 1);
         }
         
@@ -186 +188 @@
        
         /* Save screen */
-        newpmap = sync_send(fb_info.phone, FB_VP2PIXMAP, 0, NULL);
+        newpmap = async_req(fb_info.phone, FB_VP2PIXMAP, 0, NULL);
         if (newpmap < 0)
                 return -1;
@@ -192 +194 @@
         if (oldpixmap != -1) {
                 /* Show old screen */
-                nsend_call_2(fb_info.phone, FB_VP_DRAW_PIXMAP, 0, oldpixmap);
+                async_msg_2(fb_info.phone, FB_VP_DRAW_PIXMAP, 0, oldpixmap);
                 /* Drop old pixmap */
-                nsend_call(fb_info.phone, FB_DROP_PIXMAP, oldpixmap);
+                async_msg(fb_info.phone, FB_DROP_PIXMAP, oldpixmap);
         }
         
@@ -237 +239 @@
                 console_pixmap = -1;
         }
-        
         active_console = newcons;
         gcons_change_console(newcons);
@@ -245 +246 @@
         curs_goto(conn->screenbuffer.position_y, conn->screenbuffer.position_x);
         curs_visibility(0);
-        
         if (interbuffer) {
                 for (i = 0; i < conn->screenbuffer.size_x; i++)
@@ -251 +251 @@
                                 interbuffer[i + j*conn->screenbuffer.size_x] = *get_field_at(&(conn->screenbuffer),i, j);
                 /* This call can preempt, but we are already at the end */
-                j = sync_send_2(fb_info.phone, FB_DRAW_TEXT_DATA, 0, 0, NULL, NULL);            
+                j = async_req_2(fb_info.phone, FB_DRAW_TEXT_DATA, 0, 0, NULL, NULL);            
         };
         
@@ -302 +302 @@
 //                      if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 + CONSOLE_COUNT)) {
                         if ((c >= 0x101) && (c < 0x101 + CONSOLE_COUNT)) {
+                                async_serialize_start();
                                 if (c == 0x112)
                                         change_console(KERNEL_CONSOLE);
                                 else
                                         change_console(c - 0x101);
+                                async_serialize_end();
                                 break;
                         }
@@ -322 +324 @@
                 default:
                         retval = ENOENT;
-                }               
+                }
                 ipc_answer_fast(callid, retval, 0, 0);
         }
@@ -341 +343 @@
         }
         conn = &connections[consnum];
-        
+        conn->used = 1;
+        
+        async_serialize_start();
         gcons_notify_connect(consnum);
-        conn->used = 1;
         conn->client_phone = IPC_GET_ARG3(call);
         screenbuffer_clear(&conn->screenbuffer);
@@ -349 +352 @@
         /* Accept the connection */
         ipc_answer_fast(iid,0,0,0);
-        
+
         while (1) {
+                async_serialize_end();
                 callid = async_get_call(&call);
+                async_serialize_start();
+
                 arg1 = arg2 = 0;
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         gcons_notify_disconnect(consnum);
+                        
                         /* Answer all pending requests */
                         while (conn->keyrequest_counter > 0) {          
@@ -365 +372 @@
                         /* Commit hangup */
                         ipc_answer_fast(callid, 0,0,0);
+                        async_serialize_end();
                         return;
                 case CONSOLE_PUTCHAR:
@@ -373 +381 @@
                         /* Send message to fb */
                         if (consnum == active_console) {
-                                send_call(fb_info.phone, FB_CLEAR, 0); 
+                                async_msg(fb_info.phone, FB_CLEAR, 0); 
                         }
                         
@@ -392 +400 @@
                         break;
                 case CONSOLE_FLUSH:
-                        sync_send_2(fb_info.phone, FB_FLUSH, 0, 0, NULL, NULL);         
+                        async_req_2(fb_info.phone, FB_FLUSH, 0, 0, NULL, NULL);         
                         break;
                 case CONSOLE_SET_STYLE:
@@ -460 +468 @@
         gcons_init(fb_info.phone);
         /* Synchronize, the gcons can have something in queue */
-        sync_send(fb_info.phone, FB_FLUSH, 0, NULL);
+        async_req(fb_info.phone, FB_FLUSH, 0, NULL);