change: 原有的文件系统区分隔为脚本区和文件系统区,并兼容老款的luatools/luatide

app/port/lfs_port.c

@@ -13,19 +13,23 @@
 #include "lfs.h"
 #include "wm_flash_map.h"
 #include "wm_internal_flash.h"
+#include "luat_timer.h"
 
 
-#ifndef FLASH_FS_REGION_SIZE
-#define FLASH_FS_REGION_SIZE 112
-#endif
+extern uint32_t lfs_addr;
+extern uint32_t lfs_size_kb;
 
-#ifndef LFS_START_ADDR
-#ifdef AIR103
-#define LFS_START_ADDR (0x0FC000 - FLASH_FS_REGION_SIZE * 1024)
-#else
-#define LFS_START_ADDR (0x1FC000 - FLASH_FS_REGION_SIZE * 1024)
+#ifdef FLASH_FS_REGION_SIZE
+#undef FLASH_FS_REGION_SIZE
 #endif
+
+#ifdef LFS_START_ADDR
+#undef LFS_START_ADDR
 #endif
+
+#define FLASH_FS_REGION_SIZE lfs_size_kb
+#define LFS_START_ADDR lfs_addr
+
 /***************************************************
  ***************       MACRO      ******************
  ***************************************************/
@@ -39,6 +43,8 @@
  *******    FUNCTION FORWARD DECLARTION     ********
  ***************************************************/
 
+
+
 // Read a block
 static int block_device_read(const struct lfs_config *cfg, lfs_block_t block,
         lfs_off_t off, void *buffer, lfs_size_t size);
@@ -88,7 +94,7 @@ struct lfs_config lfs_cfg =
     .read_size = LFS_BLOCK_DEVICE_READ_SIZE,
     .prog_size = LFS_BLOCK_DEVICE_PROG_SIZE,
     .block_size = LFS_BLOCK_DEVICE_ERASE_SIZE,
-    .block_count = LFS_BLOCK_DEVICE_TOTOAL_SIZE / LFS_BLOCK_DEVICE_ERASE_SIZE,
+    //.block_count = LFS_BLOCK_DEVICE_TOTOAL_SIZE / LFS_BLOCK_DEVICE_ERASE_SIZE,
     .block_cycles = 200,
     .cache_size = LFS_BLOCK_DEVICE_CACHE_SIZE,
     .lookahead_size = LFS_BLOCK_DEVICE_LOOK_AHEAD,
