Changeset c621f4aa in mainline for kernel/arch/arm32/src/interrupt.c

Timestamp:

2010-07-25T10:11:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline.

File:

• kernel/arch/arm32/src/interrupt.c (modified) (3 diffs)

kernel/arch/arm32/src/interrupt.c

@@ -36 +36 @@
 #include <arch/asm.h>
 #include <arch/regutils.h>
+#include <arch/machine_func.h>
 #include <ddi/irq.h>
 #include <ddi/device.h>
 #include <interrupt.h>
-
-#ifdef MACHINE_testarm
-        #include <arch/mach/testarm/testarm.h>
-#endif
-
-#ifdef MACHINE_integratorcp
-        #include <arch/mach/integratorcp/integratorcp.h>
-#endif
-
-/** Initial size of a table holding interrupt handlers. */
-#define IRQ_COUNT 8
 
 /** Disable interrupts.
@@ -97 +87 @@
 }
 
+/** Check interrupts state.
+ *
+ * @return True if interrupts are disabled.
+ *
+ */
+bool interrupts_disabled(void)
+{
+        return current_status_reg_read() & STATUS_REG_IRQ_DISABLED_BIT;
+}
+
 /** Initialize basic tables for exception dispatching
  * and starts the timer.
@@ -102 +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();
 }