Changeset 8b5690f in mainline for uspace/lib/packet/generic/packet_server.c

Timestamp:

2011-02-03T05:11:01Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ba38f72c

Parents:

22027b6e (diff), 86d7bfa (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.

File:

• uspace/lib/packet/generic/packet_server.c (modified) (8 diffs)

uspace/lib/packet/generic/packet_server.c

@@ -44 +44 @@
 #include <unistd.h>
 #include <sys/mman.h>
-
-#include <ipc/ipc.h>
 #include <ipc/packet.h>
 #include <ipc/net.h>
-
 #include <net/packet.h>
 #include <net/packet_header.h>
@@ -292 +289 @@
 
         if (!async_share_in_receive(&callid, &size)) {
-                ipc_answer_0(callid, EINVAL);
+                async_answer_0(callid, EINVAL);
                 return EINVAL;
         }
 
         if (size != packet->length) {
-                ipc_answer_0(callid, ENOMEM);
+                async_answer_0(callid, ENOMEM);
                 return ENOMEM;
         }
@@ -322 +319 @@
 int
 packet_server_message(ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer,
-    int *answer_count)
+    size_t *answer_count)
 {
         packet_t *packet;
@@ -333 +330 @@
         case NET_PACKET_CREATE_1:
                 packet = packet_get_local(DEFAULT_ADDR_LEN, DEFAULT_PREFIX,
-                    IPC_GET_CONTENT(call), DEFAULT_SUFFIX);
+                    IPC_GET_CONTENT(*call), DEFAULT_SUFFIX);
                 if (!packet)
                         return ENOMEM;
@@ -343 +340 @@
         case NET_PACKET_CREATE_4:
                 packet = packet_get_local(
-                    ((DEFAULT_ADDR_LEN < IPC_GET_ADDR_LEN(call)) ?
-                    IPC_GET_ADDR_LEN(call) : DEFAULT_ADDR_LEN),
-                    DEFAULT_PREFIX + IPC_GET_PREFIX(call),
-                    IPC_GET_CONTENT(call),
-                    DEFAULT_SUFFIX + IPC_GET_SUFFIX(call));
+                    ((DEFAULT_ADDR_LEN < IPC_GET_ADDR_LEN(*call)) ?
+                    IPC_GET_ADDR_LEN(*call) : DEFAULT_ADDR_LEN),
+                    DEFAULT_PREFIX + IPC_GET_PREFIX(*call),
+                    IPC_GET_CONTENT(*call),
+                    DEFAULT_SUFFIX + IPC_GET_SUFFIX(*call));
                 if (!packet)
                         return ENOMEM;
@@ -356 +353 @@
         
         case NET_PACKET_GET:
-                packet = pm_find(IPC_GET_ID(call));
+                packet = pm_find(IPC_GET_ID(*call));
                 if (!packet_is_valid(packet))
                         return ENOENT;
@@ -362 +359 @@
         
         case NET_PACKET_GET_SIZE:
-                packet = pm_find(IPC_GET_ID(call));
+                packet = pm_find(IPC_GET_ID(*call));
                 if (!packet_is_valid(packet))
                         return ENOENT;
@@ -370 +367 @@
         
         case NET_PACKET_RELEASE:
-                return packet_release_wrapper(IPC_GET_ID(call));
+                return packet_release_wrapper(IPC_GET_ID(*call));
         }