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

Timestamp:

2011-04-15T19:38:07Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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) (4 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>
@@ -115 +112 @@
     size_t max_content, size_t max_suffix)
 {
-        // clear the packet content
+        /* Clear the packet content */
         bzero(((void *) packet) + sizeof(packet_t),
             packet->length - sizeof(packet_t));
         
-        // clear the packet header
+        /* Clear the packet header */
         packet->order = 0;
         packet->metric = 0;
@@ -154 +151 @@
         assert(fibril_mutex_is_locked(&ps_globals.lock));
 
-        // already locked
+        /* Already locked */
         packet = (packet_t *) mmap(NULL, length, PROTO_READ | PROTO_WRITE,
             MAP_SHARED | MAP_ANONYMOUS, 0, 0);
@@ -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;
         }