X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FCORTEX_MB9A310_IAR_Keil%2Fmain-full.c;h=16df0a2af3e7cf92b7c365d2bf748dcd67f5bbe4;hb=f60b252c8f21e9198438dd0b7c7623f269aa6f1a;hp=7fb41ae2ff08f2324fbff02dd8e7a259c5536626;hpb=abc9255183aa4ad1b011116333f26570ccc7aa4b;p=freertos diff --git a/FreeRTOS/Demo/CORTEX_MB9A310_IAR_Keil/main-full.c b/FreeRTOS/Demo/CORTEX_MB9A310_IAR_Keil/main-full.c index 7fb41ae2f..16df0a2af 100644 --- a/FreeRTOS/Demo/CORTEX_MB9A310_IAR_Keil/main-full.c +++ b/FreeRTOS/Demo/CORTEX_MB9A310_IAR_Keil/main-full.c @@ -1,59 +1,64 @@ /* - FreeRTOS V7.5.2 - Copyright (C) 2013 Real Time Engineers Ltd. + FreeRTOS V9.0.0rc1 - Copyright (C) 2016 Real Time Engineers Ltd. + All rights reserved 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. + 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. + *************************************************************************** + >>! 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 + FOR A PARTICULAR PURPOSE. Full license text is available on 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?" * + * FreeRTOS provides completely free yet professionally developed, * + * robust, strictly quality controlled, supported, and cross * + * platform software that is more than just the market leader, it * + * is the industry's de facto standard. * * * - * http://www.FreeRTOS.org/FAQHelp.html * + * Help yourself get started quickly while simultaneously helping * + * to support the FreeRTOS project by purchasing a FreeRTOS * + * tutorial book, reference manual, or both: * + * http://www.FreeRTOS.org/Documentation * * * *************************************************************************** - http://www.FreeRTOS.org - Documentation, books, training, latest versions, - license and Real Time Engineers Ltd. contact details. + http://www.FreeRTOS.org/FAQHelp.html - Having a problem? Start by reading + the FAQ page "My application does not run, what could be wrong?". Have you + defined configASSERT()? + + http://www.FreeRTOS.org/support - In return for receiving this top quality + embedded software for free we request you assist our global community by + participating in the support forum. + + http://www.FreeRTOS.org/training - Investing in training allows your team to + be as productive as possible as early as possible. Now you can receive + FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers + Ltd, and the world's leading authority on the world's leading RTOS. 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.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate. + Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS. + + http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High + Integrity Systems ltd. to sell under the OpenRTOS brand. Low cost OpenRTOS + licenses offer ticketed support, indemnification and commercial middleware. http://www.SafeRTOS.com - High Integrity Systems also provide a safety engineered and independently SIL3 certified version for use in safety and @@ -173,8 +178,8 @@ #include "dynamic.h" /* The rate at which data is sent to the queue, specified in milliseconds, and -converted to ticks using the portTICK_RATE_MS constant. */ -#define mainQUEUE_SEND_FREQUENCY_MS ( 200 / portTICK_RATE_MS ) +converted to ticks using the portTICK_PERIOD_MS constant. */ +#define mainQUEUE_SEND_FREQUENCY_MS ( 200 / portTICK_PERIOD_MS ) /* The number of items the queue can hold. This is 1 as the receive task will remove items as they are added, meaning the send task should always find @@ -223,21 +228,21 @@ FreeRTOS.org web site to see which LEDs this relates to. */ /* The period at which the check timer will expire, in ms, provided no errors have been reported by any of the standard demo tasks. ms are converted to the -equivalent in ticks using the portTICK_RATE_MS constant. */ -#define mainCHECK_TIMER_PERIOD_MS ( 3000UL / portTICK_RATE_MS ) +equivalent in ticks using the portTICK_PERIOD_MS constant. */ +#define mainCHECK_TIMER_PERIOD_MS ( 3000UL / portTICK_PERIOD_MS ) /* The period at which the check timer will expire, in ms, if an error has been reported in one of the standard demo tasks. ms are converted to the equivalent -in ticks using the portTICK_RATE_MS constant. */ -#define mainERROR_CHECK_TIMER_PERIOD_MS ( 500UL / portTICK_RATE_MS ) +in ticks using the portTICK_PERIOD_MS constant. */ +#define mainERROR_CHECK_TIMER_PERIOD_MS ( 500UL / portTICK_PERIOD_MS ) /* The period at which the digit counter timer will expire, in ms, and converted -to ticks using the portTICK_RATE_MS constant. */ -#define mainDIGIT_COUNTER_TIMER_PERIOD_MS ( 250UL / portTICK_RATE_MS ) +to ticks using the portTICK_PERIOD_MS constant. */ +#define mainDIGIT_COUNTER_TIMER_PERIOD_MS ( 250UL / portTICK_PERIOD_MS ) /* The LED will remain on until the button has not been pushed for a full 5000ms. */ -#define mainLED_TIMER_PERIOD_MS ( 5000UL / portTICK_RATE_MS ) +#define mainLED_TIMER_PERIOD_MS ( 5000UL / portTICK_PERIOD_MS ) /* A zero block time. */ #define mainDONT_BLOCK ( 0UL ) @@ -262,17 +267,17 @@ static void prvQueueSendTask( void *pvParameters ); /* * The LED timer callback function. This does nothing but switch an LED off. */ -static void prvLEDTimerCallback( xTimerHandle xTimer ); +static void prvLEDTimerCallback( TimerHandle_t xTimer ); /* * The check timer callback function, as described at the top of this file. */ -static void prvCheckTimerCallback( xTimerHandle xTimer ); +static void prvCheckTimerCallback( TimerHandle_t xTimer ); /* * The digit counter callback function, as described at the top of this file. */ -static void prvDigitCounterTimerCallback( xTimerHandle xTimer ); +static void prvDigitCounterTimerCallback( TimerHandle_t xTimer ); /* * This is not a 'standard' partest function, so the prototype is not in @@ -283,19 +288,19 @@ void vParTestSetLEDFromISR( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE x /*-----------------------------------------------------------*/ /* The queue used by both application specific demo tasks defined in this file. */ -static xQueueHandle xQueue = NULL; +static QueueHandle_t xQueue = NULL; /* The LED software timer. This uses prvLEDTimerCallback() as it's callback function. */ -static xTimerHandle xLEDTimer = NULL; +static TimerHandle_t xLEDTimer = NULL; /* The digit counter software timer. This displays a counting digit on one half of the seven segment displays. */ -static xTimerHandle xDigitCounterTimer = NULL; +static TimerHandle_t xDigitCounterTimer = NULL; /* The check timer. This uses prvCheckTimerCallback() as its callback function. */ -static xTimerHandle xCheckTimer = NULL; +static TimerHandle_t xCheckTimer = NULL; /* If an error is detected in a standard demo task, then pcStatusMessage will be set to point to a string that identifies the offending task. This is just @@ -316,37 +321,37 @@ int main(void) { /* Start the two application specific demo tasks, as described in the comments at the top of this file. */ - xTaskCreate( prvQueueReceiveTask, ( signed char * ) "Rx", configMINIMAL_STACK_SIZE, NULL, mainQUEUE_RECEIVE_TASK_PRIORITY, NULL ); - xTaskCreate( prvQueueSendTask, ( signed char * ) "TX", configMINIMAL_STACK_SIZE, NULL, mainQUEUE_SEND_TASK_PRIORITY, NULL ); + xTaskCreate( prvQueueReceiveTask, "Rx", configMINIMAL_STACK_SIZE, NULL, mainQUEUE_RECEIVE_TASK_PRIORITY, NULL ); + xTaskCreate( prvQueueSendTask, "TX", configMINIMAL_STACK_SIZE, NULL, mainQUEUE_SEND_TASK_PRIORITY, NULL ); /* Create the software timer that is responsible for turning off the LED if the button is not pushed within 5000ms, as described at the top of this file. */ - xLEDTimer = xTimerCreate( ( const signed char * ) "LEDTimer", /* A text name, purely to help debugging. */ - ( mainLED_TIMER_PERIOD_MS ), /* The timer period, in this case 5000ms (5s). */ - pdFALSE, /* This is a one shot timer, so xAutoReload is set to pdFALSE. */ - ( void * ) 0, /* The ID is not used, so can be set to anything. */ - prvLEDTimerCallback /* The callback function that switches the LED off. */ + xLEDTimer = xTimerCreate( "LEDTimer", /* A text name, purely to help debugging. */ + ( mainLED_TIMER_PERIOD_MS ),/* The timer period, in this case 5000ms (5s). */ + pdFALSE, /* This is a one shot timer, so xAutoReload is set to pdFALSE. */ + ( void * ) 0, /* The ID is not used, so can be set to anything. */ + prvLEDTimerCallback /* The callback function that switches the LED off. */ ); /* Create the software timer that performs the 'check' functionality, as described at the top of this file. */ - xCheckTimer = xTimerCreate( ( const signed char * ) "CheckTimer",/* A text name, purely to help debugging. */ - ( mainCHECK_TIMER_PERIOD_MS ), /* The timer period, in this case 3000ms (3s). */ - pdTRUE, /* This is an auto-reload timer, so xAutoReload is set to pdTRUE. */ - ( void * ) 0, /* The ID is not used, so can be set to anything. */ - prvCheckTimerCallback /* The callback function that inspects the status of all the other tasks. */ + xCheckTimer = xTimerCreate( "CheckTimer", /* A text name, purely to help debugging. */ + ( mainCHECK_TIMER_PERIOD_MS ), /* The timer period, in this case 3000ms (3s). */ + pdTRUE, /* This is an auto-reload timer, so xAutoReload is set to pdTRUE. */ + ( void * ) 0, /* The ID is not used, so can be set to anything. */ + prvCheckTimerCallback /* The callback function that inspects the status of all the other tasks. */ ); /* Create the software timer that performs the 'digit counting' functionality, as described at the top of this file. */ - xDigitCounterTimer = xTimerCreate( ( const signed char * ) "DigitCounter", /* A text name, purely to help debugging. */ - ( mainDIGIT_COUNTER_TIMER_PERIOD_MS ), /* The timer period, in this case 3000ms (3s). */ - pdTRUE, /* This is an auto-reload timer, so xAutoReload is set to pdTRUE. */ - ( void * ) 0, /* The ID is not used, so can be set to anything. */ - prvDigitCounterTimerCallback /* The callback function that inspects the status of all the other tasks. */ - ); - + xDigitCounterTimer = xTimerCreate( "DigitCounter", /* A text name, purely to help debugging. */ + ( mainDIGIT_COUNTER_TIMER_PERIOD_MS ), /* The timer period, in this case 3000ms (3s). */ + pdTRUE, /* This is an auto-reload timer, so xAutoReload is set to pdTRUE. */ + ( void * ) 0, /* The ID is not used, so can be set to anything. */ + prvDigitCounterTimerCallback /* The callback function that inspects the status of all the other tasks. */ + ); + /* Create a lot of 'standard demo' tasks. Over 40 tasks are created in this demo. For a much simpler demo, select the 'blinky' build configuration. */ @@ -362,7 +367,7 @@ int main(void) vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY ); vStartCountingSemaphoreTasks(); vStartDynamicPriorityTasks(); - + /* The suicide tasks must be created last, as they need to know how many tasks were running prior to their creation in order to ascertain whether or not the correct/expected number of tasks are running at any given @@ -382,7 +387,7 @@ int main(void) } /*-----------------------------------------------------------*/ -static void prvCheckTimerCallback( xTimerHandle xTimer ) +static void prvCheckTimerCallback( TimerHandle_t xTimer ) { /* Check the standard demo tasks are running without error. Latch the latest reported error in the pcStatusMessage character pointer. */ @@ -425,7 +430,7 @@ static void prvCheckTimerCallback( xTimerHandle xTimer ) { pcStatusMessage = "Error: ComTest\r\n"; } - + if( xAreTimerDemoTasksStillRunning( ( mainCHECK_TIMER_PERIOD_MS ) ) != pdTRUE ) { pcStatusMessage = "Error: TimerDemo"; @@ -440,12 +445,12 @@ static void prvCheckTimerCallback( xTimerHandle xTimer ) { pcStatusMessage = "Error: CountSem"; } - + if( xAreDynamicPriorityTasksStillRunning() != pdTRUE ) { pcStatusMessage = "Error: DynamicPriority"; } - + /* Toggle the check LED to give an indication of the system status. If the LED toggles every mainCHECK_TIMER_PERIOD_MS milliseconds then everything is ok. A faster toggle indicates an error. vParTestToggleLED() @@ -476,7 +481,7 @@ static void prvCheckTimerCallback( xTimerHandle xTimer ) } /*-----------------------------------------------------------*/ -static void prvLEDTimerCallback( xTimerHandle xTimer ) +static void prvLEDTimerCallback( TimerHandle_t xTimer ) { /* The timer has expired - so no button pushes have occurred in the last five seconds - turn the LED off. */ @@ -484,7 +489,7 @@ static void prvLEDTimerCallback( xTimerHandle xTimer ) } /*-----------------------------------------------------------*/ -static void prvDigitCounterTimerCallback( xTimerHandle xTimer ) +static void prvDigitCounterTimerCallback( TimerHandle_t xTimer ) { /* Define the bit patterns that display numbers on the seven segment display. */ static const unsigned short usNumbersPatterns[] = { 0x8004, 0xF204, 0x4804, 0x6004, 0x3204, 0x2404, 0x0404, 0xF104, 0x0004, 0x2004 }; @@ -496,13 +501,13 @@ unsigned short usCheckLEDState; the state of the check LED. A critical section is not required to access the port as only one timer can be executing at any one time. */ usCheckLEDState = ( FM3_GPIO->PDOR3 & mainCHECK_LED ); - + /* Display the next number, counting up. */ FM3_GPIO->PDOR3 = usNumbersPatterns[ lCounter ] | usCheckLEDState; - /* Move onto the next digit. */ + /* Move onto the next digit. */ lCounter++; - + /* Ensure the counter does not go off the end of the array. */ if( lCounter >= lNumberOfDigits ) { @@ -541,7 +546,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; static void prvQueueSendTask( void *pvParameters ) { -portTickType xNextWakeTime; +TickType_t xNextWakeTime; const unsigned long ulValueToSend = 100UL; /* The timer command queue will have been filled when the timer test tasks @@ -602,15 +607,15 @@ const unsigned short usButtonInputBit = 0x01U; SystemCoreClockUpdate(); /* Initialise the IO used for the LEDs on the 7 segment displays. */ - vParTestInitialise(); - + vParTestInitialise(); + /* Set the switches to input (P18->P1F). */ FM3_GPIO->DDR5 = 0x0000; FM3_GPIO->PFR5 = 0x0000; /* Assign the button input as GPIO. */ FM3_GPIO->PFR5 |= usButtonInputBit; - + /* Button interrupt on falling edge. */ FM3_EXTI->ELVR = 0x0003; @@ -619,7 +624,7 @@ const unsigned short usButtonInputBit = 0x01U; /* Enable the button interrupt. */ FM3_EXTI->ENIR |= usButtonInputBit; - + /* Setup the GPIO and the NVIC for the switch used in this simple demo. */ NVIC_SetPriority( EXINT0_7_IRQn, configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY ); NVIC_EnableIRQ( EXINT0_7_IRQn ); @@ -637,7 +642,7 @@ void vApplicationMallocFailedHook( void ) } /*-----------------------------------------------------------*/ -void vApplicationStackOverflowHook( xTaskHandle pxTask, signed char *pcTaskName ) +void vApplicationStackOverflowHook( TaskHandle_t pxTask, char *pcTaskName ) { ( void ) pcTaskName; ( void ) pxTask; @@ -674,6 +679,6 @@ void vApplicationTickHook( void ) /* Call the periodic timer test, which tests the timer API functions that can be called from an ISR. */ vTimerPeriodicISRTests(); -} +} /*-----------------------------------------------------------*/