Update version number to 9.0.0rc2.

[freertos] / FreeRTOS / Source / portable / BCC / 16BitDOS / PC / port.c

diff --git a/FreeRTOS/Source/portable/BCC/16BitDOS/PC/port.c b/FreeRTOS/Source/portable/BCC/16BitDOS/PC/port.c
index a5874f999759e40225228485f847884594b2d487..b2e2b94a231c0074641e36f2acb04d70e115441e 100644 (file)
--- a/FreeRTOS/Source/portable/BCC/16BitDOS/PC/port.c
+++ b/FreeRTOS/Source/portable/BCC/16BitDOS/PC/port.c
@@ -1,75 +1,70 @@
 /*\r
 /*\r

-    FreeRTOS V7.4.2 - Copyright (C) 2013 Real Time Engineers Ltd.\r
-\r
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT\r
-    http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\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.0rc2 - Copyright (C) 2016 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
+    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 obliged to\r
-    provide the source code for proprietary components outside of the FreeRTOS\r
-    kernel.\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
 \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.  See the GNU General Public License for more\r
-    details. You should have received a copy of the GNU General Public License\r
-    and the FreeRTOS license exception along with FreeRTOS; if not it can be\r
-    viewed here: http://www.freertos.org/a00114.html and also obtained by\r
-    writing to Real Time Engineers Ltd., contact details for whom are available\r
-    on the FreeRTOS WEB site.\r
-\r
-    1 tab == 4 spaces!\r
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following\r
+    link: http://www.freertos.org/a00114.html\r

 \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

+    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
 \r

-    http://www.FreeRTOS.org - Documentation, books, training, latest versions, \r
-    license and Real Time Engineers Ltd. contact details.\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
 \r
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r

-    including FreeRTOS+Trace - an indispensable productivity tool, and our new\r
-    fully thread aware and reentrant UDP/IP stack.\r
-\r
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High \r
-    Integrity Systems, who sell the code with commercial support, \r
-    indemnification and middleware, under the OpenRTOS brand.\r
-    \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
+    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
+    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
     mission critical applications that require provable dependability.\r

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

 */\r
 \r
 /*\r
 */\r
 \r
 /*\r


@@ -102,7 +97,7 @@ Changes from V4.0.1
 #define portTIMER_INT_NUMBER   0x08\r
 \r
 /* Setup hardware for required tick interrupt rate. */\r
 #define portTIMER_INT_NUMBER   0x08\r
 \r
 /* Setup hardware for required tick interrupt rate. */\r

-static void prvSetTickFrequency( unsigned long ulTickRateHz );\r
+static void prvSetTickFrequency( uint32_t ulTickRateHz );\r

 \r
 /* Restore hardware to as it was prior to starting the scheduler. */\r
 static void prvExitFunction( void );\r
 \r
 /* Restore hardware to as it was prior to starting the scheduler. */\r
 static void prvExitFunction( void );\r


@@ -134,10 +129,10 @@ static void prvSetTickFrequencyDefault( void );
 /*lint -e956 File scopes necessary here. */\r
 \r
 /* Used to signal when to chain to the DOS tick, and when to just clear the PIC ourselves. */\r
 /*lint -e956 File scopes necessary here. */\r
 \r
 /* Used to signal when to chain to the DOS tick, and when to just clear the PIC ourselves. */\r

-static short sDOSTickCounter;\r
+static int16_t sDOSTickCounter;\r

 \r
 /* Set true when the vectors are set so the scheduler will service the tick. */\r
 \r
 /* Set true when the vectors are set so the scheduler will service the tick. */\r

-static portBASE_TYPE xSchedulerRunning = pdFALSE;                              \r
+static BaseType_t xSchedulerRunning = pdFALSE;                         \r

 \r
 /* Points to the original routine installed on the vector we use for manual context switches.  This is then used to restore the original routine during prvExitFunction(). */\r
 static void ( __interrupt __far *pxOldSwitchISR )();           \r
 \r
 /* Points to the original routine installed on the vector we use for manual context switches.  This is then used to restore the original routine during prvExitFunction(). */\r
 static void ( __interrupt __far *pxOldSwitchISR )();           \r


@@ -151,7 +146,7 @@ static jmp_buf xJumpBuf;
 /*lint +e956 */\r
 \r
 /*-----------------------------------------------------------*/\r
 /*lint +e956 */\r
 \r
 /*-----------------------------------------------------------*/\r

