Fixed compatibility issues between CMSIS and EWARM 6.20.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.2.x@3081 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2011-06-26 08:17:36 +00:00
parent 850e4802e7
commit 52a64c67c8
1 changed files with 80 additions and 80 deletions

View File

@ -26,7 +26,7 @@
/* /*
* Parts of this files have been modified in ChibiOS/RT in order to fix * 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.
*/ */
/**************************************************************************//** /**************************************************************************//**
@ -1112,7 +1112,7 @@ static __INLINE void __CLREX() { __ASM ("clrex"); }
* *
* Return the actual process stack pointer * Return the actual process stack pointer
*/ */
extern uint32_t __get_PSP(void); //extern uint32_t __get_PSP(void);
/** /**
* @brief Set the Process Stack Pointer * @brief Set the Process Stack Pointer
@ -1122,7 +1122,7 @@ extern uint32_t __get_PSP(void);
* Assign the value ProcessStackPointer to the MSP * Assign the value ProcessStackPointer to the MSP
* (process stack pointer) Cortex processor register * (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 * @brief Return the Main Stack Pointer
@ -1132,7 +1132,7 @@ extern void __set_PSP(uint32_t topOfProcStack);
* Return the current value of the MSP (main stack pointer) * Return the current value of the MSP (main stack pointer)
* Cortex processor register * Cortex processor register
*/ */
extern uint32_t __get_MSP(void); //extern uint32_t __get_MSP(void);
/** /**
* @brief Set the Main Stack Pointer * @brief Set the Main Stack Pointer
@ -1142,7 +1142,7 @@ extern uint32_t __get_MSP(void);
* Assign the value mainStackPointer to the MSP * Assign the value mainStackPointer to the MSP
* (main stack pointer) Cortex processor register * (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 * @brief Reverse byte order in unsigned short value
@ -1152,7 +1152,7 @@ extern void __set_MSP(uint32_t topOfMainStack);
* *
* Reverse byte order in unsigned short value * 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 * @brief Reverse bit order of value
@ -1162,7 +1162,7 @@ extern uint32_t __REV16(uint16_t value);
* *
* Reverse bit order of 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) * @brief LDR Exclusive (8 bit)
@ -1203,7 +1203,7 @@ extern uint32_t __LDREXW(uint32_t *addr);
* *
* Exclusive STR command for 8 bit values * 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) * @brief STR Exclusive (16 bit)
@ -1214,7 +1214,7 @@ extern uint32_t __STREXB(uint8_t value, uint8_t *addr);
* *
* Exclusive STR command for 16 bit values * 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) * @brief STR Exclusive (32 bit)