From fd65bf46844bd3a42f3a3f048bbe33f54c629b37 Mon Sep 17 00:00:00 2001 From: rtel Date: Fri, 13 Jun 2014 14:06:43 +0000 Subject: [PATCH] Add additional comments to the Zynq lwIP demo. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2259 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../RTOSDemo/src/lwIP_Demo/lwIP_port/sys_arch.c | 1 - .../RTOSDemo/src/lwIP_Demo/main_lwIP.c | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/lwIP_Demo/lwIP_port/sys_arch.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/lwIP_Demo/lwIP_port/sys_arch.c index e2e880521..bb3662e0d 100644 --- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/lwIP_Demo/lwIP_port/sys_arch.c +++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/lwIP_Demo/lwIP_port/sys_arch.c @@ -422,7 +422,6 @@ BaseType_t xHigherPriorityTaskWoken = pdFALSE; } else { -#warning What happens if the mutex cannot be taken from an ISR in the code below xGotSemaphore = xSemaphoreTakeFromISR( *pxMutex, &xHigherPriorityTaskWoken ); configASSERT( xGotSemaphore ); portYIELD_FROM_ISR( xHigherPriorityTaskWoken ); diff --git a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/lwIP_Demo/main_lwIP.c b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/lwIP_Demo/main_lwIP.c index 7cd652da6..d749abda5 100644 --- a/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/lwIP_Demo/main_lwIP.c +++ b/FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/lwIP_Demo/main_lwIP.c @@ -74,8 +74,23 @@ * basic demo. Generic functions, such FreeRTOS hook functions, and functions * required to configure the hardware are defined in main.c. ****************************************************************************** + * + * The lwIP example can be configured to use either a static or dynamic IP + * address: + * + To use a dynamically allocated IP address set LWIP_DHCP to 1 in + * lwipopts.h and connect the target to a network that includes a DHCP + * server. The obtained IP address is printed to the UART console. + * + To use a static IP address set LWIP_DHCP to 0 in lwipopts.h and set + * the static IP address using the configIP_ADDR0 to configIP_ADDR3 + * constants at the bottom of FreeRTOSConfig.h. Constants used to define + * a netmask are also located at the bottom of FreeRTOSConfig.h. + * + * When connected correctly the demo uses the lwIP sockets API to create + * a FreeRTOS+CLI command console, and the lwIP raw API to create a create a + * basic HTTP web server with server side includes that generate dynamic run + * time web pages. See http://www.freertos.org/RTOS-Xilinx-Zynq.html for more + * information. */ -#warning Need to update the comment above. /* Kernel includes. */ #include "FreeRTOS.h" -- 2.39.5