p71924506
/
kernel_liteos_a1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!100 解决kernel/liteos_a仓下关闭fat，编译不过的问题 

Merge pull request !100 from li_zan/master
This commit is contained in:
openharmony_ci 2021-03-29 12:06:31 +08:00 committed by Gitee
parent 1763f37811 2e47684d15
commit 7387d410bf
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/vfs/disk/disk.c
View File

@ -76,12 +76,12 @@ UINT32 g_usbMode = 0;
typedef VOID *(*StorageHookFunction)(VOID *); typedef VOID *(*StorageHookFunction)(VOID *);
#ifdef LOSCFG_FS_FAT_CACHE
static UINT32 OsReHookFuncAddDiskRef(StorageHookFunction handler, static UINT32 OsReHookFuncAddDiskRef(StorageHookFunction handler,
VOID *param) __attribute__((weakref("osReHookFuncAdd"))); VOID *param) __attribute__((weakref("osReHookFuncAdd")));
static UINT32 OsReHookFuncDelDiskRef(StorageHookFunction handler) __attribute__((weakref("osReHookFuncDel"))); static UINT32 OsReHookFuncDelDiskRef(StorageHookFunction handler) __attribute__((weakref("osReHookFuncDel")));
#ifdef LOSCFG_FS_FAT_CACHE
UINT32 GetFatBlockNums(VOID) UINT32 GetFatBlockNums(VOID)
{ {
return g_uwFatBlockNums; return g_uwFatBlockNums;

2
kernel/common/los_rootfs.c
View File

@ -437,11 +437,13 @@ STATIC VOID OsMountUserdata(const CHAR *fsType)
} }
err = get_errno(); err = get_errno();
if (err == ENOENT) { if (err == ENOENT) {
#ifdef LOSCFG_FS_FAT
ret = format(emmcUserdataDev, 0, FM_FAT32); ret = format(emmcUserdataDev, 0, FM_FAT32);
if (ret != LOS_OK) { if (ret != LOS_OK) {
PRINT_ERR("Failed to format %s\n", emmcUserdataDev); PRINT_ERR("Failed to format %s\n", emmcUserdataDev);
return; return;
} }
#endif
ret = mount(emmcUserdataDev, userdataDir, fsType, 0, "umask=000"); ret = mount(emmcUserdataDev, userdataDir, fsType, 0, "umask=000");
if (ret != LOS_OK) { if (ret != LOS_OK) {
err = get_errno(); err = get_errno();