Changeset 92574f4 in mainline for uspace/lib/c/generic/net/socket_client.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/c/generic/net/socket_client.c (modified) (3 diffs)

uspace/lib/c/generic/net/socket_client.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <errno.h>
-
+#include <task.h>
 #include <ipc/services.h>
 #include <ipc/socket.h>
-
 #include <net/modules.h>
 #include <net/in.h>
@@ -278 +277 @@
         }
 
-        ipc_answer_0(callid, (sysarg_t) rc);
+        async_answer_0(callid, (sysarg_t) rc);
         goto loop;
 }
@@ -687 +686 @@
 
         /* Read address */
-        ipc_data_read_start(socket->phone, cliaddr, *addrlen);
+        async_data_read_start(socket->phone, cliaddr, *addrlen);
         fibril_rwlock_write_unlock(&socket_globals.lock);
         async_wait_for(message_id, &ipc_result);