Changeset e47ed05 in mainline for kernel/genarch/include

Timestamp:

2013-12-27T18:18:13Z (12 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

Location:

kernel/genarch/include/genarch/drivers/grlib

Files:

• irqmp.h (moved) (moved from kernel/genarch/include/genarch/drivers/grlib_irqmp/grlib_irqmp.h ) (3 diffs)
• uart.h (moved) (moved from kernel/genarch/include/genarch/drivers/grlib_uart/grlib_uart.h ) (1 diff)

kernel/genarch/include/genarch/drivers/grlib/irqmp.h

@@ -41 +41 @@
 #include <arch.h>
 
-#define GRLIB_IRQMP_MASK_OFFSET         0x40
-#define GRLIB_IRQMP_FORCE_OFFSET        0x80
+#define GRLIB_IRQMP_MASK_OFFSET   0x40
+#define GRLIB_IRQMP_FORCE_OFFSET  0x80
 
 /** IRQMP registers */
@@ -56 +56 @@
 /** LEON3 interrupt assignments */
 enum grlib_irq_source {
-        GRLIB_INT_AHBERROR      = 1,
-        GRLIB_INT_UART1         = 2,
-        GRLIB_INT_PCIDMA        = 4,
-        GRLIB_INT_CAN           = 5,
-        GRLIB_INT_TIMER0        = 6,
-        GRLIB_INT_TIMER1        = 7,
-        GRLIB_INT_TIMER2        = 8,
-        GRLIB_INT_TIMER3        = 9,
-        GRLIB_INT_ETHERNET      = 14
+        GRLIB_INT_AHBERROR = 1,
+        GRLIB_INT_UART1    = 2,
+        GRLIB_INT_PCIDMA   = 4,
+        GRLIB_INT_CAN      = 5,
+        GRLIB_INT_TIMER0   = 6,
+        GRLIB_INT_TIMER1   = 7,
+        GRLIB_INT_TIMER2   = 8,
+        GRLIB_INT_TIMER3   = 9,
+        GRLIB_INT_ETHERNET = 14
 };
 
@@ -73 +73 @@
 extern void grlib_irqmp_init(grlib_irqmp_t *, bootinfo_t *);
 extern int grlib_irqmp_inum_get(grlib_irqmp_t *);
-extern void grlib_irqmp_clear(grlib_irqmp_t *, int);
-extern void grlib_irqmp_mask(grlib_irqmp_t *, int);
-extern void grlib_irqmp_unmask(grlib_irqmp_t *, int);
+extern void grlib_irqmp_clear(grlib_irqmp_t *, unsigned int);
+extern void grlib_irqmp_mask(grlib_irqmp_t *, unsigned int);
+extern void grlib_irqmp_unmask(grlib_irqmp_t *, unsigned int);
 
 #endif

kernel/genarch/include/genarch/drivers/grlib/uart.h

@@ -97 +97 @@
 } grlib_uart_t;
 
-extern outdev_t *grlib_uart_init(uintptr_t, inr_t inr);
+extern outdev_t *grlib_uart_init(uintptr_t, inr_t);
 extern void grlib_uart_input_wire(grlib_uart_t *,
     indev_t *);