Replace standard types with stdint.h types.

[freertos] / FreeRTOS / Source / include / portable.h

diff --git a/FreeRTOS/Source/include/portable.h b/FreeRTOS/Source/include/portable.h
index cb3bacbab0f0097afc227d7610a3cc5458dd133e..b28ecfdfe2c5c56d26874af9b2b8b12e3f470b71 100644 (file)
--- a/FreeRTOS/Source/include/portable.h
+++ b/FreeRTOS/Source/include/portable.h
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -70,8 +70,10 @@
 #ifndef PORTABLE_H\r
 #define PORTABLE_H\r
 \r
-/* Include the macro file relevant to the port being used. */\r
-\r
+/* Include the macro file relevant to the port being used.\r
+NOTE:  The following definitions are *DEPRECATED* as it is preferred to instead\r
+just add the path to the correct portmacro.h header file to the compiler's\r
+include path. */\r
 #ifdef OPEN_WATCOM_INDUSTRIAL_PC_PORT\r
        #include "..\..\Source\portable\owatcom\16bitdos\pc\portmacro.h"\r
        typedef void ( __interrupt __far *pxISR )();\r
@@ -91,15 +93,15 @@
 #endif\r
 \r
 #ifdef MPLAB_PIC24_PORT\r
-       #include "..\..\Source\portable\MPLAB\PIC24_dsPIC\portmacro.h"\r
+       #include "../../Source/portable/MPLAB/PIC24_dsPIC/portmacro.h"\r
 #endif\r
 \r
 #ifdef MPLAB_DSPIC_PORT\r
-       #include "..\..\Source\portable\MPLAB\PIC24_dsPIC\portmacro.h"\r
+       #include "../../Source/portable/MPLAB/PIC24_dsPIC/portmacro.h"\r
 #endif\r
 \r
 #ifdef MPLAB_PIC18F_PORT\r
-       #include "..\..\Source\portable\MPLAB\PIC18F\portmacro.h"\r
+       #include "../../Source/portable/MPLAB/PIC18F/portmacro.h"\r
 #endif\r
 \r
 #ifdef MPLAB_PIC32MX_PORT\r
@@ -356,9 +358,9 @@ extern "C" {
  *\r
  */\r
 #if( portUSING_MPU_WRAPPERS == 1 )\r
-       portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters, portBASE_TYPE xRunPrivileged ) PRIVILEGED_FUNCTION;\r
+       StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters, BaseType_t xRunPrivileged ) PRIVILEGED_FUNCTION;\r
 #else\r
-       portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters ) PRIVILEGED_FUNCTION;\r
+       StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters ) PRIVILEGED_FUNCTION;\r
 #endif\r
 \r
 /*\r
@@ -368,12 +370,13 @@ void *pvPortMalloc( size_t xSize ) PRIVILEGED_FUNCTION;
 void vPortFree( void *pv ) PRIVILEGED_FUNCTION;\r
 void vPortInitialiseBlocks( void ) PRIVILEGED_FUNCTION;\r
 size_t xPortGetFreeHeapSize( void ) PRIVILEGED_FUNCTION;\r
+size_t xPortGetMinimumEverFreeHeapSize( void ) PRIVILEGED_FUNCTION;\r
 \r
 /*\r
  * Setup the hardware ready for the scheduler to take control.  This generally\r
  * sets up a tick interrupt and sets timers for the correct tick frequency.\r
  */\r
-portBASE_TYPE xPortStartScheduler( void ) PRIVILEGED_FUNCTION;\r
+BaseType_t xPortStartScheduler( void ) PRIVILEGED_FUNCTION;\r
 \r
 /*\r
  * Undo any hardware/ISR setup that was performed by xPortStartScheduler() so\r
@@ -391,7 +394,7 @@ void vPortEndScheduler( void ) PRIVILEGED_FUNCTION;
  */\r
 #if( portUSING_MPU_WRAPPERS == 1 )\r
        struct xMEMORY_REGION;\r
-       void vPortStoreTaskMPUSettings( xMPU_SETTINGS *xMPUSettings, const struct xMEMORY_REGION * const xRegions, portSTACK_TYPE *pxBottomOfStack, unsigned short usStackDepth ) PRIVILEGED_FUNCTION;\r
+       void vPortStoreTaskMPUSettings( xMPU_SETTINGS *xMPUSettings, const struct xMEMORY_REGION * const xRegions, StackType_t *pxBottomOfStack, uint16_t usStackDepth ) PRIVILEGED_FUNCTION;\r
 #endif\r
 \r
 #ifdef __cplusplus\r