Replace portLONG with long, portCHAR with char, and portSHORT with short.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1334 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/PIC32MX_MPLAB/IntQueueTimer.c b/Demo/PIC32MX_MPLAB/IntQueueTimer.c
index 15b40d0bd81123cc4d5690a206ccc01e1d777c52..481094997ed9e3f094fe1ebb21617c13d91b2ec1 100644 (file)
--- a/Demo/PIC32MX_MPLAB/IntQueueTimer.c
+++ b/Demo/PIC32MX_MPLAB/IntQueueTimer.c
@@ -74,7 +74,7 @@ void vInitialiseTimerForIntQueueTest( void )
 \r
        T3CON = 0;\r
        TMR3 = 0;\r
-       PR3 = ( unsigned portSHORT ) ( configPERIPHERAL_CLOCK_HZ / timerINTERRUPT3_FREQUENCY );\r
+       PR3 = ( unsigned short ) ( configPERIPHERAL_CLOCK_HZ / timerINTERRUPT3_FREQUENCY );\r
 \r
        /* Setup timer 3 interrupt priority to be above the kernel priority. */\r
        ConfigIntTimer3( T3_INT_ON | ( configMAX_SYSCALL_INTERRUPT_PRIORITY - 1 ) );\r
@@ -92,7 +92,7 @@ void vInitialiseTimerForIntQueueTest( void )
        /* Do the same for timer 4. */\r
        T4CON = 0;\r
        TMR4 = 0;\r
-       PR4 = ( unsigned portSHORT ) ( configPERIPHERAL_CLOCK_HZ / timerINTERRUPT4_FREQUENCY );\r
+       PR4 = ( unsigned short ) ( configPERIPHERAL_CLOCK_HZ / timerINTERRUPT4_FREQUENCY );\r
 \r
        /* Setup timer 4 interrupt priority to be above the kernel priority. */\r
        ConfigIntTimer4( T4_INT_ON | ( configMAX_SYSCALL_INTERRUPT_PRIORITY ) );\r

diff --git a/Demo/PIC32MX_MPLAB/lcd.c b/Demo/PIC32MX_MPLAB/lcd.c
index 3b250eb03acddd95aa32ba5d2db6bb303d7a2eac..d8b60938edbc34f7a1d4f689248c03a99356b439 100644 (file)
--- a/Demo/PIC32MX_MPLAB/lcd.c
+++ b/Demo/PIC32MX_MPLAB/lcd.c
@@ -78,12 +78,12 @@ static void prvSetupLCD( void );
 /* \r
  * Move to the first (0) or second (1) row of the LCD. \r
  */\r
-static void prvLCDGotoRow( unsigned portSHORT usRow );\r
+static void prvLCDGotoRow( unsigned short usRow );\r
 \r
 /* \r
  * Write a string of text to the LCD. \r
  */\r
-static void prvLCDPutString( portCHAR *pcString );\r
+static void prvLCDPutString( char *pcString );\r
 \r
 /* \r
  * Clear the LCD. \r
@@ -121,8 +121,8 @@ static void prvLCDClear( void );
 xQueueHandle xLCDQueue;\r
 \r
 /* LCD access functions. */\r
-static void prvLCDCommand( portCHAR cCommand );\r
-static void prvLCDData( portCHAR cChar );\r
+static void prvLCDCommand( char cCommand );\r
+static void prvLCDData( char cChar );\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -134,13 +134,13 @@ xQueueHandle xStartLCDTask( void )
 \r
        /* Start the task that will write to the LCD.  The LCD hardware is\r
        initialised from within the task itself so delays can be used. */\r
-       xTaskCreate( vLCDTask, ( signed portCHAR * ) "LCD", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY + 1, NULL );\r
+       xTaskCreate( vLCDTask, ( signed char * ) "LCD", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY + 1, NULL );\r
 \r
        return xLCDQueue;\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvLCDGotoRow( unsigned portSHORT usRow )\r
