Changeset b74959bd in mainline for uspace/srv/fb/sysio.c

Timestamp:

2007-11-20T21:33:32Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8498915

Parents:

3209923

Message:

Modify ipc_answer_*() to make use of all six syscall arguments. The recommended
means of answering calls is via the ipc_answer_m() macros (where m denotes the
number of return arguments) that automatically decide between the fast register
version or the slow universal version of ipc_answer().

File:

• uspace/srv/fb/sysio.c (modified) (1 diff)

uspace/srv/fb/sysio.c

@@ -118 +118 @@
 
         if (client_connected) {
-                ipc_answer_fast(iid, ELIMIT, 0,0);
+                ipc_answer_0(iid, ELIMIT);
                 return;
         }
         
         client_connected = 1;
-        ipc_answer_fast(iid, 0, 0, 0); /* Accept connection */
+        ipc_answer_0(iid, EOK); /* Accept connection */
         while (1) {
                 callid = async_get_call(&call);
                 switch (IPC_GET_METHOD(call)) {
-                        case IPC_M_PHONE_HUNGUP:
-                                client_connected = 0;
-                                ipc_answer_fast(callid, 0, 0, 0);
-                                return; /* Exit thread */
-                        case FB_PUTCHAR:
-                                c = IPC_GET_ARG1(call);
-                                newrow = IPC_GET_ARG2(call);
-                                newcol = IPC_GET_ARG3(call);
-                                if ((lastcol != newcol) || (lastrow != newrow))
-                                        curs_goto(newrow, newcol);
-                                lastcol = newcol + 1;
-                                lastrow = newrow;
-                                sysput(c);
-                                retval = 0;
+                case IPC_M_PHONE_HUNGUP:
+                        client_connected = 0;
+                        ipc_answer_0(callid, EOK);
+                        return; /* Exit thread */
+                case FB_PUTCHAR:
+                        c = IPC_GET_ARG1(call);
+                        newrow = IPC_GET_ARG2(call);
+                        newcol = IPC_GET_ARG3(call);
+                        if ((lastcol != newcol) || (lastrow != newrow))
+                                curs_goto(newrow, newcol);
+                        lastcol = newcol + 1;
+                        lastrow = newrow;
+                        sysput(c);
+                        retval = 0;
+                        break;
+                case FB_CURSOR_GOTO:
+                        newrow = IPC_GET_ARG1(call);
+                        newcol = IPC_GET_ARG2(call);
+                        curs_goto(newrow, newcol);
+                        lastrow = newrow;
+                        lastcol = newcol;
+                        retval = 0;
+                        break;
+                case FB_GET_CSIZE:
+                        ipc_answer_2(callid, EOK, HEIGHT, WIDTH);
+                        continue;
+                case FB_CLEAR:
+                        clrscr();
+                        retval = 0;
+                        break;
+                case FB_SET_STYLE:
+                        fgcolor = IPC_GET_ARG1(call);
+                        bgcolor = IPC_GET_ARG2(call);
+                        if (fgcolor < bgcolor)
+                                set_style(0);
+                        else
+                                set_style(7);
+                        retval = 0;
+                        break;
+                case FB_SCROLL:
+                        i = IPC_GET_ARG1(call);
+                        if ((i > HEIGHT) || (i < -HEIGHT)) {
+                                retval = EINVAL;
                                 break;
-                        case FB_CURSOR_GOTO:
-                                newrow = IPC_GET_ARG1(call);
-                                newcol = IPC_GET_ARG2(call);
-                                curs_goto(newrow, newcol);
-                                lastrow = newrow;
-                                lastcol = newcol;
-                                retval = 0;
-                                break;
-                        case FB_GET_CSIZE:
-                                ipc_answer_fast(callid, 0, HEIGHT, WIDTH);
-                                continue;
-                        case FB_CLEAR:
-                                clrscr();
-                                retval = 0;
-                                break;
-                        case FB_SET_STYLE:
-                                fgcolor = IPC_GET_ARG1(call);
-                                bgcolor = IPC_GET_ARG2(call);
-                                if (fgcolor < bgcolor)
-                                        set_style(0);
-                                else
-                                        set_style(7);
-                                retval = 0;
-                                break;
-                        case FB_SCROLL:
-                                i = IPC_GET_ARG1(call);
-                                if ((i > HEIGHT) || (i < -HEIGHT)) {
-                                        retval = EINVAL;
-                                        break;
-                                }
-                                scroll(i);
-                                curs_goto(lastrow, lastcol);
-                                retval = 0;
-                                break;
-                        default:
-                                retval = ENOENT;
+                        }
+                        scroll(i);
+                        curs_goto(lastrow, lastcol);
+                        retval = 0;
+                        break;
+                default:
+                        retval = ENOENT;
                 }
                 
-                ipc_answer_fast(callid, retval, 0, 0);
+                ipc_answer_0(callid, retval);
         }
 }