Changeset ff34e5a in mainline for uspace/drv/uhci-hcd/uhci_hc.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_hc.c (modified) (4 diffs)

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);