WebSVN – HelenOS – Diff – /trunk/uspace/srv/console/gcons.c

 static int active_console = 0;
 static void vp_switch(int vp)
+{
-    async_msg(fbphone,FB_VIEWPORT_SWITCH, vp);
+    async_msg_1(fbphone,FB_VIEWPORT_SWITCH, vp);
+}
 /** Create view port */
-static int vp_create(unsigned int x, unsigned int y,
+static int vp_create(unsigned int x, unsigned int y, unsigned int width,
-             unsigned int width, unsigned int height)
+    unsigned int height)
+{
-    return async_req_2(fbphone, FB_VIEWPORT_CREATE,
+    return async_req_2_0(fbphone, FB_VIEWPORT_CREATE, (x << 16) | y,
-               (x << 16) | y, (width << 16) | height, NULL, NULL);
+        (width << 16) | height);
+}
 static void clear(void)
+{
-    async_msg(fbphone, FB_CLEAR, 0);
+    async_msg_0(fbphone, FB_CLEAR);
+}
 static void set_style(int fgcolor, int bgcolor)
+{
     async_msg_2(fbphone, FB_SET_STYLE, fgcolor, bgcolor);
     enum butstate state = console_state[consnum];
     vp_switch(cstatus_vp[consnum]);
     if (ic_pixmaps[state] != -1)
         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) {
         snprintf(data, 5, "%d", consnum + 1);
         for (i = 0; data[i]; i++)
     if (active_console == KERNEL_CONSOLE) {
         for (i = 0; i < CONSOLE_COUNT; i++)
             redraw_state(i);
         if (animation != -1)
-            async_msg(fbphone, FB_ANIM_START, animation);
+            async_msg_1(fbphone, FB_ANIM_START, animation);
     } else {
         if (console_state[active_console] == CONS_DISCONNECTED_SEL)
             console_state[active_console] = CONS_DISCONNECTED;
         else
             console_state[active_console] = CONS_IDLE;
     else
         console_state[active_console] = CONS_IDLE;
     redraw_state(active_console);
     if (animation != -1)
-        async_msg(fbphone, FB_ANIM_STOP, animation);
+        async_msg_1(fbphone, FB_ANIM_STOP, animation);
     active_console = KERNEL_CONSOLE; /* Set to kernel console */
     vp_switch(0);
+}
     char *shm;
     int rc;
     /* Create area */
     shm = mmap(NULL, size, PROTO_READ | PROTO_WRITE, MAP_SHARED |
         MAP_ANONYMOUS, 0, 0);
     if (shm == MAP_FAILED)
         return;
     memcpy(shm, logo, size);
     /* Send area */
-    rc = async_req_2(fbphone, FB_PREPARE_SHM, (ipcarg_t) shm, 0, NULL,
+    rc = async_req_1_0(fbphone, FB_PREPARE_SHM, (ipcarg_t) shm);
-        NULL);
     if (rc)
         goto exit;
-    rc = async_req_3(fbphone, IPC_M_AS_AREA_SEND, (ipcarg_t) shm, 0,
+    rc = async_req_3_0(fbphone, IPC_M_AS_AREA_SEND, (ipcarg_t) shm, 0,
-        PROTO_READ, NULL, NULL, NULL);
+        PROTO_READ);
     if (rc)
         goto drop;
     /* Draw logo */
     async_msg_2(fbphone, FB_DRAW_PPM, x, y);
 drop:
     /* Drop area */
-    async_msg(fbphone, FB_DROP_SHM, 0);
+    async_msg_0(fbphone, FB_DROP_SHM);
 exit:
     /* Remove area */
     munmap(shm, size);
+}
     vp_switch(0);
     set_style(MAIN_COLOR, MAIN_COLOR);
     clear();
     draw_pixmap(_binary_helenos_ppm_start,
         (size_t) &_binary_helenos_ppm_size, xres - 66, 2);
     draw_pixmap(_binary_nameic_ppm_start,
         (size_t) &_binary_nameic_ppm_size, 5, 17);
-    for (i = 0;i < CONSOLE_COUNT; i++)
+    for (i = 0; i < CONSOLE_COUNT; i++)
         redraw_state(i);
     vp_switch(console_vp);
+}
 /** Creates a pixmap on framebuffer
     int rc;
     int pxid = -1;
     /* Create area */
     shm = mmap(NULL, size, PROTO_READ | PROTO_WRITE, MAP_SHARED |
         MAP_ANONYMOUS, 0, 0);
     if (shm == MAP_FAILED)
         return -1;
     memcpy(shm, data, size);
     /* Send area */
