Changeset 3b5d1535 in mainline for uspace/lib/usb/src/hub.c

Timestamp:

2011-02-23T10:28:21Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

eb48f61

Parents:

e936e8e (diff), eb1a2f4 (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

File:

• uspace/lib/usb/src/hub.c (modified) (3 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.
@@ -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);
@@ -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;