Changeset 63530c62 in mainline for kernel/generic

Timestamp:

2006-10-14T19:31:03Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e3890b3f

Parents:

7dcf22a

Message:

Changes in ns16550 and z8530 drivers.
Add some stuff for IRQ notifications to irq_t.

Location:

kernel/generic

Files:

• include/ddi/irq.h (modified) (4 diffs)
• src/ddi/irq.c (modified) (4 diffs)

kernel/generic/include/ddi/irq.h

@@ -38 +38 @@
 #include <arch/types.h>
 #include <adt/list.h>
+#include <ipc/ipc.h>
+#include <ipc/irq.h>
+#include <atomic.h>
+#include <synch/spinlock.h>
 
 typedef enum {
@@ -63 +67 @@
         link_t link;
 
+        /** Lock protecting everything in this structure
+         *  except the link member. When both the IRQ
+         *  hash table lock and this lock are to be acquired,
+         *  this lock must not be taken first.
+         */
+        SPINLOCK_DECLARE(lock);
+
         /** Unique device number. -1 if not yet assigned. */
         devno_t devno;
@@ -68 +79 @@
         /** Actual IRQ number. -1 if not yet assigned. */
         inr_t inr;
-        /** Task ID of the task to be notified about the IRQ or 0. */
-        task_id_t notif;
         /** Trigger level of the IRQ.*/
         irq_trigger_t trigger;
@@ -78 +87 @@
         /** Argument for the handler. */
         void *arg;
+
+        /** Answerbox of the task that wanted to be notified. */
+        answerbox_t *notif_answerbox;
+        /** Pseudo-code to be performed by the top-half
+         *  before a notification is sent. */
+        irq_code_t *code;
+        /** Counter of IRQ notifications. */
+        atomic_t counter;
 };
 

kernel/generic/src/ddi/irq.c

@@ -64 +64 @@
 #include <typedefs.h>
 #include <synch/spinlock.h>
+#include <atomic.h>
 #include <arch.h>
 
@@ -128 +129 @@
 {
         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);
 }
 
@@ -221 +225 @@
         irq_t *irq = hash_table_get_instance(item, irq_t, link);
         inr_t *inr = (inr_t *) key;
-        
-        return ((irq->inr == *inr) && (irq->claim() == IRQ_ACCEPT));
+        bool rv;
+        
+        spinlock_lock(&irq->lock);
+        rv = ((irq->inr == *inr) && (irq->claim() == IRQ_ACCEPT));
+        spinlock_unlock(&irq->lock);
+
+        return rv;
 }
 
@@ -260 +269 @@
 {
         irq_t *irq = list_get_instance(item, irq_t, link);
-        
-        return (irq->claim() == IRQ_ACCEPT);
+        bool rv;
+        
+        spinlock_lock(&irq->lock);
+        rv = (irq->claim() == IRQ_ACCEPT);
+        spinlock_unlock(&irq->lock);
+        
+        return rv;
 }