Changeset cf2af94 in mainline for uspace/lib/c/generic/ipc/ns.c

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/lib/c/generic/ipc/ns.c (moved) (moved from uspace/srv/net/il/arp/arp_module.h ) (2 diffs)

uspace/lib/c/generic/ipc/ns.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2011 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup arp
+/** @addtogroup libc
  * @{
  */
-
 /** @file
- * ARP module functions.
- * The functions are used as ARP module entry points.
  */
 
-#ifndef NET_ARP_MODULE_H_
-#define NET_ARP_MODULE_H_
+#include <async.h>
+#include <ipc/ns.h>
 
-#include <ipc/ipc.h>
-#include <async.h>
+int service_register(sysarg_t service)
+{
+        return async_connect_to_me(PHONE_NS, service, 0, 0, NULL);
+}
 
-extern int arp_initialize(async_client_conn_t);
-extern int arp_message_standalone(ipc_callid_t, ipc_call_t *, ipc_call_t *,
-    int *);
+int service_connect(sysarg_t service, sysarg_t arg2, sysarg_t arg3)
+{
+        return async_connect_me_to(PHONE_NS, service, arg2, arg3);
+}
 
-#endif
+int service_connect_blocking(sysarg_t service, sysarg_t arg2, sysarg_t arg3)
+{
+        return async_connect_me_to_blocking(PHONE_NS, service, arg2, arg3);
+}
 
 /** @}