fs: Remove all LIBC_IOCTL_VARIADIC related stuff

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2020-05-04 17:00:51 +08:00
committed by patacongo
parent 19cc84ed4a
commit 6604cdb3f2
14 changed files with 103 additions and 272 deletions
+1 -2
View File
@@ -24,7 +24,6 @@
"exit","stdlib.h","","void","int"
"fcntl","fcntl.h","","int","int","int","..."
"fs_fdopen","nuttx/fs/fs.h","CONFIG_NFILE_STREAMS > 0","FAR struct file_struct*","int","int","FAR struct tcb_s*"
"fs_ioctl","nuttx/fs/fs.h","defined(CONFIG_LIBC_IOCTL_VARIADIC)","int","int","int","unsigned long"
"fstat","sys/stat.h","","int","int","FAR struct stat*"
"fstatfs","sys/statfs.h","","int","int","FAR struct statfs*"
"fsync","unistd.h","!defined(CONFIG_DISABLE_MOUNTPOINT)","int","int"
@@ -42,7 +41,7 @@
"if_indextoname","net/if.h","defined(CONFIG_NETDEV_IFINDEX)","FAR char *","unsigned int","FAR char *"
"if_nametoindex","net/if.h","defined(CONFIG_NETDEV_IFINDEX)","unsigned int","FAR const char *"
"insmod","nuttx/module.h","defined(CONFIG_MODULE)","FAR void *","FAR const char *","FAR const char *"
"ioctl","sys/ioctl.h","!defined(CONFIG_LIBC_IOCTL_VARIADIC)","int","int","int","unsigned long"
"ioctl","sys/ioctl.h","","int","int","int","..."
"kill","signal.h","","int","pid_t","int"
"link","unistd.h","defined(CONFIG_PSEUDOFS_SOFTLINKS)","int","FAR const char *","FAR const char *"
"listen","sys/socket.h","defined(CONFIG_NET)","int","int","int"
1 _exit unistd.h void int
24 exit stdlib.h void int
25 fcntl fcntl.h int int
26 fs_fdopen nuttx/fs/fs.h CONFIG_NFILE_STREAMS > 0 FAR struct file_struct* int
fs_ioctl nuttx/fs/fs.h defined(CONFIG_LIBC_IOCTL_VARIADIC) int int
27 fstat sys/stat.h int int
28 fstatfs sys/statfs.h int int
29 fsync unistd.h !defined(CONFIG_DISABLE_MOUNTPOINT) int int
41 if_indextoname net/if.h defined(CONFIG_NETDEV_IFINDEX) FAR char * unsigned int
42 if_nametoindex net/if.h defined(CONFIG_NETDEV_IFINDEX) unsigned int FAR const char *
43 insmod nuttx/module.h defined(CONFIG_MODULE) FAR void * FAR const char *
44 ioctl sys/ioctl.h !defined(CONFIG_LIBC_IOCTL_VARIADIC) int int
45 kill signal.h int pid_t
46 link unistd.h defined(CONFIG_PSEUDOFS_SOFTLINKS) int FAR const char *
47 listen sys/socket.h defined(CONFIG_NET) int int
+1 -5
View File
@@ -197,11 +197,7 @@ SYSCALL_LOOKUP(up_assert, 2, STUB_up_assert)
*/
SYSCALL_LOOKUP(close, 1, STUB_close)
#ifdef CONFIG_LIBC_IOCTL_VARIADIC
SYSCALL_LOOKUP(fs_ioctl, 3, STUB_fs_ioctl)
#else
SYSCALL_LOOKUP(ioctl, 3, STUB_ioctl)
#endif
SYSCALL_LOOKUP(ioctl, 6, STUB_ioctl)
SYSCALL_LOOKUP(read, 3, STUB_read)
SYSCALL_LOOKUP(write, 3, STUB_write)
SYSCALL_LOOKUP(pread, 4, STUB_pread)
+2 -6
View File
@@ -189,13 +189,9 @@ uintptr_t STUB_nx_vsyslog(int nbr, uintptr_t parm1, uintptr_t parm2,
*/
uintptr_t STUB_close(int nbr, uintptr_t parm1);
#ifdef CONFIG_LIBC_IOCTL_VARIADIC
uintptr_t STUB_fs_ioctl(int nbr, uintptr_t parm1, uintptr_t parm2,
uintptr_t parm3);
#else
uintptr_t STUB_ioctl(int nbr, uintptr_t parm1, uintptr_t parm2,
uintptr_t parm3);
#endif
uintptr_t parm3, uintptr_t parm4, uintptr_t parm5,
uintptr_t parm6);
uintptr_t STUB_read(int nbr, uintptr_t parm1, uintptr_t parm2,
uintptr_t parm3);
uintptr_t STUB_write(int nbr, uintptr_t parm1, uintptr_t parm2,