Previously the STM32F0518 compiler setting was changed to enable the use of the __wea...

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2784 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS/Demo/CORTEX_M0_STM32F0518_IAR/RTOSDemo.ewp b/FreeRTOS/Demo/CORTEX_M0_STM32F0518_IAR/RTOSDemo.ewp
index ea4097b44d3e8d63b8f6c07dac781cdd1fbb9467..2ce04ea22ba0e4b7c85e2a8261cbc3213ef50fc0 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M0_STM32F0518_IAR/RTOSDemo.ewp
+++ b/FreeRTOS/Demo/CORTEX_M0_STM32F0518_IAR/RTOSDemo.ewp
@@ -311,7 +311,7 @@
                 </option>\r
                 <option>\r
                     <name>CCLangConformance</name>\r
-                    <state>0</state>\r
+                    <state>1</state>\r
                 </option>\r
                 <option>\r
                     <name>CCSignedPlainChar</name>\r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM0/port.c b/FreeRTOS/Source/portable/IAR/ARM_CM0/port.c
index 84f1e66e06cf04cd2ea8778efd4a7b93a100a5a7..08b59f3d4fc347cd2502b89719af0a4f876ede96 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CM0/port.c
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM0/port.c
@@ -96,6 +96,7 @@ power functionality only. */
  * file is weak to allow application writers to change the timer used to\r
  * generate the tick interrupt.\r
  */\r
+#pragma weak vPortSetupTimerInterrupt\r
 void vPortSetupTimerInterrupt( void );\r
 \r
 /*\r
@@ -235,7 +236,7 @@ uint32_t ulPreviousMask;
  * Setup the systick timer to generate the tick interrupts at the required\r
  * frequency.\r
  */\r
-__weak void vPortSetupTimerInterrupt( void )\r
+void vPortSetupTimerInterrupt( void )\r
 {\r
        /* Calculate the constants required to configure the tick interrupt. */\r
        #if( configUSE_TICKLESS_IDLE == 1 )\r