Changes in uspace/lib/usbdev/src/hub.c [56fd7cf:1ab8539] in mainline

File:

• uspace/lib/usbdev/src/hub.c (modified) (6 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;
-
-        int rc;
+        
         struct timeval start_time;
-
-        rc = gettimeofday(&start_time, NULL);
-        if (rc != EOK) {
+        gettimeofday(&start_time, NULL);
+        
+        /* We are gona do a lot of communication better open it in advance. */
+        int rc = usb_hc_connection_open(hc_conn);
+        if (rc != EOK)
                 return rc;
-        }
-
-        /* We are gona do a lot of communication better open it in advance. */
-        rc = usb_hc_connection_open(hc_conn);
-        if (rc != EOK) {
-                return rc;
-        }
-
+        
         /* Request a new address. */
         usb_address_t dev_addr =
@@ -226 +220 @@
                 goto leave_release_default_address;
         }
-
+        
         struct timeval end_time;
-        rc = gettimeofday(&end_time, NULL);
-        if (rc != EOK) {
-                goto leave_release_default_address;
-        }
-
+        gettimeofday(&end_time, NULL);
+        
         /* According to the USB spec part 9.1.2 host allows 100ms time for
          * the insertion process to complete. According to 7.1.7.1 this is the
@@ -271 +262 @@
         /* 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 +270 @@
         const usb_hub_attached_device_t new_device = {
                 .address = dev_addr,
-                .fun = child_fun,
+                .fun = fun,
         };
 
@@ -288 +278 @@
         if (rc != EOK) {
                 /* The child function is already created. */
-                ddf_fun_destroy(child_fun);
                 rc = EDESTADDRREQ;
                 goto leave_release_free_address;
@@ -296 +285 @@
                 *assigned_address = dev_addr;
         }
-
-        *new_fun = child_fun;
 
         rc = EOK;