Changeset 208b5f5 in mainline for kernel/genarch/src/drivers/grlib/irqmp.c

Timestamp:

2013-12-29T14:32:55Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

4c14b88, 6fa9a99d, 9be30cdf, aacdb8e

Parents:

2a13328

Message:

cherrypick important fixes and updates from lp:~jceel/helenos/leon3

File:

• kernel/genarch/src/drivers/grlib/irqmp.c (modified) (4 diffs)

kernel/genarch/src/drivers/grlib/irqmp.c

@@ -44 +44 @@
             PAGE_NOT_CACHEABLE);
         
+        /* Clear all pending interrupts */
+        pio_write_32(&irqc->regs->clear, 0xffffffff);
+        
         /* Mask all interrupts */
-        pio_write_32((void *) irqc->regs + GRLIB_IRQMP_MASK_OFFSET, 0x8);
+        pio_write_32((void *) irqc->regs + GRLIB_IRQMP_MASK_OFFSET, 0);
 }
 
@@ -62 +65 @@
 void grlib_irqmp_clear(grlib_irqmp_t *irqc, unsigned int inum)
 {
-        inum++;
         pio_write_32(&irqc->regs->clear, (1 << inum));
 }
@@ -71 +73 @@
             GRLIB_IRQMP_MASK_OFFSET);
         
-        src++;
         mask &= ~(1 << src);
-        
         pio_write_32((void *) irqc->regs + GRLIB_IRQMP_MASK_OFFSET, mask);
 }
@@ -82 +82 @@
             GRLIB_IRQMP_MASK_OFFSET);
         
-        src++;
         mask |= (1 << src);
-        
         pio_write_32((void *) irqc->regs + GRLIB_IRQMP_MASK_OFFSET, mask);
 }