Changeset 162726b in mainline

Timestamp:

2011-10-12T20:15:31Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

013517b

Parents:

90994fa

Message:

libusbdev: Remove child_handle output parameter.

Use child_fun instead.

Location:

uspace/lib/usbdev

Files:

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

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

@@ -51 +51 @@
 
 int usb_device_register_child_in_devman(usb_address_t, devman_handle_t,
-    ddf_dev_t *, devman_handle_t *, ddf_dev_ops_t *, void *, ddf_fun_t **);
+    ddf_dev_t *, ddf_dev_ops_t *, void *, ddf_fun_t **);
 
 #endif

uspace/lib/usbdev/src/hub.c

@@ -322 +322 @@
         ddf_fun_t *child_fun;
         rc = usb_device_register_child_in_devman(dev_addr, dev_conn.hc_handle,
-            parent, NULL,
-            dev_ops, new_dev_data, &child_fun);
+            parent, dev_ops, new_dev_data, &child_fun);
         if (rc != EOK) {
                 rc = ESTALL;

uspace/lib/usbdev/src/recognise.c

@@ -339 +339 @@
  * @param[in] hc_handle Handle of the host controller.
  * @param[in] parent Parent device.
- * @param[out] child_handle Handle of the child device.
  * @param[in] dev_ops Child device ops.
  * @param[in] dev_data Arbitrary pointer to be stored in the child
@@ -348 +347 @@
  */
 int usb_device_register_child_in_devman(usb_address_t address,
-    devman_handle_t hc_handle,
-    ddf_dev_t *parent, devman_handle_t *child_handle,
+    devman_handle_t hc_handle, ddf_dev_t *parent,
     ddf_dev_ops_t *dev_ops, void *dev_data, ddf_fun_t **child_fun)
 {
@@ -414 +412 @@
         }
 
-        if (child_handle != NULL) {
-                *child_handle = child->handle;
-        }
-
         if (child_fun != NULL) {
                 *child_fun = child;