diff --git a/cleonos/c/apps/help_main.c b/cleonos/c/apps/help_main.c index 1d6f919..cf479b0 100644 --- a/cleonos/c/apps/help_main.c +++ b/cleonos/c/apps/help_main.c @@ -14,10 +14,10 @@ static int ush_cmd_help(void) { ush_writeln(" clear"); ush_writeln(" ansi / ansitest / color"); ush_writeln(" bmpview [cols]"); - ush_writeln(" qrcode [--ecc ] "); - ush_writeln(" vim [file] (vim-like editor: normal/insert/:w/:q/:wq)"); - ush_writeln(" uwm (user-space window manager demo)"); - ush_writeln(" wavplay [steps] [ticks] / wavplay --stop"); + ush_writeln(" qrcode [--ecc ] "); + ush_writeln(" vim [file] (vim-like editor: normal/insert/:w/:q/:wq)"); + ush_writeln(" uwm (user-space window manager demo)"); + ush_writeln(" wavplay [steps] [ticks] / wavplay --stop"); ush_writeln(" fastfetch [--plain]"); ush_writeln(" doom [wad_path] (framebuffer bootstrap renderer)"); ush_writeln(" memstat / fsstat / taskstat / userstat / shstat / stats"); diff --git a/cleonos/c/include/cleonos_syscall.h b/cleonos/c/include/cleonos_syscall.h index ad3b804..1e3f28a 100644 --- a/cleonos/c/include/cleonos_syscall.h +++ b/cleonos/c/include/cleonos_syscall.h @@ -43,20 +43,20 @@ typedef struct cleonos_proc_snapshot { char path[CLEONOS_PROC_PATH_MAX]; } cleonos_proc_snapshot; -typedef struct cleonos_fb_info { - u64 width; - u64 height; - u64 pitch; - u64 bpp; -} cleonos_fb_info; - -typedef struct cleonos_mouse_state { - u64 x; - u64 y; - u64 buttons; - u64 packet_count; - u64 ready; -} cleonos_mouse_state; +typedef struct cleonos_fb_info { + u64 width; + u64 height; + u64 pitch; + u64 bpp; +} cleonos_fb_info; + +typedef struct cleonos_mouse_state { + u64 x; + u64 y; + u64 buttons; + u64 packet_count; + u64 ready; +} cleonos_mouse_state; typedef struct cleonos_fb_blit_req { u64 pixels_ptr; @@ -206,11 +206,11 @@ typedef struct cleonos_net_tcp_recv_req { #define CLEONOS_SYSCALL_NET_NETMASK 100ULL #define CLEONOS_SYSCALL_NET_GATEWAY 101ULL #define CLEONOS_SYSCALL_NET_DNS_SERVER 102ULL -#define CLEONOS_SYSCALL_NET_TCP_CONNECT 103ULL -#define CLEONOS_SYSCALL_NET_TCP_SEND 104ULL -#define CLEONOS_SYSCALL_NET_TCP_RECV 105ULL -#define CLEONOS_SYSCALL_NET_TCP_CLOSE 106ULL -#define CLEONOS_SYSCALL_MOUSE_STATE 107ULL +#define CLEONOS_SYSCALL_NET_TCP_CONNECT 103ULL +#define CLEONOS_SYSCALL_NET_TCP_SEND 104ULL +#define CLEONOS_SYSCALL_NET_TCP_RECV 105ULL +#define CLEONOS_SYSCALL_NET_TCP_CLOSE 106ULL +#define CLEONOS_SYSCALL_MOUSE_STATE 107ULL u64 cleonos_syscall(u64 id, u64 arg0, u64 arg1, u64 arg2); u64 cleonos_sys_log_write(const char *message, u64 length); @@ -316,10 +316,10 @@ u64 cleonos_sys_net_dns_server(void); u64 cleonos_sys_net_ping(u64 dst_ipv4_be, u64 poll_budget); u64 cleonos_sys_net_udp_send(const cleonos_net_udp_send_req *req); u64 cleonos_sys_net_udp_recv(cleonos_net_udp_recv_req *req); -u64 cleonos_sys_net_tcp_connect(const cleonos_net_tcp_connect_req *req); -u64 cleonos_sys_net_tcp_send(const cleonos_net_tcp_send_req *req); -u64 cleonos_sys_net_tcp_recv(cleonos_net_tcp_recv_req *req); -u64 cleonos_sys_net_tcp_close(u64 poll_budget); -u64 cleonos_sys_mouse_state(cleonos_mouse_state *out_state); - -#endif +u64 cleonos_sys_net_tcp_connect(const cleonos_net_tcp_connect_req *req); +u64 cleonos_sys_net_tcp_send(const cleonos_net_tcp_send_req *req); +u64 cleonos_sys_net_tcp_recv(cleonos_net_tcp_recv_req *req); +u64 cleonos_sys_net_tcp_close(u64 poll_budget); +u64 cleonos_sys_mouse_state(cleonos_mouse_state *out_state); + +#endif diff --git a/cleonos/c/src/syscall.c b/cleonos/c/src/syscall.c index 9b456b7..36d48e9 100644 --- a/cleonos/c/src/syscall.c +++ b/cleonos/c/src/syscall.c @@ -456,10 +456,10 @@ u64 cleonos_sys_net_tcp_recv(cleonos_net_tcp_recv_req *req) { return cleonos_syscall(CLEONOS_SYSCALL_NET_TCP_RECV, (u64)req, 0ULL, 0ULL); } -u64 cleonos_sys_net_tcp_close(u64 poll_budget) { - return cleonos_syscall(CLEONOS_SYSCALL_NET_TCP_CLOSE, poll_budget, 0ULL, 0ULL); -} - -u64 cleonos_sys_mouse_state(cleonos_mouse_state *out_state) { - return cleonos_syscall(CLEONOS_SYSCALL_MOUSE_STATE, (u64)out_state, 0ULL, 0ULL); -} +u64 cleonos_sys_net_tcp_close(u64 poll_budget) { + return cleonos_syscall(CLEONOS_SYSCALL_NET_TCP_CLOSE, poll_budget, 0ULL, 0ULL); +} + +u64 cleonos_sys_mouse_state(cleonos_mouse_state *out_state) { + return cleonos_syscall(CLEONOS_SYSCALL_MOUSE_STATE, (u64)out_state, 0ULL, 0ULL); +}