-portBASE_TYPE xPortStartScheduler( void )\r
+BaseType_t xPortStartScheduler( void )\r

 {\r
 pxISR pxOriginalTickISR;\r
        \r
 {\r
 pxISR pxOriginalTickISR;\r
        \r


@@ -216,10 +211,11 @@ scheduler is being used. */
        static void __interrupt __far prvPreemptiveTick( void )\r
        {\r
                /* Get the scheduler to update the task states following the tick. */\r
        static void __interrupt __far prvPreemptiveTick( void )\r
        {\r
                /* Get the scheduler to update the task states following the tick. */\r

-               vTaskIncrementTick();\r
-\r
-               /* Switch in the context of the next task to be run. */\r
-               portSWITCH_CONTEXT();\r
+               if( xTaskIncrementTick() != pdFALSE )\r
+               {\r
+                       /* Switch in the context of the next task to be run. */\r
+                       portSWITCH_CONTEXT();\r
+               }\r

 \r
                /* Reset the PIC ready for the next time. */\r
                prvPortResetPIC();\r
 \r
                /* Reset the PIC ready for the next time. */\r
                prvPortResetPIC();\r


@@ -229,7 +225,7 @@ scheduler is being used. */
        {\r
                /* Same as preemptive tick, but the cooperative scheduler is being used\r
                so we don't have to switch in the context of the next task. */\r
        {\r
                /* Same as preemptive tick, but the cooperative scheduler is being used\r
                so we don't have to switch in the context of the next task. */\r

-               vTaskIncrementTick();\r
+               xTaskIncrementTick();\r

                prvPortResetPIC();\r
        }\r
 #endif\r
                prvPortResetPIC();\r
        }\r
 #endif\r


@@ -251,7 +247,7 @@ static void prvPortResetPIC( void )
        --sDOSTickCounter;\r
        if( sDOSTickCounter <= 0 )\r
        {\r
        --sDOSTickCounter;\r
        if( sDOSTickCounter <= 0 )\r
        {\r

-               sDOSTickCounter = ( short ) portTICKS_PER_DOS_TICK;\r
+               sDOSTickCounter = ( int16_t ) portTICKS_PER_DOS_TICK;\r

                __asm{ int      portSWITCH_INT_NUMBER + 1 };             \r
        }\r
        else\r
                __asm{ int      portSWITCH_INT_NUMBER + 1 };             \r
        }\r
        else\r


@@ -301,28 +297,28 @@ void ( __interrupt __far *pxOriginalTickISR )();
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

-static void prvSetTickFrequency( unsigned long ulTickRateHz )\r
+static void prvSetTickFrequency( uint32_t ulTickRateHz )\r

 {\r
 {\r

-const unsigned short usPIT_MODE = ( unsigned short ) 0x43;\r
-const unsigned short usPIT0 = ( unsigned short ) 0x40;\r
-const unsigned long ulPIT_CONST = ( unsigned long ) 1193180UL;\r
-const unsigned short us8254_CTR0_MODE3 = ( unsigned short ) 0x36;\r
-unsigned long ulOutput;\r
+const uint16_t usPIT_MODE = ( uint16_t ) 0x43;\r
+const uint16_t usPIT0 = ( uint16_t ) 0x40;\r
+const uint32_t ulPIT_CONST = ( uint32_t ) 1193180UL;\r
+const uint16_t us8254_CTR0_MODE3 = ( uint16_t ) 0x36;\r
+uint32_t ulOutput;\r

 \r
        /* Setup the 8245 to tick at the wanted frequency. */\r
        portOUTPUT_BYTE( usPIT_MODE, us8254_CTR0_MODE3 );\r
        ulOutput = ulPIT_CONST / ulTickRateHz;\r
 \r
        /* Setup the 8245 to tick at the wanted frequency. */\r
        portOUTPUT_BYTE( usPIT_MODE, us8254_CTR0_MODE3 );\r
        ulOutput = ulPIT_CONST / ulTickRateHz;\r

-       portOUTPUT_BYTE( usPIT0, ( unsigned short )( ulOutput & ( unsigned long ) 0xff ) );\r
+       portOUTPUT_BYTE( usPIT0, ( uint16_t )( ulOutput & ( uint32_t ) 0xff ) );\r

        ulOutput >>= 8;\r
        ulOutput >>= 8;\r

-       portOUTPUT_BYTE( usPIT0, ( unsigned short ) ( ulOutput & ( unsigned long ) 0xff ) );\r
+       portOUTPUT_BYTE( usPIT0, ( uint16_t ) ( ulOutput & ( uint32_t ) 0xff ) );\r

 }\r
 /*-----------------------------------------------------------*/\r
 \r
 static void prvSetTickFrequencyDefault( void )\r
 {\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 static void prvSetTickFrequencyDefault( void )\r
 {\r

-const unsigned short usPIT_MODE = ( unsigned short ) 0x43;\r
-const unsigned short usPIT0 = ( unsigned short ) 0x40;\r
-const unsigned short us8254_CTR0_MODE3 = ( unsigned short ) 0x36;\r
+const uint16_t usPIT_MODE = ( uint16_t ) 0x43;\r
+const uint16_t usPIT0 = ( uint16_t ) 0x40;\r
+const uint16_t us8254_CTR0_MODE3 = ( uint16_t ) 0x36;\r

 \r
        portOUTPUT_BYTE( usPIT_MODE, us8254_CTR0_MODE3 );\r
        portOUTPUT_BYTE( usPIT0,0 );\r
 \r
        portOUTPUT_BYTE( usPIT_MODE, us8254_CTR0_MODE3 );\r
        portOUTPUT_BYTE( usPIT0,0 );\r