Changes in uspace/drv/ohci/hc.c [4125b7d:c8eddf4] in mainline

File:

• uspace/drv/ohci/hc.c (modified) (6 diffs)

uspace/drv/ohci/hc.c

@@ -45 +45 @@
 #include "hcd_endpoint.h"
 
+#define OHCI_USED_INTERRUPTS \
+    (I_SO | I_WDH | I_UE | I_RHSC)
 static int interrupt_emulator(hc_t *instance);
 static void hc_gain_control(hc_t *instance);
@@ -285 +287 @@
 {
         assert(instance);
-        if ((status & ~IS_SF) == 0) /* ignore sof status */
+        usb_log_debug("OHCI interrupt: %x.\n", status);
+        if ((status & ~I_SF) == 0) /* ignore sof status */
                 return;
-        if (status & IS_RHSC)
+        if (status & I_RHSC)
                 rh_interrupt(&instance->rh);
 
-        usb_log_debug("OHCI interrupt: %x.\n", status);
-
-        if (status & IS_WDH) {
+
+        if (status & I_WDH) {
                 fibril_mutex_lock(&instance->guard);
                 usb_log_debug2("HCCA: %p-%#" PRIx32 " (%p).\n", instance->hcca,
@@ -332 +334 @@
 {
         assert(instance);
+        usb_log_debug("Requesting OHCI control.\n");
         /* Turn off legacy emulation */
         volatile uint32_t *ohci_emulation_reg =
@@ -337 +340 @@
         usb_log_debug("OHCI legacy register %p: %x.\n",
                 ohci_emulation_reg, *ohci_emulation_reg);
-        *ohci_emulation_reg = 0;
+        *ohci_emulation_reg &= ~0x1;
 
         /* Interrupt routing enabled => smm driver is active */
@@ -421 +424 @@
             instance->registers->control);
 
-        /* Disable interrupts */
-        instance->registers->interrupt_disable = I_SF | I_OC;
-        usb_log_debug2("Disabling interrupts: %x.\n",
-            instance->registers->interrupt_disable);
-        instance->registers->interrupt_disable = I_MI;
+        /* Enable interrupts */
+        instance->registers->interrupt_enable = OHCI_USED_INTERRUPTS;
         usb_log_debug2("Enabled interrupts: %x.\n",
             instance->registers->interrupt_enable);
+        instance->registers->interrupt_enable = I_MI;
 
         /* Set periodic start to 90% */
@@ -492 +493 @@
             instance->lists[USB_TRANSFER_INTERRUPT].list_head_pa);
 
+        /* Init interrupt code */
+        instance->interrupt_code.cmds = instance->interrupt_commands;
+        {
+                /* Read status register */
+                instance->interrupt_commands[0].cmd = CMD_MEM_READ_32;
+                instance->interrupt_commands[0].dstarg = 1;
+                instance->interrupt_commands[0].addr =
+                    (void*)&instance->registers->interrupt_status;
+
+                /* Test whether we are the interrupt cause */
+                instance->interrupt_commands[1].cmd = CMD_BTEST;
+                instance->interrupt_commands[1].value =
+                    OHCI_USED_INTERRUPTS;
+                instance->interrupt_commands[1].srcarg = 1;
+                instance->interrupt_commands[1].dstarg = 2;
+
+                /* Predicate cleaning and accepting */
+                instance->interrupt_commands[2].cmd = CMD_PREDICATE;
+                instance->interrupt_commands[2].value = 2;
+                instance->interrupt_commands[2].srcarg = 2;
+
+                /* Write clean status register */
+                instance->interrupt_commands[3].cmd = CMD_MEM_WRITE_A_32;
+                instance->interrupt_commands[3].srcarg = 1;
+                instance->interrupt_commands[3].addr =
+                    (void*)&instance->registers->interrupt_status;
+
+                /* Accept interrupt */
+                instance->interrupt_commands[4].cmd = CMD_ACCEPT;
+
+                instance->interrupt_code.cmdcount = OHCI_NEEDED_IRQ_COMMANDS;
+        }
+
         return EOK;
 }