Map portTICK_RATE_MS to portTICK_PERIOD_MS.

[freertos] / FreeRTOS / Source / portable / BCC / 16BitDOS / PC / prtmacro.h

diff --git a/FreeRTOS/Source/portable/BCC/16BitDOS/PC/prtmacro.h b/FreeRTOS/Source/portable/BCC/16BitDOS/PC/prtmacro.h
index 21ff0000d71462cfbc4b20c39126aa1e77afad83..3a066214be7e36ab6bd00999a2bc42401f712d11 100644 (file)
--- a/FreeRTOS/Source/portable/BCC/16BitDOS/PC/prtmacro.h
+++ b/FreeRTOS/Source/portable/BCC/16BitDOS/PC/prtmacro.h
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V8.0.0:rc1 - 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
@@ -67,7 +67,7 @@
 #define PORTMACRO_H\r
 \r
 /*-----------------------------------------------------------\r
- * Port specific definitions.  \r
+ * Port specific definitions.\r
  *\r
  * The settings in this file configure FreeRTOS correctly for the\r
  * given hardware and compiler.\r
@@ -82,15 +82,19 @@
 #define portDOUBLE             long\r
 #define portLONG               long\r
 #define portSHORT              int\r
-#define portSTACK_TYPE unsigned portSHORT\r
+#define portSTACK_TYPE uint16_t\r
 #define portBASE_TYPE  portSHORT\r
 \r
+typedef portSTACK_TYPE StackType_t;\r
+typedef short BaseType_t;\r
+typedef unsigned short UBaseType_t;\r
+\r
 #if( configUSE_16_BIT_TICKS == 1 )\r
-       typedef unsigned portSHORT portTickType;\r
-       #define portMAX_DELAY ( portTickType ) 0xffff\r
+       typedef uint16_t TickType_t;\r
+       #define portMAX_DELAY ( TickType_t ) 0xffff\r
 #else\r
-       typedef unsigned portLONG portTickType;\r
-       #define portMAX_DELAY ( portTickType ) 0xffffffffUL\r
+       typedef uint32_t TickType_t;\r
+       #define portMAX_DELAY ( TickType_t ) 0xffffffffUL\r
 #endif\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -109,10 +113,10 @@
 #define portNOP()                              __asm{ nop }\r
 #define portSTACK_GROWTH               ( -1 )\r
 #define portSWITCH_INT_NUMBER  0x80\r
-#define portYIELD()                            __asm{ int portSWITCH_INT_NUMBER } \r
+#define portYIELD()                            __asm{ int portSWITCH_INT_NUMBER }\r
 #define portDOS_TICK_RATE              ( 18.20648 )\r
-#define portTICK_RATE_MS               ( ( portTickType ) 1000 / configTICK_RATE_HZ )          \r
-#define portTICKS_PER_DOS_TICK ( ( unsigned portSHORT ) ( ( ( portDOUBLE ) configTICK_RATE_HZ / portDOS_TICK_RATE ) + 0.5 ) )\r
+#define portTICK_PERIOD_MS             ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICKS_PER_DOS_TICK ( ( uint16_t ) ( ( ( portDOUBLE ) configTICK_RATE_HZ / portDOS_TICK_RATE ) + 0.5 ) )\r
 #define portINITIAL_SW                 ( ( portSTACK_TYPE ) 0x0202 )   /* Start the tasks with interrupts enabled. */\r
 #define portBYTE_ALIGNMENT             ( 2 )\r
 /*-----------------------------------------------------------*/\r