Changeset ea28272 in mainline for kernel/generic/include/ddi/irq.h

Timestamp:

2010-12-30T13:43:27Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d770deb

Parents:

d70d80ed (diff), f418e51 (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 mainline changes.

File:

• kernel/generic/include/ddi/irq.h (modified) (2 diffs)

kernel/generic/include/ddi/irq.h

@@ -122 +122 @@
         /** Answerbox for notifications. */
         answerbox_t *answerbox;
-        /** Method to be used for the notification. */
-        unative_t method;
+        /** Interface and method to be used for the notification. */
+        sysarg_t imethod;
         /** Arguments that will be sent if the IRQ is claimed. */
         uint32_t scratch[IPC_CALL_LEN];
@@ -189 +189 @@
 extern hash_table_t irq_uspace_hash_table;
 
+extern inr_t last_inr;
+
 extern void irq_init(size_t, size_t);
 extern void irq_initialize(irq_t *);