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

Timestamp:

2013-12-27T18:18:13Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

f6f22cdb

Parents:

96b9724

Message:

code review
coding style changes, removal of debugging prints
simplify directory structure

File:

• kernel/genarch/src/drivers/grlib/irqmp.c (moved) (moved from kernel/genarch/src/drivers/grlib_irqmp/grlib_irqmp.c ) (3 diffs)

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

@@ -35 +35 @@
  */
 
-#include <genarch/drivers/grlib_irqmp/grlib_irqmp.h>
+#include <genarch/drivers/grlib/irqmp.h>
 #include <arch/asm.h>
 #include <mm/km.h>
@@ -43 +43 @@
         irqc->regs = (void *) km_map(bootinfo->intc_base, PAGE_SIZE,
             PAGE_NOT_CACHEABLE);
-
-        printf("irqmp regs: %p\n", irqc->regs);
-
+        
         /* Mask all interrupts */
-        pio_write_32((void *)irqc->regs + GRLIB_IRQMP_MASK_OFFSET, 0x8);
+        pio_write_32((void *) irqc->regs + GRLIB_IRQMP_MASK_OFFSET, 0x8);
 }
 
 int grlib_irqmp_inum_get(grlib_irqmp_t *irqc)
 {
-        int i;
         uint32_t pending = pio_read_32(&irqc->regs->pending);
-
-        for (i = 1; i < 16; i++) {
+        
+        for (unsigned int i = 1; i < 16; i++) {
                 if (pending & (1 << i))
                         return i;
         }
-
+        
         return -1;
 }
 
-void grlib_irqmp_clear(grlib_irqmp_t *irqc, int inum)
+void grlib_irqmp_clear(grlib_irqmp_t *irqc, unsigned int inum)
 {
         inum++;
@@ -69 +66 @@
 }
 
-void grlib_irqmp_mask(grlib_irqmp_t *irqc, int src)
+void grlib_irqmp_mask(grlib_irqmp_t *irqc, unsigned 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)
+void grlib_irqmp_unmask(grlib_irqmp_t *irqc, unsigned 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);
 }