WebSVN – HelenOS – Diff – /trunk/kernel/generic/src/ddi/irq.c

 #include <ddi/irq.h>
 #include <adt/hash_table.h>
 #include <arch/types.h>
 #include <typedefs.h>
 #include <synch/spinlock.h>
+#include <atomic.h>
 #include <arch.h>
 /**
  * Spinlock protecting the hash table.
  * This lock must be taken only when interrupts are disabled.
+ *
  */
 void irq_initialize(irq_t *irq)
+{
     link_initialize(&irq->link);
+    spinlock_initialize(&irq->lock, "irq.lock");
     irq->inr = -1;
     irq->devno = -1;
-    irq->notif = 0;
     irq->trigger = 0;
     irq->claim = NULL;
     irq->handler = NULL;
     irq->arg = NULL;
+    irq->notif_answerbox = NULL;
+    irq->code = NULL;
+    atomic_set(&irq->counter, 0);
+}
 /** Register IRQ for device.
+ *
  * The irq structure must be filled with information
  */
 bool irq_ht_compare(unative_t *key, count_t keys, link_t *item)
+{
     irq_t *irq = hash_table_get_instance(item, irq_t, link);
     inr_t *inr = (inr_t *) key;
+    bool rv;
+    spinlock_lock(&irq->lock);
-    return ((irq->inr == *inr) && (irq->claim() == IRQ_ACCEPT));
+    rv = ((irq->inr == *inr) && (irq->claim() == IRQ_ACCEPT));
+    spinlock_unlock(&irq->lock);
+    return rv;
+}
 /** Compute hash index for the key.
+ *
  * This function computes hash index into
  * @return True on match or false otherwise.
  */
 bool irq_lin_compare(unative_t *key, count_t keys, link_t *item)
+{
     irq_t *irq = list_get_instance(item, irq_t, link);
+    bool rv;
+    spinlock_lock(&irq->lock);
+    rv = (irq->claim() == IRQ_ACCEPT);
+    spinlock_unlock(&irq->lock);
-    return (irq->claim() == IRQ_ACCEPT);
+    return rv;
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/trunk/kernel/generic/src/ddi/irq.c – Rev 1920 → 1921