Changes in kernel/generic/include/ddi/irq.h [ca207e0:9d58539] in mainline

File:

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

kernel/generic/include/ddi/irq.h

@@ -43 +43 @@
 #include <proc/task.h>
 #include <ipc/ipc.h>
-#include <mm/slab.h>
 
 typedef enum {
@@ -71 +70 @@
         /** When false, notifications are not sent. */
         bool notify;
-        /** True if the structure is in irq_uspace_hash_table_table */
-        bool hashed_in;
         /** Answerbox for notifications. */
         answerbox_t *answerbox;
@@ -79 +76 @@
         /** Arguments that will be sent if the IRQ is claimed. */
         uint32_t scratch[IPC_CALL_LEN];
-        /** Top-half IRQ code. */
+        /** Top-half pseudocode. */
         irq_code_t *code;
         /** Counter. */
         size_t counter;
+        
+        /**
+         * Link between IRQs that are notifying the same answerbox. The list is
+         * protected by the answerbox irq_lock.
+         */
+        link_t link;
 } ipc_notif_cfg_t;
 
@@ -88 +91 @@
  *
  * If one device has multiple interrupts, there will be multiple irq_t
- * instantions.
+ * instantions with the same devno.
+ *
  */
 typedef struct irq {
         /** Hash table link. */
-        ht_link_t link;
+        link_t link;
         
         /** Lock protecting everything in this structure
@@ -108 +112 @@
          */
         bool preack;
+        
+        /** Unique device number. -1 if not yet assigned. */
+        devno_t devno;
         
         /** Actual IRQ number. -1 if not yet assigned. */
@@ -132 +139 @@
 extern hash_table_t irq_uspace_hash_table;
 
-extern slab_cache_t *irq_slab;
-
 extern inr_t last_inr;