Changeset 5ac77cc in mainline

Timestamp:

2010-06-20T15:08:35Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

66fcba2

Parents:

25c97174

Message:

Remove more machine-dependent includes.

Location:

kernel/arch/arm32/src

Files:

• exception.c (modified) (2 diffs)
• interrupt.c (modified) (1 diff)
• mm/frame.c (modified) (1 diff)

kernel/arch/arm32/src/exception.c

@@ -37 +37 @@
 #include <arch/memstr.h>
 #include <arch/regutils.h>
+#include <arch/machine_func.h>
 #include <interrupt.h>
 #include <arch/mm/page_fault.h>
@@ -43 +44 @@
 #include <syscall/syscall.h>
 #include <stacktrace.h>
-
-#ifdef MACHINE_testarm
-        #include <arch/mach/testarm/testarm.h>
-#endif
-
-#ifdef MACHINE_integratorcp
-        #include <arch/mach/integratorcp/integratorcp.h>
-#endif
 
 /** Offset used in calculation of exception handler's relative address.

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. */

kernel/arch/arm32/src/mm/frame.c

@@ -36 +36 @@
 #include <mm/frame.h>
 #include <arch/mm/frame.h>
+#include <arch/machine_func.h>
 #include <config.h>
-
-#ifdef MACHINE_testarm
-        #include <arch/mach/testarm/testarm.h>
-#endif
-
-#ifdef MACHINE_integratorcp
-        #include <arch/mach/integratorcp/integratorcp.h>
-#endif
 
 /** Address of the last frame in the memory. */