[rtems commit] arm: Move type definition and prototypes

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    c04ac2ca4a03d574756a5ddd2ae097a518133251
Changeset: http://git.rtems.org/rtems/commit/?id=c04ac2ca4a03d574756a5ddd2ae097a518133251

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Jan  4 13:16:35 2013 +0100

arm: Move type definition and prototypes

---

 cpukit/score/cpu/arm/rtems/score/armv4.h |   10 ++++++++++
 cpukit/score/cpu/arm/rtems/score/cpu.h   |   10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cpukit/score/cpu/arm/rtems/score/armv4.h b/cpukit/score/cpu/arm/rtems/score/armv4.h
index 97f502d..022f0c1 100644
--- a/cpukit/score/cpu/arm/rtems/score/armv4.h
+++ b/cpukit/score/cpu/arm/rtems/score/armv4.h
@@ -27,6 +27,16 @@ void bsp_interrupt_dispatch( void );
 
 void _ARMV4_Exception_interrupt( void );
 
+typedef void arm_exc_abort_handler( arm_cpu_context *context );
+
+void arm_exc_data_abort_set_handler( arm_exc_abort_handler handler );
+
+void arm_exc_data_abort( void );
+
+void arm_exc_prefetch_abort_set_handler( arm_exc_abort_handler handler );
+
+void arm_exc_prefetch_abort( void );
+
 #endif /* ARM_MULTILIB_ARCH_V4 */
 
 #ifdef __cplusplus
diff --git a/cpukit/score/cpu/arm/rtems/score/cpu.h b/cpukit/score/cpu/arm/rtems/score/cpu.h
index 935dcd2..82bad38 100644
--- a/cpukit/score/cpu/arm/rtems/score/cpu.h
+++ b/cpukit/score/cpu/arm/rtems/score/cpu.h
@@ -510,8 +510,6 @@ typedef struct {
   uint32_t cpsr;
 } arm_cpu_context;
 
-typedef void arm_exc_abort_handler( arm_cpu_context *context );
-
 typedef enum {
   ARM_EXCEPTION_RESET = 0,
   ARM_EXCEPTION_UNDEF = 1,
@@ -558,14 +556,6 @@ static inline void arm_status_restore( uint32_t psr )
   RTEMS_COMPILER_MEMORY_BARRIER();
 }
 
-void arm_exc_data_abort_set_handler( arm_exc_abort_handler handler );
-
-void arm_exc_data_abort( void );
-
-void arm_exc_prefetch_abort_set_handler( arm_exc_abort_handler handler );
-
-void arm_exc_prefetch_abort( void );
-
 /** @} */
 
 /* XXX This is out of date */