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

修复BUG(simulator)：修复bsp/simulator编译报错的BUG

This commit is contained in:
breederbai 2022-12-29 13:56:04 +08:00 committed by Man, Jianting (Meco)
parent 8a71ae75ad
commit 5e40f3a0d4
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bsp/simulator/drivers/dfs_win32.c
View File

@ -158,7 +158,7 @@ static int dfs_win32_open(struct dfs_fd *file)
HANDLE handle; HANDLE handle;
int len; int len;
file_path = winpath_dirdup(WIN32_DIRDISK_ROOT, file->path); file_path = winpath_dirdup(WIN32_DIRDISK_ROOT, file->vnode->path);
if (oflag & O_CREAT) /* create a dir*/ if (oflag & O_CREAT) /* create a dir*/
{ {
@ -196,7 +196,7 @@ static int dfs_win32_open(struct dfs_fd *file)
wdirp->end += len; wdirp->end += len;
rt_strncpy(wdirp->curr, wdirp->finddata.name, len); rt_strncpy(wdirp->curr, wdirp->finddata.name, len);
file->data = (void *)wdirp; file->vnode->data = (void *)wdirp;
rt_free(file_path); rt_free(file_path);
return 0; return 0;
} }
@ -212,7 +212,7 @@ static int dfs_win32_open(struct dfs_fd *file)
/* Creates a new file. The function fails if the file is already existing. */ /* Creates a new file. The function fails if the file is already existing. */
if (oflag & O_EXCL) mode |= O_EXCL; if (oflag & O_EXCL) mode |= O_EXCL;
file_path = winpath_dirdup(WIN32_DIRDISK_ROOT, file->path); file_path = winpath_dirdup(WIN32_DIRDISK_ROOT, file->vnode->path);
fd = _open(file_path, mode, 0x0100 | 0x0080); /* _S_IREAD | _S_IWRITE */ fd = _open(file_path, mode, 0x0100 | 0x0080); /* _S_IREAD | _S_IWRITE */
rt_free(file_path); rt_free(file_path);
@ -223,11 +223,11 @@ static int dfs_win32_open(struct dfs_fd *file)
* flush(), seek(), and will be free when calling close()*/ * flush(), seek(), and will be free when calling close()*/
file->data = (void *)fd; file->data = (void *)fd;
file->pos = 0; file->pos = 0;
file->size = _lseek(fd, 0, SEEK_END); file->vnode->size = _lseek(fd, 0, SEEK_END);
if (oflag & O_APPEND) if (oflag & O_APPEND)
{ {
file->pos = file->size; file->pos = file->vnode->size;
} }
else else
_lseek(fd, 0, SEEK_SET); _lseek(fd, 0, SEEK_SET);
@ -243,7 +243,7 @@ static int dfs_win32_close(struct dfs_fd *file)
{ {
if (file->flags & O_DIRECTORY) if (file->flags & O_DIRECTORY)
{ {
WINDIR *wdirp = (WINDIR*)(file->data); WINDIR *wdirp = (WINDIR*)(file->vnode->data);
RT_ASSERT(wdirp != RT_NULL); RT_ASSERT(wdirp != RT_NULL);
if (_findclose((intptr_t)wdirp->handle) == 0) { if (_findclose((intptr_t)wdirp->handle) == 0) {
free(wdirp->start); /* NOTE: here we don't use rt_free! */ free(wdirp->start); /* NOTE: here we don't use rt_free! */
@ -307,9 +307,9 @@ static int dfs_win32_seek(struct dfs_fd *file,
int result; int result;
/* set offset as current offset */ /* set offset as current offset */
if (file->type == FT_DIRECTORY) if (file->vnode->type == FT_DIRECTORY)
{ {
WINDIR* wdirp = (WINDIR*)(file->data); WINDIR* wdirp = (WINDIR*)(file->vnode->data);
RT_ASSERT(wdirp != RT_NULL); RT_ASSERT(wdirp != RT_NULL);
wdirp->curr = wdirp->start + offset; wdirp->curr = wdirp->start + offset;
return offset; return offset;
@ -335,7 +335,7 @@ static int dfs_win32_getdents(struct dfs_fd *file, struct dirent *dirp, rt_uint3
if (count / sizeof(struct dirent) != 1) if (count / sizeof(struct dirent) != 1)
return -EINVAL; return -EINVAL;
wdirp = (WINDIR*)(file->data); wdirp = (WINDIR*)(file->vnode->data);
RT_ASSERT(wdirp != RT_NULL); RT_ASSERT(wdirp != RT_NULL);
if (wdirp->curr == NULL) //no more entries in this directory if (wdirp->curr == NULL) //no more entries in this directory
return 0; return 0;