Changes in uspace/drv/bus/usb/uhci/hc.c [5e07cbc0:933b0d7] in mainline

File:

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

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

@@ -192 +192 @@
             "Device registers at %p (%zuB) accessible.\n", io, reg_size);
 
-        ret = hc_init_mem_structures(instance);
-        CHECK_RET_RETURN(ret,
-            "Failed to initialize UHCI memory structures: %s.\n",
+        ret = hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11,
+            bandwidth_count_usb11);
+        CHECK_RET_RETURN(ret, "Failed to initialize HCD generic driver: %s.\n",
             str_error(ret));
-
-#undef CHECK_RET_RETURN
-
-        hcd_init(&instance->generic, USB_SPEED_FULL,
-            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
 
         instance->generic.private_data = instance;
         instance->generic.schedule = hc_schedule;
         instance->generic.ep_add_hook = NULL;
+
+#undef CHECK_RET_DEST_FUN_RETURN
+
+        ret = hc_init_mem_structures(instance);
+        if (ret != EOK) {
+                usb_log_error(
+                    "Failed to initialize UHCI memory structures: %s.\n",
+                    str_error(ret));
+                hcd_destroy(&instance->generic);
+                return ret;
+        }
 
         hc_init_hw(instance);
@@ -293 +299 @@
         const uint32_t queue = LINK_POINTER_QH(
                 addr_to_phys(instance->transfers_interrupt.queue_head));
-
-        for (unsigned i = 0; i < UHCI_FRAME_LIST_COUNT; ++i) {
+        unsigned i = 0;
+        for(; i < UHCI_FRAME_LIST_COUNT; ++i) {
                 instance->frame_list[i] = queue;
         }