Changeset c24c157d in mainline for uspace/lib/usbdev/src

Timestamp:

2011-12-12T11:59:35Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1a38701

Parents:

899f1a9

Message:

libusb, libusbdev: Provide generic usb_get_info_by_handle function.

Add separate wrappers for host controller handle, address and interface number.

File:

• uspace/lib/usbdev/src/devdrv.c (modified) (2 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -484 +484 @@
         usb_dev->pipes = NULL;
 
+        /* Get assigned params */
+        devman_handle_t hc_handle;
+        usb_address_t address;
+
+        int rc = usb_get_info_by_handle(ddf_dev->handle,
+            &hc_handle, &address, &usb_dev->interface_no);
+        if (rc != EOK) {
+                *errstr_ptr = "device parameters retrieval";
+                return rc;
+        }
+
         /* Initialize hc connection. */
-        usb_hc_connection_initialize_from_device(&usb_dev->hc_conn, ddf_dev);
-        const usb_address_t address =
-            usb_get_address_by_handle(ddf_dev->handle);
+        usb_hc_connection_initialize(&usb_dev->hc_conn, hc_handle);
 
         /* Initialize backing wire and control pipe. */
-        int rc = usb_device_connection_initialize(
+        rc = usb_device_connection_initialize(
             &usb_dev->wire, &usb_dev->hc_conn, address);
         if (rc != EOK) {
@@ -512 +521 @@
         }
 
-        /* Get our interface. */
-        usb_dev->interface_no = usb_device_get_assigned_interface(ddf_dev);
         /* Retrieve standard descriptors. */
         rc = usb_device_retrieve_descriptors(