Changeset 8986412 in mainline for uspace/drv/uhci-hcd/hc.c

Timestamp:

2011-04-23T10:26:26Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

564a2b3, f7ccf46

Parents:

302a4b6

Message:

Fix interrupt vs. status register values

File:

• uspace/drv/uhci-hcd/hc.c (modified) (4 diffs)

uspace/drv/uhci-hcd/hc.c

@@ -44 +44 @@
 #include "hc.h"
 
-#define UHCI_STATUS_ALLOW_INTERRUPTS \
+#define UHCI_INTR_ALLOW_INTERRUPTS \
     (UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET)
+#define UHCI_STATUS_USED_INTERRUPTS \
+    (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)
 
 
@@ -139 +141 @@
                 /* Enable all interrupts, but resume interrupt */
                 pio_write_16(&instance->registers->usbintr,
-                    UHCI_STATUS_ALLOW_INTERRUPTS);
+                    UHCI_INTR_ALLOW_INTERRUPTS);
         }
 
@@ -183 +185 @@
                 instance->interrupt_commands[1].cmd = CMD_BTEST;
                 instance->interrupt_commands[1].value =
-                    UHCI_STATUS_ALLOW_INTERRUPTS | UHCI_STATUS_NM_INTERRUPTS;
+                    UHCI_STATUS_USED_INTERRUPTS | UHCI_STATUS_NM_INTERRUPTS;
                 instance->interrupt_commands[1].srcarg = 1;
                 instance->interrupt_commands[1].dstarg = 2;
@@ -332 +334 @@
 {
         assert(instance);
-        usb_log_info("Got interrupt: %x.\n", status);
         /* Lower 2 bits are transaction error and transaction complete */
         if (status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) {