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

File:

• uspace/lib/usb/src/hub.c (modified) (8 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.
@@ -57 +56 @@
  *
  * @param connection Opened connection to host controller.
- * @param speed Speed of the device that will respond on the default address.
  * @return Error code.
  */
@@ -87 +85 @@
  *
  * @param connection Opened connection to host controller.
- * @param speed Speed of the new device (device that will be assigned
- *    the returned address).
  * @return Assigned USB address or negative error code.
  */
@@ -147 +143 @@
 /** Wrapper for registering attached device to the hub.
  *
- * The @p enable_port function is expected to enable signaling on given
+ * The @p enable_port function is expected to enable singalling on given
  * port.
  * The two arguments to it can have arbitrary meaning
@@ -155 +151 @@
  *
  * If the @p enable_port fails (i.e. does not return EOK), the device
- * addition is canceled.
+ * addition is cancelled.
  * 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).
  *
- * @param[in] parent Parent device (i.e. the hub device).
- * @param[in] connection Opened connection to host controller.
- * @param[in] dev_speed New device speed.
- * @param[in] enable_port Function for enabling signaling through the port the
+ * @param parent Parent device (i.e. the hub device).
+ * @param connection Opened connection to host controller.
+ * @param dev_speed New device speed.
+ * @param enable_port Function for enabling signalling through the port the
  *      device is attached to.
- * @param[in] port_no Port number (passed through to @p enable_port).
- * @param[in] arg Any data argument to @p enable_port.
+ * @param port_no Port number (passed through to @p enable_port).
+ * @param arg Any data argument to @p enable_port.
  * @param[out] assigned_address USB address of the device.
  * @param[out] assigned_handle Devman handle of the new device.
- * @param[in] dev_ops Child device ops.
- * @param[in] new_dev_data Arbitrary pointer to be stored in the child
- *      as @c driver_data.
- * @param[out] new_fun Storage where pointer to allocated child function
- *      will be written.
  * @return Error code.
  * @retval ENOENT Connection to HC not opened.
@@ -181 +172 @@
  *      request or requests for descriptors when creating match ids).
  */
-int usb_hc_new_device_wrapper(ddf_dev_t *parent, usb_hc_connection_t *connection,
+int usb_hc_new_device_wrapper(device_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,
-    ddf_dev_ops_t *dev_ops, void *new_dev_data, ddf_fun_t **new_fun)
+    usb_address_t *assigned_address, devman_handle_t *assigned_handle)
 {
         CHECK_CONNECTION(connection);
@@ -209 +199 @@
 
         /*
-         * Enable the port (i.e. allow signaling through this port).
+         * Enable the port (i.e. allow signalling through this port).
          */
         rc = enable_port(port_no, arg);
@@ -261 +251 @@
         devman_handle_t child_handle;
         rc = usb_device_register_child_in_devman(dev_addr, dev_conn.hc_handle,
-            parent, &child_handle,
-            dev_ops, new_dev_data, new_fun);
+            parent, &child_handle);
         if (rc != EOK) {
                 rc = ESTALL;