Changeset a5361fb in mainline

Timestamp:

2014-01-18T21:39:55Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4bfcf22

Parents:

3e200736

Message:

ohci: Don't enable device interrupts if interrupt setup failed.

Location:

uspace/drv/bus/usb/ohci

Files:

• hc.c (modified) (2 diffs)
• hc.h (modified) (1 diff)

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

@@ -172 +172 @@
         list_initialize(&instance->pending_batches);
         fibril_mutex_initialize(&instance->guard);
+        instance->hw_interrupts = interrupts;
 
         ret = hc_init_memory(instance);
@@ -485 +486 @@
 
         /* Enable interrupts */
-        OHCI_WR(instance->registers->interrupt_enable, OHCI_USED_INTERRUPTS);
-        usb_log_debug("Enabled interrupts: %x.\n",
-            OHCI_RD(instance->registers->interrupt_enable));
-        OHCI_WR(instance->registers->interrupt_enable, I_MI);
+        if (instance->hw_interrupts) {
+                OHCI_WR(instance->registers->interrupt_enable,
+                    OHCI_USED_INTERRUPTS);
+                usb_log_debug("Enabled interrupts: %x.\n",
+                    OHCI_RD(instance->registers->interrupt_enable));
+                OHCI_WR(instance->registers->interrupt_enable, I_MI);
+        }
 
         /* Set periodic start to 90% */

uspace/drv/bus/usb/ohci/hc.h

@@ -71 +71 @@
         fibril_mutex_t guard;
 
+        /** interrupts available */
+        bool hw_interrupts;
+
         /** USB hub emulation structure */
         ohci_rh_t rh;