From 31c7f9242c83405066bb46114c07e637b94743e3 Mon Sep 17 00:00:00 2001
From: andy <1414772332@qq.com>
Date: Mon, 29 Sep 2025 22:34:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=A4=96=E7=BD=AE=E5=86=85?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net/lwip-2.1.0/src/arch/sys_arch.c          | 17 ++++++++++++-----
 Project/Src/rt-thread/rtconfig.h                |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Project/Src/rt-thread/components/net/lwip-2.1.0/src/arch/sys_arch.c b/Project/Src/rt-thread/components/net/lwip-2.1.0/src/arch/sys_arch.c
index 4165fbb..9d1b27a 100644
--- a/Project/Src/rt-thread/components/net/lwip-2.1.0/src/arch/sys_arch.c
+++ b/Project/Src/rt-thread/components/net/lwip-2.1.0/src/arch/sys_arch.c
@@ -52,6 +52,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include "mymem.h"
 
 #if 0
 /*
@@ -520,7 +521,7 @@ u32_t sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout)
             t = timeout / (1000/RT_TICK_PER_SECOND);
     }
 
-    ret = rt_mb_recv(*mbox, (rt_uint32_t *)msg, t);
+    ret = rt_mb_recv(*mbox, (rt_ubase_t *)msg, t);
 
     if(ret == -RT_ETIMEOUT)
         return SYS_ARCH_TIMEOUT;
@@ -551,7 +552,7 @@ u32_t sys_arch_mbox_tryfetch(sys_mbox_t *mbox, void **msg)
 {
     int ret;
 
-    ret = rt_mb_recv(*mbox, (rt_uint32_t *)msg, 0);
+    ret = rt_mb_recv(*mbox, (rt_ubase_t *)msg, 0);
 
     if(ret == -RT_ETIMEOUT)
         return SYS_ARCH_TIMEOUT;
@@ -720,24 +721,30 @@ void mem_init(void)
 
 void *mem_calloc(mem_size_t count, mem_size_t size)
 {
-    return rt_calloc(count, size);
+    // return rt_calloc(count, size);
+    void *r = mymalloc_exm(size * count);
+    memset(r, 0, size * count);
+    return r;
 }
 
 void *mem_trim(void *mem, mem_size_t size)
 {
     // return rt_realloc(mem, size);
     /* not support trim yet */
+    mem = myrealloc(mem, size);
     return mem;
 }
 
 void *mem_malloc(mem_size_t size)
 {
-    return rt_malloc(size);
+    // return rt_malloc(size);
+    return mymalloc_exm(size);
 }
 
 void  mem_free(void *mem)
 {
-    rt_free(mem);
+    // rt_free(mem);
+    myfree(mem);
 }
 
 #ifdef RT_LWIP_PPP
diff --git a/Project/Src/rt-thread/rtconfig.h b/Project/Src/rt-thread/rtconfig.h
index aba3dcc..07a2c30 100644
--- a/Project/Src/rt-thread/rtconfig.h
+++ b/Project/Src/rt-thread/rtconfig.h
@@ -217,6 +217,7 @@
 #define RT_USING_LIBC
 #define RT_LWIP_TCP
 #define RT_LWIP_UDP
+#define RT_LWIP_DEBUG
 
 // <<< end of configuration section >>>