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

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

diff --git a/FreeRTOS/Source/portable/BCC/16BitDOS/Flsh186/port.c b/FreeRTOS/Source/portable/BCC/16BitDOS/Flsh186/port.c
index bf08e022103898fb8bce74b28d01f008b46e6d97..4aba1ab319f1e714b377d2a3fd99899c97644a35 100644 (file)
--- a/FreeRTOS/Source/portable/BCC/16BitDOS/Flsh186/port.c
+++ b/FreeRTOS/Source/portable/BCC/16BitDOS/Flsh186/port.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.5.3 - 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
@@ -92,15 +92,15 @@ Changes from V2.6.1
 /*lint -e950 Non ANSI reserved words okay in this file only. */\r
 \r
 #define portTIMER_EOI_TYPE             ( 8 )\r
-#define portRESET_PIC()                        portOUTPUT_WORD( ( unsigned short ) 0xff22, portTIMER_EOI_TYPE )\r
+#define portRESET_PIC()                        portOUTPUT_WORD( ( uint16_t ) 0xff22, portTIMER_EOI_TYPE )\r
 #define portTIMER_INT_NUMBER   0x12\r
 \r
-#define portTIMER_1_CONTROL_REGISTER   ( ( unsigned short ) 0xff5e )\r
-#define portTIMER_0_CONTROL_REGISTER   ( ( unsigned short ) 0xff56 )\r
-#define portTIMER_INTERRUPT_ENABLE             ( ( unsigned short ) 0x2000 )\r
+#define portTIMER_1_CONTROL_REGISTER   ( ( uint16_t ) 0xff5e )\r
+#define portTIMER_0_CONTROL_REGISTER   ( ( uint16_t ) 0xff56 )\r
+#define portTIMER_INTERRUPT_ENABLE             ( ( uint16_t ) 0x2000 )\r
 \r
 /* Setup the hardware to generate the required tick frequency. */\r
-static void prvSetTickFrequency( unsigned long ulTickRateHz );\r
+static void prvSetTickFrequency( uint32_t ulTickRateHz );\r
 \r
 /* Set the hardware back to the state as per before the scheduler started. */\r
 static void prvExitFunction( void );\r
@@ -123,7 +123,7 @@ static void __interrupt __far prvYieldProcessor( void );
 /*lint -e956 File scopes necessary here. */\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\r
 context switches.  This is then used to restore the original routine during\r
@@ -136,7 +136,7 @@ static jmp_buf xJumpBuf;
 /*lint +e956 */\r
 \r
 /*-----------------------------------------------------------*/\r
-portBASE_TYPE xPortStartScheduler( void )\r
+BaseType_t xPortStartScheduler( void )\r
 {\r
        /* This is called with interrupts already disabled. */\r
 \r
@@ -224,8 +224,8 @@ void vPortEndScheduler( void )
 \r
 static void prvExitFunction( void )\r
 {\r
-const unsigned short usTimerDisable = 0x0000;\r
-unsigned short usTimer0Control;\r
+const uint16_t usTimerDisable = 0x0000;\r
+uint16_t usTimer0Control;\r
 \r
        /* Interrupts should be disabled here anyway - but no\r
        harm in making sure. */\r
@@ -252,23 +252,23 @@ unsigned short usTimer0Control;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvSetTickFrequency( unsigned long ulTickRateHz )\r
+static void prvSetTickFrequency( uint32_t ulTickRateHz )\r
 {\r
-const unsigned short usMaxCountRegister = 0xff5a;\r
-const unsigned short usTimerPriorityRegister = 0xff32;\r
-const unsigned short usTimerEnable = 0xC000;\r
-const unsigned short usRetrigger = 0x0001;\r
-const unsigned short usTimerHighPriority = 0x0000;\r
-unsigned short usTimer0Control;\r
+const uint16_t usMaxCountRegister = 0xff5a;\r
+const uint16_t usTimerPriorityRegister = 0xff32;\r
+const uint16_t usTimerEnable = 0xC000;\r
+const uint16_t usRetrigger = 0x0001;\r
+const uint16_t usTimerHighPriority = 0x0000;\r
+uint16_t usTimer0Control;\r
 \r
 /* ( CPU frequency / 4 ) / clock 2 max count [inpw( 0xff62 ) = 7] */\r
 \r
-const unsigned long ulClockFrequency = ( unsigned long ) 0x7f31a0UL;\r
+const uint32_t ulClockFrequency = ( uint32_t ) 0x7f31a0UL;\r
 \r
-unsigned long ulTimerCount = ulClockFrequency / ulTickRateHz;\r
+uint32_t ulTimerCount = ulClockFrequency / ulTickRateHz;\r
 \r
        portOUTPUT_WORD( portTIMER_1_CONTROL_REGISTER, usTimerEnable | portTIMER_INTERRUPT_ENABLE | usRetrigger );\r
-       portOUTPUT_WORD( usMaxCountRegister, ( unsigned short ) ulTimerCount );\r
+       portOUTPUT_WORD( usMaxCountRegister, ( uint16_t ) ulTimerCount );\r
        portOUTPUT_WORD( usTimerPriorityRegister, usTimerHighPriority );\r
 \r
        /* Stop the DOS tick - don't do this if you want to maintain a TOD clock. */\r