X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FCORTEX_Kinetis_K60_Tower_IAR%2FuIP_Task.c;h=5198f497f5bee74dbbf56db00c689d175127eafe;hb=b15dfacb6026af3b0ba697e5753844923b468d2b;hp=2172f0dfdc3feb7ab3814a8db2d21c2461a440f9;hpb=b18af6b07e944b8c932a9be32fbce2344510896c;p=freertos diff --git a/FreeRTOS/Demo/CORTEX_Kinetis_K60_Tower_IAR/uIP_Task.c b/FreeRTOS/Demo/CORTEX_Kinetis_K60_Tower_IAR/uIP_Task.c index 2172f0dfd..5198f497f 100644 --- a/FreeRTOS/Demo/CORTEX_Kinetis_K60_Tower_IAR/uIP_Task.c +++ b/FreeRTOS/Demo/CORTEX_Kinetis_K60_Tower_IAR/uIP_Task.c @@ -1,66 +1,29 @@ /* - FreeRTOS V7.5.0 - 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! + */ /* Standard includes. */ #include @@ -121,7 +84,7 @@ static void prvInitialise_uIP( void ); * The callback function that is assigned to both the periodic timer and the * ARP timer. */ -static void prvUIPTimerCallback( xTimerHandle xTimer ); +static void prvUIPTimerCallback( TimerHandle_t xTimer ); /* * Port functions required by the uIP stack. @@ -131,7 +94,7 @@ clock_time_t clock_time( void ); /*-----------------------------------------------------------*/ /* The queue used to send TCP/IP events to the uIP stack. */ -xQueueHandle xEMACEventQueue = NULL; +QueueHandle_t xEMACEventQueue = NULL; /*-----------------------------------------------------------*/ @@ -165,7 +128,7 @@ unsigned short usPacketLength; if( ( usPacketLength > 0U ) && ( uip_buf != NULL ) ) { uip_len = usPacketLength; - + if( xHeader->type == htons( UIP_ETHTYPE_IP ) ) { uip_arp_ipin(); @@ -209,7 +172,7 @@ unsigned short usPacketLength; for( i = 0; i < UIP_CONNS; i++ ) { uip_periodic( i ); - + /* If the above function invocation resulted in data that should be sent out on the network, the global variable uip_len is set to a value > 0. */ @@ -258,7 +221,7 @@ struct uip_eth_addr xAddr; static void prvInitialise_uIP( void ) { uip_ipaddr_t xIPAddr; -xTimerHandle xARPTimer, xPeriodicTimer; +TimerHandle_t xARPTimer, xPeriodicTimer; uip_init(); uip_ipaddr( &xIPAddr, configIP_ADDR0, configIP_ADDR1, configIP_ADDR2, configIP_ADDR3 ); @@ -272,15 +235,15 @@ xTimerHandle xARPTimer, xPeriodicTimer; xEMACEventQueue = xQueueCreate( uipEVENT_QUEUE_LENGTH, sizeof( unsigned long ) ); /* Create and start the uIP timers. */ - xARPTimer = xTimerCreate( ( signed char * ) "ARPTimer", /* Just a name that is helpful for debugging, not used by the kernel. */ - ( 10000UL / portTICK_RATE_MS ), /* Timer period. */ + xARPTimer = xTimerCreate( "ARPTimer", /* Just a name that is helpful for debugging, not used by the kernel. */ + ( 10000UL / portTICK_PERIOD_MS ), /* Timer period. */ pdTRUE, /* Autor-reload. */ ( void * ) uipARP_TIMER, prvUIPTimerCallback ); - xPeriodicTimer = xTimerCreate( ( signed char * ) "PeriodicTimer", - ( 500UL / portTICK_RATE_MS ), + xPeriodicTimer = xTimerCreate( "PeriodicTimer", + ( 500UL / portTICK_PERIOD_MS ), pdTRUE, /* Autor-reload. */ ( void * ) uipPERIODIC_TIMER, prvUIPTimerCallback @@ -298,7 +261,7 @@ xTimerHandle xARPTimer, xPeriodicTimer; } /*-----------------------------------------------------------*/ -static void prvUIPTimerCallback( xTimerHandle xTimer ) +static void prvUIPTimerCallback( TimerHandle_t xTimer ) { static const unsigned long ulARPTimerExpired = uipARP_TIMER_EVENT; static const unsigned long ulPeriodicTimerExpired = uipPERIODIC_TIMER_EVENT; @@ -327,7 +290,7 @@ const unsigned long ulYellowLED = 2UL; /* Only interested in processing form input if this is the IO page. */ c = strstr( pcInputString, "io.shtml" ); - + if( c ) { /* Is there a command in the string? */