X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FCORTEX_LM3S102_Rowley%2FDemo3%2Fmain.c;h=cc9d7f40e37c67d8d4e0d9113f5a8e41ad935e69;hb=b15dfacb6026af3b0ba697e5753844923b468d2b;hp=fa4bd8981514a4a78bc94c2e0fac06a441556f13;hpb=29ba679b4650a076bdb5d97b6eb578aec31eafc5;p=freertos diff --git a/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c b/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c index fa4bd8981..cc9d7f40e 100644 --- a/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c +++ b/FreeRTOS/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c @@ -1,68 +1,29 @@ /* - FreeRTOS V7.2.0 - Copyright (C) 2012 Real Time Engineers Ltd. - - - *************************************************************************** - * * - * 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! * - * * - * >>> See http://www.FreeRTOS.org/Documentation for details. <<< * - * * - * Thank you for using FreeRTOS, and thank you for your support! * - * * - *************************************************************************** - - - 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. - - 1 tab == 4 spaces! - - *************************************************************************** - * * - * Having a problem? Start by reading the FAQ "My application does * - * 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/plus - A selection of FreeRTOS ecosystem products, - including FreeRTOS+Trace - an indispensable productivity tool. - - 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. -*/ + * FreeRTOS Kernel V10.3.0 + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * http://www.FreeRTOS.org + * http://aws.amazon.com/freertos + * + * 1 tab == 4 spaces! + */ /* @@ -132,10 +93,10 @@ static volatile portBASE_TYPE uxDelay = 250; /* The queue used to communicate between the I2C interrupt and the I2C co-routine. */ -static xQueueHandle xADCQueue; +static QueueHandle_t xADCQueue; /* The queue used to synchronise the flash co-routines. */ -static xQueueHandle xDelayQueue; +static QueueHandle_t xDelayQueue; /* * Sets up the PLL, I2C and GPIO used by the demo. @@ -143,8 +104,8 @@ static xQueueHandle xDelayQueue; static void prvSetupHardware( void ); /* The co-routines as described at the top of the file. */ -static void vI2CCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); -static void vFlashCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ); +static void vI2CCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); +static void vFlashCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ); /*-----------------------------------------------------------*/ @@ -157,7 +118,7 @@ unsigned portBASE_TYPE uxCoRoutine; /* Create the queue used to communicate between the ISR and I2C co-routine. This can only ever contain one value. */ - xADCQueue = xQueueCreate( mainQUEUE_LENGTH, sizeof( portTickType ) ); + xADCQueue = xQueueCreate( mainQUEUE_LENGTH, sizeof( TickType_t ) ); /* Create the queue used to synchronise the flash co-routines. The queue is used to trigger three tasks, but is for synchronisation only and does @@ -206,9 +167,9 @@ static void prvSetupHardware( void ) } /*-----------------------------------------------------------*/ -static void vI2CCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void vI2CCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { -portTickType xADCResult; +TickType_t xADCResult; static portBASE_TYPE xResult = 0, xMilliSecs, xLED; crSTART( xHandle ); @@ -226,7 +187,7 @@ static portBASE_TYPE xResult = 0, xMilliSecs, xLED; /* Scale the result to give a useful range of values for a visual demo. */ xADCResult >>= 2; - xMilliSecs = xADCResult / portTICK_RATE_MS; + xMilliSecs = xADCResult / portTICK_PERIOD_MS; /* The delay is split between the four co-routines so they remain in synch. */ @@ -248,7 +209,7 @@ static portBASE_TYPE xResult = 0, xMilliSecs, xLED; } /*-----------------------------------------------------------*/ -static void vFlashCoRoutine( xCoRoutineHandle xHandle, unsigned portBASE_TYPE uxIndex ) +static void vFlashCoRoutine( CoRoutineHandle_t xHandle, unsigned portBASE_TYPE uxIndex ) { portBASE_TYPE xResult, xNothing; @@ -276,7 +237,7 @@ portBASE_TYPE xResult, xNothing; void vI2C_ISR(void) { -static portTickType xReading; +static TickType_t xReading; /* Clear the interrupt. */ I2CMasterIntClear( I2C_MASTER_BASE );