libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3457 from cliff-cmc/msc 

Support msc mode automatic switching
This commit is contained in:
Bernard Xiong 2020-03-16 15:31:35 +08:00 committed by GitHub
parent a7bcf90d78 1c68bd9d3c
commit 32e07e51a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/dfs/include/dfs_fs.h
View File

@ -91,6 +91,7 @@ int dfs_unmount(const char *specialfile);
int dfs_mkfs(const char *fs_name, const char *device_name);
int dfs_statfs(const char *path, struct statfs *buffer);
int dfs_mount_device(rt_device_t dev);
int dfs_unmount_device(rt_device_t dev);
#ifdef __cplusplus
}

48
components/dfs/src/dfs_fs.c
View File

@ -555,6 +555,54 @@ int dfs_mount_device(rt_device_t dev)
rt_kprintf("can't find device:%s to be mounted.\n", dev->parent.name);
return -RT_ERROR;
}
int dfs_unmount_device(rt_device_t dev)
{
struct dfs_filesystem *iter;
struct dfs_filesystem *fs = NULL;
/* lock filesystem */
dfs_lock();
for (iter = &filesystem_table[0];
iter < &filesystem_table[DFS_FILESYSTEMS_MAX]; iter++)
{
/* check if the PATH is mounted */
if ((iter->dev_id->parent.name != NULL)
&& (strcmp(iter->dev_id->parent.name, dev->parent.name) == 0))
{
fs = iter;
break;
}
}
if (fs == NULL ||
fs->ops->unmount == NULL ||
fs->ops->unmount(fs) < 0)
{
goto err1;
}
/* close device, but do not check the status of device */
if (fs->dev_id != NULL)
rt_device_close(fs->dev_id);
if (fs->path != NULL)
rt_free(fs->path);
/* clear this filesystem table entry */
memset(fs, 0, sizeof(struct dfs_filesystem));
dfs_unlock();
return 0;
err1:
dfs_unlock();
return -1;
}
#endif
#ifdef RT_USING_FINSH

13
components/drivers/usb/usbdevice/class/mstorage.c
View File

@ -16,6 +16,10 @@
#include "drivers/usb_device.h"
#include "mstorage.h"
#ifdef RT_USING_DFS_MNTTABLE
#include "dfs_fs.h"
#endif
#ifdef RT_USB_DEVICE_MSTORAGE
enum STAT
@ -955,7 +959,7 @@ static rt_err_t _function_enable(ufunction_t func)
struct mstorage *data;
RT_ASSERT(func != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("Mass storage function enabled\n"));
data = (struct mstorage*)func->user_data;
data = (struct mstorage*)func->user_data;
data->disk = rt_device_find(RT_USB_MSTORAGE_DISK_NAME);
if(data->disk == RT_NULL)
@ -964,6 +968,10 @@ static rt_err_t _function_enable(ufunction_t func)
return -RT_ERROR;
}
#ifdef RT_USING_DFS_MNTTABLE
dfs_unmount_device(data->disk);
#endif
if(rt_device_open(data->disk, RT_DEVICE_OFLAG_RDWR) != RT_EOK)
{
rt_kprintf("disk open error\n");
@ -1029,6 +1037,9 @@ static rt_err_t _function_disable(ufunction_t func)
if(data->disk != RT_NULL)
{
rt_device_close(data->disk);
#ifdef RT_USING_DFS_MNTTABLE
dfs_mount_device(data->disk);
#endif
data->disk = RT_NULL;
}