Replace standard types with stdint.h types.

[freertos] / FreeRTOS / Source / portable / MPLAB / PIC32MX / port.c

diff --git a/FreeRTOS/Source/portable/MPLAB/PIC32MX/port.c b/FreeRTOS/Source/portable/MPLAB/PIC32MX/port.c
index cb8ba11d69f7cc1bedefb39cab83cbf623d5917b..b988edd84112fd446db370c8507d9b72b57652ef 100644 (file)
--- a/FreeRTOS/Source/portable/MPLAB/PIC32MX/port.c
+++ b/FreeRTOS/Source/portable/MPLAB/PIC32MX/port.c
@@ -137,7 +137,7 @@ task stack, not the ISR stack). */
        the ISR stack. */\r
        #define portISR_STACK_FILL_BYTE 0xee\r
 \r
-       static const unsigned char ucExpectedStackBytes[] = {\r
+       static const uint8_t ucExpectedStackBytes[] = {\r
                                                                        portISR_STACK_FILL_BYTE, portISR_STACK_FILL_BYTE, portISR_STACK_FILL_BYTE, portISR_STACK_FILL_BYTE,             \\r
                                                                        portISR_STACK_FILL_BYTE, portISR_STACK_FILL_BYTE, portISR_STACK_FILL_BYTE, portISR_STACK_FILL_BYTE,             \\r
                                                                        portISR_STACK_FILL_BYTE, portISR_STACK_FILL_BYTE, portISR_STACK_FILL_BYTE, portISR_STACK_FILL_BYTE,             \\r
@@ -178,47 +178,47 @@ static void prvTaskExitError( void );
 \r
 /* Records the interrupt nesting depth.  This is initialised to one as it is\r
 decremented to 0 when the first task starts. */\r
-volatile unsigned portBASE_TYPE uxInterruptNesting = 0x01;\r
+volatile UBaseType_t uxInterruptNesting = 0x01;\r
 \r
 /* Stores the task stack pointer when a switch is made to use the system stack. */\r
-unsigned portBASE_TYPE uxSavedTaskStackPointer = 0;\r
+UBaseType_t uxSavedTaskStackPointer = 0;\r
 \r
 /* The stack used by interrupt service routines that cause a context switch. */\r
-portSTACK_TYPE xISRStack[ configISR_STACK_SIZE ] = { 0 };\r
+StackType_t xISRStack[ configISR_STACK_SIZE ] = { 0 };\r
 \r
 /* The top of stack value ensures there is enough space to store 6 registers on\r
 the callers stack, as some functions seem to want to do this. */\r
-const portSTACK_TYPE * const xISRStackTop = &( xISRStack[ configISR_STACK_SIZE - 7 ] );\r
+const StackType_t * const xISRStackTop = &( xISRStack[ configISR_STACK_SIZE - 7 ] );\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
 /*\r
  * See header file for description.\r
  */\r
-portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters )\r
+StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters )\r
 {\r
        /* Ensure byte alignment is maintained when leaving this function. */\r
        pxTopOfStack--;\r
 \r
-       *pxTopOfStack = (portSTACK_TYPE) 0xDEADBEEF;\r
+       *pxTopOfStack = (StackType_t) 0xDEADBEEF;\r
        pxTopOfStack--;\r
 \r
-       *pxTopOfStack = (portSTACK_TYPE) 0x12345678;    /* Word to which the stack pointer will be left pointing after context restore. */\r
+       *pxTopOfStack = (StackType_t) 0x12345678;       /* Word to which the stack pointer will be left pointing after context restore. */\r
        pxTopOfStack--;\r
 \r
-       *pxTopOfStack = (portSTACK_TYPE) _CP0_GET_CAUSE();\r
+       *pxTopOfStack = (StackType_t) _CP0_GET_CAUSE();\r
        pxTopOfStack--;\r
 \r
-       *pxTopOfStack = (portSTACK_TYPE) portINITIAL_SR;/* CP0_STATUS */\r
+       *pxTopOfStack = (StackType_t) portINITIAL_SR;/* CP0_STATUS */\r
        pxTopOfStack--;\r
 \r
-       *pxTopOfStack = (portSTACK_TYPE) pxCode;                /* CP0_EPC */\r
+       *pxTopOfStack = (StackType_t) pxCode;           /* CP0_EPC */\r
        pxTopOfStack--;\r
 \r
-       *pxTopOfStack = (portSTACK_TYPE) portTASK_RETURN_ADDRESS;       /* ra */\r
+       *pxTopOfStack = (StackType_t) portTASK_RETURN_ADDRESS;  /* ra */\r
        pxTopOfStack -= 15;\r
 \r
-       *pxTopOfStack = (portSTACK_TYPE) pvParameters; /* Parameters to pass in. */\r
+       *pxTopOfStack = (StackType_t) pvParameters; /* Parameters to pass in. */\r
        pxTopOfStack -= 15;\r
 \r
        return pxTopOfStack;\r
@@ -250,7 +250,7 @@ static void prvTaskExitError( void )
  */\r
 __attribute__(( weak )) void vApplicationSetupTickTimerInterrupt( void )\r
 {\r
-const unsigned long ulCompareMatch = ( (configPERIPHERAL_CLOCK_HZ / portTIMER_PRESCALE) / configTICK_RATE_HZ ) - 1;\r
+const uint32_t ulCompareMatch = ( (configPERIPHERAL_CLOCK_HZ / portTIMER_PRESCALE) / configTICK_RATE_HZ ) - 1;\r
 \r
        T1CON = 0x0000;\r
        T1CONbits.TCKPS = portPRESCALE_BITS;\r
@@ -276,7 +276,7 @@ void vPortEndScheduler(void)
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-portBASE_TYPE xPortStartScheduler( void )\r
+BaseType_t xPortStartScheduler( void )\r
 {\r
 extern void vPortStartFirstTask( void );\r
 extern void *pxCurrentTCB;\r
@@ -305,7 +305,7 @@ extern void *pxCurrentTCB;
 \r
        /* Kick off the highest priority task that has been created so far.\r
        Its stack location is loaded into uxSavedTaskStackPointer. */\r
-       uxSavedTaskStackPointer = *( unsigned portBASE_TYPE * ) pxCurrentTCB;\r
+       uxSavedTaskStackPointer = *( UBaseType_t * ) pxCurrentTCB;\r
        vPortStartFirstTask();\r
 \r
        /* Should never get here as the tasks will now be executing!  Call the task\r
@@ -320,7 +320,7 @@ extern void *pxCurrentTCB;
 \r
 void vPortIncrementTick( void )\r
 {\r
-unsigned portBASE_TYPE uxSavedStatus;\r
+UBaseType_t uxSavedStatus;\r
 \r
        uxSavedStatus = uxPortSetInterruptMaskFromISR();\r
        {\r
@@ -340,9 +340,9 @@ unsigned portBASE_TYPE uxSavedStatus;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-unsigned portBASE_TYPE uxPortSetInterruptMaskFromISR( void )\r
+UBaseType_t uxPortSetInterruptMaskFromISR( void )\r
 {\r
-unsigned portBASE_TYPE uxSavedStatusRegister;\r
+UBaseType_t uxSavedStatusRegister;\r
 \r
        __builtin_disable_interrupts();\r
        uxSavedStatusRegister = _CP0_GET_STATUS() | 0x01;\r
@@ -358,7 +358,7 @@ unsigned portBASE_TYPE uxSavedStatusRegister;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-void vPortClearInterruptMaskFromISR( unsigned portBASE_TYPE uxSavedStatusRegister )\r
+void vPortClearInterruptMaskFromISR( UBaseType_t uxSavedStatusRegister )\r
 {\r
        _CP0_SET_STATUS( uxSavedStatusRegister );\r
 }\r