Replace use of legacy portTYPE macros from old demos and standard demo files.

[freertos] / FreeRTOS / Demo / CORTEX_LM3Sxxxx_IAR_Keil / main.c

diff --git a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c
index a97cda90298de98976bc93df08efe11ee89921c9..cabc1763eeb8e609cb495a1dcf20a01ae3371f6e 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c
+++ b/FreeRTOS/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c
@@ -181,7 +181,7 @@ time. */
 \r
 /* The period of the system clock in nano seconds.  This is used to calculate\r
 the jitter time in nano seconds. */\r
-#define mainNS_PER_CLOCK                                       ( ( unsigned portLONG ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) )\r
+#define mainNS_PER_CLOCK                                       ( ( unsigned long ) ( ( 1.0 / ( double ) configCPU_CLOCK_HZ ) * 1000000000.0 ) )\r
 \r
 /* Constants used when writing strings to the display. */\r
 #define mainCHARACTER_HEIGHT                           ( 9 )\r
@@ -221,7 +221,7 @@ extern void vSetupHighFrequencyTimer( void );
 /*\r
  * Hook functions that can get called by the kernel.\r
  */\r
-void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed portCHAR *pcTaskName );\r
+void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed char *pcTaskName );\r
 void vApplicationTickHook( void );\r
 \r
 \r
@@ -231,7 +231,7 @@ void vApplicationTickHook( void );
 xQueueHandle xOLEDQueue;\r
 \r
 /* The welcome text. */\r
-const portCHAR * const pcWelcomeMessage = "   www.FreeRTOS.org";\r
+const char * const pcWelcomeMessage = "   www.FreeRTOS.org";\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -323,7 +323,7 @@ void prvSetupHardware( void )
 void vApplicationTickHook( void )\r
 {\r
 static xOLEDMessage xMessage = { "PASS" };\r
-static unsigned portLONG ulTicksSinceLastDisplay = 0;\r
+static unsigned long ulTicksSinceLastDisplay = 0;\r
 portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
 \r
        /* Called from every tick interrupt.  Have enough ticks passed to make it\r
@@ -395,16 +395,16 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 void vOLEDTask( void *pvParameters )\r
 {\r
 xOLEDMessage xMessage;\r
-unsigned portLONG ulY, ulMaxY;\r
-static portCHAR cMessage[ mainMAX_MSG_LEN ];\r
-extern volatile unsigned portLONG ulMaxJitter;\r
-const unsigned portCHAR *pucImage;\r
+unsigned long ulY, ulMaxY;\r
+static char cMessage[ mainMAX_MSG_LEN ];\r
+extern volatile unsigned long ulMaxJitter;\r
+const unsigned char *pucImage;\r
 \r
 /* Functions to access the OLED.  The one used depends on the dev kit\r
 being used. */\r
-void ( *vOLEDInit )( unsigned portLONG ) = NULL;\r
-void ( *vOLEDStringDraw )( const portCHAR *, unsigned portLONG, unsigned portLONG, unsigned portCHAR ) = NULL;\r
-void ( *vOLEDImageDraw )( const unsigned portCHAR *, unsigned portLONG, unsigned portLONG, unsigned portLONG, unsigned portLONG ) = NULL;\r
+void ( *vOLEDInit )( unsigned long ) = NULL;\r
+void ( *vOLEDStringDraw )( const char *, unsigned long, unsigned long, unsigned char ) = NULL;\r
+void ( *vOLEDImageDraw )( const unsigned char *, unsigned long, unsigned long, unsigned long, unsigned long ) = NULL;\r
 void ( *vOLEDClear )( void ) = NULL;\r
 \r
        /* Map the OLED access functions to the driver functions that are appropriate\r
@@ -468,7 +468,7 @@ void ( *vOLEDClear )( void ) = NULL;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed portCHAR *pcTaskName )\r
+void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed char *pcTaskName )\r
 {\r
        ( void ) pxTask;\r
        ( void ) pcTaskName;\r