diff options
| author | Richard Barry <ribarry@amazon.com> | 2014-06-13 14:06:43 +0000 |
|---|---|---|
| committer | Richard Barry <ribarry@amazon.com> | 2014-06-13 14:06:43 +0000 |
| commit | d45f18cc8d310e71eb63f094b9367d2c6195b077 (patch) | |
| tree | 4b6b6abbad8d65e01357a1b9a76cec8df3952d94 | |
| parent | 8426eba8e714be2932f0cd53f8c20da468de3f75 (diff) | |
| download | freertos-git-d45f18cc8d310e71eb63f094b9367d2c6195b077.tar.gz | |
Add additional comments to the Zynq lwIP demo.
| -rw-r--r-- | FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/lwIP_Demo/lwIP_port/sys_arch.c | 1 | ||||
| -rw-r--r-- | FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/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"
|