libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1296 from uestczyh222/master 

[Components][Dfs][Fat]fix mkfs bug
This commit is contained in:
Bernard Xiong 2018-03-18 18:00:00 +08:00 committed by GitHub
parent 60b756a8ff 38169bb51a
commit d5d07b761f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/dfs/filesystems/elmfat/dfs_elm.c
View File

@ -214,7 +214,8 @@ int dfs_elm_mkfs(rt_device_t dev_id)
int flag; int flag;
FRESULT result; FRESULT result;
int index; int index;
char logic_nbr[2] = {'0',':'};
work = rt_malloc(_MAX_SS); work = rt_malloc(_MAX_SS);
if(RT_NULL == work) { if(RT_NULL == work) {
return -ENOMEM; return -ENOMEM;
@ -264,7 +265,8 @@ int dfs_elm_mkfs(rt_device_t dev_id)
* on the disk, you will get a failure. so we need f_mount here, * on the disk, you will get a failure. so we need f_mount here,
* just fill the FatFS[index] in elm fatfs to make mkfs work. * just fill the FatFS[index] in elm fatfs to make mkfs work.
*/ */
f_mount(fat, "", (BYTE)index); logic_nbr[0] = '0' + index;
f_mount(fat, logic_nbr, (BYTE)index);
} }
} }
@ -273,14 +275,14 @@ int dfs_elm_mkfs(rt_device_t dev_id)
/* [IN] Size of the allocation unit */ /* [IN] Size of the allocation unit */
/* [-] Working buffer */ /* [-] Working buffer */
/* [IN] Size of working buffer */ /* [IN] Size of working buffer */
result = f_mkfs("", FM_ANY, 0, work, _MAX_SS); result = f_mkfs(logic_nbr, FM_ANY, 0, work, _MAX_SS);
rt_free(work); work = RT_NULL; rt_free(work); work = RT_NULL;
/* check flag status, we need clear the temp driver stored in disk[] */ /* check flag status, we need clear the temp driver stored in disk[] */
if (flag == FSM_STATUS_USE_TEMP_DRIVER) if (flag == FSM_STATUS_USE_TEMP_DRIVER)
{ {
rt_free(fat); rt_free(fat);
f_mount(RT_NULL, "",(BYTE)index); f_mount(RT_NULL, logic_nbr,(BYTE)index);
disk[index] = RT_NULL; disk[index] = RT_NULL;
/* close device */ /* close device */
rt_device_close(dev_id); rt_device_close(dev_id);