Replace standard types with stdint.h types.

[freertos] / FreeRTOS / Source / portable / Renesas / RX100 / port.c

diff --git a/FreeRTOS/Source/portable/Renesas/RX100/port.c b/FreeRTOS/Source/portable/Renesas/RX100/port.c
index 5f49466464076a5e0d885109f0093ed342f6a22f..7b82e48d3b8d0bcc498b15f0d136be5f7f86b2f3 100644 (file)
--- a/FreeRTOS/Source/portable/Renesas/RX100/port.c
+++ b/FreeRTOS/Source/portable/Renesas/RX100/port.c
@@ -84,7 +84,7 @@
 \r
 /* Tasks should start with interrupts enabled and in Supervisor mode, therefore\r
 PSW is set with U and I set, and PM and IPL clear. */\r
-#define portINITIAL_PSW     ( ( portSTACK_TYPE ) 0x00030000 )\r
+#define portINITIAL_PSW     ( ( StackType_t ) 0x00030000 )\r
 \r
 /* The peripheral clock is divided by this value before being supplying the\r
 CMT. */\r
@@ -112,8 +112,8 @@ respectively. */
 /* The following lines are to ensure vSoftwareInterruptEntry can be referenced,\r
  and therefore installed in the vector table, when the FreeRTOS code is built\r
 as a library. */\r
-extern portBASE_TYPE vSoftwareInterruptEntry;\r
-const portBASE_TYPE * p_vSoftwareInterruptEntry = &vSoftwareInterruptEntry;\r
+extern BaseType_t vSoftwareInterruptEntry;\r
+const BaseType_t * p_vSoftwareInterruptEntry = &vSoftwareInterruptEntry;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -157,7 +157,7 @@ static void prvSetupTimerInterrupt( void );
  * instruction.\r
  */\r
 #if configUSE_TICKLESS_IDLE == 1\r
-       static void prvSleep( portTickType xExpectedIdleTime );\r
+       static void prvSleep( TickType_t xExpectedIdleTime );\r
 #endif /* configUSE_TICKLESS_IDLE */\r
 \r
 /*-----------------------------------------------------------*/\r
@@ -169,7 +169,7 @@ extern void vTaskSwitchContext( void );
 /*-----------------------------------------------------------*/\r
 \r
 /* Calculate how many clock increments make up a single tick period. */\r
-static const unsigned long ulMatchValueForOneTick = ( ( configPERIPHERAL_CLOCK_HZ / portCLOCK_DIVISOR ) / configTICK_RATE_HZ );\r
+static const uint32_t ulMatchValueForOneTick = ( ( configPERIPHERAL_CLOCK_HZ / portCLOCK_DIVISOR ) / configTICK_RATE_HZ );\r
 \r
 #if configUSE_TICKLESS_IDLE == 1\r
 \r
