Changeset 302a4b6 in mainline

Timestamp:

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

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8986412

Parents:

af81980

Message:

Add UHCI pseudocode interrupt sharing

Location:

uspace/drv/uhci-hcd

Files:

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

uspace/drv/uhci-hcd/hc.c

@@ -44 +44 @@
 #include "hc.h"
 
-#define UHCI_SUPPORTED_INTERRUPTS \
+#define UHCI_STATUS_ALLOW_INTERRUPTS \
     (UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET)
+
 
 static int hc_init_transfer_lists(hc_t *instance);
@@ -138 +139 @@
                 /* Enable all interrupts, but resume interrupt */
                 pio_write_16(&instance->registers->usbintr,
-                    UHCI_SUPPORTED_INTERRUPTS);
+                    UHCI_STATUS_ALLOW_INTERRUPTS);
         }
 
@@ -182 +183 @@
                 instance->interrupt_commands[1].cmd = CMD_BTEST;
                 instance->interrupt_commands[1].value =
-                    UHCI_SUPPORTED_INTERRUPTS;
+                    UHCI_STATUS_ALLOW_INTERRUPTS | UHCI_STATUS_NM_INTERRUPTS;
                 instance->interrupt_commands[1].srcarg = 1;
                 instance->interrupt_commands[1].dstarg = 2;
@@ -215 +216 @@
 
         /* Set all frames to point to the first queue head */
-        const uint32_t queue =
-            LINK_POINTER_QH(addr_to_phys(
-                instance->transfers_interrupt.queue_head));
+        const uint32_t queue = LINK_POINTER_QH(
+                addr_to_phys(instance->transfers_interrupt.queue_head));
 
         unsigned i = 0;
@@ -279 +279 @@
 #ifdef FSBR
         transfer_list_set_next(&instance->transfers_bulk_full,
-                &instance->transfers_control_full);
+            &instance->transfers_control_full);
 #endif
 
@@ -332 +332 @@
 {
         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)) {
@@ -353 +354 @@
         }
         /* Resume interrupts are not supported */
+        if (status & UHCI_STATUS_RESUME) {
+                usb_log_error("Resume interrupt!\n");
+        }
 
         /* Bits 4 and 5 indicate hc error */

uspace/drv/uhci-hcd/hc.h

@@ -69 +69 @@
 #define UHCI_STATUS_ERROR_INTERRUPT (1 << 1)
 #define UHCI_STATUS_INTERRUPT (1 << 0)
+#define UHCI_STATUS_NM_INTERRUPTS \
+    (UHCI_STATUS_PROCESS_ERROR | UHCI_STATUS_SYSTEM_ERROR)
 
         /** Interrupt enabled registers */