Fix debug settings

mongoose-os-libs · Mar 22, 2021 · bcf0ba7 · bcf0ba7
1 parent 70235bc
commit bcf0ba7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/mos.yml b/mos.yml
@@ -60,6 +60,8 @@ conds:
               TCP_WND: 2920
               MEMP_NUM_TCP_PCB: 20
               LWIP_DNS_NO_CLIENT: 1
+              # LWIP_DEBUG: 1
+              # DHCP_DEBUG: LWIP_DBG_ON
 
   # TODO(rojer): When mos supports more elaborate conds, this can be deduped.
   - when: mos.platform == "stm32"

diff --git a/src/esp8266/sdk_lwip/include/arch/cc.h b/src/esp8266/sdk_lwip/include/arch/cc.h
@@ -34,7 +34,6 @@
 #ifndef __ARCH_CC_H__
 #define __ARCH_CC_H__
 
-//#include <string.h>
 #include "c_types.h"
 #include "ets_sys.h"
 #include "osapi.h"
@@ -61,9 +60,9 @@ typedef unsigned long   mem_ptr_t;
 #define U16_F "d"
 #define X16_F "x"
 
-#define S32_F "d"
-#define U32_F "d"
-#define X32_F "x"
+#define S32_F "ld"
+#define U32_F "lu"
+#define X32_F "lx"
 
 #define LWIP_ERR_T s32_t
 
@@ -73,11 +72,9 @@ typedef unsigned long   mem_ptr_t;
 #define PACK_STRUCT_BEGIN
 #define PACK_STRUCT_END
 
-//#define LWIP_DEBUG
-
 #ifdef LWIP_DEBUG
 #define LWIP_PLATFORM_DIAG(x) os_printf x
-#define LWIP_PLATFORM_ASSERT(x) ETS_ASSERT(x)
+#define LWIP_PLATFORM_ASSERT(x) os_printf("%s\n", x)
 #else
 #define LWIP_PLATFORM_DIAG(x)
 #define LWIP_PLATFORM_ASSERT(x)

diff --git a/src/esp8266/sdk_lwip/include/lwipopts.h b/src/esp8266/sdk_lwip/include/lwipopts.h
@@ -1826,7 +1826,7 @@
  * debug messages of certain types.
  */
 #ifndef LWIP_DBG_TYPES_ON
-#define LWIP_DBG_TYPES_ON               LWIP_DBG_OFF
+#define LWIP_DBG_TYPES_ON               LWIP_DBG_ON
 #endif
 
 /**

diff --git a/src/esp8266/sdk_lwip/src/core/ipv4/icmp.c b/src/esp8266/sdk_lwip/src/core/ipv4/icmp.c
@@ -235,7 +235,7 @@ icmp_input(struct pbuf *p, struct netif *inp)
       ret = ip_output_if(p, ip_current_dest_addr(), IP_HDRINCL,
                    ICMP_TTL, 0, IP_PROTO_ICMP, inp);
       if (ret != ERR_OK) {
-        LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: ip_output_if returned an error: %c.\n", ret));
+        LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: ip_output_if returned an error: %d.\n", (int) ret));
       }
     }
     break;