Changeset 03cfda08 in mainline

Timestamp:

2011-05-06T12:47:04Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a58dd620

Parents:

180255f

Message:

Fix OHCI interrupt pseudocode, remove dead code

File:

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

uspace/drv/ohci/hc.c

@@ -428 +428 @@
             instance->registers->interrupt_enable);
         instance->registers->interrupt_enable = I_MI;
-        /* 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;
 
         /* Set periodic start to 90% */
@@ -503 +498 @@
                 instance->interrupt_commands[0].cmd = CMD_MEM_READ_32;
                 instance->interrupt_commands[0].dstarg = 1;
-                instance->interrupt_commands[0].addr = (void*)
-                    addr_to_phys((void*)&instance->registers->interrupt_status);
+                instance->interrupt_commands[0].addr =
+                    (void*)&instance->registers->interrupt_status;
 
                 /* Test whether we are the interrupt cause */
@@ -519 +514 @@
 
                 /* Write clean status register */
-                instance->interrupt_commands[3].cmd = CMD_PIO_WRITE_A_32;
+                instance->interrupt_commands[3].cmd = CMD_MEM_WRITE_A_32;
                 instance->interrupt_commands[3].srcarg = 1;
-                instance->interrupt_commands[3].addr = (void*)
-                    addr_to_phys((void*)&instance->registers->interrupt_status);
+                instance->interrupt_commands[3].addr =
+                    (void*)&instance->registers->interrupt_status;
 
                 /* Accept interrupt */