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

Timestamp:

2011-01-23T20:09:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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) (5 diffs)

kernel/generic/include/ddi/irq.h

@@ -54 +54 @@
         /** Read 4 bytes from the I/O space. */
         CMD_PIO_READ_32,
+        
         /** Write 1 byte to the I/O space. */
         CMD_PIO_WRITE_8,
@@ -62 +63 @@
         
         /**
-         * Perform a bit test on the source argument and store the result into
-         * the destination argument.
+         * Write 1 byte from the source argument
+         * to the I/O space.
+         */
+        CMD_PIO_WRITE_A_8,
+        /**
+         * Write 2 bytes from the source argument
+         * to the I/O space.
+         */
+        CMD_PIO_WRITE_A_16,
+        /**
+         * Write 4 bytes from the source argument
+         * to the I/O space.
+         */
+        CMD_PIO_WRITE_A_32,
+        
+        /**
+         * Perform a bit masking on the source argument
+         * and store the result into the destination argument.
          */
         CMD_BTEST,
         
         /**
-         * Predicate the execution of the following N commands by the boolean
-         * value of the source argument.
+         * Predicate the execution of the following
+         * N commands by the boolean value of the source
+         * argument.
          */
         CMD_PREDICATE,
@@ -75 +93 @@
         /** Accept the interrupt. */
         CMD_ACCEPT,
+        
         /** Decline the interrupt. */
         CMD_DECLINE,
@@ -122 +141 @@
         /** 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 +208 @@
 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 *);