Changeset 6a44ee4 in mainline for uspace/lib/c/generic/ns_obsolete.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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/ns_obsolete.c (moved) (moved from uspace/lib/c/generic/ipc/ns.c ) (1 diff)

uspace/lib/c/generic/ns_obsolete.c

@@ -34 +34 @@
 
 #include <async.h>
-#include <ipc/ns.h>
+#include <async_obsolete.h>
+#include <ns_obsolete.h>
+#include <kernel/ipc/ipc_methods.h>
 
-int service_register(sysarg_t service)
+int service_obsolete_connect(sysarg_t service, sysarg_t arg2, sysarg_t arg3)
 {
-        return async_connect_to_me(PHONE_NS, service, 0, 0, NULL);
+        return async_obsolete_connect_me_to(PHONE_NS, service, arg2, arg3);
 }
 
-int service_connect(sysarg_t service, sysarg_t arg2, sysarg_t arg3)
+int service_obsolete_connect_blocking(sysarg_t service, sysarg_t arg2, sysarg_t arg3)
 {
-        return async_connect_me_to(PHONE_NS, service, arg2, arg3);
-}
-
-int service_connect_blocking(sysarg_t service, sysarg_t arg2, sysarg_t arg3)
-{
-        return async_connect_me_to_blocking(PHONE_NS, service, arg2, arg3);
+        return async_obsolete_connect_me_to_blocking(PHONE_NS, service, arg2, arg3);
 }