Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 06:42:32 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Kernel module should prefer functions with nx/kmm prefix

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2020-05-02 22:30:58 +08:00
committed by Alin Jerpelea
parent 15480e51cf
commit 0536953ded
52 changed files with 207 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/mmap/fs_mmap.c
+6 -8
View File
@@ -127,7 +127,6 @@ FAR void *mmap(FAR void *start, size_t length, int prot, int flags,
int fd, off_t offset)
{
FAR void *addr;
int errcode;
int ret = -1;
/* Since only a tiny subset of mmap() functionality, we have to verify many
@@ -144,7 +143,7 @@ FAR void *mmap(FAR void *start, size_t length, int prot, int flags,
(flags & (MAP_FIXED | MAP_DENYWRITE)) != 0)
{
ferr("ERROR: Unsupported options, prot=%x flags=%04x\n", prot, flags);
errcode = ENOSYS;
ret = -ENOSYS;
goto errout;
}
@@ -153,7 +152,7 @@ FAR void *mmap(FAR void *start, size_t length, int prot, int flags,
if (length == 0)
{
ferr("ERROR: Invalid length, length=%zu\n", length);
errcode = EINVAL;
ret = -EINVAL;
goto errout;
}
#endif
@@ -178,7 +177,7 @@ FAR void *mmap(FAR void *start, size_t length, int prot, int flags,
if (alloc == NULL)
{
ferr("ERROR: kumm_alloc() failed: %d\n", ret);
errcode = ENOMEM;
ret = -ENOMEM;
goto errout;
}
@@ -193,7 +192,7 @@ FAR void *mmap(FAR void *start, size_t length, int prot, int flags,
if ((flags & MAP_PRIVATE) == 0)
{
ret = ioctl(fd, FIOC_MMAP, (unsigned long)((uintptr_t)&addr));
ret = nx_ioctl(fd, FIOC_MMAP, (unsigned long)((uintptr_t)&addr));
}
if (ret < 0)
@@ -211,8 +210,7 @@ FAR void *mmap(FAR void *start, size_t length, int prot, int flags,
#else
/* Error out. The errno value was already set by ioctl() */
ferr("ERROR: ioctl(FIOC_MMAP) failed: %d\n", get_errno());
errcode = ENOSYS;
ferr("ERROR: ioctl(FIOC_MMAP) failed: %d\n", ret);
goto errout;
#endif
}
@@ -222,6 +220,6 @@ FAR void *mmap(FAR void *start, size_t length, int prot, int flags,
return (FAR void *)(((FAR uint8_t *)addr) + offset);
errout:
set_errno(errcode);
set_errno(-ret);
return MAP_FAILED;
}
fs/mmap/fs_rammap.c
+7 -9
View File
@@ -122,7 +122,6 @@ FAR void *rammap(int fd, size_t length, off_t offset)
FAR uint8_t *rdbuffer;
ssize_t nread;
off_t fpos;
int errcode;
int ret;
/* There is a major design flaw that I have not yet thought of fix for:
@@ -144,7 +143,7 @@ FAR void *rammap(int fd, size_t length, off_t offset)
if (!alloc)
{
ferr("ERROR: Region allocation failed, length: %d\n", (int)length);
errcode = ENOMEM;
ret = -ENOMEM;
goto errout;
}
@@ -158,15 +157,15 @@ FAR void *rammap(int fd, size_t length, off_t offset)
/* Seek to the specified file offset */
fpos = lseek(fd, offset, SEEK_SET);
if (fpos == (off_t)-1)
fpos = nx_seek(fd, offset, SEEK_SET);
if (fpos < 0)
{
/* Seek failed... errno has already been set, but EINVAL is probably
* the correct response.
*/
ferr("ERROR: Seek to position %d failed\n", (int)offset);
errcode = EINVAL;
ret = fpos;
goto errout_with_region;
}
@@ -189,7 +188,7 @@ FAR void *rammap(int fd, size_t length, off_t offset)
ferr("ERROR: Read failed: offset=%d errno=%d\n",
(int)offset, (int)nread);
errcode = (int)-nread;
ret = nread;
goto errout_with_region;
}
}
@@ -217,11 +216,10 @@ FAR void *rammap(int fd, size_t length, off_t offset)
ret = nxsem_wait(&g_rammaps.exclsem);
if (ret < 0)
{
errcode = -ret;
goto errout_with_region;
}
map->flink = g_rammaps.head;
map->flink = g_rammaps.head;
g_rammaps.head = map;
nxsem_post(&g_rammaps.exclsem);
@@ -231,7 +229,7 @@ errout_with_region:
kumm_free(alloc);
errout:
set_errno(errcode);
set_errno(-ret);
return MAP_FAILED;
}