Changes in uspace/drv/uhci-hcd/uhci.c [ff34e5a:a9f91cd] in mainline

File:

• uspace/drv/uhci-hcd/uhci.c (modified) (6 diffs)

uspace/drv/uhci-hcd/uhci.c

@@ -60 +60 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Get address of the device identified by handle.
- *
- * @param[in] dev DDF instance of the device to use.
- * @param[in] iid (Unused).
- * @param[in] call Pointer to the call that represents interrupt.
- */
 static int usb_iface_get_address(
     ddf_fun_t *fun, devman_handle_t handle, usb_address_t *address)
@@ -112 +106 @@
 };
 /*----------------------------------------------------------------------------*/
-/** Get root hub hw resources (I/O registers).
+/** Gets root hub hw resources.
  *
  * @param[in] fun Root hub function.
@@ -133 +127 @@
 };
 /*----------------------------------------------------------------------------*/
-/** Initialize hc and rh ddf structures and their respective drivers.
- *
- * @param[in] instance UHCI structure to use.
- * @param[in] device DDF instance of the device to use.
- *
- * This function does all the preparatory work for hc and rh drivers:
- *  - gets device hw resources
- *  - disables UHCI legacy support
- *  - asks for interrupt
- *  - registers interrupt handler
- */
 int uhci_init(uhci_t *instance, ddf_dev_t *device)
 {
@@ -174 +157 @@
             "Failed(%d) to disable legacy USB: %s.\n", ret, str_error(ret));
 
-        bool interrupts = false;
+#if 0
         ret = pci_enable_interrupts(device);
         if (ret != EOK) {
@@ -180 +163 @@
                     "Failed(%d) to enable interrupts, fall back to polling.\n",
                     ret);
-        } else {
-                usb_log_debug("Hw interrupts enabled.\n");
-                interrupts = true;
         }
+#endif
 
         instance->hc_fun = ddf_fun_create(device, fun_exposed, "uhci-hc");
         ret = (instance->hc_fun == NULL) ? ENOMEM : EOK;
-        CHECK_RET_DEST_FUN_RETURN(ret,
-            "Failed(%d) to create HC function.\n", ret);
-
-        ret = uhci_hc_init(&instance->hc, instance->hc_fun,
-            (void*)io_reg_base, io_reg_size, interrupts);
+        CHECK_RET_DEST_FUN_RETURN(ret, "Failed(%d) to create HC function.\n", ret);
+
+        ret = uhci_hc_init(
+            &instance->hc, instance->hc_fun, (void*)io_reg_base, io_reg_size);
         CHECK_RET_DEST_FUN_RETURN(ret, "Failed(%d) to init uhci-hcd.\n", ret);
         instance->hc_fun->ops = &uhci_hc_ops;
@@ -237 +217 @@
 #undef CHECK_RET_FINI_RETURN
 }
+
 /**
  * @}