X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FARM9_STR91X_IAR%2Fmain.c;h=d0544b4452d83e9b6b725feb63a7b508d2b5c870;hb=b15dfacb6026af3b0ba697e5753844923b468d2b;hp=0b5b090d3bb0bd94aacc6f9c18c2a8a257639cbc;hpb=abc9255183aa4ad1b011116333f26570ccc7aa4b;p=freertos diff --git a/FreeRTOS/Demo/ARM9_STR91X_IAR/main.c b/FreeRTOS/Demo/ARM9_STR91X_IAR/main.c index 0b5b090d3..d0544b445 100644 --- a/FreeRTOS/Demo/ARM9_STR91X_IAR/main.c +++ b/FreeRTOS/Demo/ARM9_STR91X_IAR/main.c @@ -1,66 +1,29 @@ /* - FreeRTOS V7.5.2 - Copyright (C) 2013 Real Time Engineers Ltd. - - VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. - - *************************************************************************** - * * - * FreeRTOS provides completely free yet professionally developed, * - * robust, strictly quality controlled, supported, and cross * - * platform software that has become a de facto standard. * - * * - * 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! * - * * - *************************************************************************** - - 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. 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?" * - * * - * http://www.FreeRTOS.org/FAQHelp.html * - * * - *************************************************************************** - - 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, 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. - - 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! -*/ + * 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! + */ /* NOTE : Tasks run in system mode and the scheduler runs in Supervisor mode. @@ -142,9 +105,9 @@ #define mainGENERIC_QUEUE_PRIORITY ( tskIDLE_PRIORITY ) /* Delays used by the various tasks defined in this file. */ -#define mainCHECK_PERIOD ( ( portTickType ) 3000 / portTICK_RATE_MS ) -#define mainSTRING_WRITE_DELAY ( 500 / portTICK_RATE_MS ) -#define mainLCD_DELAY ( 20 / portTICK_RATE_MS ) +#define mainCHECK_PERIOD ( ( TickType_t ) 3000 / portTICK_PERIOD_MS ) +#define mainSTRING_WRITE_DELAY ( 500 / portTICK_PERIOD_MS ) +#define mainLCD_DELAY ( 20 / portTICK_PERIOD_MS ) /* Constants for the ComTest tasks. */ #define mainCOM_TEST_BAUD_RATE ( ( unsigned long ) 115200 ) @@ -204,7 +167,7 @@ static void prvLCDMessageTask( void * pvParameters ); /*-----------------------------------------------------------*/ /* The queue used to pass messages to the LCD task. */ -static xQueueHandle xLCDQueue; +static QueueHandle_t xLCDQueue; /* Error status flag. */ static unsigned long ulErrorFlags = 0; @@ -313,7 +276,7 @@ static void vErrorChecks( void *pvParameters ) static char cCheckVal[ mainMAX_FLAG_STRING_LEN ]; char *pcFlagString; xLCDMessage xMessageToSend; -portTickType xLastWakeTime; +TickType_t xLastWakeTime; char *pcStringsToDisplay[] = { "Check status flag" }; @@ -405,7 +368,7 @@ static void prvCheckOtherTasksAreStillRunning( void ) static void prvLCDMessageTask( void * pvParameters ) { -xQueueHandle *pxLCDQueue; +QueueHandle_t *pxLCDQueue; xLCDMessage xMessageToSend; portBASE_TYPE xIndex = 0; @@ -422,7 +385,7 @@ char *pcStringsToDisplay[] = { /* To test the parameter passing mechanism, the queue on which messages are posted is passed in as a parameter even though it is available as a file scope variable anyway. */ - pxLCDQueue = ( xQueueHandle * ) pvParameters; + pxLCDQueue = ( QueueHandle_t * ) pvParameters; for( ;; ) { @@ -451,14 +414,14 @@ char *pcStringsToDisplay[] = { void prvLCDTask( void * pvParameters ) { -xQueueHandle *pxLCDQueue; +QueueHandle_t *pxLCDQueue; xLCDMessage xReceivedMessage; char *pcString; /* To test the parameter passing mechanism, the queue on which messages are received is passed in as a parameter even though it is available as a file scope variable anyway. */ - pxLCDQueue = ( xQueueHandle * ) pvParameters; + pxLCDQueue = ( QueueHandle_t * ) pvParameters; LCD_Init();