openharmony/device_board_talkweb
1
0
Fork 0
mirror of https://github.com/openharmony/device_board_talkweb.git synced 2026-07-01 21:54:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

!81 【OpenHarmony开源贡献者计划2022】解决littlefs中函数返回类型不对齐的警告，解决函数return未带返回值的bug

Browse Source 
Merge pull request !81 from yaoyao945a/master
This commit is contained in:
openharmony_ci
2022-06-08 02:41:30 +00:00
committed by Gitee
parent c41269dd94 3ac0be679b
commit 9dbbf80009
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
niobe407/liteos_m/fs/littlefs/include/littlefs.h
+4 -4
View File
@@ -22,12 +22,12 @@
extern "C" {
#endif
int32_t LittlefsRead(const struct lfs_config *cfg, lfs_block_t block,
int LittlefsRead(const struct lfs_config *cfg, lfs_block_t block,
lfs_off_t off, void *buffer, lfs_size_t size);
int32_t LittlefsProg(const struct lfs_config *cfg, lfs_block_t block,
int LittlefsProg(const struct lfs_config *cfg, lfs_block_t block,
lfs_off_t off, const void *buffer, lfs_size_t size);
int32_t LittlefsErase(const struct lfs_config *cfg, lfs_block_t block);
int32_t LittlefsSync(const struct lfs_config *cfg);
int LittlefsErase(const struct lfs_config *cfg, lfs_block_t block);
int LittlefsSync(const struct lfs_config *cfg);
#ifdef __cplusplus
}
niobe407/liteos_m/fs/littlefs/src/fs_init.c
+1 -1
View File
@@ -168,7 +168,7 @@ static int32_t FsDriverInit(struct HdfDeviceObject *object)
ret = mkdir(fs[i].mount_point, S_IRUSR | S_IWUSR);
if (ret != LOS_OK) {
HDF_LOGE("Mkdir failed %d\n", ret);
return;
return HDF_FAILURE;
} else {
HDF_LOGI("mkdir success %d\n", ret);
}
niobe407/liteos_m/fs/littlefs/src/littlefs.c
+4 -4
View File
@@ -17,27 +17,27 @@
#include <string.h>
#include "los_memory.h"
int32_t LittlefsRead(const struct lfs_config *cfg, lfs_block_t block,
int LittlefsRead(const struct lfs_config *cfg, lfs_block_t block,
lfs_off_t off, void *buffer, lfs_size_t size)
{
W25x_BufferRead(buffer, cfg->context + cfg->block_size * block + off, size);
return LFS_ERR_OK;
}
int32_t LittlefsProg(const struct lfs_config *cfg, lfs_block_t block,
int LittlefsProg(const struct lfs_config *cfg, lfs_block_t block,
lfs_off_t off, const void *buffer, lfs_size_t size)
{
W25x_BufferWrite((uint8_t *)buffer, cfg->context + cfg->block_size * block + off,size);
return LFS_ERR_OK;
}
int32_t LittlefsErase(const struct lfs_config *cfg, lfs_block_t block)
int LittlefsErase(const struct lfs_config *cfg, lfs_block_t block)
{
W25x_SectorErase(cfg->context + cfg->block_size * block);
return LFS_ERR_OK;
}
int32_t LittlefsSync(const struct lfs_config *cfg)
int LittlefsSync(const struct lfs_config *cfg)
{
return LFS_ERR_OK;
}