Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-09-23 20:57:20 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3275 from BernardXiong/delayUtil

Browse Source 
Delay until
This commit is contained in:
Bernard Xiong
2019-12-19 11:04:40 +08:00
committed by GitHub
parent c05d9dfee6 2c1f7b73a7
commit 01fa184f9a
4 changed files with 71 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/dfs/src/dfs_file.c
+3 -5
View File
@@ -369,8 +369,7 @@ int dfs_file_stat(const char *path, struct stat *buf)
if ((fs = dfs_filesystem_lookup(fullpath)) == NULL)
{
LOG_E(
"can't find mounted filesystem on this path:%s", fullpath);
LOG_E("can't find mounted filesystem on this path:%s", fullpath);
rt_free(fullpath);
return -ENOENT;
@@ -399,8 +398,7 @@ int dfs_file_stat(const char *path, struct stat *buf)
if (fs->ops->stat == NULL)
{
rt_free(fullpath);
LOG_E(
"the filesystem didn't implement this function");
LOG_E("the filesystem didn't implement this function");
return -ENOSYS;
}
@@ -565,7 +563,7 @@ void ls(const char *pathname)
}
else
{
rt_kprintf("%-25lu\n", stat.st_size);
rt_kprintf("%-25lu\n", (unsigned long)stat.st_size);
}
}
else
components/drivers/src/pipe.c
+10 -2
View File
@@ -19,6 +19,7 @@
static int pipe_fops_open(struct dfs_fd *fd)
{
int rc = 0;
rt_device_t device;
rt_pipe_t *pipe;
@@ -31,6 +32,11 @@ static int pipe_fops_open(struct dfs_fd *fd)
if (device->ref_count == 0)
{
pipe->fifo = rt_ringbuffer_create(pipe->bufsz);
if (pipe->fifo == RT_NULL)
{
rc = -RT_ENOMEM;
goto __exit;
}
}
switch (fd->flags & O_ACCMODE)
@@ -48,9 +54,10 @@ static int pipe_fops_open(struct dfs_fd *fd)
}
device->ref_count ++;
__exit:
rt_mutex_release(&(pipe->lock));
return 0;
return rc;
}
static int pipe_fops_close(struct dfs_fd *fd)
@@ -90,7 +97,8 @@ static int pipe_fops_close(struct dfs_fd *fd)
if (device->ref_count == 1)
{
rt_ringbuffer_destroy(pipe->fifo);
if (pipe->fifo != RT_NULL)
rt_ringbuffer_destroy(pipe->fifo);
pipe->fifo = RT_NULL;
}
device->ref_count --;