Changeset 571addd in mainline for kernel/arch/arm32/src/machine_func.c

Timestamp:

2010-07-27T21:42:47Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

69a60c4

Parents:

5a9f4d7 (diff), 1720cf9 (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 from lp:~jsvoboda/helenos/gta02.

File:

• kernel/arch/arm32/src/machine_func.c (modified) (1 diff)

kernel/arch/arm32/src/machine_func.c

@@ -128 +128 @@
 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;
+        return (machine_ops->machine_get_irq_count)();
 }