Changeset 33fee91 in mainline for uspace/lib/usb/src/hc.c

Timestamp:

2012-08-31T07:35:27Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a3da2b2

Parents:

72cf064 (diff), 0d57c3e (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/hc.c (modified) (1 diff)

uspace/lib/usb/src/hc.c

@@ -115 +115 @@
  */
 int usb_hc_connection_initialize_from_device(usb_hc_connection_t *connection,
-    const ddf_dev_t *device)
-{
-        assert(connection);
-
-        if (device == NULL) {
+    ddf_dev_t *device)
+{
+        if (device == NULL)
                 return EBADMEM;
-        }
 
         devman_handle_t hc_handle;
-        const int rc = usb_get_hc_by_handle(device->handle, &hc_handle);
+        const int rc = usb_get_hc_by_handle(ddf_dev_get_handle(device), &hc_handle);
         if (rc == EOK) {
                 usb_hc_connection_initialize(connection, hc_handle);