Changeset 1affcdf3 in mainline for uspace/lib/c/generic/net/modules.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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/c/generic/net/modules.c (modified) (4 diffs)

uspace/lib/c/generic/net/modules.c

@@ -40 +40 @@
 
 #include <async.h>
+#include <async_obsolete.h>
 #include <malloc.h>
 #include <errno.h>
@@ -45 +46 @@
 #include <ipc/services.h>
 #include <net/modules.h>
+#include <ns.h>
+#include <ns_obsolete.h>
 
 /** The time between connect requests in microseconds. */
-#define MODULE_WAIT_TIME        (10 * 1000)
+#define MODULE_WAIT_TIME  (10 * 1000)
 
 /** Answer a call.
@@ -138 +141 @@
         if (phone >= 0) {
                 /* Request the bidirectional connection */
-                int rc = async_connect_to_me(phone, arg1, arg2, arg3, client_receiver);
+                int rc = async_obsolete_connect_to_me(phone, arg1, arg2, arg3, client_receiver);
                 if (rc != EOK) {
-                        async_hangup(phone);
+                        async_obsolete_hangup(phone);
                         return rc;
                 }
@@ -172 +175 @@
         /* If no timeout is set */
         if (timeout <= 0)
-                return async_connect_me_to_blocking(PHONE_NS, need, 0, 0);
-
+                return service_obsolete_connect_blocking(need, 0, 0);
+        
         while (true) {
-                phone = async_connect_me_to(PHONE_NS, need, 0, 0);
+                phone = service_obsolete_connect(need, 0, 0);
                 if ((phone >= 0) || (phone != ENOENT))
                         return phone;