From e377ad7d621f9b278a29dbbff25b915a40e6073b Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Mon, 7 Jan 2013 08:48:45 +0100
Subject: arm: Include <rtems/score/cpu.h>

---
 cpukit/score/cpu/arm/armv7m-context-initialize.c         | 3 +--
 cpukit/score/cpu/arm/armv7m-context-restore.c            | 3 +--
 cpukit/score/cpu/arm/armv7m-context-switch.c             | 3 +--
 cpukit/score/cpu/arm/armv7m-exception-handler-get.c      | 3 +--
 cpukit/score/cpu/arm/armv7m-exception-handler-set.c      | 4 +---
 cpukit/score/cpu/arm/armv7m-exception-priority-get.c     | 4 +---
 cpukit/score/cpu/arm/armv7m-exception-priority-handler.c | 4 +---
 cpukit/score/cpu/arm/armv7m-exception-priority-set.c     | 4 +---
 cpukit/score/cpu/arm/armv7m-initialize.c                 | 4 +---
 cpukit/score/cpu/arm/armv7m-isr-dispatch.c               | 3 +--
 cpukit/score/cpu/arm/armv7m-isr-enter-leave.c            | 3 +--
 cpukit/score/cpu/arm/armv7m-isr-level-get.c              | 4 +---
 cpukit/score/cpu/arm/armv7m-isr-level-set.c              | 4 +---
 cpukit/score/cpu/arm/armv7m-isr-vector-install.c         | 3 +--
 cpukit/score/cpu/arm/armv7m-multitasking-start-stop.c    | 4 +---
 cpukit/score/cpu/arm/rtems/score/armv7m.h                | 7 +++++--
 16 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/cpukit/score/cpu/arm/armv7m-context-initialize.c b/cpukit/score/cpu/arm/armv7m-context-initialize.c
index 640adae03d..892df4d8c8 100644
--- a/cpukit/score/cpu/arm/armv7m-context-initialize.c
+++ b/cpukit/score/cpu/arm/armv7m-context-initialize.c
@@ -24,12 +24,11 @@
 
 #include <string.h>
 
