Update version number in preparation for maintenance release.

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

diff --git a/FreeRTOS/Demo/CORTEX_STM32F103_Primer_GCC/timertest.c b/FreeRTOS/Demo/CORTEX_STM32F103_Primer_GCC/timertest.c
index 7f029ffe36083bd2ff309c761991cc8582550874..8d4ad21e4e71213666a210a607696c74eb4db957 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_STM32F103_Primer_GCC/timertest.c
+++ b/FreeRTOS/Demo/CORTEX_STM32F103_Primer_GCC/timertest.c
@@ -1,67 +1,70 @@
 /*\r
 /*\r

-    FreeRTOS V7.1.1 - Copyright (C) 2012 Real Time Engineers Ltd.\r
-       \r
-\r
-    ***************************************************************************\r
-     *                                                                       *\r
-     *    FreeRTOS tutorial books are available in pdf and paperback.        *\r
-     *    Complete, revised, and edited pdf reference manuals are also       *\r
-     *    available.                                                         *\r
-     *                                                                       *\r
-     *    Purchasing FreeRTOS documentation will not only help you, by       *\r
-     *    ensuring you get running as quickly as possible and with an        *\r
-     *    in-depth knowledge of how to use FreeRTOS, it will also help       *\r
-     *    the FreeRTOS project to continue with its mission of providing     *\r
-     *    professional grade, cross platform, de facto standard solutions    *\r
-     *    for microcontrollers - completely free of charge!                  *\r
-     *                                                                       *\r
-     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *\r
-     *                                                                       *\r
-     *    Thank you for using FreeRTOS, and thank you for your support!      *\r
-     *                                                                       *\r
-    ***************************************************************************\r
+    FreeRTOS V9.0.1 - Copyright (C) 2017 Real Time Engineers Ltd.\r
+    All rights reserved\r

 \r
 \r

+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r

 \r
     This file is part of the FreeRTOS distribution.\r
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
 \r
     This file is part of the FreeRTOS distribution.\r
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     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
-    >>>NOTE<<< The modification to the GPL is included to allow you to\r
-    distribute a combined work that includes FreeRTOS without being obliged to\r
-    provide the source code for proprietary components outside of the FreeRTOS\r
-    kernel.  FreeRTOS is distributed in the hope that it will be useful, but\r
-    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
-    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
-    more details. You should have received a copy of the GNU General Public\r
-    License and the FreeRTOS license exception along with FreeRTOS; if not it\r
-    can be viewed here: http://www.freertos.org/a00114.html and also obtained\r
-    by writing to Richard Barry, contact details for whom are available on the\r
-    FreeRTOS WEB site.\r
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.\r
+\r
+    ***************************************************************************\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
+\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
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following\r
+    link: http://www.freertos.org/a00114.html\r

 \r
 \r

-    1 tab == 4 spaces!\r
-    \r

     ***************************************************************************\r
      *                                                                       *\r
     ***************************************************************************\r
      *                                                                       *\r

-     *    Having a problem?  Start by reading the FAQ "My application does   *\r
-     *    not run, what could be wrong?                                      *\r
+     *    FreeRTOS provides completely free yet professionally developed,    *\r
+     *    robust, strictly quality controlled, supported, and cross          *\r
+     *    platform software that is more than just the market leader, it     *\r
+     *    is the industry's de facto standard.                               *\r

      *                                                                       *\r
      *                                                                       *\r

-     *    http://www.FreeRTOS.org/FAQHelp.html                               *\r
+     *    Help yourself get started quickly while simultaneously helping     *\r
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *\r
+     *    tutorial book, reference manual, or both:                          *\r
+     *    http://www.FreeRTOS.org/Documentation                              *\r

      *                                                                       *\r
     ***************************************************************************\r
 \r
      *                                                                       *\r
     ***************************************************************************\r
 \r

-    \r
-    http://www.FreeRTOS.org - Documentation, training, latest information, \r
-    license and contact details.\r
-    \r
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading\r
+    the FAQ page "My application does not run, what could be wrong?".  Have you\r
+    defined configASSERT()?\r
+\r
+    http://www.FreeRTOS.org/support - In return for receiving this top quality\r
+    embedded software for free we request you assist our global community by\r
+    participating in the support forum.\r
+\r
+    http://www.FreeRTOS.org/training - Investing in training allows your team to\r
+    be as productive as possible as early as possible.  Now you can receive\r
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers\r
+    Ltd, and the world's leading authority on the world's leading RTOS.\r
+\r

     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r

-    including FreeRTOS+Trace - an indispensable productivity tool.\r
+    including FreeRTOS+Trace - an indispensable productivity tool, a DOS\r
+    compatible FAT file system, and our tiny thread aware UDP/IP stack.\r
+\r
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.\r
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.\r
+\r
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High\r
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS\r
+    licenses offer ticketed support, indemnification and commercial middleware.\r

 \r
 \r

-    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell \r
-    the code with commercial support, indemnification, and middleware, under \r
-    the OpenRTOS brand: http://www.OpenRTOS.com.  High Integrity Systems also\r
-    provide a safety engineered and independently SIL3 certified version under \r
-    the SafeRTOS brand: http://www.SafeRTOS.com.\r
+    http://www.SafeRTOS.com - High Integrity Systems also provide a safety\r
+    engineered and independently SIL3 certified version for use in safety and\r
+    mission critical applications that require provable dependability.\r
+\r
+    1 tab == 4 spaces!\r

 */\r
 \r
 /* High speed timer test as described in main.c. */\r
 */\r
 \r
 /* High speed timer test as described in main.c. */\r


@@ -76,7 +79,7 @@
 \r
 /* The set frequency of the interrupt.  Deviations from this are measured as\r
 the jitter. */\r
 \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
 \r
 /* The expected time between each of the timer interrupts - if the jitter was\r
 zero. */\r


@@ -103,7 +106,7 @@ void vSetupTimerTest( void );
 void vTimer2IntHandler( void );\r
 \r
 /* Stores the value of the maximum recorded jitter between interrupts. */\r
 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
 \r
 /*-----------------------------------------------------------*/\r
 \r


@@ -125,7 +128,7 @@ NVIC_InitTypeDef NVIC_InitStructure;
 \r
        /* Time base configuration for timer 2 - which generates the interrupts. */\r
        ulFrequency = configCPU_CLOCK_HZ / timerINTERRUPT_FREQUENCY;    \r
 \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
        TIM_TimeBaseStructure.TIM_Prescaler = 0x0;\r
        TIM_TimeBaseStructure.TIM_ClockDivision = 0x0;\r
        TIM_TimeBaseStructure.TIM_CounterMode = TIM_CounterMode_Up;\r


@@ -135,7 +138,7 @@ NVIC_InitTypeDef NVIC_InitStructure;
        \r
        /* Configuration for timer 3 which is used as a high resolution time\r
        measurement. */\r
        \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
        TIM_TimeBaseInit( TIM3, &TIM_TimeBaseStructure );\r
        TIM_ARRPreloadConfig( TIM3, ENABLE );\r
        \r


@@ -155,8 +158,8 @@ NVIC_InitTypeDef NVIC_InitStructure;
 \r
 void vTimer2IntHandler( void )\r
 {\r
 \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
 \r
        /* Capture the free running timer 3 value as we enter the interrupt. */\r
        usThisCount = TIM3->CNT;\r