From f2a0e221bf917cccd39dd2eefee36fab7ac2d0d6 Mon Sep 17 00:00:00 2001
From: tojo <tobias.johansson@arccore.com>
Date: Wed, 1 Dec 2010 14:26:23 +0100
Subject: [PATCH] Inclusion fixes for CM3 kernel

---
 arch/arm/arm_cm3/kernel/arch.c      |  1 -
 arch/arm/arm_cm3/kernel/core_cm3.h  | 30 +++++++++++++++--------------
 arch/arm/arm_cm3/kernel/irq.c       |  1 -
 arch/arm/arm_cm3/kernel/irq_types.h |  2 ++
 arch/arm/arm_cm3/kernel/sys_tick.c  |  1 -
 common/newlib_port.c                |  2 +-
 include/arm/Cpu.h                   |  2 +-
 7 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/arch/arm/arm_cm3/kernel/arch.c b/arch/arm/arm_cm3/kernel/arch.c
index 9fbb279f..4e71d30e 100644
--- a/arch/arm/arm_cm3/kernel/arch.c
+++ b/arch/arm/arm_cm3/kernel/arch.c
@@ -16,7 +16,6 @@
 #include "internal.h"
 #include "stack.h"
 #include "stm32f10x.h"
-#include "core_cm3.h"
 
 
 /**
diff --git a/arch/arm/arm_cm3/kernel/core_cm3.h b/arch/arm/arm_cm3/kernel/core_cm3.h
index cd422113..270883df 100644
--- a/arch/arm/arm_cm3/kernel/core_cm3.h
+++ b/arch/arm/arm_cm3/kernel/core_cm3.h
@@ -22,20 +22,6 @@
 
 #ifndef __CM3_CORE_H__
 #define __CM3_CORE_H__
-#include "stm32f10x.h"
-
-static inline unsigned long _Irq_Save(void)
-{
-   unsigned long val = __get_PRIMASK();
-   Irq_Disable();
-   return val;
-}
-
-/*-----------------------------------------------------------------*/
-
-static inline void _Irq_Restore(unsigned mask) {
-	__set_PRIMASK(mask);
-}
 
 
 
@@ -1377,6 +1363,22 @@ static __INLINE uint32_t ITM_SendChar (uint32_t ch)
   return (ch);
 }
 
+/* ---  Arctic Core --- */
+
+static inline unsigned long _Irq_Save(void)
+{
+   unsigned long val = __get_PRIMASK();
+   __disable_irq();
+   return val;
+}
+
+
+static inline void _Irq_Restore(unsigned mask) {
+	__set_PRIMASK(mask);
+}
+
+
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/arch/arm/arm_cm3/kernel/irq.c b/arch/arm/arm_cm3/kernel/irq.c
index 67dcad99..172f798e 100644
--- a/arch/arm/arm_cm3/kernel/irq.c
+++ b/arch/arm/arm_cm3/kernel/irq.c
@@ -18,7 +18,6 @@
 #include "hooks.h"
 #include "stm32f10x.h"
 #include "irq.h"
-#include "core_cm3.h"
 
 extern void *Irq_VectorTable[NUMBER_OF_INTERRUPTS_AND_EXCEPTIONS];
 
diff --git a/arch/arm/arm_cm3/kernel/irq_types.h b/arch/arm/arm_cm3/kernel/irq_types.h
index 2d5461ee..46c1b326 100644
--- a/arch/arm/arm_cm3/kernel/irq_types.h
+++ b/arch/arm/arm_cm3/kernel/irq_types.h
@@ -25,6 +25,8 @@ typedef IRQn_Type IrqType;
  */
 #define IRQ_INTERRUPT_OFFSET  16
 
+#define Irq_SOI()
+
 /* Total number of interrupts and exceptions
  */
 
diff --git a/arch/arm/arm_cm3/kernel/sys_tick.c b/arch/arm/arm_cm3/kernel/sys_tick.c
index b600dd24..0c060e91 100644
--- a/arch/arm/arm_cm3/kernel/sys_tick.c
+++ b/arch/arm/arm_cm3/kernel/sys_tick.c
@@ -16,7 +16,6 @@
 #include "Os.h"
 #include "internal.h"
 #include "stm32f10x.h"
-#include "core_cm3.h"
 #include "irq.h"
 #include "arc.h"
 
diff --git a/common/newlib_port.c b/common/newlib_port.c
index 28d7a11c..58e9ae7f 100644
--- a/common/newlib_port.c
+++ b/common/newlib_port.c
@@ -26,7 +26,7 @@
 
 #if defined(CFG_ARM_CM3)
 #include "irq_types.h"
-#include "core_cm3.h"
+#include "stm32f10x.h"
 #endif
 
 #ifdef USE_TTY_TCF_STREAMS
diff --git a/include/arm/Cpu.h b/include/arm/Cpu.h
index 08fc96c6..453c1765 100644
--- a/include/arm/Cpu.h
+++ b/include/arm/Cpu.h
@@ -19,7 +19,7 @@
 #include <stdint.h>
 
 #if defined(CFG_ARM_CM3)
-#include "core_cm3.h"
+#include "stm32f10x.h"
 #elif defined(CFG_ARM_CR4)
 #include "core_cr4.h"
 #endif
-- 
2.39.2