-    rc = async_req_2(fbphone, FB_PREPARE_SHM, (ipcarg_t) shm, 0, NULL,
+    rc = async_req_1_0(fbphone, FB_PREPARE_SHM, (ipcarg_t) shm);
-        NULL);
     if (rc)
         goto exit;
-    rc = async_req_3(fbphone, IPC_M_AS_AREA_SEND, (ipcarg_t) shm, 0,
+    rc = async_req_3_0(fbphone, IPC_M_AS_AREA_SEND, (ipcarg_t) shm, 0,
-        PROTO_READ, NULL, NULL, NULL);
+        PROTO_READ);
     if (rc)
         goto drop;
     /* Obtain pixmap */
-    rc = async_req(fbphone, FB_SHM2PIXMAP, 0, NULL);
+    rc = async_req_0_0(fbphone, FB_SHM2PIXMAP);
     if (rc < 0)
         goto drop;
     pxid = rc;
 drop:
     /* Drop area */
-    async_msg(fbphone, FB_DROP_SHM, 0);
+    async_msg_0(fbphone, FB_DROP_SHM);
 exit:
     /* Remove area */
     munmap(shm, size);
     return pxid;
 static void make_anim(void)
+{
     int an;
     int pm;
-    an = async_req(fbphone, FB_ANIM_CREATE, cstatus_vp[KERNEL_CONSOLE],
+    an = async_req_1_0(fbphone, FB_ANIM_CREATE, cstatus_vp[KERNEL_CONSOLE]);
-        NULL);
     if (an < 0)
         return;
     pm = make_pixmap(_binary_anim_1_ppm_start,
         (int) &_binary_anim_1_ppm_size);
     async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
     pm = make_pixmap(_binary_anim_2_ppm_start,
         (int) &_binary_anim_2_ppm_size);
     async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
     pm = make_pixmap(_binary_anim_3_ppm_start,
         (int) &_binary_anim_3_ppm_size);
     async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
     pm = make_pixmap(_binary_anim_4_ppm_start,
         (int) &_binary_anim_4_ppm_size);
     async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
-    async_msg(fbphone, FB_ANIM_START, an);
+    async_msg_1(fbphone, FB_ANIM_START, an);
     animation = an;
+}
 extern char _binary_cons_selected_ppm_start[0];
     int i;
     int status_start = STATUS_START;
     fbphone = phone;
-    rc = async_req_2(phone, FB_GET_RESOLUTION, 0, 0, &xres, &yres);
+    rc = async_req_0_2(phone, FB_GET_RESOLUTION, &xres, &yres);
     if (rc)
         return;
     if (xres < 800 || yres < 600)
         return;
     /* create console viewport */
     /* Align width & height to character size */
     console_vp = vp_create(CONSOLE_MARGIN, CONSOLE_TOP,
         ALIGN_DOWN(xres - 2 * CONSOLE_MARGIN, 8),
         ALIGN_DOWN(yres - (CONSOLE_TOP + CONSOLE_MARGIN), 16));
     if (console_vp < 0)
         return;
     /* Create status buttons */
     status_start += (xres - 800) / 2;
     for (i = 0; i < CONSOLE_COUNT; i++) {
         cstatus_vp[i] = vp_create(status_start + CONSOLE_MARGIN +
             i * (STATUS_WIDTH + STATUS_SPACE), STATUS_TOP,
             STATUS_WIDTH, STATUS_HEIGHT);
         if (cstatus_vp[i] < 0)
             return;
         vp_switch(cstatus_vp[i]);
         set_style(0x202020, 0xffffff);
+    }
     /* Initialize icons */
     ic_pixmaps[CONS_SELECTED] =
         make_pixmap(_binary_cons_selected_ppm_start,
         (int) &_binary_cons_selected_ppm_size);
     ic_pixmaps[CONS_IDLE] = make_pixmap(_binary_cons_idle_ppm_start,
         (int) &_binary_cons_idle_ppm_size);
     ic_pixmaps[CONS_HAS_DATA] =
         make_pixmap(_binary_cons_has_data_ppm_start,
         (int) &_binary_cons_has_data_ppm_size);
     ic_pixmaps[CONS_DISCONNECTED] =
         make_pixmap(_binary_cons_idle_ppm_start,
         (int) &_binary_cons_idle_ppm_size);
     ic_pixmaps[CONS_KERNEL] = make_pixmap(_binary_cons_kernel_ppm_start,
         (int) &_binary_cons_kernel_ppm_size);
     ic_pixmaps[CONS_DISCONNECTED_SEL] = ic_pixmaps[CONS_SELECTED];
     make_anim();
     use_gcons = 1;

Subversion Repositories HelenOS

(root)/trunk/uspace/srv/console/gcons.c – Rev 2479 → 2621