mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-08-20 01:58:32 -04:00
Remove unnecessary use of portLONG, portCHAR and portSHORT.
Change version number in headers.
This commit is contained in:
Richard Barry
parent
7f0c4ef656
commit
64c701aff7
96 changed files with 3668 additions and 3576 deletions
|
|
@ -1,48 +1,49 @@
|
|||
/*
|
||||
FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
|
||||
FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.
|
||||
|
||||
This file is part of the FreeRTOS distribution.
|
||||
This file is part of the FreeRTOS distribution.
|
||||
|
||||
FreeRTOS is free software; you can redistribute it and/or modify it under
|
||||
the terms of the GNU General Public License (version 2) as published by the
|
||||
Free Software Foundation and modified by the FreeRTOS exception.
|
||||
**NOTE** The exception to the GPL is included to allow you to distribute a
|
||||
combined work that includes FreeRTOS without being obliged to provide the
|
||||
source code for proprietary components outside of the FreeRTOS kernel.
|
||||
Alternative commercial license and support terms are also available upon
|
||||
request. See the licensing section of http://www.FreeRTOS.org for full
|
||||
license details.
|
||||
FreeRTOS is free software; you can redistribute it and/or modify it under
|
||||
the terms of the GNU General Public License (version 2) as published by the
|
||||
Free Software Foundation and modified by the FreeRTOS exception.
|
||||
**NOTE** The exception to the GPL is included to allow you to distribute a
|
||||
combined work that includes FreeRTOS without being obliged to provide the
|
||||
source code for proprietary components outside of the FreeRTOS kernel.
|
||||
Alternative commercial license and support terms are also available upon
|
||||
request. See the licensing section of http://www.FreeRTOS.org for full
|
||||
license details.
|
||||
|
||||
FreeRTOS is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
more details.
|
||||
FreeRTOS is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59
|
||||
Temple Place, Suite 330, Boston, MA 02111-1307 USA.
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59
|
||||
Temple Place, Suite 330, Boston, MA 02111-1307 USA.
|
||||
|
||||
|
||||
***************************************************************************
|
||||
* *
|
||||
* Looking for a quick start? Then check out the FreeRTOS eBook! *
|
||||
* See http://www.FreeRTOS.org/Documentation for details *
|
||||
* *
|
||||
***************************************************************************
|
||||
***************************************************************************
|
||||
* *
|
||||
* The FreeRTOS eBook and reference manual are available to purchase for a *
|
||||
* small fee. Help yourself get started quickly while also helping the *
|
||||
* FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *
|
||||
* *
|
||||
***************************************************************************
|
||||
|
||||
1 tab == 4 spaces!
|
||||
1 tab == 4 spaces!
|
||||
|
||||
Please ensure to read the configuration and relevant port sections of the
|
||||
online documentation.
|
||||
Please ensure to read the configuration and relevant port sections of the
|
||||
online documentation.
|
||||
|
||||
http://www.FreeRTOS.org - Documentation, latest information, license and
|
||||
contact details.
|
||||
http://www.FreeRTOS.org - Documentation, latest information, license and
|
||||
contact details.
|
||||
|
||||
http://www.SafeRTOS.com - A version that is certified for use in safety
|
||||
critical systems.
|
||||
http://www.SafeRTOS.com - A version that is certified for use in safety
|
||||
critical systems.
|
||||
|
||||
http://www.OpenRTOS.com - Commercial support, development, porting,
|
||||
licensing and training services.
|
||||
http://www.OpenRTOS.com - Commercial support, development, porting,
|
||||
licensing and training services.
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -159,8 +160,8 @@ characters from mainFIRST_TX_CHAR to mainLAST_TX_CHAR. */
|
|||
|
||||
/* Just used to walk through the program memory in order that some random data
|
||||
can be generated. */
|
||||
#define mainTOTAL_PROGRAM_MEMORY ( ( unsigned portLONG * ) ( 8 * 1024 ) )
|
||||
#define mainFIRST_PROGRAM_BYTES ( ( unsigned portLONG * ) 4 )
|
||||
#define mainTOTAL_PROGRAM_MEMORY ( ( unsigned long * ) ( 8 * 1024 ) )
|
||||
#define mainFIRST_PROGRAM_BYTES ( ( unsigned long * ) 4 )
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
|
|
@ -183,7 +184,7 @@ static void vSerialTxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE
|
|||
/*
|
||||
* Writes a string the the LCD.
|
||||
*/
|
||||
static void prvWriteString( const portCHAR *pcString );
|
||||
static void prvWriteString( const char *pcString );
|
||||
|
||||
/*
|
||||
* Initialisation routine for the UART.
|
||||
|
|
@ -193,7 +194,7 @@ static void vSerialInit( void );
|
|||
/*
|
||||
* Thread safe write to the PDC.
|
||||
*/
|
||||
static void prvPDCWrite( portCHAR cAddress, portCHAR cData );
|
||||
static void prvPDCWrite( char cAddress, char cData );
|
||||
|
||||
/*
|
||||
* Function to simply set a known value into the general purpose registers
|
||||
|
|
@ -219,7 +220,7 @@ defined within this file. */
|
|||
unsigned portBASE_TYPE uxErrorStatus = pdPASS;
|
||||
|
||||
/* The next character to transmit. */
|
||||
static portCHAR cNextChar;
|
||||
static char cNextChar;
|
||||
|
||||
/* The queue used to transmit characters from the interrupt to the Comms Rx
|
||||
task. */
|
||||
|
|
@ -231,7 +232,7 @@ int main( void )
|
|||
{
|
||||
/* Create the queue used to communicate between the UART ISR and the Comms
|
||||
Rx task. */
|
||||
xCommsQueue = xQueueCreate( mainRX_QUEUE_LEN, sizeof( portCHAR ) );
|
||||
xCommsQueue = xQueueCreate( mainRX_QUEUE_LEN, sizeof( char ) );
|
||||
|
||||
/* Setup the ports used by the demo and the clock. */
|
||||
prvSetupHardware();
|
||||
|
|
@ -285,7 +286,7 @@ void vApplicationIdleHook( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
static void prvWriteString( const portCHAR *pcString )
|
||||
static void prvWriteString( const char *pcString )
|
||||
{
|
||||
/* Write pcString to the LED, pausing between each character. */
|
||||
prvPDCWrite(PDC_LCD_CSR, LCD_CLEAR);
|
||||
|
|
@ -301,7 +302,7 @@ static void prvWriteString( const portCHAR *pcString )
|
|||
void vLCDTask( void * pvParameters )
|
||||
{
|
||||
unsigned portBASE_TYPE uxIndex;
|
||||
const unsigned portCHAR ucCFGData[] = {
|
||||
const unsigned char ucCFGData[] = {
|
||||
0x30, /* Set data bus to 8-bits. */
|
||||
0x30,
|
||||
0x30,
|
||||
|
|
@ -313,7 +314,7 @@ const unsigned portCHAR ucCFGData[] = {
|
|||
};
|
||||
|
||||
/* The strings that are written to the LCD. */
|
||||
const portCHAR *pcStringsToDisplay[] = {
|
||||
const char *pcStringsToDisplay[] = {
|
||||
"Stellaris",
|
||||
"Demo",
|
||||
"Two",
|
||||
|
|
@ -360,7 +361,7 @@ const portCHAR *pcStringsToDisplay[] = {
|
|||
|
||||
static void vCommsRxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex )
|
||||
{
|
||||
static portCHAR cRxedChar, cExpectedChar = mainFIRST_TX_CHAR;
|
||||
static char cRxedChar, cExpectedChar = mainFIRST_TX_CHAR;
|
||||
portBASE_TYPE xResult;
|
||||
|
||||
crSTART( xHandle );
|
||||
|
|
@ -414,7 +415,7 @@ portBASE_TYPE xResult;
|
|||
static void vSerialTxCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex )
|
||||
{
|
||||
portTickType xDelayPeriod;
|
||||
static unsigned portLONG *pulRandomBytes = mainFIRST_PROGRAM_BYTES;
|
||||
static unsigned long *pulRandomBytes = mainFIRST_PROGRAM_BYTES;
|
||||
|
||||
/* Co-routine MUST start with a call to crSTART. */
|
||||
crSTART( xHandle );
|
||||
|
|
@ -500,8 +501,8 @@ static void vSerialInit( void )
|
|||
|
||||
void vUART_ISR(void)
|
||||
{
|
||||
unsigned portLONG ulStatus;
|
||||
portCHAR cRxedChar;
|
||||
unsigned long ulStatus;
|
||||
char cRxedChar;
|
||||
portBASE_TYPE xTaskWokenByPost = pdFALSE;
|
||||
|
||||
/* What caused the interrupt. */
|
||||
|
|
@ -518,7 +519,7 @@ portBASE_TYPE xTaskWokenByPost = pdFALSE;
|
|||
/* Get the char from the buffer and post it onto the queue of
|
||||
Rxed chars. Posting the character should wake the task that is
|
||||
blocked on the queue waiting for characters. */
|
||||
cRxedChar = ( portCHAR ) HWREG( UART0_BASE + UART_O_DR );
|
||||
cRxedChar = ( char ) HWREG( UART0_BASE + UART_O_DR );
|
||||
xTaskWokenByPost = crQUEUE_SEND_FROM_ISR( xCommsQueue, &cRxedChar, xTaskWokenByPost );
|
||||
}
|
||||
}
|
||||
|
|
@ -545,7 +546,7 @@ portBASE_TYPE xTaskWokenByPost = pdFALSE;
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
static void prvPDCWrite( portCHAR cAddress, portCHAR cData )
|
||||
static void prvPDCWrite( char cAddress, char cData )
|
||||
{
|
||||
vTaskSuspendAll();
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue