Changeset 0e796cc in mainline

Timestamp:

2010-07-15T09:01:49Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

41ce4d9

Parents:

bd11d3e

Message:

Allow different number of IRQs for each arm machine.

Location:

kernel/arch/arm32

Files:

• include/mach/gta02/gta02.h (modified) (1 diff)
• include/mach/integratorcp/integratorcp.h (modified) (1 diff)
• include/mach/testarm/testarm.h (modified) (1 diff)
• include/machine_func.h (modified) (1 diff)
• src/interrupt.c (modified) (2 diffs)
• src/mach/testarm/testarm.c (modified) (1 diff)
• src/machine_func.c (modified) (1 diff)

kernel/arch/arm32/include/mach/gta02/gta02.h

@@ -43 +43 @@
 extern struct arm_machine_ops gta02_machine_ops;
 
+/** Size of GTA02 IRQ number range (starting from 0) */
+#define GTA02_IRQ_COUNT 32
+
 #endif
 

kernel/arch/arm32/include/mach/integratorcp/integratorcp.h

@@ -108 +108 @@
 extern struct arm_machine_ops icp_machine_ops;
 
+/** Size of IntegratorCP IRQ number range (starting from 0) */
+#define ICP_IRQ_COUNT 8
+
 #endif
 

kernel/arch/arm32/include/mach/testarm/testarm.h

@@ -42 +42 @@
 #include <arch/machine_func.h>
 
-/** Last interrupt number (beginning from 0) whose status is probed
- * from interrupt controller
- */
-#define GXEMUL_IRQC_MAX_IRQ  8
-#define GXEMUL_KBD_IRQ       2
-#define GXEMUL_TIMER_IRQ     4
+/** Size of GXemul IRQ number range (starting from 0) */
+#define GXEMUL_IRQ_COUNT        32
+#define GXEMUL_KBD_IRQ          2
+#define GXEMUL_TIMER_IRQ        4
 
 /** Timer frequency */

kernel/arch/arm32/include/machine_func.h

@@ -104 +104 @@
 extern void machine_input_init(void);
 
+extern size_t machine_get_irq_count(void);
+
 #endif
 

kernel/arch/arm32/src/interrupt.c

@@ -40 +40 @@
 #include <ddi/device.h>
 #include <interrupt.h>
-
-/** Initial size of a table holding interrupt handlers. */
-#define IRQ_COUNT 8
 
 /** Disable interrupts.
@@ -105 +102 @@
 void interrupt_init(void)
 {
-        irq_init(IRQ_COUNT, IRQ_COUNT);
+        size_t irq_count;
+
+        irq_count = machine_get_irq_count();
+        irq_init(irq_count, irq_count);
+
         machine_timer_irq_start();
 }

kernel/arch/arm32/src/mach/testarm/testarm.c

@@ -211 +211 @@
         unsigned int i;
 
-        for (i = 0; i < GXEMUL_IRQC_MAX_IRQ; i++) {
+        for (i = 0; i < GXEMUL_IRQ_COUNT; i++) {
                 if (sources & (1 << i)) {
                         irq_t *irq = irq_dispatch_and_lock(i);

kernel/arch/arm32/src/machine_func.c

@@ -125 +125 @@
 }
 
+/** Get IRQ number range used by machine. */
+size_t machine_get_irq_count(void)
+{
+        size_t irq_count;
+ 
+#if defined(MACHINE_gta02)
+        irq_count = GTA02_IRQ_COUNT;
+#elif defined(MACHINE_testarm)
+        irq_count = GXEMUL_IRQ_COUNT;
+#elif defined(MACHINE_integratorcp)
+        irq_count = ICP_IRQ_COUNT;
+#else
+#error Machine type not defined.
+#endif
+        return irq_count;
+}
+
 /** @}
  */