Skip to content

Commit 10f4f5a

Browse files
clemdiepclemdiep
committed
correct format
1 parent 8aa38bc commit 10f4f5a

File tree

4 files changed

+86
-82
lines changed

4 files changed

+86
-82
lines changed

‎so3/fs/vfs.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ SYSCALL_DEFINE5(mmap, addr_t, start, size_t, length, int, prot, int, fd, off_t,
751751
if (-1 == gfd) {
752752
printk("%s: could not get global fd.\n", __func__);
753753
set_errno(EBADF);
754-
return (long)MAP_FAILED;
754+
return (long) MAP_FAILED;
755755
}
756756

757757
mutex_lock(&vfs_lock);
@@ -760,7 +760,7 @@ SYSCALL_DEFINE5(mmap, addr_t, start, size_t, length, int, prot, int, fd, off_t,
760760
printk("%s: could not get device fops.\n", __func__);
761761
mutex_unlock(&vfs_lock);
762762
set_errno(EBADF);
763-
return (long)MAP_FAILED;
763+
return (long) MAP_FAILED;
764764
}
765765

766766
mutex_unlock(&vfs_lock);
@@ -774,11 +774,11 @@ SYSCALL_DEFINE5(mmap, addr_t, start, size_t, length, int, prot, int, fd, off_t,
774774
if (!fops->mmap) {
775775
printk("%s: device doesn't support mmap.\n", __func__);
776776
set_errno(EACCES);
777-
return (long)MAP_FAILED;
777+
return (long) MAP_FAILED;
778778
}
779779

780780
/* Call the mmap fops that will do the actual mapping. */
781-
return (long)fops->mmap(fd, start, page_count, offset);
781+
return (long) fops->mmap(fd, start, page_count, offset);
782782
}
783783

784784
SYSCALL_DEFINE3(ioctl, int, fd, unsigned long, cmd, unsigned long, args)

‎so3/include/syscall.h‎

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,18 @@
4545
* @param t Type of the function arguments
4646
* @param n name of the function arguments
4747
*/
48-
#define __MAP1(m,t,n) m(t,n)
49-
#define __MAP2(m,t,n,...) m(t,n), __MAP1(m,__VA_ARGS__)
50-
#define __MAP3(m,t,n,...) m(t,n), __MAP2(m,__VA_ARGS__)
51-
#define __MAP4(m,t,n,...) m(t,n), __MAP3(m,__VA_ARGS__)
52-
#define __MAP5(m,t,n,...) m(t,n), __MAP4(m,__VA_ARGS__)
53-
#define __MAP6(m,t,n,...) m(t,n), __MAP5(m,__VA_ARGS__)
54-
#define __MAP(x,m,...) __MAP##x(m,__VA_ARGS__)
48+
#define __MAP1(m, t, n) m(t, n)
49+
#define __MAP2(m, t, n, ...) m(t, n), __MAP1(m, __VA_ARGS__)
50+
#define __MAP3(m, t, n, ...) m(t, n), __MAP2(m, __VA_ARGS__)
51+
#define __MAP4(m, t, n, ...) m(t, n), __MAP3(m, __VA_ARGS__)
52+
#define __MAP5(m, t, n, ...) m(t, n), __MAP4(m, __VA_ARGS__)
53+
#define __MAP6(m, t, n, ...) m(t, n), __MAP5(m, __VA_ARGS__)
54+
#define __MAP(x, m, ...) __MAP##x(m, __VA_ARGS__)
5555

5656
/** Macros to map type and name with __MAP */
57-
#define __M_DECL(t,n) t n
58-
#define __M_LONG(t,n) long n
59-
#define __M_ARGS(t,n) n
57+
#define __M_DECL(t, n) t n
58+
#define __M_LONG(t, n) long n
59+
#define __M_ARGS(t, n) n
6060

6161
/**
6262
* Map syscall arguments by casting them for function call.
@@ -68,13 +68,13 @@
6868
* @param n name of the function arguments, not use but allow
6969
* to use same __VA_ARGS__ as in __MAP()
7070
*/
71-
#define __MAP_ARGS1(x,args,t,n) (t)args[x-1]
72-
#define __MAP_ARGS2(x,args,t,n,...) (t)args[x-2], __MAP_ARGS1(x,args,__VA_ARGS__)
73-
#define __MAP_ARGS3(x,args,t,n,...) (t)args[x-3], __MAP_ARGS2(x,args,__VA_ARGS__)
74-
#define __MAP_ARGS4(x,args,t,n,...) (t)args[x-4], __MAP_ARGS3(x,args,__VA_ARGS__)
75-
#define __MAP_ARGS5(x,args,t,n,...) (t)args[x-5], __MAP_ARGS4(x,args,__VA_ARGS__)
76-
#define __MAP_ARGS6(x,args,t,n,...) (t)args[x-6], __MAP_ARGS5(x,args,__VA_ARGS__)
77-
#define __MAP_ARGS(x,args,...) __MAP_ARGS##x((x),(args),__VA_ARGS__)
71+
#define __MAP_ARGS1(x, args, t, n) (t) args[x - 1]
72+
#define __MAP_ARGS2(x, args, t, n, ...) (t) args[x - 2], __MAP_ARGS1(x, args, __VA_ARGS__)
73+
#define __MAP_ARGS3(x, args, t, n, ...) (t) args[x - 3], __MAP_ARGS2(x, args, __VA_ARGS__)
74+
#define __MAP_ARGS4(x, args, t, n, ...) (t) args[x - 4], __MAP_ARGS3(x, args, __VA_ARGS__)
75+
#define __MAP_ARGS5(x, args, t, n, ...) (t) args[x - 5], __MAP_ARGS4(x, args, __VA_ARGS__)
76+
#define __MAP_ARGS6(x, args, t, n, ...) (t) args[x - 6], __MAP_ARGS5(x, args, __VA_ARGS__)
77+
#define __MAP_ARGS(x, args, ...) __MAP_ARGS##x((x), (args), __VA_ARGS__)
7878

7979
/**
8080
* Syscall functions declaration and definitions helper.
@@ -88,26 +88,29 @@
8888
* arguments define like a normal function. That function is automatically
8989
* called by __sys_SYCALL_NAME with the correct argument number and cast.
9090
*/
91-
#define SYSCALL_DECLARE(name,...) \
91+
#define SYSCALL_DECLARE(name, ...) \
9292
long __sys_##name(syscall_args_t *args); \
9393
inline long do_##name(__VA_ARGS__);
9494

95-
#define SYSCALL_DEFINE0(name) \
96-
long __sys_##name(syscall_args_t *unused) { return do_##name(); } \
95+
#define SYSCALL_DEFINE0(name) \
96+
long __sys_##name(syscall_args_t *unused) \
97+
{ \
98+
return do_##name(); \
99+
} \
97100
inline long do_##name(void)
98-
#define SYSCALL_DEFINE1(...) __SYSCALL_DEFINEx(1,__VA_ARGS__)
99-
#define SYSCALL_DEFINE2(...) __SYSCALL_DEFINEx(2,__VA_ARGS__)
100-
#define SYSCALL_DEFINE3(...) __SYSCALL_DEFINEx(3,__VA_ARGS__)
101-
#define SYSCALL_DEFINE4(...) __SYSCALL_DEFINEx(4,__VA_ARGS__)
102-
#define SYSCALL_DEFINE5(...) __SYSCALL_DEFINEx(5,__VA_ARGS__)
103-
#define SYSCALL_DEFINE6(...) __SYSCALL_DEFINEx(6,__VA_ARGS__)
104-
105-
#define __SYSCALL_DEFINEx(x,name,...) \
106-
long __sys_##name(syscall_args_t *args) \
107-
{ \
108-
return do_##name(__MAP_ARGS(x,args->args,__VA_ARGS__)); \
109-
} \
110-
inline long do_##name(__MAP(x,__M_DECL,__VA_ARGS__))
101+
#define SYSCALL_DEFINE1(...) __SYSCALL_DEFINEx(1, __VA_ARGS__)
102+
#define SYSCALL_DEFINE2(...) __SYSCALL_DEFINEx(2, __VA_ARGS__)
103+
#define SYSCALL_DEFINE3(...) __SYSCALL_DEFINEx(3, __VA_ARGS__)
104+
#define SYSCALL_DEFINE4(...) __SYSCALL_DEFINEx(4, __VA_ARGS__)
105+
#define SYSCALL_DEFINE5(...) __SYSCALL_DEFINEx(5, __VA_ARGS__)
106+
#define SYSCALL_DEFINE6(...) __SYSCALL_DEFINEx(6, __VA_ARGS__)
107+
108+
#define __SYSCALL_DEFINEx(x, name, ...) \
109+
long __sys_##name(syscall_args_t *args) \
110+
{ \
111+
return do_##name(__MAP_ARGS(x, args->args, __VA_ARGS__)); \
112+
} \
113+
inline long do_##name(__MAP(x, __M_DECL, __VA_ARGS__))
111114

112115
typedef struct {
113116
unsigned long args[6];

‎so3/kernel/syscalls.c‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -38,61 +38,61 @@ extern uint32_t __get_syscall_stack_arg(uint32_t nr);
3838
extern void test_malloc(int test_no);
3939

4040
static const syscall_fn_t syscall_table[NR_SYSCALLS] = {
41-
[0 ... NR_SYSCALLS - 1] = NULL,
41+
[0 ... NR_SYSCALLS - 1] = NULL,
4242

4343
#ifdef CONFIG_MMU
44-
[SYSCALL_GETPID] = __sys_getpid,
45-
[SYSCALL_GETTIMEOFDAY] = __sys_gettimeofday,
46-
[SYSCALL_CLOCK_GETTIME] = __sys_clock_gettime,
47-
[SYSCALL_EXIT] = __sys_exit,
48-
[SYSCALL_EXECVE] = __sys_execve,
49-
[SYSCALL_FORK] = __sys_fork,
50-
[SYSCALL_WAITPID] = __sys_waitpid,
51-
[SYSCALL_PTRACE] = __sys_ptrace,
44+
[SYSCALL_GETPID] = __sys_getpid,
45+
[SYSCALL_GETTIMEOFDAY] = __sys_gettimeofday,
46+
[SYSCALL_CLOCK_GETTIME] = __sys_clock_gettime,
47+
[SYSCALL_EXIT] = __sys_exit,
48+
[SYSCALL_EXECVE] = __sys_execve,
49+
[SYSCALL_FORK] = __sys_fork,
50+
[SYSCALL_WAITPID] = __sys_waitpid,
51+
[SYSCALL_PTRACE] = __sys_ptrace,
5252
#endif
53-
[SYSCALL_READ] = __sys_read,
54-
[SYSCALL_WRITE] = __sys_write,
55-
[SYSCALL_OPEN] = __sys_open,
56-
[SYSCALL_CLOSE] = __sys_close,
57-
[SYSCALL_THREAD_CREATE] = __sys_thread_create,
58-
[SYSCALL_THREAD_JOIN] = __sys_thread_join,
59-
[SYSCALL_THREAD_EXIT] = __sys_thread_exit,
60-
[SYSCALL_THREAD_YIELD] = __sys_thread_yield,
61-
[SYSCALL_READDIR] = __sys_readdir,
62-
[SYSCALL_IOCTL] = __sys_ioctl,
63-
[SYSCALL_FCNTL] = __sys_fcntl,
64-
[SYSCALL_LSEEK] = __sys_lseek,
53+
[SYSCALL_READ] = __sys_read,
54+
[SYSCALL_WRITE] = __sys_write,
55+
[SYSCALL_OPEN] = __sys_open,
56+
[SYSCALL_CLOSE] = __sys_close,
57+
[SYSCALL_THREAD_CREATE] = __sys_thread_create,
58+
[SYSCALL_THREAD_JOIN] = __sys_thread_join,
59+
[SYSCALL_THREAD_EXIT] = __sys_thread_exit,
60+
[SYSCALL_THREAD_YIELD] = __sys_thread_yield,
61+
[SYSCALL_READDIR] = __sys_readdir,
62+
[SYSCALL_IOCTL] = __sys_ioctl,
63+
[SYSCALL_FCNTL] = __sys_fcntl,
64+
[SYSCALL_LSEEK] = __sys_lseek,
6565
#ifdef CONFIG_IPC_PIPE
66-
[SYSCALL_PIPE] = __sys_pipe,
66+
[SYSCALL_PIPE] = __sys_pipe,
6767
#endif
68-
[SYSCALL_DUP] = __sys_dup,
69-
[SYSCALL_DUP2] = __sys_dup2,
70-
[SYSCALL_STAT] = __sys_stat,
71-
[SYSCALL_MMAP] = __sys_mmap,
72-
[SYSCALL_NANOSLEEP] = __sys_nanosleep,
68+
[SYSCALL_DUP] = __sys_dup,
69+
[SYSCALL_DUP2] = __sys_dup2,
70+
[SYSCALL_STAT] = __sys_stat,
71+
[SYSCALL_MMAP] = __sys_mmap,
72+
[SYSCALL_NANOSLEEP] = __sys_nanosleep,
7373
#ifdef CONFIG_PROC_ENV
74-
[SYSCALL_SBRK] = __sys_sbrk,
74+
[SYSCALL_SBRK] = __sys_sbrk,
7575
#endif
76-
[SYSCALL_MUTEX_LOCK] = __sys_mutex_lock,
77-
[SYSCALL_MUTEX_UNLOCK] = __sys_mutex_unlock,
76+
[SYSCALL_MUTEX_LOCK] = __sys_mutex_lock,
77+
[SYSCALL_MUTEX_UNLOCK] = __sys_mutex_unlock,
7878
#ifdef CONFIG_IPC_SIGNAL
79-
[SYSCALL_SIGACTION] = __sys_sigaction,
80-
[SYSCALL_KILL] = __sys_kill,
81-
[SYSCALL_SIGRETURN] = __sys_sigreturn,
79+
[SYSCALL_SIGACTION] = __sys_sigaction,
80+
[SYSCALL_KILL] = __sys_kill,
81+
[SYSCALL_SIGRETURN] = __sys_sigreturn,
8282
#endif
8383
#ifdef CONFIG_NET
84-
[SYSCALL_SOCKET] = __sys_socket,
85-
[SYSCALL_BIND] = __sys_bind,
86-
[SYSCALL_LISTEN] = __sys_listen,
87-
[SYSCALL_ACCEPT] = __sys_accept,
88-
[SYSCALL_CONNECT] = __sys_connect,
89-
[SYSCALL_RECV] = __sys_recv,
90-
[SYSCALL_SEND] = __sys_send,
91-
[SYSCALL_SENDTO] = __sys_sendto,
92-
[SYSCALL_SETSOCKOPT] = __sys_setsockopt,
93-
[SYSCALL_RECVFROM] = __sys_recvfrom,
84+
[SYSCALL_SOCKET] = __sys_socket,
85+
[SYSCALL_BIND] = __sys_bind,
86+
[SYSCALL_LISTEN] = __sys_listen,
87+
[SYSCALL_ACCEPT] = __sys_accept,
88+
[SYSCALL_CONNECT] = __sys_connect,
89+
[SYSCALL_RECV] = __sys_recv,
90+
[SYSCALL_SEND] = __sys_send,
91+
[SYSCALL_SENDTO] = __sys_sendto,
92+
[SYSCALL_SETSOCKOPT] = __sys_setsockopt,
93+
[SYSCALL_RECVFROM] = __sys_recvfrom,
9494
#endif
95-
[SYSCALL_SYSINFO] = __sys_sysinfo,
95+
[SYSCALL_SYSINFO] = __sys_sysinfo,
9696
};
9797

9898
/*

‎so3/net/net.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,8 @@ SYSCALL_DEFINE4(send, int, sockfd, const void *, dataptr, size_t, size, int, fla
499499
return lwip_send(lwip_fd, dataptr, size, flags);
500500
}
501501

502-
SYSCALL_DEFINE6(sendto, int, sockfd, const void *, dataptr, size_t, size, int, flags, const struct sockaddr *, to, socklen_t, tolen)
502+
SYSCALL_DEFINE6(sendto, int, sockfd, const void *, dataptr, size_t, size, int, flags, const struct sockaddr *, to, socklen_t,
503+
tolen)
503504
{
504505
struct sockaddr_in to_lwip;
505506
int lwip_fd = get_lwip_fd(sockfd);

0 commit comments

Comments
 (0)