X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Demo%2FAVR_ATMega323_WinAVR%2Fserial%2Fserial.c;h=eb745e8c7286238d82fbc72fd5ea9d883b19ab0b;hb=b50b48b5915471248b185bdff4ee0a4ee1826f75;hp=5b2286a6614495be1027edf475d1c439b3294d0e;hpb=763d6a5028f736b860543baaf746962e6c3d1523;p=freertos diff --git a/Demo/AVR_ATMega323_WinAVR/serial/serial.c b/Demo/AVR_ATMega323_WinAVR/serial/serial.c index 5b2286a66..eb745e8c7 100644 --- a/Demo/AVR_ATMega323_WinAVR/serial/serial.c +++ b/Demo/AVR_ATMega323_WinAVR/serial/serial.c @@ -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. */ /* @@ -55,7 +56,7 @@ Changes from V1.2.3 Changes from V2.0.0 + Delay periods are now specified using variables and constants of - portTickType rather than unsigned portLONG. + portTickType rather than unsigned long. + xQueueReceiveFromISR() used in place of xQueueReceive() within the ISR. Changes from V2.6.0 @@ -75,24 +76,24 @@ Changes from V2.6.0 #include "task.h" #include "serial.h" -#define serBAUD_DIV_CONSTANT ( ( unsigned portLONG ) 16 ) +#define serBAUD_DIV_CONSTANT ( ( unsigned long ) 16 ) /* Constants for writing to UCSRB. */ -#define serRX_INT_ENABLE ( ( unsigned portCHAR ) 0x80 ) -#define serRX_ENABLE ( ( unsigned portCHAR ) 0x10 ) -#define serTX_ENABLE ( ( unsigned portCHAR ) 0x08 ) -#define serTX_INT_ENABLE ( ( unsigned portCHAR ) 0x20 ) +#define serRX_INT_ENABLE ( ( unsigned char ) 0x80 ) +#define serRX_ENABLE ( ( unsigned char ) 0x10 ) +#define serTX_ENABLE ( ( unsigned char ) 0x08 ) +#define serTX_INT_ENABLE ( ( unsigned char ) 0x20 ) /* Constants for writing to UCSRC. */ -#define serUCSRC_SELECT ( ( unsigned portCHAR ) 0x80 ) -#define serEIGHT_DATA_BITS ( ( unsigned portCHAR ) 0x06 ) +#define serUCSRC_SELECT ( ( unsigned char ) 0x80 ) +#define serEIGHT_DATA_BITS ( ( unsigned char ) 0x06 ) static xQueueHandle xRxedChars; static xQueueHandle xCharsForTx; #define vInterruptOn() \ { \ - unsigned portCHAR ucByte; \ + unsigned char ucByte; \ \ ucByte = UCSRB; \ ucByte |= serTX_INT_ENABLE; \ @@ -102,7 +103,7 @@ static xQueueHandle xCharsForTx; #define vInterruptOff() \ { \ - unsigned portCHAR ucInByte; \ + unsigned char ucInByte; \ \ ucInByte = UCSRB; \ ucInByte &= ~serTX_INT_ENABLE; \ @@ -110,27 +111,27 @@ static xQueueHandle xCharsForTx; } /*-----------------------------------------------------------*/ -xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) +xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) { -unsigned portLONG ulBaudRateCounter; -unsigned portCHAR ucByte; +unsigned long ulBaudRateCounter; +unsigned char ucByte; 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 ) ); /* Calculate the baud rate register value from the equation in the data sheet. */ - ulBaudRateCounter = ( configCPU_CLOCK_HZ / ( serBAUD_DIV_CONSTANT * ulWantedBaud ) ) - ( unsigned portLONG ) 1; + ulBaudRateCounter = ( configCPU_CLOCK_HZ / ( serBAUD_DIV_CONSTANT * ulWantedBaud ) ) - ( unsigned long ) 1; /* Set the baud rate. */ - ucByte = ( unsigned portCHAR ) ( ulBaudRateCounter & ( unsigned portLONG ) 0xff ); + ucByte = ( unsigned char ) ( ulBaudRateCounter & ( unsigned long ) 0xff ); UBRRL = ucByte; - ulBaudRateCounter >>= ( unsigned portLONG ) 8; - ucByte = ( unsigned portCHAR ) ( ulBaudRateCounter & ( unsigned portLONG ) 0xff ); + ulBaudRateCounter >>= ( unsigned long ) 8; + ucByte = ( unsigned char ) ( ulBaudRateCounter & ( unsigned long ) 0xff ); UBRRH = ucByte; /* Enable the Rx interrupt. The Tx interrupt will get enabled @@ -149,7 +150,7 @@ unsigned portCHAR ucByte; } /*-----------------------------------------------------------*/ -signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime ) +signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime ) { /* Only one port is supported. */ ( void ) pxPort; @@ -167,7 +168,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 ) { /* Only one port is supported. */ ( void ) pxPort; @@ -186,7 +187,7 @@ signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOut void vSerialClose( xComPortHandle xPort ) { -unsigned portCHAR ucByte; +unsigned char ucByte; /* The parameter is not used. */ ( void ) xPort; @@ -207,7 +208,7 @@ unsigned portCHAR ucByte; SIGNAL( SIG_UART_RECV ) { -signed portCHAR cChar; +signed char cChar; signed portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; /* Get the character and post it on the queue of Rxed characters. @@ -226,7 +227,7 @@ signed portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; SIGNAL( SIG_UART_DATA ) { -signed portCHAR cChar, cTaskWoken; +signed char cChar, cTaskWoken; if( xQueueReceiveFromISR( xCharsForTx, &cChar, &cTaskWoken ) == pdTRUE ) {