Changeset 04a73cdf in mainline for init/init.c

Timestamp:

2006-05-17T14:05:01Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

04552a80

Parents:

afa6e74

Message:

Sync with kernel.
Add ipc_wait_for_call_timeout() and ipc_trywait_for_call().
Modify ipc_wait_for_call() to be unconditional.

File:

• init/init.c (modified) (6 diffs)

init/init.c

@@ -180 +180 @@
                 printf(".");
         printf("\n");
-        ipc_wait_for_call(&data, NULL);
+        ipc_wait_for_call(&data);
         printf("Received call???\n");
 }
@@ -204 +204 @@
                 ipc_call_async(PHONE_NS, NS_PING_SVC, 0, "prov",
                                got_answer_2);
-                callid = ipc_wait_for_call(&data, NULL);
+                callid = ipc_wait_for_call(&data);
                 printf("Received ping\n");
                 ipc_answer_fast(callid, 0, 0, 0);
@@ -244 +244 @@
         printf("Newphid: %d\n", phoneid);
         for (i=0; i < 1000; i++) {
-                if ((callid=ipc_wait_for_call(&data, IPC_WAIT_NONBLOCKING)))
+                if ((callid=ipc_trywait_for_call(&data)))
                         printf("callid: %d\n");
         }
@@ -267 +267 @@
         
         for (i=0; i < 1000; i++) {
-                if ((callid=ipc_wait_for_call(&data, IPC_WAIT_NONBLOCKING)))
+                if ((callid=ipc_trywait_for_call(&data)))
                         printf("callid: %d\n");
         }
@@ -276 +276 @@
         ipc_call_async_2(PHONE_NS, NS_PING, 1, 0xbeefbee2,
                          "Pong1", got_answer);
-        ipc_wait_for_call(&data, 0);
+        ipc_wait_for_call(&data);
 }
 
@@ -395 +395 @@
 //      test_as_send();
 //      test_pci();
-//      test_kbd();
+        test_kbd();
 //      test_fb();