Changeset 961c29e8 in mainline

Timestamp:

2011-08-25T14:40:35Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

cc34f5f0

Parents:

620c710

Message:

ohci: hub switched to generic hcd

Location:

uspace/drv/bus/usb/ohci

Files:

• hc.c (modified) (3 diffs)
• ohci.c (modified) (1 diff)

uspace/drv/bus/usb/ohci/hc.c

@@ -133 +133 @@
 
         const usb_address_t hub_address =
-            device_keeper_get_free_address(&instance->manager, USB_SPEED_FULL);
+            device_keeper_get_free_address(
+                &instance->generic.dev_manager, USB_SPEED_FULL);
         if (hub_address <= 0) {
                 usb_log_error("Failed to get OHCI root hub address: %s\n",
@@ -141 +142 @@
         instance->rh.address = hub_address;
         usb_device_keeper_bind(
-            &instance->manager, hub_address, hub_fun->handle);
+            &instance->generic.dev_manager, hub_address, hub_fun->handle);
 
 #define CHECK_RET_RELEASE(ret, message...) \
@@ -200 +201 @@
 
         ret = hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11);
+        CHECK_RET_RETURN(ret, "Failed to initialize endpoint manager: %s.\n",
+            str_error(ret));
         instance->generic.private_data = instance;
         instance->generic.schedule = schedule;

uspace/drv/bus/usb/ohci/ohci.c

@@ -89 +89 @@
 {
         assert(fun);
-        usb_device_keeper_t *manager = &dev_to_ohci(fun->dev)->hc.generic.dev_manager;
+        usb_device_keeper_t *manager =
+            &dev_to_ohci(fun->dev)->hc.generic.dev_manager;
 
         usb_address_t addr = usb_device_keeper_find(manager, handle);