Update version number to 8.1.2 after moving the defaulting of configUSE_PORT_OPTIMISE...

[freertos] / FreeRTOS / Demo / CORTEX_STM32F103_IAR / timertest.c

diff --git a/FreeRTOS/Demo/CORTEX_STM32F103_IAR/timertest.c b/FreeRTOS/Demo/CORTEX_STM32F103_IAR/timertest.c
index 44985a777b002734ab8650caafe98f0f0c763f93..4a58f809b2b090d3a54d25ea5332bf6465b9770b 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_STM32F103_IAR/timertest.c
+++ b/FreeRTOS/Demo/CORTEX_STM32F103_IAR/timertest.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V8.1.2 - Copyright (C) 2014 Real Time Engineers Ltd. \r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -24,10 +24,10 @@
     the terms of the GNU General Public License (version 2) as published by the\r
     Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
 \r
-    >>! NOTE: The modification to the GPL is included to allow you to distribute\r
-    >>! a combined work that includes FreeRTOS without being obliged to provide\r
-    >>! the source code for proprietary components outside of the FreeRTOS\r
-    >>! kernel.\r
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<\r
+    >>!   obliged to provide the source code for proprietary components     !<<\r
+    >>!   outside of the FreeRTOS kernel.                                   !<<\r
 \r
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
@@ -75,7 +75,7 @@
 \r
 /* The set frequency of the interrupt.  Deviations from this are measured as\r
 the jitter. */\r
-#define timerINTERRUPT_FREQUENCY               ( ( unsigned portSHORT ) 20000 )\r
+#define timerINTERRUPT_FREQUENCY               ( ( unsigned short ) 20000 )\r
 \r
 /* The expected time between each of the timer interrupts - if the jitter was\r
 zero. */\r
@@ -102,7 +102,7 @@ void vSetupTimerTest( void );
 void vTimer2IntHandler( void );\r
 \r
 /* Stores the value of the maximum recorded jitter between interrupts. */\r
-volatile unsigned portSHORT usMaxJitter = 0;\r
+volatile unsigned short usMaxJitter = 0;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -124,7 +124,7 @@ NVIC_InitTypeDef NVIC_InitStructure;
 \r
        /* Time base configuration for timer 2 - which generates the interrupts. */\r
        ulFrequency = configCPU_CLOCK_HZ / timerINTERRUPT_FREQUENCY;    \r
-       TIM_TimeBaseStructure.TIM_Period = ( unsigned portSHORT ) ( ulFrequency & 0xffffUL );\r
+       TIM_TimeBaseStructure.TIM_Period = ( unsigned short ) ( ulFrequency & 0xffffUL );\r
        TIM_TimeBaseStructure.TIM_Prescaler = 0x0;\r
        TIM_TimeBaseStructure.TIM_ClockDivision = 0x0;\r
        TIM_TimeBaseStructure.TIM_CounterMode = TIM_CounterMode_Up;\r
@@ -134,7 +134,7 @@ NVIC_InitTypeDef NVIC_InitStructure;
        \r
        /* Configuration for timer 3 which is used as a high resolution time\r
        measurement. */\r
-       TIM_TimeBaseStructure.TIM_Period = ( unsigned portSHORT ) 0xffff;\r
+       TIM_TimeBaseStructure.TIM_Period = ( unsigned short ) 0xffff;\r
        TIM_TimeBaseInit( TIM3, &TIM_TimeBaseStructure );\r
        TIM_ARRPreloadConfig( TIM3, ENABLE );\r
        \r
@@ -154,8 +154,8 @@ NVIC_InitTypeDef NVIC_InitStructure;
 \r
 void vTimer2IntHandler( void )\r
 {\r
-static unsigned portSHORT usLastCount = 0, usSettleCount = 0, usMaxDifference = 0;\r
-unsigned portSHORT usThisCount, usDifference;\r
+static unsigned short usLastCount = 0, usSettleCount = 0, usMaxDifference = 0;\r
+unsigned short usThisCount, usDifference;\r
 \r
        /* Capture the free running timer 3 value as we enter the interrupt. */\r
        usThisCount = TIM3->CNT;\r