mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-09-01 11:53:53 -04:00
Replace use of legacy portTYPE macros from old demos and standard demo files.
This commit is contained in:
parent
3e20aa7d60
commit
b54158d1dc
123 changed files with 736 additions and 736 deletions
|
@ -123,12 +123,12 @@ to PDR09 (SEG1) are used by the prvFlashCoRoutine() and PDR00 (SEG2) are used by
|
|||
/*
|
||||
* The 'fixed delay' co-routine as described at the top of the file.
|
||||
*/
|
||||
static void prvFixedDelayCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex );
|
||||
static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex );
|
||||
|
||||
/*
|
||||
* The 'flash' co-routine as described at the top of the file.
|
||||
*/
|
||||
static void prvFlashCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex );
|
||||
static void prvFlashCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex );
|
||||
|
||||
/* The queue used to pass data between the 'fixed delay' co-routines and the
|
||||
'flash' co-routine. */
|
||||
|
@ -168,7 +168,7 @@ unsigned portBASE_TYPE uxIndex;
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
static void prvFixedDelayCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex )
|
||||
static void prvFixedDelayCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex )
|
||||
{
|
||||
/* Even though this is a co-routine the xResult variable does not need to be
|
||||
static as we do not need it to maintain its state between blocks. */
|
||||
|
@ -209,7 +209,7 @@ static const portTickType xFlashRates[ crfMAX_FLASH_TASKS ] = { 150 / portTICK_R
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
static void prvFlashCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex )
|
||||
static void prvFlashCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex )
|
||||
{
|
||||
/* Even though this is a co-routine the variable do not need to be
|
||||
static as we do not need it to maintain their state between blocks. */
|
||||
|
|
|
@ -70,8 +70,8 @@
|
|||
|
||||
#define partstNUM_LEDs 8
|
||||
|
||||
static unsigned portCHAR sState[ partstNUM_LEDs ] = { pdFALSE };
|
||||
static unsigned portCHAR sState1[ partstNUM_LEDs ] = { pdFALSE };
|
||||
static unsigned char sState[ partstNUM_LEDs ] = { pdFALSE };
|
||||
static unsigned char sState1[ partstNUM_LEDs ] = { pdFALSE };
|
||||
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
|
|
@ -85,19 +85,19 @@ static xQueueHandle xRxedChars;
|
|||
/* The queue used to hold characters waiting transmission. */
|
||||
static xQueueHandle xCharsForTx;
|
||||
|
||||
static volatile portSHORT sTHREEmpty;
|
||||
static volatile short sTHREEmpty;
|
||||
|
||||
static volatile portSHORT queueFail = pdFALSE;
|
||||
static volatile short queueFail = pdFALSE;
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )
|
||||
xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )
|
||||
{
|
||||
/* Initialise the hardware. */
|
||||
portENTER_CRITICAL();
|
||||
{
|
||||
/* Create the queues used by the com test task. */
|
||||
xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof(signed portCHAR) );
|
||||
xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof(signed portCHAR) );
|
||||
xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof(signed char) );
|
||||
xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof(signed char) );
|
||||
|
||||
if( xRxedChars == 0 )
|
||||
{
|
||||
|
@ -129,7 +129,7 @@ xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime )
|
||||
signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime )
|
||||
{
|
||||
/* Get the next character from the buffer. Return false if no characters
|
||||
are available, or arrive before xBlockTime expires. */
|
||||
|
@ -144,7 +144,7 @@ signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcR
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime )
|
||||
signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime )
|
||||
{
|
||||
signed portBASE_TYPE xReturn;
|
||||
|
||||
|
@ -199,7 +199,7 @@ signed portBASE_TYPE xReturn;
|
|||
*/
|
||||
__interrupt void UART0_RxISR( void )
|
||||
{
|
||||
volatile signed portCHAR cChar;
|
||||
volatile signed char cChar;
|
||||
portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
|
||||
|
||||
/* Get the character from the UART and post it on the queue of Rxed
|
||||
|
@ -223,7 +223,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
|
|||
*/
|
||||
__interrupt void UART0_TxISR( void )
|
||||
{
|
||||
signed portCHAR cChar;
|
||||
signed char cChar;
|
||||
signed portBASE_TYPE xTaskWoken = pdFALSE;
|
||||
|
||||
/* The previous character has been transmitted. See if there are any
|
||||
|
|
|
@ -69,7 +69,7 @@ char Getch0( void ) /* waits for and returns incomming char */
|
|||
|
||||
void Puts0( const char *Name1 ) /* Puts a String to UART */
|
||||
{
|
||||
volatile portSHORT i, len;
|
||||
volatile short i, len;
|
||||
len = strlen( Name1 );
|
||||
|
||||
for( i = 0; i < len; i++ ) /* go through string */
|
||||
|
@ -85,7 +85,7 @@ void Puts0( const char *Name1 ) /* Puts a String to UART */
|
|||
|
||||
void Puthex0( unsigned long n, unsigned char digits )
|
||||
{
|
||||
unsigned portCHAR digit = 0, div = 0, i;
|
||||
unsigned char digit = 0, div = 0, i;
|
||||
|
||||
div = ( 4 * (digits - 1) ); /* init shift divisor */
|
||||
for( i = 0; i < digits; i++ )
|
||||
|
@ -98,8 +98,8 @@ void Puthex0( unsigned long n, unsigned char digits )
|
|||
|
||||
void Putdec0( unsigned long x, int digits )
|
||||
{
|
||||
portSHORT i;
|
||||
portCHAR buf[10], sign = 1;
|
||||
short i;
|
||||
char buf[10], sign = 1;
|
||||
|
||||
if( digits < 0 )
|
||||
{ /* should be print of zero? */
|
||||
|
@ -144,11 +144,11 @@ void vUtilityStartTraceTask( unsigned portBASE_TYPE uxPriority )
|
|||
|
||||
static void vUART0Task( void *pvParameters )
|
||||
{
|
||||
static portCHAR buff[ 800 ] = { 0 };
|
||||
unsigned portLONG trace_len;
|
||||
signed portLONG i, j, l = 0;
|
||||
static char buff[ 800 ] = { 0 };
|
||||
unsigned long trace_len;
|
||||
signed long i, j, l = 0;
|
||||
|
||||
unsigned portCHAR ch;
|
||||
unsigned char ch;
|
||||
( void ) pvParameters;
|
||||
|
||||
SSR0_RIE = 1;
|
||||
|
@ -221,7 +221,7 @@ static void vUART0Task( void *pvParameters )
|
|||
|
||||
__interrupt void UART0_TraceRxISR( void )
|
||||
{
|
||||
unsigned portCHAR ch;
|
||||
unsigned char ch;
|
||||
portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
|
||||
|
||||
ch = RDR0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue