X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FCommon%2FFull%2FPollQ.c;h=f57c93ae3eba0f6b2990a9ae3510ed8e375b796a;hb=a0c885cd8b40e413c04232b56cea3b388f4c3283;hp=2827c902a3b701a94f86b4548afc3891019ebae1;hpb=29ba679b4650a076bdb5d97b6eb578aec31eafc5;p=freertos diff --git a/FreeRTOS/Demo/Common/Full/PollQ.c b/FreeRTOS/Demo/Common/Full/PollQ.c index 2827c902a..f57c93ae3 100644 --- a/FreeRTOS/Demo/Common/Full/PollQ.c +++ b/FreeRTOS/Demo/Common/Full/PollQ.c @@ -1,67 +1,66 @@ /* - FreeRTOS V7.2.0 - Copyright (C) 2012 Real Time Engineers Ltd. - + FreeRTOS V8.1.1 - Copyright (C) 2014 Real Time Engineers Ltd. + All rights reserved + + VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. *************************************************************************** * * - * FreeRTOS tutorial books are available in pdf and paperback. * - * Complete, revised, and edited pdf reference manuals are also * - * available. * - * * - * Purchasing FreeRTOS documentation will not only help you, by * - * ensuring you get running as quickly as possible and with an * - * in-depth knowledge of how to use FreeRTOS, it will also help * - * the FreeRTOS project to continue with its mission of providing * - * professional grade, cross platform, de facto standard solutions * - * for microcontrollers - completely free of charge! * + * FreeRTOS provides completely free yet professionally developed, * + * robust, strictly quality controlled, supported, and cross * + * platform software that has become a de facto standard. * * * - * >>> See http://www.FreeRTOS.org/Documentation for details. <<< * + * Help yourself get started quickly and support the FreeRTOS * + * project by purchasing a FreeRTOS tutorial book, reference * + * manual, or both from: http://www.FreeRTOS.org/Documentation * * * - * Thank you for using FreeRTOS, and thank you for your support! * + * Thank you! * * * *************************************************************************** - 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 modification 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. 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 and the FreeRTOS license exception along with FreeRTOS; if not it - can be viewed here: http://www.freertos.org/a00114.html and also obtained - by writing to Richard Barry, contact details for whom are available on the - FreeRTOS WEB site. + Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception. + + >>! NOTE: The modification 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. !<< + + 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. Full license text is available from the following + link: http://www.freertos.org/a00114.html 1 tab == 4 spaces! - + *************************************************************************** * * * Having a problem? Start by reading the FAQ "My application does * - * not run, what could be wrong? * + * not run, what could be wrong?" * * * * http://www.FreeRTOS.org/FAQHelp.html * * * *************************************************************************** - - http://www.FreeRTOS.org - Documentation, training, latest information, - license and contact details. - + http://www.FreeRTOS.org - Documentation, books, training, latest versions, + license and Real Time Engineers Ltd. contact details. + http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products, - including FreeRTOS+Trace - an indispensable productivity tool. + including FreeRTOS+Trace - an indispensable productivity tool, a DOS + compatible FAT file system, and our tiny thread aware UDP/IP stack. + + http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High + Integrity Systems to sell under the OpenRTOS brand. Low cost OpenRTOS + licenses offer ticketed support, indemnification and middleware. - Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell - the code with commercial support, indemnification, and middleware, under - the OpenRTOS brand: http://www.OpenRTOS.com. High Integrity Systems also - provide a safety engineered and independently SIL3 certified version under - the SafeRTOS brand: http://www.SafeRTOS.com. + http://www.SafeRTOS.com - High Integrity Systems also provide a safety + engineered and independently SIL3 certified version for use in safety and + mission critical applications that require provable dependability. + + 1 tab == 4 spaces! */ @@ -95,7 +94,7 @@ Changes from V2.0.0 + Delay periods are now specified using variables and constants of - portTickType rather than unsigned long. + TickType_t rather than unsigned long. */ #include @@ -123,7 +122,7 @@ static volatile short sPollingConsumerCount = 0, sPollingProducerCount = 0; void vStartPolledQueueTasks( unsigned portBASE_TYPE uxPriority ) { -static xQueueHandle xPolledQueue; +static QueueHandle_t xPolledQueue; const unsigned portBASE_TYPE uxQueueSize = 10; /* Create the queue used by the producer and consumer. */ @@ -138,8 +137,8 @@ const unsigned portBASE_TYPE uxQueueSize = 10; static void vPolledQueueProducer( void *pvParameters ) { unsigned short usValue = 0, usLoop; -xQueueHandle *pxQueue; -const portTickType xDelay = ( portTickType ) 200 / portTICK_RATE_MS; +QueueHandle_t *pxQueue; +const TickType_t xDelay = ( TickType_t ) 200 / portTICK_PERIOD_MS; const unsigned short usNumToProduce = 3; const char * const pcTaskStartMsg = "Polled queue producer started.\r\n"; const char * const pcTaskErrorMsg = "Could not post on polled queue.\r\n"; @@ -149,14 +148,14 @@ short sError = pdFALSE; vPrintDisplayMessage( &pcTaskStartMsg ); /* The queue being used is passed in as the parameter. */ - pxQueue = ( xQueueHandle * ) pvParameters; + pxQueue = ( QueueHandle_t * ) pvParameters; for( ;; ) { for( usLoop = 0; usLoop < usNumToProduce; ++usLoop ) { /* Send an incrementing number on the queue without blocking. */ - if( xQueueSendToBack( *pxQueue, ( void * ) &usValue, ( portTickType ) 0 ) != pdPASS ) + if( xQueueSendToBack( *pxQueue, ( void * ) &usValue, ( TickType_t ) 0 ) != pdPASS ) { /* We should never find the queue full - this is an error. */ vPrintDisplayMessage( &pcTaskErrorMsg ); @@ -186,8 +185,8 @@ short sError = pdFALSE; static void vPolledQueueConsumer( void *pvParameters ) { unsigned short usData, usExpectedValue = 0; -xQueueHandle *pxQueue; -const portTickType xDelay = ( portTickType ) 200 / portTICK_RATE_MS; +QueueHandle_t *pxQueue; +const TickType_t xDelay = ( TickType_t ) 200 / portTICK_PERIOD_MS; const char * const pcTaskStartMsg = "Polled queue consumer started.\r\n"; const char * const pcTaskErrorMsg = "Incorrect value received on polled queue.\r\n"; short sError = pdFALSE; @@ -196,14 +195,14 @@ short sError = pdFALSE; vPrintDisplayMessage( &pcTaskStartMsg ); /* The queue being used is passed in as the parameter. */ - pxQueue = ( xQueueHandle * ) pvParameters; + pxQueue = ( QueueHandle_t * ) pvParameters; for( ;; ) { /* Loop until the queue is empty. */ while( uxQueueMessagesWaiting( *pxQueue ) ) { - if( xQueueReceive( *pxQueue, &usData, ( portTickType ) 0 ) == pdPASS ) + if( xQueueReceive( *pxQueue, &usData, ( TickType_t ) 0 ) == pdPASS ) { if( usData != usExpectedValue ) {