Changes in uspace/drv/bus/usb/uhci/uhci.c [8b54fe6:1dc4a5e] in mainline

File:

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

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

@@ -41 +41 @@
 
 #include "uhci.h"
+#include "iface.h"
 #include "pci.h"
 
@@ -86 +87 @@
 /** Operations supported by the HC driver */
 static ddf_dev_ops_t hc_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &hcd_iface, /* see iface.h/c */
+        .interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */
 };
 /*----------------------------------------------------------------------------*/
@@ -99 +100 @@
 {
         assert(fun);
-        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);
+        usb_device_keeper_t *manager = &dev_to_uhci(fun->dev)->hc.manager;
+        usb_address_t addr = usb_device_keeper_find(manager, handle);
 
         if (addr < 0) {
@@ -192 +192 @@
                 ddf_fun_destroy(instance->rh_fun); \
         } \
+        free(instance); \
         device->driver_data = NULL; \
         usb_log_error(message); \
@@ -202 +203 @@
         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.generic;
+        instance->hc_fun->driver_data = &instance->hc;
 
         instance->rh_fun = ddf_fun_create(device, fun_inner, "uhci_rh");