Changeset 4874c2d in mainline

Timestamp:

2006-10-17T20:32:35Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b14e35f2

Parents:

8513ad7

Message:

Do not copy notification config out of the IRQ structure.
Add the notify member, that toggles notifications on and off instead.
This is good for preventing other tasks from registering the notification
while the notification config is stored outside the IRQ structure.
It should also help to implement the cleanup code.

Location:

kernel

Files:

• arch/ppc32/src/drivers/cuda.c (modified) (4 diffs)
• genarch/src/kbd/ns16550.c (modified) (4 diffs)
• genarch/src/kbd/z8530.c (modified) (4 diffs)
• generic/include/ipc/irq.h (modified) (1 diff)
• generic/src/ipc/irq.c (modified) (2 diffs)

kernel/arch/ppc32/src/drivers/cuda.c

@@ -64 +64 @@
 static volatile uint8_t *cuda = NULL;
 static irq_t cuda_irq;          /**< Cuda's IRQ. */
-
-static ipc_notif_cfg_t saved_notif_cfg;
-
 
 static char lchars[0x80] = {
@@ -255 +252 @@
 static void cuda_irq_handler(irq_t *irq, void *arg, ...)
 {
-        if (irq->notif_cfg.answerbox)
+        if (irq->notif_cfg.notify && irq->notif_cfg.answerbox)
                 ipc_irq_send_notif(irq);
         else {
@@ -277 +274 @@
 void cuda_grab(void)
 {
-        if (cuda_irq.notif_cfg.answerbox) {
-                saved_notif_cfg = cuda_irq.notif_cfg;
-                cuda_irq.notif_cfg.answerbox = NULL;
-                cuda_irq.notif_cfg.code = NULL;
-                cuda_irq.notif_cfg.method = 0;
-                cuda_irq.notif_cfg.counter = 0;
-        }
+        cuda_irq.notif_cfg.notify = false;
 }
 
@@ -290 +281 @@
 void cuda_release(void)
 {
-        if (saved_notif_cfg.answerbox)
-                cuda_irq.notif_cfg = saved_notif_cfg;
+        if (cuda_irq.notif_cfg.answerbox)
+                cuda_irq.notif_cfg.notify = true;
 }
 

kernel/genarch/src/kbd/ns16550.c

@@ -62 +62 @@
 static irq_t ns16550_irq;
 
-static ipc_notif_cfg_t saved_notif_cfg;
-
 /*
  * These codes read from ns16550 data register are silently ignored.
@@ -88 +86 @@
                 (void) ns16550_rbr_read(&ns16550);
 
-        if (ns16550_irq.notif_cfg.answerbox) {
-                saved_notif_cfg = ns16550_irq.notif_cfg;
-                ns16550_irq.notif_cfg.answerbox = NULL;
-                ns16550_irq.notif_cfg.code = NULL;
-                ns16550_irq.notif_cfg.method = 0;
-                ns16550_irq.notif_cfg.counter = 0;
-        }
+        ns16550_irq.notif_cfg.notify = false;
 }
 
@@ -100 +92 @@
 void ns16550_release(void)
 {
-        if (saved_notif_cfg.answerbox)
-                ns16550_irq.notif_cfg = saved_notif_cfg;
+        if (ns16550_irq.notif_cfg.answerbox)
+                ns16550_irq.notif_cfg.notify = true;
 }
 
@@ -184 +176 @@
 
         if (ns16550_lsr_read(&ns16550) & LSR_DATA_READY) {
-                if (ns16550_irq.notif_cfg.answerbox) {
+                if (ns16550_irq.notif_cfg.notify && ns16550_irq.notif_cfg.answerbox) {
                         /*
                          * Send IPC notification.

kernel/genarch/src/kbd/z8530.c

@@ -63 +63 @@
 static irq_t z8530_irq;         /**< z8530's IRQ. */ 
 
-static ipc_notif_cfg_t saved_notif_cfg;
-
 static void z8530_suspend(chardev_t *);
 static void z8530_resume(chardev_t *);
@@ -92 +90 @@
         z8530_write_a(&z8530, WR9, WR9_MIE);            /* Master Interrupt Enable. */
         
-        if (z8530_irq.notif_cfg.answerbox) {
-                saved_notif_cfg = z8530_irq.notif_cfg;
-                z8530_irq.notif_cfg.answerbox = NULL;
-                z8530_irq.notif_cfg.code = NULL;
-                z8530_irq.notif_cfg.method = 0;
-                z8530_irq.notif_cfg.counter = 0;
-        }
+        z8530_irq.notif_cfg.notify = false;
 }
 
@@ -104 +96 @@
 void z8530_release(void)
 {
-        if (saved_notif_cfg.answerbox)
-                z8530_irq.notif_cfg = saved_notif_cfg;
+        if (z8530_irq.notif_cfg.answerbox)
+                z8530_irq.notif_cfg.notify = true;
 }
 
@@ -205 +197 @@
          * interrupt traps. Process the interrupt directly.
          */
-        if (irq->notif_cfg.answerbox)
+        if (irq->notif_cfg.notify && irq->notif_cfg.answerbox)
                 ipc_irq_send_notif(irq);
         else

kernel/generic/include/ipc/irq.h

@@ -79 +79 @@
  */
 struct ipc_notif_cfg {
+        bool notify;                    /**< When false, notifications are not sent. */
         answerbox_t *answerbox;         /**< Answerbox for notifications. */
         unative_t method;               /**< Method to be used for the notification. */

kernel/generic/src/ipc/irq.c

@@ -177 +177 @@
         if (irq) {
                 if (irq->notif_cfg.answerbox == box) {
-                        code_free(irq->notif_cfg.code);
+                        irq->notif_cfg.notify = false;
+                        irq->notif_cfg.answerbox = NULL;
                         irq->notif_cfg.code = NULL;
-                        irq->notif_cfg.answerbox = NULL;
                         irq->notif_cfg.method = 0;
                         irq->notif_cfg.counter = 0;
+                        code_free(irq->notif_cfg.code);
                         spinlock_unlock(&irq->lock);
                 }
@@ -227 +228 @@
         }
         
+        irq->notif_cfg.notify = true;
         irq->notif_cfg.answerbox = box;
         irq->notif_cfg.method = method;