Changeset cf2af94 in mainline for uspace/lib/net/generic/packet_remote.c

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/lib/net/generic/packet_remote.c (modified) (5 diffs)

uspace/lib/net/generic/packet_remote.c

@@ -38 +38 @@
 #include <async.h>
 #include <errno.h>
-#include <ipc/ipc.h>
 #include <ipc/packet.h>
 #include <sys/mman.h>
@@ -86 +85 @@
         }
         
-        ipcarg_t result;
+        sysarg_t result;
         async_wait_for(message, &result);
         
@@ -116 +115 @@
         *packet = pm_find(packet_id);
         if (!*packet) {
-                ipcarg_t size;
+                sysarg_t size;
                 
                 rc = async_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id,
@@ -151 +150 @@
     size_t max_prefix, size_t max_suffix)
 {
-        ipcarg_t packet_id;
-        ipcarg_t size;
+        sysarg_t packet_id;
+        sysarg_t size;
         int rc;
         
@@ -182 +181 @@
 packet_t *packet_get_1_remote(int phone, size_t content)
 {
-        ipcarg_t packet_id;
-        ipcarg_t size;
+        sysarg_t packet_id;
+        sysarg_t size;
         int rc;