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

uspace/lib/net/nil/nil_skel.c

@@ -54 +54 @@
          * the initial IPC_M_CONNECT_ME_TO call.
          */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         while (true) {
@@ -115 +115 @@
                 goto out;
         
-        rc = ipc_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL);
+        rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL);
         if (rc != EOK)
                 goto out;