Changeset 5fe0a69 in mainline for uspace/drv/bus/usb/uhci/uhci.c

Timestamp:

2011-08-24T14:40:26Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3afb758

Parents:

df8f3fa

Message:

UHCI: Use new usb hc driver architecture.

File:

• uspace/drv/bus/usb/uhci/uhci.c (modified) (3 diffs)

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

@@ -87 +87 @@
 /** 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 +100 @@
 {
         assert(fun);
-        usb_device_keeper_t *manager = &dev_to_uhci(fun->dev)->hc.manager;
+        usb_device_keeper_t *manager = &dev_to_uhci(fun->dev)->hc.generic.dev_manager;
         usb_address_t addr = usb_device_keeper_find(manager, handle);
 
@@ -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");