+static void prvLCDGotoRow( unsigned short usRow )\r
 {\r
        if(usRow == 0) \r
        {\r
@@ -153,7 +153,7 @@ static void prvLCDGotoRow( unsigned portSHORT usRow )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvLCDCommand( portCHAR cCommand ) \r
+static void prvLCDCommand( char cCommand ) \r
 {\r
        PMPSetAddress( LCD_COMMAND_ADDRESS );\r
        PMPMasterWrite( cCommand );\r
@@ -161,7 +161,7 @@ static void prvLCDCommand( portCHAR cCommand )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvLCDData( portCHAR cChar )\r
+static void prvLCDData( char cChar )\r
 {\r
        PMPSetAddress( LCD_DATA_ADDRESS );\r
        PMPMasterWrite( cChar );\r
@@ -169,7 +169,7 @@ static void prvLCDData( portCHAR cChar )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-static void prvLCDPutString( portCHAR *pcString )\r
+static void prvLCDPutString( char *pcString )\r
 {\r
        /* Write out each character with appropriate delay between each. */\r
        while(*pcString)\r
@@ -226,7 +226,7 @@ static void prvSetupLCD(void)
 static void vLCDTask(void *pvParameters)\r
 {\r
 xLCDMessage xMessage;\r
-unsigned portSHORT usRow = 0;\r
+unsigned short usRow = 0;\r
 \r
        /* Initialise the hardware.  This uses delays so must not be called prior\r
        to the scheduler being started. */\r

diff --git a/Demo/PIC32MX_MPLAB/main.c b/Demo/PIC32MX_MPLAB/main.c
index e310d014b23e41db3e40e8762a9bbf4628ab7483..a719086b80b26875bf0cf90bfbabd935b21eb617 100644 (file)
--- a/Demo/PIC32MX_MPLAB/main.c
+++ b/Demo/PIC32MX_MPLAB/main.c
@@ -166,7 +166,7 @@ interrupt test" interrupt. */
 #define mainEXPECTED_CLOCKS_BETWEEN_INTERRUPTS ( ( configCPU_CLOCK_HZ >> 1 ) / mainTEST_INTERRUPT_FREQUENCY )\r
 \r
 /* The number of nano seconds between each core clock. */\r
-#define mainNS_PER_CLOCK ( ( unsigned portLONG ) ( ( 1.0 / ( double ) ( configCPU_CLOCK_HZ >> 1 ) ) * 1000000000.0 ) )\r
+#define mainNS_PER_CLOCK ( ( unsigned long ) ( ( 1.0 / ( double ) ( configCPU_CLOCK_HZ >> 1 ) ) * 1000000000.0 ) )\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -197,12 +197,12 @@ static xQueueHandle xLCDQueue;
 \r
 /* Flag used by prvTestTask1() and prvTestTask2() to indicate their status\r
 (pass/fail). */\r
-unsigned portLONG ulStatus1 = pdPASS;\r
+unsigned long ulStatus1 = pdPASS;\r
 \r
 /* Variables incremented by prvTestTask1() and prvTestTask2() respectively on \r
 each iteration of their function.  This is used to detect either task stopping\r
 their execution.. */\r
-unsigned portLONG ulRegTest1Cycles = 0, ulRegTest2Cycles = 0;\r
+unsigned long ulRegTest1Cycles = 0, ulRegTest2Cycles = 0;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
@@ -293,14 +293,14 @@ static void prvSetupHardware( void )
 \r
 static void prvCheckTask( void *pvParameters )\r
 {\r
-unsigned portLONG ulLastRegTest1Value = 0, ulLastRegTest2Value = 0, ulTicksToWait = mainNO_ERROR_PERIOD;\r
+unsigned long ulLastRegTest1Value = 0, ulLastRegTest2Value = 0, ulTicksToWait = mainNO_ERROR_PERIOD;\r
 portTickType xLastExecutionTime;\r
 \r
 /* Buffer into which the high frequency timer count is written as a string. */\r
-static portCHAR cStringBuffer[ mainMAX_STRING_LENGTH ];\r
+static char cStringBuffer[ mainMAX_STRING_LENGTH ];\r
 \r
 /* The count of the high frequency timer interrupts. */\r
-extern unsigned portLONG ulHighFrequencyTimerInterrupts;\r
+extern unsigned long ulHighFrequencyTimerInterrupts;\r
 xLCDMessage xMessage = { ( 200 / portTICK_RATE_MS ), cStringBuffer };\r
 \r
        /* Setup the high frequency, high priority, timer test.  It is setup here\r
@@ -391,7 +391,7 @@ void vApplicationStackOverflowHook( void )
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-void _general_exception_handler( unsigned portLONG ulCause, unsigned portLONG ulStatus )\r
+void _general_exception_handler( unsigned long ulCause, unsigned long ulStatus )\r
 {\r
        /* This overrides the definition provided by the kernel.  Other exceptions \r
        should be handled here. */\r

diff --git a/Demo/PIC32MX_MPLAB/timertest.c b/Demo/PIC32MX_MPLAB/timertest.c
index ba32d7a30013f4b4f07e8c427ad00b041098fb07..72c8d487daf7dc4bae097e19d50c8de3fc967042 100644 (file)
--- a/Demo/PIC32MX_MPLAB/timertest.c
+++ b/Demo/PIC32MX_MPLAB/timertest.c
@@ -68,17 +68,17 @@ void __attribute__( (interrupt(ipl0), vector(_TIMER_2_VECTOR))) vT2InterruptWrap
 /*-----------------------------------------------------------*/\r
 \r
 /* Incremented every 20,000 interrupts, so should count in seconds. */\r
-unsigned portLONG ulHighFrequencyTimerInterrupts = 0;\r
+unsigned long ulHighFrequencyTimerInterrupts = 0;\r
 \r
 /* The frequency at which the timer is interrupting. */\r
-static unsigned portLONG ulFrequencyHz;\r
+static unsigned long ulFrequencyHz;\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
-void vSetupTimerTest( unsigned portSHORT usFrequencyHz )\r
+void vSetupTimerTest( unsigned short usFrequencyHz )\r
 {\r
        /* Remember the frequency so it can be used from the ISR. */\r
-       ulFrequencyHz = ( unsigned portLONG ) usFrequencyHz;\r
+       ulFrequencyHz = ( unsigned long ) usFrequencyHz;\r
 \r
        /* T2 is used to generate interrupts above the kernel and max syscall interrupt\r
        priority. */\r
@@ -86,7 +86,7 @@ void vSetupTimerTest( unsigned portSHORT usFrequencyHz )
        TMR2 = 0;\r
 \r
        /* Timer 2 is going to interrupt at usFrequencyHz Hz. */\r
-       PR2 = ( unsigned portSHORT ) ( ( configPERIPHERAL_CLOCK_HZ / ( unsigned portLONG ) usFrequencyHz ) - 1 );\r
+       PR2 = ( unsigned short ) ( ( configPERIPHERAL_CLOCK_HZ / ( unsigned long ) usFrequencyHz ) - 1 );\r
 \r
        /* Setup timer 2 interrupt priority to be above the kernel priority so \r
        the timer jitter is not effected by the kernel activity. */\r
@@ -105,7 +105,7 @@ void vSetupTimerTest( unsigned portSHORT usFrequencyHz )
 \r
 void vT2InterruptHandler( void )\r
 {\r
-static unsigned portLONG ulCalls = 0;\r
+static unsigned long ulCalls = 0;\r
 \r
        ++ulCalls;\r
        if( ulCalls >= ulFrequencyHz )\r