Changeset c2417bc in mainline for kernel/arch/ppc32/src/interrupt.c

Timestamp:

2009-04-21T12:46:26Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

f2d2c7ba

Parents:

44b7783

Message:

change the way how input devices are wired together according to ticket #44
(also the proposal ​http://lists.modry.cz/cgi-bin/private/helenos-devel/2009-March/002507.html)

File:

• kernel/arch/ppc32/src/interrupt.c (modified) (3 diffs)

kernel/arch/ppc32/src/interrupt.c

@@ -61 +61 @@
         
         while ((inum = pic_get_pending()) != -1) {
-                bool ack = false;
                 irq_t *irq = irq_dispatch_and_lock(inum);
                 if (irq) {
@@ -70 +69 @@
                         if (irq->preack) {
                                 /* Acknowledge the interrupt before processing */
-                                pic_ack_interrupt(inum);
-                                ack = true;
+                                if (irq->cir)
+                                        irq->cir(irq->cir_arg, irq->inr);
                         }
                         
                         irq->handler(irq);
+                        
+                        if (!irq->preack) {
+                                if (irq->cir)
+                                        irq->cir(irq->cir_arg, irq->inr);
+                        }
+                        
                         spinlock_unlock(&irq->lock);
                 } else {
@@ -84 +89 @@
 #endif
                 }
-                
-                if (!ack)
-                        pic_ack_interrupt(inum);
         }
 }