From a553bca00f380e9e099dbe422e0c5206fb263164 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sun, 26 Jun 2011 11:03:44 +0000
Subject: Fixed conflicts with EWARM 6.20.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3086 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/platforms/LPC13xx/core_cm3.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/os/hal/platforms/LPC13xx/core_cm3.h b/os/hal/platforms/LPC13xx/core_cm3.h
index 387221bc6..fbffa91dc 100644
--- a/os/hal/platforms/LPC13xx/core_cm3.h
+++ b/os/hal/platforms/LPC13xx/core_cm3.h
@@ -20,7 +20,7 @@
 
 /*
  * Parts of this files have been modified in ChibiOS/RT in order to fix
- * some code quality issues.
+ * some code quality issues and conflicting declarations.
  */
 
 /**************************************************************************//**
@@ -1106,7 +1106,7 @@ static __INLINE  void __CLREX()                   { __ASM ("clrex"); }
  *
  * Return the actual process stack pointer
  */
-extern uint32_t __get_PSP(void);
+//extern uint32_t __get_PSP(void);
 
 /**
  * @brief  Set the Process Stack Pointer
@@ -1116,7 +1116,7 @@ extern uint32_t __get_PSP(void);
  * Assign the value ProcessStackPointer to the MSP 
  * (process stack pointer) Cortex processor register
  */
-extern void __set_PSP(uint32_t topOfProcStack);
+//extern void __set_PSP(uint32_t topOfProcStack);
 
 /**
  * @brief  Return the Main Stack Pointer
@@ -1126,7 +1126,7 @@ extern void __set_PSP(uint32_t topOfProcStack);
  * Return the current value of the MSP (main stack pointer)
  * Cortex processor register
  */
-extern uint32_t __get_MSP(void);
+//extern uint32_t __get_MSP(void);
 
 /**
  * @brief  Set the Main Stack Pointer
@@ -1136,7 +1136,7 @@ extern uint32_t __get_MSP(void);
  * Assign the value mainStackPointer to the MSP 
  * (main stack pointer) Cortex processor register
  */
-extern void __set_MSP(uint32_t topOfMainStack);
+//extern void __set_MSP(uint32_t topOfMainStack);
 
 /**
  * @brief  Reverse byte order in unsigned short value
@@ -1146,7 +1146,7 @@ extern void __set_MSP(uint32_t topOfMainStack);
  *
  * Reverse byte order in unsigned short value
  */
-extern uint32_t __REV16(uint16_t value);
+//extern uint32_t __REV16(uint16_t value);
 
 /**
  * @brief  Reverse bit order of value
@@ -1156,7 +1156,7 @@ extern uint32_t __REV16(uint16_t value);
  *
  * Reverse bit order of value
  */
-extern uint32_t __RBIT(uint32_t value);
+//extern uint32_t __RBIT(uint32_t value);
 
 /**
  * @brief  LDR Exclusive (8 bit)
@@ -1197,7 +1197,7 @@ extern uint32_t __LDREXW(uint32_t *addr);
  *
  * Exclusive STR command for 8 bit values
  */
-extern uint32_t __STREXB(uint8_t value, uint8_t *addr);
+//extern uint32_t __STREXB(uint8_t value, uint8_t *addr);
 
 /**
  * @brief  STR Exclusive (16 bit)
@@ -1208,7 +1208,7 @@ extern uint32_t __STREXB(uint8_t value, uint8_t *addr);
  *
  * Exclusive STR command for 16 bit values
  */
-extern uint32_t __STREXH(uint16_t value, uint16_t *addr);
+//extern uint32_t __STREXH(uint16_t value, uint16_t *addr);
 
 /**
  * @brief  STR Exclusive (32 bit)
-- 
cgit v1.2.3