Changeset b1f51f0 in mainline for console/console.c

Timestamp:

2006-06-02T16:09:18Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

b917098

Parents:

a116ef22

Message:

Changed recommended way of asynchronous communication.

File:

• console/console.c (modified) (12 diffs)

console/console.c

@@ -42 +42 @@
 #include <sys/mman.h>
 
-#define CONSOLE_COUNT 12 
 #define MAX_KEYREQUESTS_BUFFERED 32
 
@@ -119 +118 @@
 
                         if (console == active_console) {
-                                ipc_call_async_3(fb_info.phone, FB_PUTCHAR, ' ', scr->position_y, scr->position_x, NULL, NULL);
+                                nsend_call_3(fb_info.phone, FB_PUTCHAR, ' ', scr->position_y, scr->position_x);
                         }
         
@@ -127 +126 @@
                 default:        
                         if (console == active_console) {
-                                ipc_call_async_3(fb_info.phone, FB_PUTCHAR, key, scr->position_y, scr->position_x, NULL, NULL);
+                                nsend_call_3(fb_info.phone, FB_PUTCHAR, key, scr->position_y, scr->position_x);
                         }
         
@@ -139 +138 @@
                 scr->position_y = scr->size_y - 1;
                 screenbuffer_clear_line(scr, scr->top_line++);
-                ipc_call_async(fb_info.phone, FB_SCROLL, 1, NULL, NULL);
+                if (console == active_console)
+                        nsend_call(fb_info.phone, FB_SCROLL, 1);
         }
         
@@ -145 +145 @@
         
         if (console == active_console)  
-                ipc_call_async_2(fb_info.phone, FB_CURSOR_GOTO, scr->position_y, scr->position_x, NULL, NULL);
+                send_call_2(fb_info.phone, FB_CURSOR_GOTO, scr->position_y, scr->position_x);
         
 }
@@ -193 +193 @@
                                 conn = &connections[active_console];
 
-                                ipc_call_async(fb_info.phone, FB_CURSOR_VISIBILITY, 0, NULL, NULL); 
+                                nsend_call(fb_info.phone, FB_CURSOR_VISIBILITY, 0); 
                 
                                 if (interbuffer) {
@@ -202 +202 @@
                                         sync_send_2(fb_info.phone, FB_DRAW_TEXT_DATA, 0, 0, NULL, NULL);                
                                 } else {
-
-                                        ipc_call_async_2(fb_info.phone, FB_CLEAR, 0, 0, NULL, NULL);
+                                        nsend_call(fb_info.phone, FB_CLEAR, 0);
                                 
                                         
@@ -210 +209 @@
                                                         d = get_field_at(&(conn->screenbuffer),i, j)->character;
                                                         if (d && d != ' ')
-                                                                ipc_call_async_3(fb_info.phone, FB_PUTCHAR, d, j, i, NULL, NULL);
+                                                                nsend_call_3(fb_info.phone, FB_PUTCHAR, d, j, i);
                                                 }
 
                                 }
-                                ipc_call_async_2(fb_info.phone, FB_CURSOR_GOTO, conn->screenbuffer.position_y, conn->screenbuffer.position_x, NULL, NULL); 
-                                ipc_call_async_2(fb_info.phone, FB_SET_STYLE, conn->screenbuffer.style.fg_color, \
-                                                conn->screenbuffer.style.bg_color, NULL, NULL); 
-                                ipc_call_async(fb_info.phone, FB_CURSOR_VISIBILITY, 1, NULL, NULL); 
+                                nsend_call_2(fb_info.phone, FB_CURSOR_GOTO, conn->screenbuffer.position_y, conn->screenbuffer.position_x); 
+                                nsend_call_2(fb_info.phone, FB_SET_STYLE, conn->screenbuffer.style.fg_color, \
+                                                conn->screenbuffer.style.bg_color); 
+                                send_call(fb_info.phone, FB_CURSOR_VISIBILITY, 1); 
 
                                 break;
@@ -241 +240 @@
 
 /** Default thread for new connections */
-void client_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
         ipc_callid_t callid;
@@ -273 +272 @@
                         /* Send message to fb */
                         if (consnum == active_console) {
-                                ipc_call_async_2(fb_info.phone, FB_CLEAR, 0, 0, NULL, NULL); 
+                                send_call(fb_info.phone, FB_CLEAR, 0); 
                         }
                         
@@ -331 +330 @@
         
         ipc_call_sync_2(fb_info.phone, FB_GET_CSIZE, 0, 0, &(fb_info.rows), &(fb_info.cols)); 
-        ipc_call_async_2(fb_info.phone, FB_SET_STYLE, DEFAULT_FOREGROUND_COLOR, DEFAULT_BACKGROUND_COLOR, NULL, NULL); 
-        ipc_call_sync(fb_info.phone, FB_CURSOR_VISIBILITY, 1, NULL); 
+        nsend_call_2(fb_info.phone, FB_SET_STYLE, DEFAULT_FOREGROUND_COLOR, DEFAULT_BACKGROUND_COLOR); 
+        nsend_call(fb_info.phone, FB_CURSOR_VISIBILITY, 1); 
         
         /* Init virtual consoles */
@@ -362 +361 @@
         async_new_connection(phonehash, 0, NULL, keyboard_events);
         
-        ipc_call_async_2(fb_info.phone, FB_CURSOR_GOTO, 0, 0, NULL, NULL); 
-
+        nsend_call_2(fb_info.phone, FB_CURSOR_GOTO, 0, 0); 
+
+        /* Register at NS */
         if (ipc_connect_to_me(PHONE_NS, SERVICE_CONSOLE, 0, &phonehash) != 0) {
                 return -1;