Changeset d783145 in mainline for kernel/genarch/src/drivers/grlib_irqmp/grlib_irqmp.c

Timestamp:

2013-10-20T21:51:39Z (11 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

817d939

Parents:

13c94f7

Message:

Finally plug in IRQMP and UART kernel drivers.

File:

• kernel/genarch/src/drivers/grlib_irqmp/grlib_irqmp.c (modified) (3 diffs)

kernel/genarch/src/drivers/grlib_irqmp/grlib_irqmp.c

@@ -45 +45 @@
             PAGE_NOT_CACHEABLE);
 
+        printf("irqmp regs: %p\n", irqc->regs);
+
         /* Mask all interrupts */
-        pio_write_32((void *)&irqc->regs + GRLIB_IRQMP_MASK_OFFSET, 0);
+        pio_write_32((void *)irqc->regs + GRLIB_IRQMP_MASK_OFFSET, 0);
 }
 
@@ -64 +66 @@
 void grlib_irqmp_clear(grlib_irqmp_t *irqc, int inum)
 {
+        inum++;
         pio_write_32(&irqc->regs->clear, (1 << inum));
 }
@@ -69 +72 @@
 void grlib_irqmp_mask(grlib_irqmp_t *irqc, int src)
 {
-        uint32_t mask = pio_read_32((void *)&irqc->regs + GRLIB_IRQMP_MASK_OFFSET);
+        uint32_t mask = pio_read_32((void *)irqc->regs + GRLIB_IRQMP_MASK_OFFSET);
 
+        src++;
         mask &= ~(1 << src);
 
-        pio_write_32((void *)&irqc->regs + GRLIB_IRQMP_MASK_OFFSET, mask);
+        pio_write_32((void *)irqc->regs + GRLIB_IRQMP_MASK_OFFSET, mask);
 }
 
 void grlib_irqmp_unmask(grlib_irqmp_t *irqc, int src)
 {
-        uint32_t mask = pio_read_32((void *)&irqc->regs + GRLIB_IRQMP_MASK_OFFSET);
+        uint32_t mask = pio_read_32((void *)irqc->regs + GRLIB_IRQMP_MASK_OFFSET);
 
+        src++;
         mask |= (1 << src);
 
-        pio_write_32((void *)&irqc->regs + GRLIB_IRQMP_MASK_OFFSET, mask);
+        pio_write_32((void *)irqc->regs + GRLIB_IRQMP_MASK_OFFSET, mask);
 }