Changeset ff34e5a in mainline for uspace/drv/uhci-hcd/uhci.c

Timestamp:

2011-03-14T14:04:15Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9370884

Parents:

6298d80

Message:

Try to enable hw interrupts

File:

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

uspace/drv/uhci-hcd/uhci.c

@@ -174 +174 @@
             "Failed(%d) to disable legacy USB: %s.\n", ret, str_error(ret));
 
-#if 0
+        bool interrupts = false;
         ret = pci_enable_interrupts(device);
         if (ret != EOK) {
@@ -180 +180 @@
                     "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);
+        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 init uhci-hcd.\n", ret);
         instance->hc_fun->ops = &uhci_hc_ops;
@@ -234 +237 @@
 #undef CHECK_RET_FINI_RETURN
 }
-
 /**
  * @}