update: netdrv-napt兼容csdk编译

components/network/netdrv/src/luat_netdrv.c

@@ -1,9 +1,11 @@
 #include "luat_base.h"
 #include "luat_netdrv.h"
 #include "luat_network_adapter.h"
+#ifdef __LUATOS__
 #include "luat_netdrv_ch390h.h"
 #include "luat_netdrv_uart.h"
-#include "luat_malloc.h"
+#endif
+#include "luat_mem.h"
 
 #define LUAT_LOG_TAG "netdrv"
 #include "luat_log.h"
@@ -16,6 +18,7 @@ luat_netdrv_t* luat_netdrv_setup(luat_netdrv_conf_t *conf) {
     }
     if (drvs[conf->id] == NULL) {
         // 注册新的设备?
+        #ifdef __LUATOS__
         if (conf->impl == 1) { // CH390H
             drvs[conf->id] = luat_netdrv_ch390h_setup(conf);
             return drvs[conf->id];
@@ -24,6 +27,7 @@ luat_netdrv_t* luat_netdrv_setup(luat_netdrv_conf_t *conf) {
             drvs[conf->id] = luat_netdrv_uart_setup(conf);
             return drvs[conf->id];
         }
+        #endif
     }
     else {
         if (drvs[conf->id]->boot) {

components/network/netdrv/src/luat_netdrv_napt.c

@@ -1,7 +1,9 @@
 #include "luat_base.h"
 #include "luat_netdrv.h"
 #include "luat_network_adapter.h"
+#ifdef __LUATOS__
 #include "luat_netdrv_ch390h.h"
+#endif
 #include "luat_malloc.h"
 #include "luat_netdrv_napt.h"
 #include "lwip/pbuf.h"

components/network/netdrv/src/luat_netdrv_napt_icmp.c

@@ -1,12 +1,9 @@
 #include "luat_base.h"
 #include "luat_netdrv.h"
 #include "luat_network_adapter.h"
-#include "luat_netdrv_ch390h.h"
-#include "luat_malloc.h"
 #include "luat_netdrv_napt.h"
 #include "lwip/pbuf.h"
 #include "lwip/ip.h"
-#include "lwip/etharp.h"
 #include "lwip/icmp.h"
 #include "luat_mcu.h"
 

components/network/netdrv/src/luat_netdrv_napt_tcp.c

@@ -1,8 +1,6 @@
 #include "luat_base.h"
 #include "luat_netdrv.h"
 #include "luat_network_adapter.h"
-#include "luat_netdrv_ch390h.h"
-#include "luat_malloc.h"
 #include "luat_netdrv_napt.h"
 #include "lwip/pbuf.h"
 #include "lwip/ip.h"

components/network/netdrv/src/luat_netdrv_napt_udp.c

@@ -1,8 +1,6 @@
 #include "luat_base.h"
 #include "luat_netdrv.h"
 #include "luat_network_adapter.h"
-#include "luat_netdrv_ch390h.h"
-#include "luat_malloc.h"
 #include "luat_netdrv_napt.h"
 #include "lwip/pbuf.h"
 #include "lwip/ip.h"

components/network/ulwip/include/luat_ulwip.h

@@ -2,7 +2,7 @@
 #define LUAT_ULWIP_H
 
 #include "luat_base.h"
-#include "luat_msgbus.h"
+// #include "luat_msgbus.h"
 #include "luat_timer.h"
 #include "luat_mem.h"
 #include "luat_zbuff.h"
@@ -60,8 +60,10 @@ err_t ulwip_etharp_output(struct netif *netif, struct pbuf *q, const ip4_addr_t
 
 int ulwip_netif_ip_event(ulwip_ctx_t* ctx);
 
+#ifdef __LUATOS__
 int l_dhcp_client_cb(lua_State *L, void* ptr);
 int l_ulwip_netif_output_cb(lua_State *L, void* ptr);
+#endif
 
 struct netif* ulwip_find_netif(uint8_t adapter_index);