Changeset 54d71e1 in mainline for uspace/drv/uhci-hcd/hc.h

Timestamp:

2011-04-29T07:05:30Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

361fcec

Parents:

9014dcd (diff), cd4ae1e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with development

File:

• uspace/drv/uhci-hcd/hc.h (modified) (3 diffs)

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 */
@@ -91 +93 @@
 #define UHCI_DEBUGER_TIMEOUT 5000000
 #define UHCI_ALLOWED_HW_FAIL 5
+#define UHCI_NEEDED_IRQ_COMMANDS 5
 
 /* Main HC driver structure */
@@ -119 +122 @@
         /** Code to be executed in kernel interrupt handler */
         irq_code_t interrupt_code;
+
+        /** Commands that form interrupt code */
+        irq_cmd_t interrupt_commands[UHCI_NEEDED_IRQ_COMMANDS];
 
         /** Fibril periodically checking status register*/