Changeset 013517b in mainline for uspace/lib/usbdev

Timestamp:

2011-10-12T20:23:23Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

32ec5671

Parents:

162726b

Message:

usb: Remove assigned_handle output parameter.

Use new_fun instead.

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/hub.h (modified) (1 diff)
• src/hub.c (modified) (3 diffs)

uspace/lib/usbdev/include/usb/dev/hub.h

@@ -44 +44 @@
 int usb_hc_new_device_wrapper(ddf_dev_t *, usb_hc_connection_t *, usb_speed_t,
     int (*)(int, void *), int, void *,
-    usb_address_t *, devman_handle_t *,
-    ddf_dev_ops_t *, void *, ddf_fun_t **);
+    usb_address_t *, ddf_dev_ops_t *, void *, ddf_fun_t **);
 
 /** Info about device attached to host controller.

uspace/lib/usbdev/src/hub.c

@@ -178 +178 @@
  * @param[in] 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
@@ -195 +194 @@
     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,
     ddf_dev_ops_t *dev_ops, void *new_dev_data, ddf_fun_t **new_fun)
 {
@@ -349 +348 @@
                 *assigned_address = dev_addr;
         }
-        if (assigned_handle != NULL) {
-                *assigned_handle = child_fun->handle;
-        }
         if (new_fun != NULL) {
                 *new_fun = child_fun;