mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-08-19 09:38:32 -04:00
Remove unnecessary use of portLONG, portCHAR and portSHORT.
Change version number in headers.
This commit is contained in:
Richard Barry
parent
4322b8d649
commit
23a5a73219
59 changed files with 2136 additions and 2087 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.
|
||||
*/
|
||||
|
||||
|
||||
|
|
@ -69,10 +70,10 @@ static xQueueHandle xRxedChars;
|
|||
static xQueueHandle xCharsForTx;
|
||||
|
||||
/* Hardware specific constants. */
|
||||
#define serTX_INTERRUPT ( ( unsigned portCHAR ) 0x80 )
|
||||
#define serRX_INTERRUPT ( ( unsigned portCHAR ) 0x40 )
|
||||
#define serTX_ENABLE ( ( unsigned portCHAR ) 0x20 )
|
||||
#define serRX_ENABLE ( ( unsigned portCHAR ) 0x10 )
|
||||
#define serTX_INTERRUPT ( ( unsigned char ) 0x80 )
|
||||
#define serRX_INTERRUPT ( ( unsigned char ) 0x40 )
|
||||
#define serTX_ENABLE ( ( unsigned char ) 0x20 )
|
||||
#define serRX_ENABLE ( ( unsigned char ) 0x10 )
|
||||
|
||||
/* Macros to turn on and off the serial port THRE interrupt while leaving the
|
||||
other register bits in their correct state. The Rx interrupt is always
|
||||
|
|
@ -82,7 +83,7 @@ enabled. */
|
|||
|
||||
/* Bit used to switch on the channel 1 serial port in the module stop
|
||||
register. */
|
||||
#define serMSTP6 ( ( unsigned portSHORT ) 0x0040 )
|
||||
#define serMSTP6 ( ( unsigned short ) 0x0040 )
|
||||
|
||||
/* Interrupt service routines. Note that the Rx and Tx service routines can
|
||||
cause a context switch and are therefore defined with the saveall attribute in
|
||||
|
|
@ -97,12 +98,12 @@ void vCOM_1_Error_ISR( void ) __attribute__ ( ( interrupt_handler ) );
|
|||
/*
|
||||
* Initialise port 1 for interrupt driven communications.
|
||||
*/
|
||||
xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )
|
||||
xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )
|
||||
{
|
||||
/* Create the queues used to communicate between the tasks and the
|
||||
interrupt service routines. */
|
||||
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 ) );
|
||||
|
||||
/* No parity, 8 data bits and 1 stop bit is the default so does not require
|
||||
configuration - setup the remains of the hardware. */
|
||||
|
|
@ -143,7 +144,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 queue. Return false if no characters
|
||||
are available, or arrive before xBlockTime expires. */
|
||||
|
|
@ -158,7 +159,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 = pdPASS;
|
||||
|
||||
|
|
@ -201,7 +202,7 @@ void vCOM_1_Rx_ISR( void )
|
|||
|
||||
/* As this is a switching ISR the local variables must be declared as
|
||||
static. */
|
||||
static portCHAR cRxByte;
|
||||
static char cRxByte;
|
||||
static portBASE_TYPE xHigherPriorityTaskWoken;
|
||||
|
||||
xHigherPriorityTaskWoken = pdFALSE;
|
||||
|
|
@ -231,7 +232,7 @@ void vCOM_1_Tx_ISR( void )
|
|||
|
||||
/* As this is a switching ISR the local variables must be declared as
|
||||
static. */
|
||||
static portCHAR cTxByte;
|
||||
static char cTxByte;
|
||||
static signed portBASE_TYPE xTaskWokenByTx;
|
||||
|
||||
/* This variable is static so must be explicitly reinitialised each
|
||||
|
|
@ -269,7 +270,7 @@ void vCOM_1_Tx_ISR( void )
|
|||
*/
|
||||
void vCOM_1_Error_ISR( void )
|
||||
{
|
||||
volatile unsigned portCHAR ucIn;
|
||||
volatile unsigned char ucIn;
|
||||
|
||||
ucIn = SSR1;
|
||||
SSR1 = 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue