Changes in uspace/lib/usb/src/hub.c [357a302:a6add7a] in mainline

File:

• uspace/lib/usb/src/hub.c (modified) (7 diffs)

uspace/lib/usb/src/hub.c

@@ -39 +39 @@
 #include <usbhc_iface.h>
 #include <errno.h>
+#include <assert.h>
 
 /** Check that HC connection is alright.
@@ -143 +144 @@
 /** Wrapper for registering attached device to the hub.
  *
- * The @p enable_port function is expected to enable singalling on given
+ * The @p enable_port function is expected to enable signaling on given
  * port.
  * The two arguments to it can have arbitrary meaning
@@ -151 +152 @@
  *
  * If the @p enable_port fails (i.e. does not return EOK), the device
- * addition is cancelled.
+ * addition is canceled.
  * The return value is then returned (it is good idea to use different
  * error codes than those listed as return codes by this function itself).
@@ -158 +159 @@
  * @param connection Opened connection to host controller.
  * @param dev_speed New device speed.
- * @param enable_port Function for enabling signalling through the port the
+ * @param enable_port Function for enabling signaling through the port the
  *      device is attached to.
  * @param port_no Port number (passed through to @p enable_port).
@@ -172 +173 @@
  *      request or requests for descriptors when creating match ids).
  */
-int usb_hc_new_device_wrapper(device_t *parent, usb_hc_connection_t *connection,
+int usb_hc_new_device_wrapper(ddf_dev_t *parent, usb_hc_connection_t *connection,
     usb_speed_t dev_speed,
     int (*enable_port)(int port_no, void *arg), int port_no, void *arg,
-    usb_address_t *assigned_address, devman_handle_t *assigned_handle)
+    usb_address_t *assigned_address, devman_handle_t *assigned_handle,
+    ddf_dev_ops_t *dev_ops, void *new_dev_data, ddf_fun_t **new_fun)
 {
         CHECK_CONNECTION(connection);
@@ -199 +201 @@
 
         /*
-         * Enable the port (i.e. allow signalling through this port).
+         * Enable the port (i.e. allow signaling through this port).
          */
         rc = enable_port(port_no, arg);
@@ -251 +253 @@
         devman_handle_t child_handle;
         rc = usb_device_register_child_in_devman(dev_addr, dev_conn.hc_handle,
-            parent, &child_handle);
+            parent, &child_handle,
+            dev_ops, new_dev_data, new_fun);
         if (rc != EOK) {
                 rc = ESTALL;