+#include <rtems/score/armv7m.h>
 #include <rtems/score/thread.h>
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 
-#include <rtems/score/armv7m.h>
-
 void _CPU_Context_Initialize(
   Context_Control *context,
   void *stack_area_begin,
diff --git a/cpukit/score/cpu/arm/armv7m-context-restore.c b/cpukit/score/cpu/arm/armv7m-context-restore.c
index 477904953b..a9afdf37e0 100644
--- a/cpukit/score/cpu/arm/armv7m-context-restore.c
+++ b/cpukit/score/cpu/arm/armv7m-context-restore.c
@@ -22,12 +22,11 @@
   #include "config.h"
 #endif
 
+#include <rtems/score/armv7m.h>
 #include <rtems/score/percpu.h>
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 
-#include <rtems/score/armv7m.h>
-
 void __attribute__((naked)) _CPU_Context_restore(
   Context_Control *heir
 )
diff --git a/cpukit/score/cpu/arm/armv7m-context-switch.c b/cpukit/score/cpu/arm/armv7m-context-switch.c
index 0fd3c206d0..9814ed07a1 100644
--- a/cpukit/score/cpu/arm/armv7m-context-switch.c
+++ b/cpukit/score/cpu/arm/armv7m-context-switch.c
@@ -22,12 +22,11 @@
   #include "config.h"
 #endif
 
+#include <rtems/score/armv7m.h>
 #include <rtems/score/percpu.h>
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 
-#include <rtems/score/armv7m.h>
-
 void __attribute__((naked)) _CPU_Context_switch(
   Context_Control *executing,
   Context_Control *heir
diff --git a/cpukit/score/cpu/arm/armv7m-exception-handler-get.c b/cpukit/score/cpu/arm/armv7m-exception-handler-get.c
index cf25cafe77..cf100778b8 100644
--- a/cpukit/score/cpu/arm/armv7m-exception-handler-get.c
+++ b/cpukit/score/cpu/arm/armv7m-exception-handler-get.c
@@ -22,12 +22,11 @@
   #include "config.h"
 #endif
 
+#include <rtems/score/armv7m.h>
 #include <rtems/score/cpu.h>
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 
-#include <rtems/score/armv7m.h>
-
 ARMV7M_Exception_handler _ARMV7M_Get_exception_handler( int index )
 {
   return _ARMV7M_SCB->vtor [index];
diff --git a/cpukit/score/cpu/arm/armv7m-exception-handler-set.c b/cpukit/score/cpu/arm/armv7m-exception-handler-set.c
index ea3fce3ca5..0de3a222c0 100644
--- a/cpukit/score/cpu/arm/armv7m-exception-handler-set.c
+++ b/cpukit/score/cpu/arm/armv7m-exception-handler-set.c
@@ -22,12 +22,10 @@
   #include "config.h"
 #endif
 
-#include <rtems/score/cpu.h>
+#include <rtems/score/armv7m.h>
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 
-#include <rtems/score/armv7m.h>
-
 void _ARMV7M_Set_exception_handler(
   int index,
   ARMV7M_Exception_handler handler
diff --git a/cpukit/score/cpu/arm/armv7m-exception-priority-get.c b/cpukit/score/cpu/arm/armv7m-exception-priority-get.c
index 79224e184f..6a1df1df43 100644
--- a/cpukit/score/cpu/arm/armv7m-exception-priority-get.c
+++ b/cpukit/score/cpu/arm/armv7m-exception-priority-get.c
@@ -21,12 +21,10 @@
   #include "config.h"
 #endif
 
-#include <rtems/score/cpu.h>
+#include <rtems/score/armv7m.h>
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 
-#include <rtems/score/armv7m.h>
-
 int _ARMV7M_Get_exception_priority( int vector )
 {
   if ( _ARMV7M_Is_vector_an_irq( vector ) ) {
diff --git a/cpukit/score/cpu/arm/armv7m-exception-priority-handler.c b/cpukit/score/cpu/arm/armv7m-exception-priority-handler.c
index de0b020f23..7b3ff50dbe 100644
--- a/cpukit/score/cpu/arm/armv7m-exception-priority-handler.c
+++ b/cpukit/score/cpu/arm/armv7m-exception-priority-handler.c
@@ -22,12 +22,10 @@
   #include "config.h"
 #endif
 
-#include <rtems/score/cpu.h>
+#include <rtems/score/armv7m.h>
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 
-#include <rtems/score/armv7m.h>
-
 void _ARMV7M_Set_exception_priority_and_handler(
   int index,
   int priority,
diff --git a/cpukit/score/cpu/arm/armv7m-exception-priority-set.c b/cpukit/score/cpu/arm/armv7m-exception-priority-set.c
index 085ce2dd96..76dd6d3d7f 100644
--- a/cpukit/score/cpu/arm/armv7m-exception-priority-set.c
+++ b/cpukit/score/cpu/arm/armv7m-exception-priority-set.c
@@ -22,12 +22,10 @@
   #include "config.h"
 #endif
 
-#include <rtems/score/cpu.h>
+#include <rtems/score/armv7m.h>
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 
-#include <rtems/score/armv7m.h>
-
 void _ARMV7M_Set_exception_priority( int vector, int priority )
 {
   if ( _ARMV7M_Is_vector_an_irq( vector ) ) {
diff --git a/cpukit/score/cpu/arm/armv7m-initialize.c b/cpukit/score/cpu/arm/armv7m-initialize.c
index cb3c19656d..236a0970e9 100644
--- a/cpukit/score/cpu/arm/armv7m-initialize.c
+++ b/cpukit/score/cpu/arm/armv7m-initialize.c
@@ -22,12 +22,10 @@
   #include "config.h"
 #endif
 
-#include <rtems/score/cpu.h>
+#include <rtems/score/armv7m.h>
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 
-#include <rtems/score/armv7m.h>
-
 void _CPU_Initialize( void )
 {
   /*
diff --git a/cpukit/score/cpu/arm/armv7m-isr-dispatch.c b/cpukit/score/cpu/arm/armv7m-isr-dispatch.c
index 7c2cd7370c..3cfe7d7ca5 100644
--- a/cpukit/score/cpu/arm/armv7m-isr-dispatch.c
+++ b/cpukit/score/cpu/arm/armv7m-isr-dispatch.c
@@ -22,12 +22,11 @@
   #include "config.h"
 #endif
 
+#include <rtems/score/armv7m.h>
 #include <rtems/score/percpu.h>
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 
-#include <rtems/score/armv7m.h>
-
 static void __attribute__((naked)) _ARMV7M_Thread_dispatch( void )
 {
   __asm__ volatile (
diff --git a/cpukit/score/cpu/arm/armv7m-isr-enter-leave.c b/cpukit/score/cpu/arm/armv7m-isr-enter-leave.c
index 1bce10ae77..5af0a8120d 100644
--- a/cpukit/score/cpu/arm/armv7m-isr-enter-leave.c
+++ b/cpukit/score/cpu/arm/armv7m-isr-enter-leave.c
@@ -22,12 +22,11 @@
   #include "config.h"
 #endif
 
+#include <rtems/score/armv7m.h>
 #include <rtems/score/thread.h>
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 
-#include <rtems/score/armv7m.h>
-
 void _ARMV7M_Interrupt_service_enter( void )
 {
   ++_Thread_Dispatch_disable_level;
diff --git a/cpukit/score/cpu/arm/armv7m-isr-level-get.c b/cpukit/score/cpu/arm/armv7m-isr-level-get.c
index 887e30843d..7ba13ac111 100644
--- a/cpukit/score/cpu/arm/armv7m-isr-level-get.c
+++ b/cpukit/score/cpu/arm/armv7m-isr-level-get.c
@@ -22,12 +22,10 @@
   #include "config.h"
 #endif
 
-#include <rtems/score/cpu.h>
+#include <rtems/score/armv7m.h>
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 
-#include <rtems/score/armv7m.h>
-
 uint32_t _CPU_ISR_Get_level( void )
 {
   return 0;
diff --git a/cpukit/score/cpu/arm/armv7m-isr-level-set.c b/cpukit/score/cpu/arm/armv7m-isr-level-set.c
index 2f4c36312e..81cb9fdbd3 100644
--- a/cpukit/score/cpu/arm/armv7m-isr-level-set.c
+++ b/cpukit/score/cpu/arm/armv7m-isr-level-set.c
@@ -22,12 +22,10 @@
   #include "config.h"
 #endif
 
-#include <rtems/score/cpu.h>
+#include <rtems/score/armv7m.h>
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 
-#include <rtems/score/armv7m.h>
-
 void _CPU_ISR_Set_level( uint32_t level )
 {
   _ARMV7M_Set_basepri( 0 );
diff --git a/cpukit/score/cpu/arm/armv7m-isr-vector-install.c b/cpukit/score/cpu/arm/armv7m-isr-vector-install.c
index 82b8e02e2b..ef813e318b 100644
--- a/cpukit/score/cpu/arm/armv7m-isr-vector-install.c
+++ b/cpukit/score/cpu/arm/armv7m-isr-vector-install.c
@@ -22,12 +22,11 @@
   #include "config.h"
 #endif
 
+#include <rtems/score/armv7m.h>
 #include <rtems/score/isr.h>
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 
-#include <rtems/score/armv7m.h>
-
 void _CPU_ISR_install_vector(
   uint32_t vector,
   proc_ptr new_handler,
diff --git a/cpukit/score/cpu/arm/armv7m-multitasking-start-stop.c b/cpukit/score/cpu/arm/armv7m-multitasking-start-stop.c
index d27bf8b009..f3e96e343c 100644
--- a/cpukit/score/cpu/arm/armv7m-multitasking-start-stop.c
+++ b/cpukit/score/cpu/arm/armv7m-multitasking-start-stop.c
@@ -22,12 +22,10 @@
   #include "config.h"
 #endif
 
-#include <rtems/score/cpu.h>
+#include <rtems/score/armv7m.h>
 
 #ifdef ARM_MULTILIB_ARCH_V7M
 
-#include <rtems/score/armv7m.h>
-
 void __attribute__((naked)) _ARMV7M_Start_multitasking(
   Context_Control *bsp,
   Context_Control *heir
diff --git a/cpukit/score/cpu/arm/rtems/score/armv7m.h b/cpukit/score/cpu/arm/rtems/score/armv7m.h
index 62f69ff490..c8b55c1bfe 100644
--- a/cpukit/score/cpu/arm/rtems/score/armv7m.h
+++ b/cpukit/score/cpu/arm/rtems/score/armv7m.h
@@ -15,13 +15,14 @@
 #ifndef RTEMS_SCORE_ARMV7M_H
 #define RTEMS_SCORE_ARMV7M_H
 
-#include <stdint.h>
-#include <stdbool.h>
+#include <rtems/score/cpu.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
+#ifdef ARM_MULTILIB_ARCH_V7M
+
 typedef struct {
   uint32_t reserved_0;
   uint32_t ictr;
@@ -475,6 +476,8 @@ void _ARMV7M_Pendable_service_call( void );
 
 void _ARMV7M_Supervisor_call( void );
 
+#endif /* ARM_MULTILIB_ARCH_V7M */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
-- 
cgit v1.2.3