update:统一使用luat_mem.h头

bsp/mini/port/luat_fs_mini.c

@@ -1,6 +1,6 @@
 #include "luat_base.h"
 #include "luat_fs.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 extern const struct luat_vfs_filesystem vfs_fs_posix;
 

bsp/mini/port/luat_log_mini.c

@@ -2,7 +2,7 @@
 #include "luat_base.h"
 #include "luat_log.h"
 #include "luat_uart.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "printf.h"
 
 #include <stdio.h>

bsp/mini/port/luat_malloc_mini.c

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>//add for memset
 #include "bget.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #define LUAT_LOG_TAG "vmheap"
 #include "luat_log.h"

bsp/mini/src/main_mini.c

@@ -2,7 +2,7 @@
 #include <stdio.h>
 
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_msgbus.h"
 #include "luat_fs.h"
 #include <stdlib.h>

bsp/win32/port/luat_fs_win32.c

@@ -1,6 +1,6 @@
 #include "luat_base.h"
 #include "luat_fs.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_luadb.h"
 
 #ifdef LUAT_USE_LVGL

bsp/win32/port/luat_lib_win32.c

@@ -1,6 +1,6 @@
 
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_timer.h"
 
 #define LUAT_LOG_TAG "win32"

bsp/win32/port/luat_log_win32.c

@@ -2,7 +2,7 @@
 #include "luat_base.h"
 #include "luat_log.h"
 #include "luat_uart.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "printf.h"
 
 #include <stdio.h>

bsp/win32/port/luat_malloc_win32.c

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>//add for memset
 #include "bget.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #define LUAT_LOG_TAG "vmheap"
 #include "luat_log.h"

bsp/win32/port/luat_msgbus_win32.c

@@ -11,7 +11,7 @@
 #include "luat_base.h"
 #include "luat_msgbus.h"
 #include "luat_timer.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include <stdbool.h>
 
 #include "windows.h"

bsp/win32/port/luat_timer_win32.c

@@ -9,7 +9,7 @@
  * 
  */
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_timer.h"
 #include "luat_msgbus.h"
 

bsp/win32/port/luat_uart_win32.c

@@ -1,5 +1,5 @@
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_msgbus.h"
 #include "luat_uart.h"
 #include "luat_log.h"

bsp/win32/src/main_win32.c

@@ -2,7 +2,7 @@
 #include <stdio.h>
 
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_msgbus.h"
 #include "luat_fs.h"
 

components/camera/luat_lib_camera.c

@@ -11,7 +11,7 @@
 #include "luat_camera.h"
 #include "luat_msgbus.h"
 #include "luat_fs.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_uart.h"
 #include "luat_zbuff.h"
 #define LUAT_LOG_TAG "camera"

components/cjson/cJSON.c

@@ -175,7 +175,7 @@ typedef struct internal_hooks
 //     return realloc(pointer, size);
 // }
 // #else
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #define internal_malloc luat_heap_malloc
 #define internal_free luat_heap_free
 #define internal_realloc luat_heap_realloc

components/cmux/luat_cmux.c

@@ -4,7 +4,7 @@ LuatOS cmux
 #include "lua.h"
 #include "luat_base.h"
 #include "luat_msgbus.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "stdlib.h"
 
 #define LUAT_LOG_TAG "cmux"

components/common/c_common.c

@@ -20,7 +20,7 @@
  */
 
 #include "c_common.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_base.h"
 #include "luat_log.h"
 

components/crypto/luat_crypto_mbedtls.c

@@ -5,7 +5,7 @@
 
 #include "luat_base.h"
 #include "luat_crypto.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_fs.h"
 
 #define LUAT_LOG_TAG "crypto"

components/eink/luat_lib_eink.c

@@ -11,7 +11,7 @@
 #include "luat_sys.h"
 #include "luat_msgbus.h"
 #include "luat_timer.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_spi.h"
 
 #include "luat_gpio.h"

components/ethernet/common/dhcp_client.c

@@ -1,5 +1,5 @@
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_mcu.h"
 #ifdef LUAT_USE_DHCP
 #include "luat_network_adapter.h"

