Changeset 432a269 in mainline for uspace/drv/bus/usb/uhci/uhci.c

Timestamp:

2011-09-16T21:13:57Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3a11f17

Parents:

c0e53ff (diff), fd07e526 (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/drv/bus/usb/uhci/uhci.c (modified) (4 diffs)

uspace/drv/bus/usb/uhci/uhci.c

@@ -41 +41 @@
 
 #include "uhci.h"
-#include "iface.h"
 #include "pci.h"
 
@@ -87 +86 @@
 /** Operations supported by the HC driver */
 static ddf_dev_ops_t hc_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */
+        .interfaces[USBHC_DEV_IFACE] = &hcd_iface, /* see iface.h/c */
 };
 /*----------------------------------------------------------------------------*/
@@ -100 +99 @@
 {
         assert(fun);
-        usb_device_keeper_t *manager = &dev_to_uhci(fun->dev)->hc.manager;
-        usb_address_t addr = usb_device_keeper_find(manager, handle);
+        usb_device_manager_t *manager =
+            &dev_to_uhci(fun->dev)->hc.generic.dev_manager;
+        const usb_address_t addr = usb_device_manager_find(manager, handle);
 
         if (addr < 0) {
@@ -202 +202 @@
         CHECK_RET_DEST_FREE_RETURN(ret, "Failed to create UHCI HC function.\n");
         instance->hc_fun->ops = &hc_ops;
-        instance->hc_fun->driver_data = &instance->hc;
+        instance->hc_fun->driver_data = &instance->hc.generic;
 
         instance->rh_fun = ddf_fun_create(device, fun_inner, "uhci_rh");