Changeset ff34e5a in mainline

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

Location:

uspace/drv/uhci-hcd

Files:

• uhci.c (modified) (3 diffs)
• uhci_hc.c (modified) (4 diffs)
• uhci_hc.h (modified) (1 diff)

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
 }
-
 /**
  * @}

uspace/drv/uhci-hcd/uhci_hc.c

@@ -82 +82 @@
  * interrupt fibrils.
  */
-int uhci_hc_init(uhci_hc_t *instance, ddf_fun_t *fun, void *regs, size_t reg_size)
+int uhci_hc_init(uhci_hc_t *instance, ddf_fun_t *fun,
+    void *regs, size_t reg_size, bool interrupts)
 {
         assert(reg_size >= sizeof(regs_t));
@@ -95 +96 @@
         } else (void) 0
 
+        instance->hw_interrupts = interrupts;
         /* Setup UHCI function. */
         instance->ddf_instance = fun;
@@ -113 +115 @@
 
         uhci_hc_init_hw(instance);
-        instance->cleaner =
-            fibril_create(uhci_hc_interrupt_emulator, instance);
-        fibril_add_ready(instance->cleaner);
+        if (!interrupts) {
+                instance->cleaner =
+                    fibril_create(uhci_hc_interrupt_emulator, instance);
+                fibril_add_ready(instance->cleaner);
+        }
 
         instance->debug_checker = fibril_create(uhci_hc_debug_checker, instance);
@@ -149 +153 @@
         pio_write_32(&registers->flbaseadd, pa);
 
-        /* Enable all interrupts, but resume interrupt */
-        pio_write_16(&instance->registers->usbintr,
-            UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET);
+        if (instance->hw_interrupts) {
+                /* Enable all interrupts, but resume interrupt */
+                pio_write_16(&instance->registers->usbintr,
+                    UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET);
+        }
 
         uint16_t status = pio_read_16(&registers->usbcmd);

uspace/drv/uhci-hcd/uhci_hc.h

@@ -99 +99 @@
         fid_t cleaner;
         fid_t debug_checker;
+        bool hw_interrupts;
 
         ddf_fun_t *ddf_instance;
 } uhci_hc_t;
 
-int uhci_hc_init(uhci_hc_t *instance, ddf_fun_t *fun, void *regs, size_t reg_size);
+int uhci_hc_init(uhci_hc_t *instance, ddf_fun_t *fun,
+    void *regs, size_t reg_size, bool interupts);
 
 int uhci_hc_schedule(uhci_hc_t *instance, batch_t *batch);