ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correct LWIP_DEBUG definition 

Commit f602c936 incorrectly started defining LWIP_DEBUG as either 0 or
1.

lwipopts.h locally was changed to use #if, but all existing users
continued to use #ifdef. Therefore defining it to 0 was accidentally
enabling it for quite a few users.

This would have pulled in some unwanted lwIP code, and affected some
drivers, eg k64f_emac.c allocating an extra 2K of stack.

Correct lwipopts.h to either define it as 1 or leave it undefined, and
change the #if tests back to #ifdef, so all are consistent.
pull/5083/head
Kevin Bracey 2017-08-31 11:44:06 +03:00 committed by adbridge
parent 7d7e70a218
commit 4a1032f85a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
features/FEATURE_LWIP/lwip-interface/lwipopts.h
View File

@ -69,10 +69,9 @@
#error "Either IPv4 or IPv6 must be preferred." #error "Either IPv4 or IPv6 must be preferred."
#endif #endif
#if defined(MBED_CONF_LWIP_DEBUG_ENABLED) #undef LWIP_DEBUG
#define LWIP_DEBUG MBED_CONF_LWIP_DEBUG_ENABLED #if MBED_CONF_LWIP_DEBUG_ENABLED
#else #define LWIP_DEBUG 1
#define LWIP_DEBUG 0
#endif #endif
#if NO_SYS == 0 #if NO_SYS == 0
@ -93,7 +92,7 @@
#define MBED_CONF_LWIP_TCPIP_THREAD_STACKSIZE 1200 #define MBED_CONF_LWIP_TCPIP_THREAD_STACKSIZE 1200
#endif #endif
#if LWIP_DEBUG #ifdef LWIP_DEBUG
#define TCPIP_THREAD_STACKSIZE MBED_CONF_LWIP_TCPIP_THREAD_STACKSIZE*2 #define TCPIP_THREAD_STACKSIZE MBED_CONF_LWIP_TCPIP_THREAD_STACKSIZE*2
#else #else
#define TCPIP_THREAD_STACKSIZE MBED_CONF_LWIP_TCPIP_THREAD_STACKSIZE #define TCPIP_THREAD_STACKSIZE MBED_CONF_LWIP_TCPIP_THREAD_STACKSIZE
@ -111,7 +110,7 @@
#define MBED_CONF_LWIP_PPP_THREAD_STACKSIZE 768 #define MBED_CONF_LWIP_PPP_THREAD_STACKSIZE 768
#endif #endif
#if LWIP_DEBUG #ifdef LWIP_DEBUG
#define DEFAULT_THREAD_STACKSIZE MBED_CONF_LWIP_DEFAULT_THREAD_STACKSIZE*2 #define DEFAULT_THREAD_STACKSIZE MBED_CONF_LWIP_DEFAULT_THREAD_STACKSIZE*2
#define PPP_THREAD_STACK_SIZE MBED_CONF_LWIP_PPP_THREAD_STACKSIZE*2 #define PPP_THREAD_STACK_SIZE MBED_CONF_LWIP_PPP_THREAD_STACKSIZE*2
#else #else
@ -250,7 +249,7 @@
#define ETHARP_DEBUG LWIP_DBG_OFF #define ETHARP_DEBUG LWIP_DBG_OFF
#define UDP_LPC_EMAC LWIP_DBG_OFF #define UDP_LPC_EMAC LWIP_DBG_OFF
#if LWIP_DEBUG #ifdef LWIP_DEBUG
#define MEMP_OVERFLOW_CHECK 1 #define MEMP_OVERFLOW_CHECK 1
#define MEMP_SANITY_CHECK 1 #define MEMP_SANITY_CHECK 1
#define LWIP_DBG_TYPES_ON LWIP_DBG_ON #define LWIP_DBG_TYPES_ON LWIP_DBG_ON