X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FDemo%2FRX600_RX62N-RDK_GNURX%2FRTOSDemo%2FuIP_Task.c;h=e8728af4e0843fe25e06e1f418e31936096a721b;hb=b15dfacb6026af3b0ba697e5753844923b468d2b;hp=08366f146265f4bfb8e914a521382cc0f198df38;hpb=90f4c3885b2e63f57a7172c148f67b96cf44eca2;p=freertos diff --git a/FreeRTOS/Demo/RX600_RX62N-RDK_GNURX/RTOSDemo/uIP_Task.c b/FreeRTOS/Demo/RX600_RX62N-RDK_GNURX/RTOSDemo/uIP_Task.c index 08366f146..e8728af4e 100644 --- a/FreeRTOS/Demo/RX600_RX62N-RDK_GNURX/RTOSDemo/uIP_Task.c +++ b/FreeRTOS/Demo/RX600_RX62N-RDK_GNURX/RTOSDemo/uIP_Task.c @@ -1,68 +1,29 @@ /* - FreeRTOS V7.1.1 - 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! + */ /* Standard includes. */ #include @@ -87,7 +48,7 @@ /*-----------------------------------------------------------*/ /* How long to wait before attempting to connect the MAC again. */ -#define uipINIT_WAIT ( 100 / portTICK_RATE_MS ) +#define uipINIT_WAIT ( 100 / portTICK_PERIOD_MS ) /* Shortcut to the header within the Rx buffer. */ #define xHeader ((struct uip_eth_hdr *) &uip_buf[ 0 ]) @@ -112,7 +73,7 @@ constants are assigned to the timer IDs. */ static void prvSetMACAddress( void ); /* - * Perform any uIP initialisation necessary. + * Perform any uIP initialisation necessary. */ static void prvInitialise_uIP( void ); @@ -120,7 +81,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. @@ -130,7 +91,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; /*-----------------------------------------------------------*/ @@ -147,7 +108,7 @@ unsigned long ulNewEvent = 0UL; unsigned long ulUIP_Events = 0UL; ( void ) pvParameters; - + /* Initialise the uIP stack. */ prvInitialise_uIP(); @@ -162,10 +123,10 @@ unsigned long ulUIP_Events = 0UL; for( ;; ) { if( ( ulUIP_Events & uipETHERNET_RX_EVENT ) != 0UL ) - { + { /* Is there received data ready to be processed? */ uip_len = ( unsigned short ) ulEMACRead(); - + if( ( uip_len > 0 ) && ( uip_buf != NULL ) ) { /* Standard uIP loop taken from the uIP manual. */ @@ -201,11 +162,11 @@ unsigned long ulUIP_Events = 0UL; ulUIP_Events &= ~uipETHERNET_RX_EVENT; } } - + if( ( ulUIP_Events & uipPERIODIC_TIMER_EVENT ) != 0UL ) { ulUIP_Events &= ~uipPERIODIC_TIMER_EVENT; - + for( i = 0; i < UIP_CONNS; i++ ) { uip_periodic( i ); @@ -220,14 +181,14 @@ unsigned long ulUIP_Events = 0UL; } } } - + /* Call the ARP timer function every 10 seconds. */ if( ( ulUIP_Events & uipARP_TIMER_EVENT ) != 0 ) { ulUIP_Events &= ~uipARP_TIMER_EVENT; uip_arp_timer(); } - + if( ulUIP_Events == pdFALSE ) { xQueueReceive( xEMACEventQueue, &ulNewEvent, portMAX_DELAY ); @@ -239,7 +200,7 @@ unsigned long ulUIP_Events = 0UL; static void prvInitialise_uIP( void ) { -xTimerHandle xARPTimer, xPeriodicTimer; +TimerHandle_t xARPTimer, xPeriodicTimer; uip_ipaddr_t xIPAddr; const unsigned long ul_uIPEventQueueLength = 10UL; @@ -256,15 +217,15 @@ const unsigned long ul_uIPEventQueueLength = 10UL; xEMACEventQueue = xQueueCreate( ul_uIPEventQueueLength, sizeof( unsigned long ) ); /* Create and start the uIP timers. */ - xARPTimer = xTimerCreate( ( const signed char * const ) "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( ( const signed char * const ) "PeriodicTimer", - ( 50 / portTICK_RATE_MS ), + xPeriodicTimer = xTimerCreate( "PeriodicTimer", + ( 50 / portTICK_PERIOD_MS ), pdTRUE, /* Autor-reload. */ ( void * ) uipPERIODIC_TIMER, prvUIPTimerCallback @@ -278,7 +239,7 @@ const unsigned long ul_uIPEventQueueLength = 10UL; } /*-----------------------------------------------------------*/ -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; @@ -320,7 +281,7 @@ char *c; /* 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? */