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

This commit is contained in:
Richard Barry 2013-12-29 14:49:03 +00:00
parent 3e20aa7d60
commit b54158d1dc
123 changed files with 736 additions and 736 deletions

View file

@ -87,12 +87,12 @@ static void prvSetupLCD( void );
/*
* Move to the first (0) or second (1) row of the LCD.
*/
static void prvLCDGotoRow( unsigned portSHORT usRow );
static void prvLCDGotoRow( unsigned short usRow );
/*
* Write a string of text to the LCD.
*/
static void prvLCDPutString( portCHAR *pcString );
static void prvLCDPutString( char *pcString );
/*
* Clear the LCD.
@ -142,8 +142,8 @@ static void prvLCDClear( void );
/* The queue used to send messages to the LCD task. */
xQueueHandle xLCDQueue;
static void prvLCDCommand( portCHAR cCommand );
static void prvLCDData( portCHAR cChar );
static void prvLCDCommand( char cCommand );
static void prvLCDData( char cChar );
/*-----------------------------------------------------------*/
@ -161,7 +161,7 @@ xQueueHandle xStartLCDTask( void )
}
/*-----------------------------------------------------------*/
static void prvLCDGotoRow( unsigned portSHORT usRow )
static void prvLCDGotoRow( unsigned short usRow )
{
if( usRow == 0 )
{
@ -174,7 +174,7 @@ static void prvLCDGotoRow( unsigned portSHORT usRow )
}
/*-----------------------------------------------------------*/
static void prvLCDCommand( portCHAR cCommand )
static void prvLCDCommand( char cCommand )
{
/* Prepare RD0 - RD7. */
lcdDATA &= 0xFF00;
@ -195,7 +195,7 @@ static void prvLCDCommand( portCHAR cCommand )
}
/*-----------------------------------------------------------*/
static void prvLCDData( portCHAR cChar )
static void prvLCDData( char cChar )
{
/* ensure lcdRW is 0. */
lcdRW = 0;
@ -223,7 +223,7 @@ static void prvLCDData( portCHAR cChar )
}
/*-----------------------------------------------------------*/
static void prvLCDPutString( portCHAR *pcString )
static void prvLCDPutString( char *pcString )
{
/* Write out each character with appropriate delay between each. */
while( *pcString )
@ -328,7 +328,7 @@ static void prvSetupLCD( void )
static void vLCDTask( void *pvParameters )
{
xLCDMessage xMessage;
unsigned portSHORT usRow = 0;
unsigned short usRow = 0;
/* Initialise the hardware. This uses delays so must not be called prior
to the scheduler being started. */

View file

@ -91,11 +91,11 @@ static void prvCalculateAndStoreJitter( void );
/* The maximum time (in processor clocks) between two consecutive timer
interrupts so far. */
unsigned portSHORT usMaxJitter = 0;
unsigned short usMaxJitter = 0;
/*-----------------------------------------------------------*/
void vSetupTimerTest( unsigned portSHORT usFrequencyHz )
void vSetupTimerTest( unsigned short usFrequencyHz )
{
/* T2 is used to generate interrupts. T4 is used to provide an accurate
time measurement. */
@ -105,10 +105,10 @@ void vSetupTimerTest( unsigned portSHORT usFrequencyHz )
TMR4 = 0;
/* Timer 2 is going to interrupt at usFrequencyHz Hz. */
PR2 = ( unsigned portSHORT ) ( configCPU_CLOCK_HZ / ( unsigned portLONG ) usFrequencyHz );
PR2 = ( unsigned short ) ( configCPU_CLOCK_HZ / ( unsigned long ) usFrequencyHz );
/* Timer 4 is going to free run from minimum to maximum value. */
PR4 = ( unsigned portSHORT ) timerMAX_COUNT;
PR4 = ( unsigned short ) timerMAX_COUNT;
/* Setup timer 2 interrupt priority to be above the kernel priority so
the timer jitter is not effected by the kernel activity. */
@ -128,8 +128,8 @@ void vSetupTimerTest( unsigned portSHORT usFrequencyHz )
static void prvCalculateAndStoreJitter( void )
{
static unsigned portSHORT usLastCount = 0, usSettleCount = 0;
unsigned portSHORT usThisCount, usDifference;
static unsigned short usLastCount = 0, usSettleCount = 0;
unsigned short usThisCount, usDifference;
/* Capture the timer value as we enter the interrupt. */
usThisCount = TMR4;