@@ -177,7 +177,7 @@ static const unsigned long ulMatchValueForOneTick = ( ( configPERIPHERAL_CLOCK_H
        basically how far into the future an interrupt can be generated. Set\r
        during initialisation.  This is the maximum possible value that the\r
        compare match register can hold divided by ulMatchValueForOneTick. */\r
-       static const portTickType xMaximumPossibleSuppressedTicks = USHRT_MAX / ( ( configPERIPHERAL_CLOCK_HZ / portCLOCK_DIVISOR ) / configTICK_RATE_HZ );\r
+       static const TickType_t xMaximumPossibleSuppressedTicks = USHRT_MAX / ( ( configPERIPHERAL_CLOCK_HZ / portCLOCK_DIVISOR ) / configTICK_RATE_HZ );\r
 \r
        /* Flag set from the tick interrupt to allow the sleep processing to know if\r
        sleep mode was exited because of a tick interrupt, or an interrupt\r
@@ -190,7 +190,7 @@ static const unsigned long ulMatchValueForOneTick = ( ( configPERIPHERAL_CLOCK_H
        compensate for the lost time.  The large difference between the divided CMT\r
        clock and the CPU clock means it is likely ulStoppedTimerCompensation will\r
        equal zero - and be optimised away. */\r
-       static const unsigned long ulStoppedTimerCompensation = 100UL / ( configCPU_CLOCK_HZ / ( configPERIPHERAL_CLOCK_HZ / portCLOCK_DIVISOR ) );\r
+       static const uint32_t ulStoppedTimerCompensation = 100UL / ( configCPU_CLOCK_HZ / ( configPERIPHERAL_CLOCK_HZ / portCLOCK_DIVISOR ) );\r
 \r
 #endif\r
 \r
@@ -199,7 +199,7 @@ static const unsigned long ulMatchValueForOneTick = ( ( configPERIPHERAL_CLOCK_H
 /*\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
        /* Offset to end up on 8 byte boundary. */\r
        pxTopOfStack--;\r
@@ -211,7 +211,7 @@ portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE
        pxTopOfStack--;\r
        *pxTopOfStack = portINITIAL_PSW;\r
        pxTopOfStack--;\r
-       *pxTopOfStack = ( portSTACK_TYPE ) pxCode;\r
+       *pxTopOfStack = ( StackType_t ) pxCode;\r
 \r
        /* When debugging it can be useful if every register is set to a known\r
        value.  Otherwise code space can be saved by just setting the registers\r
@@ -256,7 +256,7 @@ portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE
        }\r
        #endif\r
 \r
-       *pxTopOfStack = ( portSTACK_TYPE ) pvParameters; /* R1 */\r
+       *pxTopOfStack = ( StackType_t ) pvParameters; /* R1 */\r
        pxTopOfStack--;\r
        *pxTopOfStack = 0x12345678; /* Accumulator. */\r
        pxTopOfStack--;\r
@@ -266,7 +266,7 @@ portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-portBASE_TYPE xPortStartScheduler( void )\r
+BaseType_t xPortStartScheduler( void )\r
 {\r
        /* Use pxCurrentTCB just so it does not get optimised away. */\r
        if( pxCurrentTCB != NULL )\r
@@ -355,7 +355,7 @@ void prvTickISR( void )
 \r
                /* If this is the first tick since exiting tickless mode then the CMT\r
                compare match value needs resetting. */\r
-               CMT0.CMCOR = ( unsigned short ) ulMatchValueForOneTick;\r
+               CMT0.CMCOR = ( uint16_t ) ulMatchValueForOneTick;\r
        }\r
        #endif\r
 }\r
@@ -468,7 +468,7 @@ static void prvSetupTimerInterrupt( void )
        CMT0.CMCR.BIT.CMIE = 1;\r
 \r
        /* Set the compare match value. */\r
-       CMT0.CMCOR = ( unsigned short ) ulMatchValueForOneTick;\r
+       CMT0.CMCOR = ( uint16_t ) ulMatchValueForOneTick;\r
 \r
        /* Divide the PCLK. */\r
        #if portCLOCK_DIVISOR == 512\r
@@ -507,7 +507,7 @@ static void prvSetupTimerInterrupt( void )
 \r
 #if configUSE_TICKLESS_IDLE == 1\r
 \r
-       static void prvSleep( portTickType xExpectedIdleTime )\r
+       static void prvSleep( TickType_t xExpectedIdleTime )\r
        {\r
                /* Allow the application to define some pre-sleep processing. */\r
                configPRE_SLEEP_PROCESSING( xExpectedIdleTime );\r
@@ -529,9 +529,9 @@ static void prvSetupTimerInterrupt( void )
 \r
 #if configUSE_TICKLESS_IDLE == 1\r
 \r
-       void vPortSuppressTicksAndSleep( portTickType xExpectedIdleTime )\r
+       void vPortSuppressTicksAndSleep( TickType_t xExpectedIdleTime )\r
        {\r
-       unsigned long ulMatchValue, ulCompleteTickPeriods, ulCurrentCount;\r
+       uint32_t ulMatchValue, ulCompleteTickPeriods, ulCurrentCount;\r
        eSleepModeStatus eSleepAction;\r
 \r
                /* THIS FUNCTION IS CALLED WITH THE SCHEDULER SUSPENDED. */\r
@@ -614,8 +614,8 @@ static void prvSetupTimerInterrupt( void )
 \r
                    /* Adjust the match value to take into account that the current\r
                        time slice is already partially complete. */\r
-                       ulMatchValue -= ( unsigned long ) CMT0.CMCNT;\r
-                       CMT0.CMCOR = ( unsigned short ) ulMatchValue;\r
+                       ulMatchValue -= ( uint32_t ) CMT0.CMCNT;\r
+                       CMT0.CMCOR = ( uint16_t ) ulMatchValue;\r
 \r
                        /* Restart the CMT to count up to the new match value. */\r
                        CMT0.CMCNT = 0;\r
@@ -635,7 +635,7 @@ static void prvSetupTimerInterrupt( void )
                                /* Nothing to do here. */\r
                        }\r
 \r
-                       ulCurrentCount = ( unsigned long ) CMT0.CMCNT;\r
+                       ulCurrentCount = ( uint32_t ) CMT0.CMCNT;\r
 \r
                        if( ulTickFlag != pdFALSE )\r
                        {\r
@@ -645,7 +645,7 @@ static void prvSetupTimerInterrupt( void )
                                exited.  Reset the match value with whatever remains of this\r
                                tick period. */\r
                                ulMatchValue = ulMatchValueForOneTick - ulCurrentCount;\r
-                               CMT0.CMCOR = ( unsigned short ) ulMatchValue;\r
+                               CMT0.CMCOR = ( uint16_t ) ulMatchValue;\r
 \r
                                /* The tick interrupt handler will already have pended the tick\r
                                processing in the kernel.  As the pending tick will be\r
@@ -665,7 +665,7 @@ static void prvSetupTimerInterrupt( void )
                                /* The match value is set to whatever fraction of a single tick\r
                                period remains. */\r
                                ulMatchValue = ulCurrentCount - ( ulCompleteTickPeriods * ulMatchValueForOneTick );\r
-                               CMT0.CMCOR = ( unsigned short ) ulMatchValue;\r
+                               CMT0.CMCOR = ( uint16_t ) ulMatchValue;\r
                        }\r
 \r
                        /* Restart the CMT so it runs up to the match value.  The match value\r