components/ethernet/common/dns_client.c

@@ -1,7 +1,7 @@
 
 #include "luat_base.h"
 #include "luat_mcu.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #ifdef LUAT_USE_DNS
 #include "platform_def.h"
 #include "dns_def.h"

components/ethernet/w5500/w5500.c

@@ -11,7 +11,7 @@
 #include "luat_crypto.h"
 #include "luat_mcu.h"
 #include "luat_timer.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #include "luat_network_adapter.h"
 #ifdef LUAT_USE_MOBILE

components/fal/inc/fal_def.h

@@ -29,7 +29,7 @@
 #include <stdio.h>
 
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #ifndef LUAT_LOG_TAG
 #define LUAT_LOG_TAG "fal"

components/fastlz/luat_lib_fastlz.c

@@ -25,7 +25,7 @@ if cdata then
 end
 */
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #define LUAT_LOG_TAG "fastlz"
 #include "luat_log.h"

components/fatfs/diskio_impl.c

@@ -90,7 +90,7 @@ DRESULT diskio_open(BYTE pdrv, block_disk_t * disk) {
 	return RES_OK;
 }
 
-#include "luat_malloc.h"
+#include "luat_mem.h"
 DRESULT diskio_close(BYTE pdrv) {
 	if (pdrv >= FF_VOLUMES || disks[pdrv].opts == NULL) {
 		return RES_NOTRDY;

components/fatfs/diskio_ramdisk.c

@@ -1,7 +1,7 @@
 
 #include "luat_base.h"
 #include "luat_spi.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #define LUAT_LOG_TAG "ramdisk"
 #include "luat_log.h"

components/fatfs/diskio_spitf.c

@@ -11,7 +11,7 @@
 #include "luat_spi.h"
 #include "luat_timer.h"
 #include "luat_gpio.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #ifdef __LUATOS__
 #include "lauxlib.h"
 #endif

components/fatfs/ffsystem.c

@@ -16,7 +16,7 @@
 /*------------------------------------------------------------------------*/
 
 #ifdef __LUATOS__
-	#include "luat_malloc.h"
+	#include "luat_mem.h"
 #else
 	#include <stdlib.h>		/* with POSIX API */
 #endif

components/fatfs/luat_lib_fatfs.c

@@ -14,7 +14,7 @@
 #include "luat_sdio.h"
 #include "luat_timer.h"
 #include "luat_gpio.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_fs.h"
 
 #include "ff.h"			/* Obtains integer types */

components/flashdb/src/luat_lib_fdb.c

@@ -10,7 +10,7 @@
 
 #include "luat_base.h"
 #include "luat_msgbus.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #include "flashdb.h"
 

components/fskv/luat_fskv_sfd.c

@@ -1,7 +1,7 @@
 #ifdef __LUATOS__
 #include "luat_base.h"
 #include "luat_fskv.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_msgbus.h"
 #include "luat_sfd.h"
 

components/fskv/luat_lib_fskv.c

@@ -30,7 +30,7 @@ fskv与fdb的实现机制导致的差异
 
 #include "luat_base.h"
 #include "luat_msgbus.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #include "luat_fskv.h"
 #include "luat_sfd.h"

components/gmssl/bind/luat_lib_gmssl.c

@@ -9,7 +9,7 @@
 @tag LUAT_USE_GMSSL
 */
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_str.h"
 #include <time.h>
 #include "luat_zbuff.h"

components/gtfont/luat_lib_gtfont.c

@@ -12,7 +12,7 @@
 #include "luat_base.h"
 #include "luat_spi.h"
 #include "luat_lcd.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #include "epdpaint.h"
 

components/i2c-tools/i2c_tools.c

@@ -1,6 +1,6 @@
 #include "luat_base.h"
 #include "i2c_utils.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #define LUAT_LOG_TAG "i2c tools"
 #include "luat_log.h"

components/i2c-tools/i2c_utils.c

@@ -2,7 +2,7 @@
 #include "luat_base.h"
 #include "i2c_utils.h"
 #include "luat_i2c.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #define LUAT_LOG_TAG "i2c"
 #include "luat_log.h"

components/iconv/luat_lib_iconv.c

@@ -44,7 +44,7 @@
 
 
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #define LIB_NAME                "iconv"
 #define LIB_VERSION             LIB_NAME " r5"

components/iotauth/luat_iotauth.c

@@ -9,7 +9,7 @@
 */
 #include "luat_base.h"
 #include "luat_crypto.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "time.h"
 #include "luat_str.h"
 #include "luat_mcu.h"

components/lcd/luat_lcd.c

@@ -2,7 +2,7 @@
 #include "luat_lcd.h"
 #include "luat_gpio.h"
 #include "luat_spi.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_rtos.h"
 
 #define LUAT_LOG_TAG "lcd"

components/lcd/luat_lcd_custom.c

@@ -2,7 +2,7 @@
 #include "luat_lcd.h"
 #include "luat_gpio.h"
 #include "luat_spi.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_rtos.h"
 
 #define LUAT_LOG_TAG "custom"

components/lcd/luat_lib_lcd.c

@@ -9,7 +9,7 @@
 */
 #include "luat_base.h"
 #include "luat_lcd.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_zbuff.h"
 #include "luat_fs.h"
 #include "luat_gpio.h"

components/lfs/lfs_sfd.c

@@ -2,7 +2,7 @@
 #
 #include "luat_base.h"
 #include "luat_sfd.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #include "lfs.h"
 

components/lfs/lfs_util.h

@@ -29,7 +29,7 @@
 
 //--------------------------------
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #define LFS_NO_ASSERT 1
 #define LFS_NO_DEBUG 1
 #define LFS_NO_WARN 1

components/lfs/luat_lib_lfs2.c

@@ -4,7 +4,7 @@
 #include "luat_sfd.h"
 #include "luat_spi.h"
 #include "luat_gpio.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_fs.h"
 
 #define LUAT_LOG_TAG "lfs2"

components/lodepng/lodepng.h

@@ -27,7 +27,7 @@ freely, subject to the following restrictions:
 #define LODEPNG_H
 
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include <string.h> /*for size_t*/
 
 extern const char* LODEPNG_VERSION_STRING;

components/lora/luat_lib_lora.c

@@ -11,7 +11,7 @@
 #include "luat_rtos.h"
 #include "luat_gpio.h"
 #include "luat_spi.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #include "sx126x/radio.h"
 #include "sx126x/sx126x.h"

components/lora2/luat_lib_lora.c

@@ -11,7 +11,7 @@
 #include "luat_rtos.h"
 #include "luat_gpio.h"
 #include "luat_spi.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #include "sx126x/radio.h"
 #include "sx126x/sx126x.h"

components/lua-cjson/strbuf.c

@@ -29,7 +29,7 @@
 #include "strbuf.h"
 
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #define LUAT_LOG_TAG "cjson"
 #include "luat_log.h"

components/luatfonts/luat_lib_fonts.c

@@ -7,7 +7,7 @@
 */
 
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_fs.h"
 
 #define LUAT_LOG_TAG "fonts"

components/luf/luat_lib_luf.c

@@ -1,5 +1,5 @@
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #include "lprefix.h"
 

components/luf/luat_luf_cmp.c

@@ -1,5 +1,5 @@
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #define ldump_c
 #define LUA_CORE

components/luf/luat_luf_dump.c

@@ -5,7 +5,7 @@
 */
 
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #define ldump_c
 #define LUA_CORE

components/lvgl/binding/luat_lib_lvgl7.c

@@ -7,7 +7,7 @@
 
 #include "luat_base.h"
 #include "luat_lvgl.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_zbuff.h"
 
 typedef struct luat_lv {

components/lvgl/binding/luat_lib_lvgl_anim.c

@@ -10,7 +10,7 @@
 #include "luat_base.h"
 #include "luat_lvgl.h"
 #include "lvgl.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #if LV_USE_ANIMATION
 /*

components/lvgl/binding/luat_lib_lvgl_btnmatrix_ex.c

@@ -8,7 +8,7 @@
 #include "luat_base.h"
 #include "lvgl.h"
 #include "luat_lvgl.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 int luat_lv_btnmatrix_set_map(lua_State *L) {
     LV_DEBUG("CALL lv_btnmatrix_set_map");

components/lvgl/binding/luat_lib_lvgl_calendar_ex.c

@@ -8,7 +8,7 @@
 #include "luat_base.h"
 #include "lvgl.h"
 #include "luat_lvgl.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 int luat_lv_calendar_set_highlighted_dates(lua_State *L) {
     LV_DEBUG("CALL lv_calendar_set_highlighted_dates");

components/lvgl/binding/luat_lib_lvgl_canvas_ex.c

@@ -8,7 +8,7 @@
 #include "luat_base.h"
 #include "lvgl.h"
 #include "luat_lvgl.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_zbuff.h"
 
 static lv_res_t _canvas_gc(struct _lv_obj_t * obj, lv_signal_t sign, void * param) {

components/lvgl/binding/luat_lib_lvgl_demo.c

@@ -9,7 +9,7 @@
 #include "luat_lvgl.h"
 #include "lvgl.h"
 #include "../lv_demos/lv_examples.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 /*
 lvgl benchmark demo

components/lvgl/binding/luat_lib_lvgl_draw.c

@@ -8,7 +8,7 @@
 #include "luat_base.h"
 #include "luat_lvgl.h"
 #include "lvgl.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 /*
 创建一个lv_draw_mask_radius_param_t

components/lvgl/binding/luat_lib_lvgl_dropdown_ex.c

@@ -8,7 +8,7 @@
 #include "luat_base.h"
 #include "lvgl.h"
 #include "luat_lvgl.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 int luat_lv_dropdown_get_selected_str(lua_State *L) {
     LV_DEBUG("CALL lv_dropdown_get_selected_str");

components/lvgl/binding/luat_lib_lvgl_font.c

@@ -8,7 +8,7 @@
 #include "luat_base.h"
 #include "luat_lvgl.h"
 #include "lvgl.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #include "luat_lvgl_fonts.h"
 #include "luat_spi.h"

components/lvgl/binding/luat_lib_lvgl_gauge_ex.c

@@ -8,7 +8,7 @@
 #include "luat_base.h"
 #include "lvgl.h"
 #include "luat_lvgl.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 int luat_lv_gauge_set_needle_count(lua_State *L) {
     LV_DEBUG("CALL lv_gauge_set_needle_count");

components/lvgl/binding/luat_lib_lvgl_indev_ext.c

@@ -7,7 +7,7 @@
 #include "luat_base.h"
 #include "luat_lvgl.h"
 #include "lvgl.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 static lv_indev_data_t point_emulator_data = {0};
 static lv_indev_data_t keyboard_emulator_data = {0};

components/lvgl/binding/luat_lib_lvgl_line_ex.c

@@ -8,7 +8,7 @@
 #include "luat_base.h"
 #include "lvgl.h"
 #include "luat_lvgl.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 int luat_lv_line_set_points(lua_State *L) {
     LV_DEBUG("CALL lv_line_set_points");

components/lvgl/binding/luat_lib_lvgl_msgbox_ex.c

@@ -8,7 +8,7 @@
 #include "luat_base.h"
 #include "lvgl.h"
 #include "luat_lvgl.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_zbuff.h"
 
 int luat_lv_msgbox_add_btns(lua_State *L) {

components/lvgl/binding/luat_lib_lvgl_roller_ex.c

@@ -8,7 +8,7 @@
 #include "luat_base.h"
 #include "lvgl.h"
 #include "luat_lvgl.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_zbuff.h"
 
 int luat_lv_roller_get_selected_str(lua_State *L) {

components/lvgl/binding/luat_lib_lvgl_style.c

@@ -8,7 +8,7 @@
 #include "luat_base.h"
 #include "luat_lvgl.h"
 #include "lvgl.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 /*
 创建一个style

components/lvgl/binding/luat_lib_lvgl_tileview_ex.c

@@ -8,7 +8,7 @@
 #include "luat_base.h"
 #include "lvgl.h"
 #include "luat_lvgl.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 int luat_lv_tileview_set_valid_positions(lua_State *L) {
     LV_DEBUG("CALL lv_tileview_set_valid_positions");

components/lvgl/binding/luat_lvgl_mem.c

@@ -1,5 +1,5 @@
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #define LUAT_LOG_TAG "lv_mem"
 #include "luat_log.h"

components/lvgl/binding/luat_lvgl_mem.h

@@ -2,7 +2,7 @@
 #define LUAT_LVGL_MEM
 
 //#include "luat_base.h"
-//#include "luat_malloc.h"
+//#include "luat_mem.h"
 
 void* luat_lvgl_malloc(int len);
 void* luat_lvgl_free(void* ptr);

components/lvgl/sdl2/lv_sdl_drv_display.c

@@ -22,7 +22,7 @@
  */
 
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #define LUAT_LOG_TAG "sdl2"
 #include "luat_log.h"
 #ifdef LUAT_USE_LVGL_SDL2

components/lvgl/src/lv_widgets/lv_line.c

@@ -16,7 +16,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 /*********************
  *      DEFINES

components/max30102/luat_lib_max30102.c

@@ -8,7 +8,7 @@
 */
 
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_timer.h"
 #include "luat_gpio.h"
 #include "luat_rtos.h"

components/mempool/profiler/bind/luat_lib_profiler.c

@@ -1,6 +1,6 @@
 #include "luat_base.h"
-#include "luat_malloc.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
+#include "luat_mem.h"
 #include "luat_timer.h"
 #include "luat_profiler.h"
 

components/mempool/profiler/src/luat_profiler.c

@@ -1,5 +1,5 @@
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_profiler.h"
 
 #define LUAT_LOG_TAG "profiler"

components/miniz/luat_lib_miniz.c

@@ -21,7 +21,7 @@ if cdata then
 end
 */
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #define LUAT_LOG_TAG "miniz"
 #include "luat_log.h"

components/minmea/luat_gnss.c

@@ -1,6 +1,6 @@
 #include "luat_base.h"
 #include "luat_msgbus.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_uart.h"
 #include "luat_rtc.h"
 #include "luat_mcu.h"

components/minmea/luat_lib_libgnss.c

@@ -41,7 +41,7 @@ end)
 */
 #include "luat_base.h"
 #include "luat_msgbus.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_uart.h"
 #include "luat_mcu.h"
 #include "luat_rtc.h"

components/mlx90640-library/MLX90640_I2C_Driver.c

@@ -16,7 +16,7 @@
  */
 
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "MLX90640_I2C_Driver.h"
 
 extern mlx90640_i2c_t mlx90640_i2c;

components/mlx90640-library/luat_lib_mlx90640.c

@@ -8,7 +8,7 @@
 */
 
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include <MLX90640_I2C_Driver.h>
 #include <MLX90640_API.h>
 #include <math.h>

components/mobile/luat_lib_mobile.c

@@ -25,7 +25,7 @@ log.info("snr", mobile.snr())
 log.info("simid", mobile.simid())
 */
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_rtos.h"
 #include "luat_msgbus.h"
 

components/multimedia/amr_decode/oscl/oscl_mem.h

@@ -27,7 +27,7 @@ extern "C" {
 #include <string.h>
 #ifdef __LUATOS__
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #define oscl_malloc luat_heap_malloc
 #define oscl_free luat_heap_free
 #define oscl_memset memset

components/multimedia/amr_decode/src/amrnb_wrapper.c

@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #ifdef __LUATOS__
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #define malloc luat_heap_malloc
 #define free luat_heap_free
 #endif

components/multimedia/amr_decode/src/amrwb_wrapper.c

@@ -25,7 +25,7 @@
 #include <dtx.h>
 #ifdef __LUATOS__
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #define malloc luat_heap_malloc
 #define free luat_heap_free
 #endif

components/multimedia/luat_lib_multimedia_audio.c

@@ -15,7 +15,7 @@
 
 #include "luat_multimedia.h"
 #include "luat_audio.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #ifndef __BSP_COMMON_H__
 #include "c_common.h"

components/multimedia/luat_lib_multimedia_codec.c

@@ -12,7 +12,7 @@
 #include "luat_msgbus.h"
 #include "luat_zbuff.h"
 #include "luat_fs.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #define LUAT_LOG_TAG "codec"
 #include "luat_log.h"
 #ifdef LUAT_SUPPORT_AMR

components/multimedia/minimp3.c

@@ -1,6 +1,6 @@
 
 #include "mp3_decode/minimp3.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 extern void DBG_Printf(const char* format, ...);
 #define DBG(x,y...)		DBG_Printf("%s %d:"x"\r\n", __FUNCTION__,__LINE__,##y)
 #define _MINIMP3_IMPLEMENTATION_GUARD

components/multimedia/mp3_decode_port.c

@@ -1,7 +1,7 @@
 #include "luat_base.h"
 #include "luat_mem.h"
 #include "luat_multimedia.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #ifdef LUAT_BSP_NOT_SUPPORT_FLOAT
 
 

components/nes/luat_lib_nes.c

@@ -10,7 +10,7 @@
 #include "luat_base.h"
 #include "luat_rtos.h"
 #include "luat_lcd.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_rtos.h"
 
 #include "nes.h"

components/nes/port/nes_port.c

@@ -25,7 +25,7 @@
 #include "nes.h"
 
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_timer.h"
 #include "luat_fs.h"
 #include "luat_lcd.h"

components/network/adapter/luat_lib_socket.c

@@ -7,7 +7,7 @@
 @tag LUAT_USE_NETWORK
 */
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 // #ifdef LUAT_USE_NETWORK
 #include "luat_network_adapter.h"
 #include "luat_rtos.h"

components/network/adapter/luat_network_adapter.c

@@ -1,6 +1,6 @@
 
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_crypto.h"
 #include "luat_rtos.h"
 #ifdef LUAT_USE_NETWORK

components/network/ctiot/luat_lib_ctiot.c

@@ -7,7 +7,7 @@
 */
 #include "luat_base.h"
 #include "luat_timer.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_msgbus.h"
 #include "luat_ctiot.h"
 #define LUAT_LOG_TAG "ctiot"

components/network/ercoap/binding/luat_lib_ercoap.c

@@ -8,7 +8,7 @@
 */
 #include "luat_base.h"
 #include "luat_timer.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_msgbus.h"
 
 #include "er-coap-13.h"

components/network/ercoap/src/er-coap-13.c

@@ -46,7 +46,7 @@
 
 #include "er-coap-13.h"
 
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #define LUAT_LOG_TAG "coap"
 #include "luat_log.h"
 

components/network/errdump/luat_lib_errdump.c

@@ -26,7 +26,7 @@ end
 #include "luat_mcu.h"
 #include "luat_fs.h"
 #include "luat_pm.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #ifdef LUAT_USE_NETWORK
 

components/network/httpsrv/src/luat_httpsrv_lwip.c

@@ -1,6 +1,6 @@
 #include "luat_base.h"
 #include "luat_msgbus.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_httpsrv.h"
 #include "luat_fs.h"
 

components/network/libemqtt/libemqtt.c

@@ -28,7 +28,7 @@
 #include <string.h>
 #include <libemqtt.h>
 #include "luat_base.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #define MQTT_DUP_FLAG     (1<<3)
 #define MQTT_QOS0_FLAG    (0<<1)

components/network/libemqtt/luat_lib_mqtt.c

@@ -38,7 +38,7 @@
 #include "libemqtt.h"
 #include "luat_rtos.h"
 #include "luat_zbuff.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_mqtt.h"
 
 #define LUAT_LOG_TAG "mqtt"

components/network/libemqtt/luat_mqtt_client.c

@@ -3,7 +3,7 @@
 #include "luat_network_adapter.h"
 #include "libemqtt.h"
 #include "luat_rtos.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 #include "luat_mqtt.h"
 
 #define LUAT_LOG_TAG "mqtt"

components/network/libftp/luat_ftp_client.c

@@ -12,7 +12,7 @@
 #include "luat_network_adapter.h"
 #include "luat_rtos.h"
 #include "luat_fs.h"
-#include "luat_malloc.h"
+#include "luat_mem.h"
 
 #include "luat_ftp.h"