From 4a1032f85a862502ca63fba9204e29263af71c68 Mon Sep 17 00:00:00 2001 From: Kevin Bracey Date: Thu, 31 Aug 2017 11:44:06 +0300 Subject: [PATCH] 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. --- features/FEATURE_LWIP/lwip-interface/lwipopts.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/features/FEATURE_LWIP/lwip-interface/lwipopts.h b/features/FEATURE_LWIP/lwip-interface/lwipopts.h index ebd3b61274..37f62618a3 100644 --- a/features/FEATURE_LWIP/lwip-interface/lwipopts.h +++ b/features/FEATURE_LWIP/lwip-interface/lwipopts.h @@ -69,10 +69,9 @@ #error "Either IPv4 or IPv6 must be preferred." #endif -#if defined(MBED_CONF_LWIP_DEBUG_ENABLED) -#define LWIP_DEBUG MBED_CONF_LWIP_DEBUG_ENABLED -#else -#define LWIP_DEBUG 0 +#undef LWIP_DEBUG +#if MBED_CONF_LWIP_DEBUG_ENABLED +#define LWIP_DEBUG 1 #endif #if NO_SYS == 0 @@ -93,7 +92,7 @@ #define MBED_CONF_LWIP_TCPIP_THREAD_STACKSIZE 1200 #endif -#if LWIP_DEBUG +#ifdef LWIP_DEBUG #define TCPIP_THREAD_STACKSIZE MBED_CONF_LWIP_TCPIP_THREAD_STACKSIZE*2 #else #define TCPIP_THREAD_STACKSIZE MBED_CONF_LWIP_TCPIP_THREAD_STACKSIZE @@ -111,7 +110,7 @@ #define MBED_CONF_LWIP_PPP_THREAD_STACKSIZE 768 #endif -#if LWIP_DEBUG +#ifdef LWIP_DEBUG #define DEFAULT_THREAD_STACKSIZE MBED_CONF_LWIP_DEFAULT_THREAD_STACKSIZE*2 #define PPP_THREAD_STACK_SIZE MBED_CONF_LWIP_PPP_THREAD_STACKSIZE*2 #else @@ -250,7 +249,7 @@ #define ETHARP_DEBUG LWIP_DBG_OFF #define UDP_LPC_EMAC LWIP_DBG_OFF -#if LWIP_DEBUG +#ifdef LWIP_DEBUG #define MEMP_OVERFLOW_CHECK 1 #define MEMP_SANITY_CHECK 1 #define LWIP_DBG_TYPES_ON LWIP_DBG_ON