Changeset 0cc4313 in mainline for uspace/srv/console/console.c

Timestamp:

2007-11-22T15:50:24Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d40a8ff

Parents:

8498915

Message:

Modify the async framework to make use of all six syscall arguments.
Supply user-friendly macros as in previous cases.

File:

• uspace/srv/console/console.c (modified) (9 diffs)

uspace/srv/console/console.c

@@ -106 +106 @@
 static void clrscr(void)
 {
-        async_msg(fb_info.phone, FB_CLEAR, 0);
+        async_msg_0(fb_info.phone, FB_CLEAR);
 }
 
 static void curs_visibility(int v)
 {
-        async_msg(fb_info.phone, FB_CURSOR_VISIBILITY, v); 
+        async_msg_1(fb_info.phone, FB_CURSOR_VISIBILITY, v); 
 }
 
@@ -177 +177 @@
                 scr->top_line = (scr->top_line + 1) % scr->size_y;
                 if (console == active_console)
-                        async_msg(fb_info.phone, FB_SCROLL, 1);
+                        async_msg_1(fb_info.phone, FB_SCROLL, 1);
         }
         
@@ -197 +197 @@
        
         /* Save screen */
-        newpmap = async_req(fb_info.phone, FB_VP2PIXMAP, 0, NULL);
+        newpmap = async_req_0_0(fb_info.phone, FB_VP2PIXMAP);
         if (newpmap < 0)
                 return -1;
@@ -205 +205 @@
                 async_msg_2(fb_info.phone, FB_VP_DRAW_PIXMAP, 0, oldpixmap);
                 /* Drop old pixmap */
-                async_msg(fb_info.phone, FB_DROP_PIXMAP, oldpixmap);
+                async_msg_1(fb_info.phone, FB_DROP_PIXMAP, oldpixmap);
         }
         
@@ -267 +267 @@
                         }
                 /* This call can preempt, but we are already at the end */
-                rc = async_req_2(fb_info.phone, FB_DRAW_TEXT_DATA, 0, 0, NULL,
-                    NULL);              
+                rc = async_req_0_0(fb_info.phone, FB_DRAW_TEXT_DATA);           
         }
         
@@ -416 +415 @@
                         /* Send message to fb */
                         if (consnum == active_console) {
-                                async_msg(fb_info.phone, FB_CLEAR, 0); 
+                                async_msg_0(fb_info.phone, FB_CLEAR); 
                         }
                         
@@ -435 +434 @@
                 case CONSOLE_FLUSH:
                         if (consnum == active_console)
-                                async_req_2(fb_info.phone, FB_FLUSH, 0, 0,
-                                    NULL, NULL);                
+                                async_req_0_0(fb_info.phone, FB_FLUSH);
                         break;
                 case CONSOLE_SET_STYLE:
@@ -509 +507 @@
         gcons_init(fb_info.phone);
         /* Synchronize, the gcons can have something in queue */
-        async_req(fb_info.phone, FB_FLUSH, 0, NULL);
+        async_req_0_0(fb_info.phone, FB_FLUSH);
         /* Enable double buffering */
         async_msg_2(fb_info.phone, FB_VIEWPORT_DB, (sysarg_t) -1, 1);
         
-        async_req_2(fb_info.phone, FB_GET_CSIZE, 0, 0, &fb_info.rows,
+        async_req_0_2(fb_info.phone, FB_GET_CSIZE, &fb_info.rows,
             &fb_info.cols); 
         set_style_col(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
@@ -540 +538 @@
             PROTO_READ | PROTO_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
         if (!interbuffer) {
-                if (async_req_3(fb_info.phone, IPC_M_AS_AREA_SEND,
-                    (ipcarg_t) interbuffer, 0, AS_AREA_READ, NULL, NULL,
-                    NULL) != 0) {
+                if (async_req_3_0(fb_info.phone, IPC_M_AS_AREA_SEND,
+                    (ipcarg_t) interbuffer, 0, AS_AREA_READ) != 0) {
                         munmap(interbuffer,
                             sizeof(keyfield_t) * fb_info.cols * fb_info.rows);