Эх сурвалжийг харах

fix: sfud 警告与lfs2适配警告

Dozingfiretruck 7 сар өмнө
parent
commit
413e322036

+ 6 - 6
components/sfud/luat_sfud_lfs2.c

@@ -21,23 +21,23 @@ static size_t sfud_offset = 0;
 // Read a block
 static int sfud_block_device_read(const struct lfs_config *cfg, lfs_block_t block, lfs_off_t off, void *buffer, lfs_size_t size) {
     sfud_flash* flash = (sfud_flash*)cfg->context;
-    int ret = sfud_read(flash, sfud_offset + block * flash->chip.erase_gran + off, size, buffer);
+    return sfud_read(flash, sfud_offset + block * flash->chip.erase_gran + off, size, buffer);
     //LLOGD("sfud_block_device_read ret %d", ret);
-    return LFS_ERR_OK;
+    // return LFS_ERR_OK;
 }
 
 static int sfud_block_device_prog(const struct lfs_config *cfg, lfs_block_t block, lfs_off_t off, const void *buffer, lfs_size_t size) {
     sfud_flash* flash = (sfud_flash*)cfg->context;
-    int ret = sfud_write(flash, sfud_offset + block * flash->chip.erase_gran + off, size, buffer);
+    return sfud_write(flash, sfud_offset + block * flash->chip.erase_gran + off, size, buffer);
     //LLOGD("sfud_block_device_prog ret %d", ret);
-    return LFS_ERR_OK;
+    // return LFS_ERR_OK;
 }
 
 static int sfud_block_device_erase(const struct lfs_config *cfg, lfs_block_t block) {
     sfud_flash* flash = (sfud_flash*)cfg->context;
-    int ret = sfud_erase(flash, sfud_offset + block * flash->chip.erase_gran, flash->chip.erase_gran);
+    return sfud_erase(flash, sfud_offset + block * flash->chip.erase_gran, flash->chip.erase_gran);
     //LLOGD("sfud_block_device_erase ret %d", ret);
-    return LFS_ERR_OK;
+    // return LFS_ERR_OK;
 }
 
 static int sfud_block_device_sync(const struct lfs_config *cfg) {

+ 1 - 2
components/sfud/sfud.c

@@ -406,7 +406,6 @@ sfud_err sfud_read(const sfud_flash *flash, uint32_t addr, size_t size, uint8_t
     const sfud_spi *spi = &flash->spi;
     uint8_t cmd_data[5 + SFUD_READ_DUMMY_BYTE_CNT];
     uint8_t cmd_size;
-    uint8_t i;
 
     SFUD_ASSERT(flash);
     SFUD_ASSERT(data);
@@ -439,7 +438,7 @@ sfud_err sfud_read(const sfud_flash *flash, uint32_t addr, size_t size, uint8_t
             make_address_byte_array(flash, addr, &cmd_data[1]);
             cmd_size = flash->addr_in_4_byte ? 5 : 4;
             #if SFUD_READ_DUMMY_BYTE_CNT > 0
-            for (i = 0; i < SFUD_READ_DUMMY_BYTE_CNT; i++) {
+            for (uint8_t i = 0; i < SFUD_READ_DUMMY_BYTE_CNT; i++) {
                 cmd_data[cmd_size] = SFUD_DUMMY_DATA;
                 cmd_size++;
             }