Changeset 92574f4 in mainline for uspace/lib/packet/generic/packet_server.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/lib/packet/generic/packet_server.c (modified) (2 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;
         }