Changeset 8e7c9fe in mainline for uspace/lib/c/generic/iplink.c

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

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

uspace/lib/c/generic/iplink.c

@@ -171 +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)
 {
@@ -230 +253 @@
         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);
 }
 
@@ -249 +290 @@
                         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);