Changeset abda850 in mainline

Timestamp:

2006-05-25T21:22:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e9a3c52

Parents:

fba9b8b

Message:

Sync with kernel.
Args for IPC_M_AS_AREA_SEND changed.

Files:

• init/init.c (modified) (2 diffs)
• ns/ns.c (modified) (1 diff)

init/init.c

@@ -341 +341 @@
         memcpy(as_area, "Hello world.\n", 14);
 
-        retval = ipc_call_sync_2(PHONE_NS, IPC_M_AS_AREA_SEND, 0, (sysarg_t) as_area,
-                NULL, NULL);
+        retval = ipc_call_sync_3(PHONE_NS, IPC_M_AS_AREA_SEND, (sysarg_t) as_area, 0, AS_AREA_READ,
+                NULL, NULL, NULL);
         if (retval) {
                 printf("AS_AREA_SEND failed.\n");
@@ -393 +393 @@
 //      test_hangup();
 //      test_slam();
-//      test_as_area_send();
+        test_as_area_send();
 //      test_pci();
         test_kbd();

ns/ns.c

@@ -94 +94 @@
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_AS_AREA_SEND:
-                        as_area = (char *)IPC_GET_ARG2(call);
-//                      printf("Received as_area: %P, size:%d\n", as_area, IPC_GET_ARG3(call));
+                        as_area = (char *)IPC_GET_ARG1(call);
+//                      printf("Received as_area: %P, size:%d\n", as_area, IPC_GET_ARG2(call));
                         retval = ipc_answer_fast(callid, 0,(sysarg_t)(1024*1024), 0);
                         if (!retval) {