yystopf
/
openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!609 三方库FatFs升级至r0.14a版本 

Merge pull request !609 from Far/fatfs_update
This commit is contained in:
openharmony_ci 2021-09-24 00:53:43 +00:00 committed by Gitee
parent 1150f86d46 d23f2fc73f
commit de8bd2866a
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/fat/os_adapt/fatfs.c
View File

@ -1873,6 +1873,7 @@ int fatfs_mkfs (struct Vnode *device, int sectors, int option)
BYTE *work_buff = NULL; BYTE *work_buff = NULL;
los_part *part = NULL; los_part *part = NULL;
FRESULT result; FRESULT result;
MKFS_PARM opt = {0};
int ret; int ret;
part = los_part_find(device); part = los_part_find(device);
@ -1897,7 +1898,9 @@ int fatfs_mkfs (struct Vnode *device, int sectors, int option)
return -ENOMEM; return -ENOMEM;
} }
result = _mkfs(part, sectors, option, work_buff, FF_MAX_SS); opt.n_sect = sectors;
opt.fmt = (BYTE)option;
result = _mkfs(part, &opt, work_buff, FF_MAX_SS);
free(work_buff); free(work_buff);
if (result != FR_OK) { if (result != FR_OK) {
return -fatfs_2_vfs(result); return -fatfs_2_vfs(result);

2
fs/fat/os_adapt/fatfs.h
View File

@ -146,7 +146,7 @@ int fatfs_fscheck(struct Vnode* vnode, struct fs_dirent_s *dir);
FRESULT find_fat_partition(FATFS *fs, los_part *part, BYTE *format, QWORD *start_sector); FRESULT find_fat_partition(FATFS *fs, los_part *part, BYTE *format, QWORD *start_sector);
FRESULT init_fatobj(FATFS *fs, BYTE fmt, QWORD start_sector); FRESULT init_fatobj(FATFS *fs, BYTE fmt, QWORD start_sector);
FRESULT _mkfs(los_part *partition, int sector, int opt, BYTE *work, UINT len); FRESULT _mkfs(los_part *partition, const MKFS_PARM *opt, BYTE *work, UINT len);
#ifdef __cplusplus #ifdef __cplusplus
#if __cplusplus #if __cplusplus

6
fs/fat/virpart/src/virpartff.c
View File

@ -525,7 +525,7 @@ FRESULT f_checkvirpart(FATFS *fs, const TCHAR *path, BYTE vol)
} }
/* Lock the filesystem object */ /* Lock the filesystem object */
res = find_volume(&path, &fs, FA_WRITE); /* Update the filesystem info to the parent fs */ res = mount_volume(&path, &fs, FA_WRITE); /* Update the filesystem info to the parent fs */
if (res != FR_OK) { if (res != FR_OK) {
LEAVE_FF(fs, res); LEAVE_FF(fs, res);
} }
@ -683,7 +683,7 @@ FRESULT f_makevirpart(FATFS *fs, const TCHAR *path, BYTE vol)
} }
/* Lock the filesystem object */ /* Lock the filesystem object */
res = find_volume(&path, &fs, FA_WRITE); /* Update the filesystem info to the parent fs */ res = mount_volume(&path, &fs, FA_WRITE); /* Update the filesystem info to the parent fs */
if (res != FR_OK) { if (res != FR_OK) {
LEAVE_FF(fs, res); LEAVE_FF(fs, res);
} }
@ -774,7 +774,7 @@ FRESULT f_getvirfree(const TCHAR *path, DWORD *nclst, DWORD *cclst)
DIR dj; DIR dj;
/* Find volume to Update the global FSINFO */ /* Find volume to Update the global FSINFO */
res = find_volume(&path, &fs, 0); res = mount_volume(&path, &fs, 0);
if (res != FR_OK) { if (res != FR_OK) {
LEAVE_FF(fs, res); LEAVE_FF(fs, res);
} }