Просмотр исходного кода

fix: little_flash 警告与lfs2适配警告

Dozingfiretruck 6 месяцев назад
Родитель
Сommit
85b6d55f80

+ 6 - 6
components/little_flash/luat_little_flash_lfs2.c

@@ -17,23 +17,23 @@ static size_t lf_offset = 0;
 // Read a block
 static int lf_block_device_read(const struct lfs_config *cfg, lfs_block_t block, lfs_off_t off, void *buffer, lfs_size_t size) {
     little_flash_t* flash = (little_flash_t*)cfg->context;
-    int ret = little_flash_read(flash, lf_offset + block * flash->chip_info.erase_size + off, buffer, size);
+    return little_flash_read(flash, lf_offset + block * flash->chip_info.erase_size + off, buffer, size);
     // LLOGD("lf_block_device_read ret %d", ret);
-    return LFS_ERR_OK;
+    // return LFS_ERR_OK;
 }
 
 static int lf_block_device_prog(const struct lfs_config *cfg, lfs_block_t block, lfs_off_t off, const void *buffer, lfs_size_t size) {
     little_flash_t* flash = (little_flash_t*)cfg->context;
-    int ret = little_flash_write(flash, lf_offset + block * flash->chip_info.erase_size + off, buffer, size);
+    return little_flash_write(flash, lf_offset + block * flash->chip_info.erase_size + off, buffer, size);
     // LLOGD("lf_block_device_prog ret %d", ret);
-    return LFS_ERR_OK;
+    // return LFS_ERR_OK;
 }
 
 static int lf_block_device_erase(const struct lfs_config *cfg, lfs_block_t block) {
     little_flash_t* flash = (little_flash_t*)cfg->context;
-    int ret = little_flash_erase(flash, lf_offset + block * flash->chip_info.erase_size, flash->chip_info.erase_size);
+    return little_flash_erase(flash, lf_offset + block * flash->chip_info.erase_size, flash->chip_info.erase_size);
     // LLOGD("lf_block_device_erase ret %d", ret);
-    return LFS_ERR_OK;
+    // return LFS_ERR_OK;
 }
 
 static int lf_block_device_sync(const struct lfs_config *cfg) {

+ 0 - 2
components/little_flash/src/little_flash.c

@@ -419,7 +419,6 @@ error:
 }
 
 lf_err_t little_flash_erase(const little_flash_t *lf, uint32_t addr, uint32_t len){
-    lf_err_t result = LF_ERR_OK;
     uint8_t cmd_data[4]={0};
     if (addr + len > lf->chip_info.capacity) {
         LF_ERROR("Error: Flash address is out of bound.");
@@ -472,7 +471,6 @@ error:
 
 
 lf_err_t little_flash_write(const little_flash_t *lf, uint32_t addr, const uint8_t *data, uint32_t len){
-    lf_err_t result = LF_ERR_OK;
 #ifdef LF_USE_HEAP
     uint8_t* cmd_data = (uint8_t*)lf->malloc(4+lf->chip_info.prog_size);
     if (!cmd_data){