Changeset ee1c2d9 in mainline for uspace/lib/c/generic/iplink.c

Timestamp:

2015-06-13T18:30:18Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a157846

Parents:

0453261 (diff), 2f9a8e8 (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:

mainline changes

File:

• uspace/lib/c/generic/iplink.c (modified) (3 diffs)

uspace/lib/c/generic/iplink.c

@@ -47 +47 @@
 static void iplink_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
 
-int iplink_open(async_sess_t *sess, iplink_ev_ops_t *ev_ops,
+int iplink_open(async_sess_t *sess, iplink_ev_ops_t *ev_ops, void *arg,
     iplink_t **riplink)
 {
@@ -56 +56 @@
         iplink->sess = sess;
         iplink->ev_ops = ev_ops;
+        iplink->arg = arg;
         
         async_exch_t *exch = async_exchange_begin(sess);
@@ -234 +235 @@
         
         return (int) retval;
+}
+
+void *iplink_get_userptr(iplink_t *iplink)
+{
+        return iplink->arg;
 }