Changes in uspace/lib/c/generic/iplink.c [f9b2cb4c:a17356fd] in mainline

File:

• uspace/lib/c/generic/iplink.c (modified) (7 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, void *arg,
+int iplink_open(async_sess_t *sess, iplink_ev_ops_t *ev_ops,
     iplink_t **riplink)
 {
@@ -56 +56 @@
         iplink->sess = sess;
         iplink->ev_ops = ev_ops;
-        iplink->arg = arg;
         
         async_exch_t *exch = async_exchange_begin(sess);
-
-        port_id_t port;
-        int rc = async_create_callback_port(exch, INTERFACE_IPLINK_CB, 0, 0,
-            iplink_cb_conn, iplink, &port);
-        
+        
+        int rc = async_connect_to_me(exch, 0, 0, 0, iplink_cb_conn, iplink);
         async_exchange_end(exch);
         
@@ -175 +171 @@
 }
 
-int iplink_set_mac48(iplink_t *iplink, addr48_t mac)
-{
-        async_exch_t *exch = async_exchange_begin(iplink->sess);
-        
-        ipc_call_t answer;
-        aid_t req = async_send_0(exch, IPLINK_GET_MAC48, &answer);
-        
-        int rc = async_data_read_start(exch, mac, sizeof(addr48_t));
-        
-        loc_exchange_end(exch);
-        
-        if (rc != EOK) {
-                async_forget(req);
-                return rc;
-        }
-        
-        sysarg_t retval;
-        async_wait_for(req, &retval);
-        
-        return (int) retval;
-}
-
-
 int iplink_addr_add(iplink_t *iplink, inet_addr_t *addr)
 {
@@ -238 +211 @@
         
         return (int) retval;
-}
-
-void *iplink_get_userptr(iplink_t *iplink)
-{
-        return iplink->arg;
 }
 
@@ -250 +218 @@
         iplink_recv_sdu_t sdu;
         
-        ip_ver_t ver = IPC_GET_ARG1(*icall);
+        uint16_t af = IPC_GET_ARG1(*icall);
         
         int rc = async_data_write_accept(&sdu.data, false, 0, 0, 0,
@@ -259 +227 @@
         }
         
-        rc = iplink->ev_ops->recv(iplink, &sdu, ver);
+        rc = iplink->ev_ops->recv(iplink, &sdu, af);
         free(sdu.data);
         async_answer_0(iid, rc);
-}
-
-static void iplink_ev_change_addr(iplink_t *iplink, ipc_callid_t iid,
-    ipc_call_t *icall)
-{
-        addr48_t *addr;
-        size_t size;
-        
-        int rc = async_data_write_accept((void **)&addr, false,
-            sizeof(addr48_t), sizeof(addr48_t), 0, &size);
-        if (rc != EOK) {
-                async_answer_0(iid, rc);
-                return;
-        }
-
-        rc = iplink->ev_ops->change_addr(iplink, *addr);
-        free(addr);
-        async_answer_0(iid, EOK);
 }
 
@@ -299 +249 @@
                         iplink_ev_recv(iplink, callid, &call);
                         break;
-                case IPLINK_EV_CHANGE_ADDR:
-                        iplink_ev_change_addr(iplink, callid, &call);
                 default:
                         async_answer_0(callid, ENOTSUP);