Changeset b74959bd in mainline for uspace/srv/console/console.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/console/console.c (modified) (8 diffs)

uspace/srv/console/console.c

@@ -278 +278 @@
                 for (j = 0; j < conn->screenbuffer.size_y; j++) 
                         for (i = 0; i < conn->screenbuffer.size_x; i++) {
-                                field = get_field_at(&conn->screenbuffer, i,
-                                    j);
+                                field = get_field_at(&conn->screenbuffer, i, j);
                                 if (!style_same(*style, field->style))
                                         set_style(&field->style);
@@ -350 +349 @@
                         if (conn->keyrequest_counter > 0) {             
                                 conn->keyrequest_counter--;
-                                ipc_answer_fast(fifo_pop(conn->keyrequests), 0,
-                                    c, 0);
+                                ipc_answer_1(fifo_pop(conn->keyrequests), EOK,
+                                    c);
                                 break;
                         }
@@ -362 +361 @@
                         retval = ENOENT;
                 }
-                ipc_answer_fast(callid, retval, 0, 0);
+                ipc_answer_0(callid, retval);
         }
 }
@@ -376 +375 @@
 
         if ((consnum = find_free_connection()) == -1) {
-                ipc_answer_fast(iid, ELIMIT, 0, 0);
+                ipc_answer_0(iid, ELIMIT);
                 return;
         }
@@ -388 +387 @@
         
         /* Accept the connection */
-        ipc_answer_fast(iid, 0, 0, 0);
+        ipc_answer_0(iid, EOK);
 
         while (1) {
@@ -404 +403 @@
                         while (conn->keyrequest_counter > 0) {          
                                 conn->keyrequest_counter--;
-                                ipc_answer_fast(fifo_pop(conn->keyrequests),
-                                    ENOENT, 0, 0);
+                                ipc_answer_0(fifo_pop(conn->keyrequests),
+                                    ENOENT);
                                 break;
                         }
@@ -465 +464 @@
                                          * requests => fail.
                                         */
-                                        ipc_answer_fast(callid, ELIMIT, 0, 0);
+                                        ipc_answer_0(callid, ELIMIT);
                                 }
                                 continue;
@@ -472 +471 @@
                         break;
                 }
-                ipc_answer_fast(callid, 0, arg1, arg2);
+                ipc_answer_2(callid, EOK, arg1, arg2);
         }
 }