Changeset 1f1fa64 in mainline for uspace/lib/usbdev/src/hub.c

Timestamp:

2014-07-28T21:53:11Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

c3b25985, f2f4c00

Parents:

cbfece7 (diff), 7eb6c96 (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:

Make MAC address change possible on ethip side. Merge mainline changes.

File:

• uspace/lib/usbdev/src/hub.c (modified) (5 diffs)

uspace/lib/usbdev/src/hub.c

@@ -155 +155 @@
  *      request or requests for descriptors when creating match ids).
  */
-int usb_hc_new_device_wrapper(ddf_dev_t *parent,
+int usb_hc_new_device_wrapper(ddf_dev_t *parent, ddf_fun_t *fun,
     usb_hc_connection_t *hc_conn, usb_speed_t dev_speed,
     int (*enable_port)(void *arg), void *arg, usb_address_t *assigned_address,
-    ddf_dev_ops_t *dev_ops, void *new_dev_data, ddf_fun_t **new_fun)
+    ddf_dev_ops_t *dev_ops)
 {
-        if ((new_fun == NULL) || (hc_conn == NULL))
+        if (hc_conn == NULL)
                 return EINVAL;
 
@@ -271 +271 @@
         /* Register the device with devman. */
         /* FIXME: create device_register that will get opened ctrl pipe. */
-        ddf_fun_t *child_fun;
         rc = usb_device_register_child_in_devman(&ctrl_pipe,
-            parent, dev_ops, new_dev_data, &child_fun);
+            parent, fun, dev_ops);
         if (rc != EOK) {
                 goto leave_release_free_address;
@@ -280 +279 @@
         const usb_hub_attached_device_t new_device = {
                 .address = dev_addr,
-                .fun = child_fun,
+                .fun = fun,
         };
 
@@ -288 +287 @@
         if (rc != EOK) {
                 /* The child function is already created. */
-                ddf_fun_destroy(child_fun);
                 rc = EDESTADDRREQ;
                 goto leave_release_free_address;
@@ -296 +294 @@
                 *assigned_address = dev_addr;
         }
-
-        *new_fun = child_fun;
 
         rc = EOK;