Kaynağa Gözat

update: 调整wlan内存与lua vm的布局,将wlan内存移到sram的末尾

目的是将两块sram连起来使用, 以及对后续SPI从机开发做内存调整储备
Wendal Chen 2 yıl önce
ebeveyn
işleme
e336b92667

+ 4 - 1
app/network/luat_wlan_air101.c

@@ -152,7 +152,10 @@ int luat_wlan_init(luat_wlan_config_t *conf) {
         tls_get_tx_gain(&tx_gain_group[0]);
         TLS_DBGPRT_INFO("tx gain ");
         TLS_DBGPRT_DUMP((char *)(&tx_gain_group[0]), 27);
-        if (tls_wifi_mem_cfg(WIFI_MEM_START_ADDR, 6, 4)) /*wifi tx&rx mem customized interface*/
+        // 计算wifi内存大小的公式 (TX+RX)*2*1638+4096
+        // 例如 TX=6, RX=4, (6+4)*2*1638+4096=36856, 向上取整, 36k
+        // 然后sram的最后位置是 0x20047FFF
+        if (tls_wifi_mem_cfg((0x20048000u - (36*1024)), 6, 4)) /*wifi tx&rx mem customized interface*/
         {
             TLS_DBGPRT_INFO("wl mem initial failured\n");
         }

+ 2 - 2
app/port/luat_malloc_air101.c

@@ -96,9 +96,9 @@ void luat_heap_init(void) {
 	}
 #else
 #ifndef LUAT_USE_TLSF
-	bpool((void*)(0x20048000 - LUAT_HEAP_P2_SIZE), LUAT_HEAP_P2_SIZE);
+	bpool((void*)(0x20028000), LUAT_HEAP_P2_SIZE);
 #else
-	luavm_tlsf_ext = tlsf_add_pool(0x20048000 - LUAT_HEAP_P2_SIZE), LUAT_HEAP_P2_SIZE);
+	luavm_tlsf_ext = tlsf_add_pool(0x20028000 - LUAT_HEAP_P2_SIZE), LUAT_HEAP_P2_SIZE);
 #endif
 	#endif
 }