@@ -162,18 +168,28 @@ static int lfs_statfs_count(void *p, lfs_block_t b)
 // Initialize
 int LFS_Init(void)
 {
+    //luat_timer_mdelay(1000);
+    //LLOGD("lfs addr %08X", LFS_START_ADDR);
+    // LLOGD("lfs addr2 %08X", lfs_addr);
+    // LLOGD("lfs addr3 %p", &lfs_addr);
+    // LLOGD("lfs block_count %d", LFS_BLOCK_DEVICE_TOTOAL_SIZE / LFS_BLOCK_DEVICE_ERASE_SIZE);
     //printf("------------LFS_Init------------\r\n");
     // mount the filesystem
+    lfs_cfg.block_count = LFS_BLOCK_DEVICE_TOTOAL_SIZE / LFS_BLOCK_DEVICE_ERASE_SIZE;
     int err = lfs_mount(&lfs, &lfs_cfg);
     //printf("lfs_mount %d\r\n",err);
     // reformat if we can't mount the filesystem
     // this should only happen on the first boot
     if (err)
     {
+        luat_timer_mdelay(1000);
+        LLOGI("lfs mount fail ret=%d , exec format", err);
         err = lfs_format(&lfs, &lfs_cfg);
         //printf("lfs_format %d\r\n",err);
-        if(err)
+        if(err) {
+            LLOGW("lfs format fail ret=%d", err);
             return err;
+        }
 
         err = lfs_mount(&lfs, &lfs_cfg);
         //printf("lfs_mount %d\r\n",err);

app/port/luat_fs_air101.c

@@ -5,172 +5,27 @@
 #include "luat_log.h"
 #include "lfs_port.h"
 #include "wm_include.h"
+#include "luat_timer.h"
+#include "stdio.h"
 
 extern struct lfs_config lfs_cfg;
 extern lfs_t lfs;
 
-#ifndef LUAT_USE_FS_VFS
+// 分区信息
 
-FILE *luat_fs_fopen(const char *filename, const char *mode)
-{
-    ////LLOGD("fopen %s %s", filename, mode);
-    int ret;
-    char *t = (char *)mode;
-    int flags = 0;
-    lfs_file_t *lfsfile = NULL;
-    for (int i = 0; i < strlen(mode); i++)
-    {
+// KV -- 64k
+// luadb -- N k
+// lfs - (112 + 64 - N)k
+uint32_t kv_addr;
+uint32_t kv_size_kb = 64;
+uint32_t luadb_addr;
+uint32_t luadb_size_kb;
+uint32_t lfs_addr;
+uint32_t lfs_size_kb;
 
-        switch (*(t++))
-        {
-        case 'w':
-            flags |= LFS_O_RDWR;
-            break;
-        case 'r':
-            flags |= LFS_O_RDONLY;
-            break;
-        case 'a':
-            flags |= LFS_O_APPEND;
-            break;
-        case 'b':
-            break;
-        case '+':
-            break;
-        default:
-
-            break;
-        }
-    }
-
-    lfsfile = tls_mem_alloc(sizeof(lfs_file_t));
-    if (!lfsfile)
-    {
-        return lfsfile;
-    }
-
-    ret = lfs_file_open(&lfs, lfsfile, filename, flags);
-    if (ret != 0)
-    {
-        return NULL;
-    }
-
-    return lfsfile;
-
-}
-
-int luat_fs_getc(FILE *stream)
-{
-    return getc(stream);
-}
-
-int luat_fs_fseek(FILE *stream, long int offset, int origin)
-{
-    int ret;
-    ret = lfs_file_seek(&lfs, stream, offset, origin);
-    if (ret < 0)
-    {
-        return -1;
-    }
-
-    return ret;
-}
-
-int luat_fs_ftell(FILE *stream)
-{
-    return ftell(stream);
-}
-
-int luat_fs_fclose(FILE *stream)
-{
-    int ret;
-    ret = lfs_file_close(&lfs, (lfs_dir_t *)stream);
-    if (ret != 0)
-    {
-        return 1;
-    }
-    tls_mem_free(stream);
-    return 0;
-}
-int luat_fs_feof(FILE *stream)
-{
-    return feof(stream);
-}
-int luat_fs_ferror(FILE *stream)
-{
-    return ferror(stream);
-}
-size_t luat_fs_fread(void *ptr, size_t size, size_t nmemb, FILE *stream)
-{
-    int ret;
-    ret = lfs_file_read(&lfs, stream,ptr, size * nmemb);
-    if (ret < 0)
-    {
-        return 0;
-    }
-    return  ret;
-}
-size_t luat_fs_fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream)
-{
-    int ret;
-    ret = lfs_file_write(&lfs,stream, ptr, size * nmemb);
-    if (ret < 0)
-    {
-        return 0;
-    }
-
-    return ret;
-}
-int luat_fs_remove(const char *filename)
-{
-    int ret;
-    ret = lfs_remove(&lfs,filename);
-    if(ret != 0)
-    {
-        return 1;
-    }
-    return 0;
-}
-int luat_fs_rename(const char *old_filename, const char *new_filename)
-{
-    int ret;
-    ret = lfs_rename(&lfs, old_filename,new_filename);
-    if (ret != 0)
-    {
-       return 1;
-    }
-    return 0;
-}
-int luat_fs_fexist(const char *filename)
-{
-    FILE *fd = luat_fs_fopen(filename, "rb");
-    if (fd)
-    {
-        luat_fs_fclose(fd);
-        return 1;
-    }
-    return 0;
-}
-
-size_t luat_fs_fsize(const char *filename)
-{
-    FILE *fd;
-    size_t size = 0;
-    fd = luat_fs_fopen(filename, "rb");
-    if (fd)
-    {
-        luat_fs_fseek(fd, 0, SEEK_END);
-        size = luat_fs_ftell(fd);
-        luat_fs_fclose(fd);
-    }
-    return size;
-}
-
-int luat_fs_init(void)
-{
-    LFS_Init();
-}
-
-#else
+#ifndef FLASH_FS_REGION_SIZE
+#define FLASH_FS_REGION_SIZE 112
+#endif
 
 extern const struct luat_vfs_filesystem vfs_fs_lfs2;
 #ifdef LUAT_USE_VFS_INLINE_LIB
@@ -182,12 +37,51 @@ extern const struct luat_vfs_filesystem vfs_fs_luadb;
 #ifdef LUAT_USE_LVGL
 #include "lvgl.h"
 void luat_lv_fs_init(void);
-void lv_bmp_init(void);
-void lv_png_init(void);
+// void lv_bmp_init(void);
+// void lv_png_init(void);
 void lv_split_jpeg_init(void);
 #endif
 
 int luat_fs_init(void) {
+    //luat_timer_mdelay(1000);
+#ifdef AIR103
+    luadb_addr =  0x0E0000;
+#else
+    luadb_addr =  0x1E0000;
+#endif
+    //LLOGD("luadb_addr 0x%08X", luadb_addr);
+    uint8_t *ptr = (uint8_t*)(luadb_addr + 0x8000000); //0x80E0000
+    //LLOGD("luadb_addr ptr %p", ptr);
+
+    // 兼容老的LuaTools, 并提示更新
+    static const uint8_t luadb_magic[] = {0x01, 0x04, 0x5A, 0xA5};
+    uint8_t header[4];
+    memcpy(header, ptr, 4);
+    //LLOGD(">> %02X %02X %02X %02X", header[0], header[1], header[2], header[3]);
+    if (memcmp(header, luadb_magic, 4)) {
+        // 老的布局
+        LLOGW("Legacy non-LuaDB download, please upgrade your LuatIDE or LuatTools");
+        lfs_addr = luadb_addr;
+        kv_addr = lfs_addr - 64*1024;
+        lfs_size_kb = FLASH_FS_REGION_SIZE;
+        luadb_addr = 0;
+    }
+    else {
+        LLOGI("Using LuaDB as script zone format");
+        // TODO 根据LuaDB的区域动态调整?
+#ifdef AIR103
+        lfs_addr = luadb_addr + 64*1024;
+        lfs_size_kb = 48;
+#else
+        lfs_addr = luadb_addr + 64*1024;
+        lfs_size_kb = 48;
+#endif
+    }
+
+    //LLOGD("lfs addr4 %p", &lfs_addr);
+    //LLOGD("lfs addr5 0x%08X", lfs_addr);
+    //LLOGD("luadb_addr 0x%08X", luadb_addr);
+
     LFS_Init();
     luat_vfs_reg(&vfs_fs_lfs2);
 	luat_fs_conf_t conf = {
@@ -200,7 +94,7 @@ int luat_fs_init(void) {
 	#ifdef LUAT_USE_VFS_INLINE_LIB
 	luat_vfs_reg(&vfs_fs_luadb);
 	luat_fs_conf_t conf2 = {
-		.busname = (char*)luadb_inline_sys,
+		.busname = (char*)(luadb_addr == 0 ? luadb_inline_sys : ptr),
 		.type = "luadb",
 		.filesystem = "luadb",
 		.mount_point = "/luadb/",
@@ -217,5 +111,3 @@ int luat_fs_init(void) {
 
 	return 0;
 }
-
-#endif

soc_tools/AIR101.json

@@ -13,7 +13,8 @@
         "fs" : {
             "script" : {
                 "offset" : "81E0000",
-                "size" : 112
+                "size" : 112,
+                "type" : "luadb"
             }
         },
         "version-core": "v0007",

soc_tools/AIR103.json

@@ -13,7 +13,8 @@
         "fs" : {
             "script" : {
                 "offset" : "80E0000",
-                "size" : 112
+                "size" : 112,
+                "type" : "luadb"
             }
         },
         "version-core": "v0007",