Changeset 03362fbd in mainline for uspace/lib/usbdev/src/hub.c

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

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

uspace/lib/usbdev/src/hub.c

@@ -63 +63 @@
                 return EBADMEM;
         return usb_hc_bind_address(connection,
-            attached_device->address, attached_device->fun->handle);
+            attached_device->address, ddf_fun_get_handle(attached_device->fun));
 }
 
@@ -287 +287 @@
         rc = usb_hub_register_device(hc_conn, &new_device);
         if (rc != EOK) {
-                /* We know nothing about that data. */
-                if (new_dev_data)
-                        child_fun->driver_data = NULL;
                 /* The child function is already created. */
                 ddf_fun_destroy(child_fun);