From d16177c36d41c1141e580b71021efd98a514d9af Mon Sep 17 00:00:00 2001
From: Ivan Baravy <dunkaist@gmail.com>
Date: Tue, 31 Jan 2023 02:38:48 +0000
Subject: [PATCH] Implement common command buffer for the shell and os

---
 makefile               |  11 +-
 shell.c                | 316 ++++++++++++++++++++++++-----------------
 shell.h                |  10 +-
 system.inc             |   2 +
 umka.h                 |  51 +++++--
 umka_fuse.c            |   1 -
 umka_gen_devices_dat.c |   2 +-
 umka_os.c              |  56 ++++----
 umka_os.h              |  51 -------
 umka_os.us             |   2 +-
 umka_shell.c           |   3 +-
 util.c => umkart.c     |   9 +-
 util.h => umkart.h     |   5 +
 13 files changed, 285 insertions(+), 234 deletions(-)
 delete mode 100644 umka_os.h
 rename util.c => umkart.c (95%)
 rename util.h => umkart.h (78%)

diff --git a/makefile b/makefile
index fbc61a6..9c69ff8 100644
--- a/makefile
+++ b/makefile
@@ -57,7 +57,7 @@ test: umka_shell
 
 umka_shell: umka_shell.o umka.o shell.o trace.o trace_lbr.o vdisk.o \
             vdisk/raw.o vdisk/qcow2.o vdisk/miniz/miniz.a vnet.o lodepng.o \
-            $(HOST)/pci.o $(HOST)/thread.o io.o $(HOST)/io_async.o util.o \
+            $(HOST)/pci.o $(HOST)/thread.o io.o $(HOST)/io_async.o umkart.o \
             optparse32.o bestline32.o
 	$(CC) $(LDFLAGS_32) $^ -o $@ -T umka.ld
 
@@ -68,11 +68,12 @@ umka_fuse: umka_fuse.o umka.o trace.o trace_lbr.o vdisk.o vdisk/raw.o \
 
 umka_os: umka_os.o umka.o shell.o lodepng.o vdisk.o vdisk/raw.o vdisk/qcow2.o \
          vdisk/miniz/miniz.a vnet.o trace.o trace_lbr.o $(HOST)/pci.o \
-         $(HOST)/thread.o io.o $(HOST)/io_async.o util.o bestline32.o optparse32.o
+         $(HOST)/thread.o io.o $(HOST)/io_async.o umkart.o bestline32.o \
+         optparse32.o
 	$(CC) $(LDFLAGS_32) `sdl2-config --libs` $^ -o $@ -T umka.ld
 
 umka_gen_devices_dat: umka_gen_devices_dat.o umka.o $(HOST)/pci.o \
-                      $(HOST)/thread.o util.o
+                      $(HOST)/thread.o umkart.o
 	$(CC) $(LDFLAGS_32) $^ -o $@ -T umka.ld
 
 umka.o umka.fas: umka.asm
@@ -108,7 +109,7 @@ optparse32.o: optparse.c optparse.h
 optparse.o: optparse.c optparse.h
 	$(CC) $(CFLAGS) -c $< -o $@
 
-util.o: util.c util.h umka.h
+umkart.o: umkart.c umkart.h umka.h
 	$(CC) $(CFLAGS_32) -c $<
 
 default.skn: $(KOLIBRIOS)/skins/Leency/Shkvorka/default.asm colors.dtp
@@ -168,7 +169,7 @@ umka_shell.o: umka_shell.c umka.h trace.h
 umka_fuse.o: umka_fuse.c umka.h
 	$(CC) $(CFLAGS_32) `pkg-config fuse3 --cflags` -c $<
 
-umka_os.o: umka_os.c umka.h umka_os.h
+umka_os.o: umka_os.c umka.h
 	$(CC) $(CFLAGS_32) `sdl2-config --cflags` -c $<
 
 umka_gen_devices_dat.o: umka_gen_devices_dat.c umka.h
diff --git a/shell.c b/shell.c
index 023dba4..fd32b62 100644
--- a/shell.c
+++ b/shell.c
@@ -8,18 +8,19 @@
     Copyright (C) 2021  Magomed Kostoev <mkostoevr@yandex.ru>
 */
 
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdint.h>
+#include <assert.h>
+#include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
-#include <stdlib.h>
+#include <stdatomic.h>
+#include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <assert.h>
 #include <time.h>
-#include <errno.h>
+#include <unistd.h>
 
 // TODO: Cleanup
 #ifndef _WIN32
@@ -32,7 +33,7 @@
 #include "umka.h"
 #include "trace.h"
 #include "pci.h"
-#include "util.h"
+#include "umkart.h"
 #include "lodepng.h"
 #include "optparse.h"
 #include "bestline.h"
@@ -57,6 +58,38 @@ typedef struct {
     void (*func) (struct shell_ctx *, int, char **);
 } func_table_t;
 
+void
+umka_run_cmd_sync(struct shell_ctx *ctx) {
+    struct umka_cmd *cmd = umka_cmd_buf;
+    if (atomic_load_explicit(&cmd->status, memory_order_acquire) != UMKA_CMD_STATUS_READY) {
+        fprintf(ctx->fout, "[!] command is not ready: %d: %u\n", cmd - umka_cmd_buf, cmd->type);
+        return;
+    }
+    switch (cmd->type) {
+    case UMKA_CMD_SET_MOUSE_DATA: {
+        struct cmd_set_mouse_data *c = &cmd->arg.set_mouse_data;
+        kos_set_mouse_data(c->btn_state, c->xmoving, c->ymoving, c->vscroll,
+                           c->hscroll);
+        break;
+        }
+    default:
+        fprintf(ctx->fout, "[!] unknown command: %u\n", cmd->type);
+        break;
+    }
+    atomic_store_explicit(&cmd->status, UMKA_CMD_STATUS_DONE,
+                          memory_order_release);
+    cnd_signal(&ctx->cmd_done);
+}
+
+static void
+umka_run_cmd(struct shell_ctx *ctx) {
+    if (atomic_load_explicit(ctx->running, memory_order_acquire)) {
+        cnd_wait(&ctx->cmd_done, &ctx->cmd_mutex);
+    } else {
+        umka_run_cmd_sync(ctx);
+    }
+}
+
 const char *f70_status_name[] = {
                                  "success",
                                  "disk_base",
@@ -368,7 +401,7 @@ cmd_var(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: var <$name>\n"
-        "  $name            variable name, must start with $ sign";
+        "  $name            variable name, must start with $ sign\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -384,7 +417,7 @@ cmd_send_scancode(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: send_scancode <code>...\n"
-        "  code             dec or hex number";
+        "  code             dec or hex number\n";
     if (argc < 2) {
         fputs(usage, ctx->fout);
         return;
@@ -470,7 +503,7 @@ cmd_i40(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: i40 <eax> [ebx [ecx [edx [esi [edi [ebp]]]]]]...\n"
-        "  see '/kernel/docs/sysfuncs.txt' for details";
+        "  see '/kernel/docs/sysfuncs.txt' for details\n";
     if (argc < 2 || argc > 8) {
         fputs(usage, ctx->fout);
         return;
@@ -577,7 +610,7 @@ cmd_ramdisk_init(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: ramdisk_init <file>\n"
-        "  <file>           absolute or relative path";
+        "  <file>           absolute or relative path\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -610,7 +643,7 @@ cmd_disk_add(struct shell_ctx *ctx, int argc, char **argv) {
         "usage: disk_add <file> <name> [option]...\n"
         "  <file>           absolute or relative path\n"
         "  <name>           disk name, e.g. hd0 or rd\n"
-        "  -c cache size    size of disk cache in bytes";
+        "  -c cache size    size of disk cache in bytes\n";
     if (argc < 3) {
         fputs(usage, ctx->fout);
         return;
@@ -669,7 +702,7 @@ cmd_disk_del(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: disk_del <name>\n"
-        "  name             disk name, i.e. rd or hd0";
+        "  name             disk name, i.e. rd or hd0\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -683,7 +716,7 @@ static void
 cmd_pwd(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
-        "usage: pwd";
+        "usage: pwd\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -705,7 +738,7 @@ cmd_set_pixel(struct shell_ctx *ctx, int argc, char **argv) {
         "  x                x window coordinate\n"
         "  y                y window coordinate\n"
         "  color            argb in hex\n"
-        "  -i               inverted color";
+        "  -i               inverted color\n";
     if (argc < 4) {
         fputs(usage, ctx->fout);
         return;
@@ -735,7 +768,7 @@ cmd_write_text(struct shell_ctx *ctx, int argc, char **argv) {
         "  font_and_enc     font size and string encoding\n"
         "  draw_to_buf      draw to the buffer pointed to by the next param\n"
         "  length           length of the string if it is non-asciiz\n"
-        "  bg_color_or_buf  argb or pointer";
+        "  bg_color_or_buf  argb or pointer\n";
     if (argc != 12) {
         fputs(usage, ctx->fout);
         return;
@@ -763,7 +796,7 @@ cmd_get_key(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: get_key";
+        "usage: get_key\n";
     if (argc > 1) {
         fputs(usage, ctx->fout);
         return;
@@ -776,7 +809,7 @@ cmd_dump_key_buff(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: dump_key_buff [count]\n"
-        "  count            how many items to dump (all by default)";
+        "  count            how many items to dump (all by default)\n";
     if (argc > 2) {
         fputs(usage, ctx->fout);
         return;
@@ -796,7 +829,7 @@ cmd_dump_win_stack(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: dump_win_stack [count]\n"
-        "  count            how many items to dump";
+        "  count            how many items to dump\n";
     if (argc > 2) {
         fputs(usage, ctx->fout);
         return;
@@ -815,7 +848,7 @@ cmd_dump_win_pos(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: dump_win_pos [count]\n"
-        "  count            how many items to dump";
+        "  count            how many items to dump\n";
     if (argc < 1) {
         fputs(usage, ctx->fout);
         return;
@@ -835,7 +868,7 @@ cmd_dump_win_map(struct shell_ctx *ctx, int argc, char **argv) {
     (void)argv;
 // TODO: area
     const char *usage = \
-        "usage: dump_win_map";
+        "usage: dump_win_map\n";
     if (argc < 0) {
         fputs(usage, ctx->fout);
         return;
@@ -855,7 +888,7 @@ cmd_dump_appdata(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: dump_appdata <index> [-p]\n"
         "  index            index into appdata array to dump\n"
-        "  -p               print fields that are pointers";
+        "  -p               print fields that are pointers\n";
     if (argc < 2) {
         fputs(usage, ctx->fout);
         return;
@@ -916,7 +949,7 @@ cmd_switch_to_thread(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: switch_to_thread <tid>\n"
-        "  <tid>          thread id to switch to";
+        "  <tid>          thread id to switch to\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -931,7 +964,7 @@ cmd_get(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: get <var>\n"
-        "  <var>          variable to get";
+        "  <var>          variable to get\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -960,7 +993,7 @@ cmd_set(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: set <var> <value>\n"
         "  <var>          variable to set\n"
-        "  <value>        decimal or hex value";
+        "  <value>        decimal or hex value\n";
     if (argc != 3) {
         fputs(usage, ctx->fout);
         return;
@@ -994,7 +1027,7 @@ cmd_new_sys_thread(struct shell_ctx *ctx, int argc, char **argv) {
     (void)argv;
 // FIXME
     const char *usage = \
-        "usage: new_sys_thread";
+        "usage: new_sys_thread\n";
     if (!argc) {
         fputs(usage, ctx->fout);
         return;
@@ -1008,14 +1041,14 @@ cmd_mouse_move(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: mouse_move [-l] [-m] [-r] [-x {+|-|=}<value>]"
-            "[-y {+|-|=}<value>] [-h {+|-}<value>] [-v {+|-}<value>]\n"
+            " [-y {+|-|=}<value>] [-h {+|-}<value>] [-v {+|-}<value>]\n"
         "  -l             left button is held\n"
         "  -m             middle button is held\n"
         "  -r             right button is held\n"
         "  -x             increase, decrease or set x coordinate\n"
         "  -y             increase, decrease or set y coordinate\n"
         "  -h             scroll horizontally\n"
-        "  -v             scroll vertically";
+        "  -v             scroll vertically\n";
     if (!argc) {
         fputs(usage, ctx->fout);
         return;
@@ -1086,17 +1119,31 @@ cmd_mouse_move(struct shell_ctx *ctx, int argc, char **argv) {
             return;
         }
     }
+    uint32_t btn_state = lbheld + (rbheld << 1) + (mbheld << 2) + (yabs << 30)
+                         + (xabs << 31);
+    struct umka_cmd *cmd = umka_cmd_buf;
+    struct cmd_set_mouse_data *c = &cmd->arg.set_mouse_data;
+    cmd->type = UMKA_CMD_SET_MOUSE_DATA;
+    c->btn_state = btn_state;
+    c->xmoving = xmoving;
+    c->ymoving = ymoving;
+    c->vscroll = vscroll;
+    c->hscroll = hscroll;
+    atomic_store_explicit(&cmd->status, UMKA_CMD_STATUS_READY,
+                          memory_order_release);
     COVERAGE_ON();
-    umka_mouse_move(lbheld, mbheld, rbheld, xabs, xmoving, yabs, ymoving,
-                    hscroll, vscroll);
+    umka_run_cmd(ctx);
     COVERAGE_OFF();
+
+    atomic_store_explicit(&cmd->status, UMKA_CMD_STATUS_EMPTY,
+                          memory_order_release);
 }
 
 static void
 cmd_process_info(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: process_info <pid>\n"
-        "  pid              process id to dump, -1 for self";
+        "  pid              process id to dump, -1 for self\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -1128,7 +1175,7 @@ cmd_check_for_event(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: check_for_event";
+        "usage: check_for_event\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -1159,7 +1206,7 @@ cmd_display_number(struct shell_ctx *ctx, int argc, char **argv) {
         "  font             0 = 6x9, 1 = 8x16\n"
         "  draw_to_buf      0/1\n"
         "  scale_factor     0 = x1, ..., 7 = x8\n"
-        "  bg_color_or_buf  depending on flags fill_bg and draw_to_buf";
+        "  bg_color_or_buf  depending on flags fill_bg and draw_to_buf\n";
     if (argc != 15) {
         fputs(usage, ctx->fout);
         return;
@@ -1197,7 +1244,7 @@ cmd_set_window_colors(struct shell_ctx *ctx, int argc, char **argv) {
         "usage: set_window_colors <frame> <grab> <work_3d_dark> <work_3d_light>"
             " <grab_text> <work> <work_button> <work_button_text> <work_text>"
             " <work_graph>\n"
-        "  *                all colors are in hex";
+        "  *                all colors are in hex\n";
     if (argc != (1 + sizeof(system_colors_t)/4)) {
         fputs(usage, ctx->fout);
         return;
@@ -1223,7 +1270,7 @@ cmd_get_window_colors(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: get_window_colors";
+        "usage: get_window_colors\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -1251,7 +1298,7 @@ cmd_get_skin_height(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: get_skin_height";
+        "usage: get_skin_height\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -1267,7 +1314,7 @@ cmd_get_screen_area(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: get_screen_area";
+        "usage: get_screen_area\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -1290,7 +1337,7 @@ cmd_set_screen_area(struct shell_ctx *ctx, int argc, char **argv) {
         "  left             left x coord\n"
         "  top              top y coord\n"
         "  right            right x coord (not length!)\n"
-        "  bottom           bottom y coord";
+        "  bottom           bottom y coord\n";
     if (argc != 5) {
         fputs(usage, ctx->fout);
         return;
@@ -1310,7 +1357,7 @@ cmd_get_skin_margins(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: get_skin_margins";
+        "usage: get_skin_margins\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -1330,7 +1377,7 @@ cmd_set_button_style(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: set_button_style <style>\n"
-        "  style            0 - flat, 1 - 3d";
+        "  style            0 - flat, 1 - 3d\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -1346,7 +1393,7 @@ cmd_set_skin(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: set_skin <path>\n"
-        "  path             i.e. /rd/1/DEFAULT.SKN";
+        "  path             i.e. /rd/1/DEFAULT.SKN\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -1367,7 +1414,7 @@ cmd_get_keyboard_layout(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: get_keyboard_layout <-t type> [-f file]\n"
         "  -t type          layout type: 1 - normal, 2 - shift, 3 - alt\n"
-        "  -f file          file name to save layout to";
+        "  -f file          file name to save layout to\n";
     if (argc < 3) {
         fputs(usage, ctx->fout);
         return;
@@ -1433,7 +1480,7 @@ cmd_set_keyboard_layout(struct shell_ctx *ctx, int argc, char **argv) {
         "usage: set_keyboard_layout <-t type> <-f file|code{128}>\n"
         "  -t type          layout type: 1 - normal, 2 - shift, 3 - alt\n"
         "  -f file          file name to read layout from\n"
-        "  code             i-th ASCII code for the scancode i";
+        "  code             i-th ASCII code for the scancode i\n";
     if (argc != 5 && argc != 131) {
         fputs(usage, ctx->fout);
         return;
@@ -1498,7 +1545,7 @@ cmd_get_keyboard_lang(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: get_keyboard_lang";
+        "usage: get_keyboard_lang\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -1519,7 +1566,7 @@ cmd_get_system_lang(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: get_system_lang";
+        "usage: get_system_lang\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -1542,7 +1589,7 @@ cmd_set_keyboard_lang(struct shell_ctx *ctx, int argc, char **argv) {
         "usage: set_keyboard_lang <lang_id>\n"
         "  lang_id          number or a two-digit code:\n"
         "                   1 - en, 2 - fi, 3 - ge, 4 - ru, 5 - fr, 6 - et,\n"
-        "                   7 - ua, 8 - it, 9 - be, 10 - sp, 11 - ca";
+        "                   7 - ua, 8 - it, 9 - be, 10 - sp, 11 - ca\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -1575,7 +1622,7 @@ cmd_set_system_lang(struct shell_ctx *ctx, int argc, char **argv) {
         "usage: set_system_lang <lang_id>\n"
         "  lang_id          number or a two-digit code:\n"
         "                   1 - en, 2 - fi, 3 - ge, 4 - ru, 5 - fr, 6 - et,\n"
-        "                   7 - ua, 8 - it, 9 - be, 10 - sp, 11 - ca";
+        "                   7 - ua, 8 - it, 9 - be, 10 - sp, 11 - ca\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -1606,7 +1653,7 @@ cmd_get_keyboard_mode(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: get_keyboard_mode";
+        "usage: get_keyboard_mode\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -1624,7 +1671,7 @@ cmd_set_keyboard_mode(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: set_keyboard_mode <mode>\n"
-        "  mode             0 - ASCII, 1 - scancodes";
+        "  mode             0 - ASCII, 1 - scancodes\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -1640,7 +1687,7 @@ cmd_get_font_smoothing(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: get_font_smoothing";
+        "usage: get_font_smoothing\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -1657,7 +1704,7 @@ cmd_set_font_smoothing(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: set_font_smoothing <mode>\n"
-        "  mode             0 - off, 1 - gray AA, 2 - subpixel AA";
+        "  mode             0 - off, 1 - gray AA, 2 - subpixel AA\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -1672,7 +1719,7 @@ static void
 cmd_get_font_size(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
-        "usage: get_font_size";
+        "usage: get_font_size\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -1689,7 +1736,7 @@ cmd_set_font_size(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: set_font_size <size>\n"
-        "  size             in pixels";
+        "  size             in pixels\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -1706,7 +1753,7 @@ cmd_set_mouse_pos_screen(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: set_mouse_pos_screen <x> <y>\n"
         "  x                in pixels\n"
-        "  y                in pixels";
+        "  y                in pixels\n";
     if (argc != 3) {
         fputs(usage, ctx->fout);
         return;
@@ -1724,7 +1771,7 @@ cmd_get_mouse_pos_screen(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: get_mouse_pos_screen";
+        "usage: get_mouse_pos_screen\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -1740,7 +1787,7 @@ cmd_get_mouse_pos_window(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: get_mouse_pos_window";
+        "usage: get_mouse_pos_window\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -1759,7 +1806,7 @@ cmd_get_mouse_buttons_state(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: get_mouse_buttons_state";
+        "usage: get_mouse_buttons_state\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -1776,7 +1823,7 @@ cmd_get_mouse_buttons_state_events(struct shell_ctx *ctx, int argc, char **argv)
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: get_mouse_buttons_state_events";
+        "usage: get_mouse_buttons_state_events\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -1808,7 +1855,7 @@ cmd_button(struct shell_ctx *ctx, int argc, char **argv) {
         "  id               24-bit\n"
         "  color            hex\n"
         "  draw_button      0/1\n"
-        "  draw_frame       0/1";
+        "  draw_frame       0/1\n";
     if (argc != 9) {
         fputs(usage, ctx->fout);
         return;
@@ -1881,7 +1928,7 @@ static void
 cmd_set_cursor(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: set_cursor <handle>\n"
-        "  handle           as returned by load_cursor* functions";
+        "  handle           as returned by load_cursor* functions\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -1909,7 +1956,7 @@ cmd_put_image(struct shell_ctx *ctx, int argc, char **argv) {
         "  xsize            x size\n"
         "  ysize            y size\n"
         "  x                x coord\n"
-        "  y                y coord";
+        "  y                y coord\n";
     if (argc != 6) {
         fputs(usage, ctx->fout);
         return;
@@ -1943,7 +1990,7 @@ cmd_put_image_palette(struct shell_ctx *ctx, int argc, char **argv) {
         "  x                x coord\n"
         "  y                y coord\n"
         "  bpp              bits per pixel\n"
-        "  row_offset       in bytes";
+        "  row_offset       in bytes\n";
     if (argc != 8) {
         fputs(usage, ctx->fout);
         return;
@@ -1979,7 +2026,7 @@ cmd_draw_rect(struct shell_ctx *ctx, int argc, char **argv) {
         "  y                y coord\n"
         "  ysize            y size\n"
         "  color            in hex\n"
-        "  -g               0/1 - gradient";
+        "  -g               0/1 - gradient\n";
     if (argc < 6) {
         fputs(usage, ctx->fout);
         return;
@@ -2000,7 +2047,7 @@ cmd_get_screen_size(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: get_screen_size";
+        "usage: get_screen_size\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -2022,7 +2069,7 @@ cmd_draw_line(struct shell_ctx *ctx, int argc, char **argv) {
         "  ybegin           y top coord\n"
         "  yend             y bottom coord\n"
         "  color            hex\n"
-        "  -i               inverted color";
+        "  -i               inverted color\n";
     if (argc < 6) {
         fputs(usage, ctx->fout);
         return;
@@ -2044,7 +2091,7 @@ cmd_set_window_caption(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: set_window_caption <caption> <encoding>\n"
         "  caption          asciiz string\n"
-        "  encoding         1 = cp866, 2 = UTF-16LE, 3 = UTF-8";
+        "  encoding         1 = cp866, 2 = UTF-16LE, 3 = UTF-8\n";
     if (argc != 3) {
         fputs(usage, ctx->fout);
         return;
@@ -2074,7 +2121,7 @@ cmd_draw_window(struct shell_ctx *ctx, int argc, char **argv) {
         "  gradient_fill    0/1\n"
         "  movable          0/1\n"
         "  style            1 - draw nothing, 3 - skinned, 4 - skinned fixed\n"
-        "  caption          asciiz";
+        "  caption          asciiz\n";
     if (argc != 13) {
         fputs(usage, ctx->fout);
         return;
@@ -2104,7 +2151,7 @@ cmd_window_redraw(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: window_redraw <1|2>\n"
         "  1                begin\n"
-        "  2                end";
+        "  2                end\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -2123,7 +2170,7 @@ cmd_move_window(struct shell_ctx *ctx, int argc, char **argv) {
         "  x                new x coord\n"
         "  y                new y coord\n"
         "  xsize            x size -1\n"
-        "  ysize            y size -1";
+        "  ysize            y size -1\n";
     if (argc != 5) {
         fputs(usage, ctx->fout);
         return;
@@ -2156,7 +2203,7 @@ cmd_blit_bitmap(struct shell_ctx *ctx, int argc, char **argv) {
         "  background       0/1 - blit into background surface\n"
         "  transparent      0/1\n"
         "  client_relative  0/1\n"
-        "  row_length       in bytes";
+        "  row_length       in bytes\n";
     if (argc != 15) {
         fputs(usage, ctx->fout);
         return;
@@ -2200,7 +2247,7 @@ cmd_write_devices_dat(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: write_devices_dat <file>\n"
-        "  file             path/to/devices.dat";
+        "  file             path/to/devices.dat\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -2215,7 +2262,7 @@ cmd_scrot(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: scrot <file>\n"
-        "  file             path/to/file in png format";
+        "  file             path/to/file in png format\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -2247,7 +2294,7 @@ cmd_cd(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: cd <path>\n"
-        "  path             path/to/dir";
+        "  path             path/to/dir\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -2354,7 +2401,7 @@ cmd_exec(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: exec <file>\n"
-        "  file           executable to run";
+        "  file           executable to run\n";
     if (!argc) {
         fputs(usage, ctx->fout);
         return;
@@ -2470,7 +2517,7 @@ cmd_stat(struct shell_ctx *ctx, int argc, char **argv, f70or80_t f70or80) {
         "  file             path/to/file\n"
         "  [-c]             force show creation time\n"
         "  [-m]             force show modification time\n"
-        "  [-a]             force show access time";
+        "  [-a]             force show access time\n";
     if (argc < 2) {
         fputs(usage, ctx->fout);
         return;
@@ -2644,7 +2691,7 @@ cmd_acpi_preload_table(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: acpi_preload_table <file>\n"
-        "  file             path/to/local/file.aml";
+        "  file             path/to/local/file.aml\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -2670,7 +2717,7 @@ static void
 cmd_acpi_enable(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
-        "usage: acpi_enable";
+        "usage: acpi_enable\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -2686,7 +2733,7 @@ cmd_acpi_get_node_cnt(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: acpi_get_node_cnt";
+        "usage: acpi_get_node_cnt\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -2700,7 +2747,7 @@ cmd_acpi_get_node_alloc_cnt(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: acpi_get_node_alloc_cnt";
+        "usage: acpi_get_node_alloc_cnt\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -2713,7 +2760,7 @@ cmd_acpi_get_node_free_cnt(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: acpi_get_node_free_cnt";
+        "usage: acpi_get_node_free_cnt\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -2726,7 +2773,7 @@ cmd_acpi_set_usage(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: acpi_set_usage <num>\n"
-        "  num            one of ACPI_USAGE_* constants";
+        "  num            one of ACPI_USAGE_* constants\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -2740,7 +2787,7 @@ cmd_acpi_get_usage(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: acpi_get_usage";
+        "usage: acpi_get_usage\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -2753,7 +2800,7 @@ cmd_acpi_call(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: acpi_call <method> [args...]\n"
-        "  method         name of acpi method to call, e.g. \\_SB_PCI0_PRT";
+        "  method         name of acpi method to call, e.g. \\_SB_PCI0_PRT\n";
     if (argc > 2) {
         puts("arguments are not supported / not implemented!");
         fputs(usage, ctx->fout);
@@ -2776,7 +2823,7 @@ cmd_pci_set_path(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: pci_set_path <path>\n"
-        "  path           where aaaa:bb:cc.d dirs are";
+        "  path           where aaaa:bb:cc.d dirs are\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -2789,7 +2836,7 @@ cmd_pci_get_path(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: pci_get_path";
+        "usage: pci_get_path\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -2802,7 +2849,7 @@ cmd_load_dll(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: load_dll <path>\n"
-        "  path           /path/to/library.obj in KolibriOS fs";
+        "  path           /path/to/library.obj in KolibriOS fs\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -2822,7 +2869,7 @@ cmd_stack_init(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: stack_init";
+        "usage: stack_init\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -2837,7 +2884,7 @@ cmd_net_add_device(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: net_add_device";
+        "usage: net_add_device\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -2853,7 +2900,7 @@ static void
 cmd_net_get_dev_count(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
-        "usage: net_get_dev_count";
+        "usage: net_get_dev_count\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -2870,7 +2917,7 @@ cmd_net_get_dev_type(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: net_get_dev_type <dev_num>\n"
-        "  dev_num        device number as returned by net_add_device";
+        "  dev_num        device number as returned by net_add_device\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -2891,7 +2938,7 @@ cmd_net_get_dev_name(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: net_get_dev_name <dev_num>\n"
-        "  dev_num        device number as returned by net_add_device";
+        "  dev_num        device number as returned by net_add_device\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -2913,7 +2960,7 @@ cmd_net_dev_reset(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: net_dev_reset <dev_num>\n"
-        "  dev_num        device number as returned by net_add_device";
+        "  dev_num        device number as returned by net_add_device\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -2930,7 +2977,7 @@ cmd_net_dev_stop(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: net_dev_stop <dev_num>\n"
-        "  dev_num        device number as returned by net_add_device";
+        "  dev_num        device number as returned by net_add_device\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -2947,7 +2994,7 @@ cmd_net_get_dev(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: net_get_dev <dev_num>\n"
-        "  dev_num        device number as returned by net_add_device";
+        "  dev_num        device number as returned by net_add_device\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -2967,7 +3014,7 @@ cmd_net_get_packet_tx_count(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: net_get_packet_tx_count <dev_num>\n"
-        "  dev_num        device number as returned by net_add_device";
+        "  dev_num        device number as returned by net_add_device\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -2988,7 +3035,7 @@ cmd_net_get_packet_rx_count(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: net_get_packet_rx_count <dev_num>\n"
-        "  dev_num        device number as returned by net_add_device";
+        "  dev_num        device number as returned by net_add_device\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -3009,7 +3056,7 @@ cmd_net_get_byte_tx_count(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: net_get_byte_tx_count <dev_num>\n"
-        "  dev_num        device number as returned by net_add_device";
+        "  dev_num        device number as returned by net_add_device\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -3030,7 +3077,7 @@ cmd_net_get_byte_rx_count(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: net_get_byte_rx_count <dev_num>\n"
-        "  dev_num        device number as returned by net_add_device";
+        "  dev_num        device number as returned by net_add_device\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -3084,7 +3131,7 @@ cmd_net_get_link_status(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: net_get_link_status <dev_num>\n"
-        "  dev_num        device number as returned by net_add_device";
+        "  dev_num        device number as returned by net_add_device\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -3109,7 +3156,7 @@ cmd_net_open_socket(struct shell_ctx *ctx, int argc, char **argv) {
         "usage: net_open_socket <domain> <type> <protocol>\n"
         "  domain         domain\n"
         "  type           type\n"
-        "  protocol       protocol";
+        "  protocol       protocol\n";
     if (argc != 4) {
         fputs(usage, ctx->fout);
         return;
@@ -3129,8 +3176,8 @@ static void
 cmd_net_close_socket(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
-        "usage: net_close_socket <socket number>\n"
-        "  socket number  socket number\n";
+        "usage: net_close_socket <socknum>\n"
+        "  socknum        socket number\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -3150,7 +3197,7 @@ cmd_net_bind(struct shell_ctx *ctx, int argc, char **argv) {
         "usage: net_bind <fd> <port> <ip>\n"
         "  fd             socket number\n"
         "  port           port\n"
-        "  addr           addr";
+        "  addr           addr\n";
     if (argc != 4) {
         fputs(usage, ctx->fout);
         return;
@@ -3178,7 +3225,7 @@ cmd_net_listen(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: net_listen <fd> <backlog>\n"
         "  fd             socket number\n"
-        "  backlog        max queue length";
+        "  backlog        max queue length\n";
     if (argc != 3) {
         fputs(usage, ctx->fout);
         return;
@@ -3199,7 +3246,7 @@ cmd_net_connect(struct shell_ctx *ctx, int argc, char **argv) {
         "usage: net_connect <fd> <port> <ip>\n"
         "  fd             socket number\n"
         "  port           port\n"
-        "  addr           addr";
+        "  addr           addr\n";
     if (argc != 4) {
         fputs(usage, ctx->fout);
         return;
@@ -3228,7 +3275,7 @@ cmd_net_accept(struct shell_ctx *ctx, int argc, char **argv) {
         "usage: net_accept <fd> <port> <ip>\n"
         "  fd             socket number\n"
         "  port           port\n"
-        "  addr           addr";
+        "  addr           addr\n";
     if (argc != 4) {
         fputs(usage, ctx->fout);
         return;
@@ -3255,7 +3302,7 @@ cmd_net_eth_read_mac(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: net_eth_read_mac <dev_num>\n"
-        "  dev_num        device number as returned by net_add_device";
+        "  dev_num        device number as returned by net_add_device\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -3279,7 +3326,7 @@ cmd_net_ipv4_get_addr(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: net_ipv4_get_addr <dev_num>\n"
-        "  dev_num        device number as returned by net_add_device";
+        "  dev_num        device number as returned by net_add_device\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -3303,7 +3350,7 @@ cmd_net_ipv4_set_addr(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: net_ipv4_set_addr <dev_num> <addr>\n"
         "  dev_num        device number as returned by net_add_device\n"
-        "  addr           a.b.c.d";
+        "  addr           a.b.c.d\n";
     if (argc != 3) {
         fputs(usage, ctx->fout);
         return;
@@ -3326,7 +3373,7 @@ cmd_net_ipv4_get_dns(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: net_ipv4_get_dns <dev_num>\n"
-        "  dev_num        device number as returned by net_add_device";
+        "  dev_num        device number as returned by net_add_device\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -3350,7 +3397,7 @@ cmd_net_ipv4_set_dns(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: net_ipv4_set_dns <dev_num> <dns>\n"
         "  dev_num        device number as returned by net_add_device\n"
-        "  dns            a.b.c.d";
+        "  dns            a.b.c.d\n";
     if (argc != 3) {
         fputs(usage, ctx->fout);
         return;
@@ -3372,7 +3419,7 @@ cmd_net_ipv4_get_subnet(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: net_ipv4_get_subnet <dev_num>\n"
-        "  dev_num        device number as returned by net_add_device";
+        "  dev_num        device number as returned by net_add_device\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -3396,7 +3443,7 @@ cmd_net_ipv4_set_subnet(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: net_ipv4_set_subnet <dev_num> <subnet>\n"
         "  dev_num        device number as returned by net_add_device\n"
-        "  subnet         a.b.c.d";
+        "  subnet         a.b.c.d\n";
     if (argc != 3) {
         fputs(usage, ctx->fout);
         return;
@@ -3419,7 +3466,7 @@ cmd_net_ipv4_get_gw(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: net_ipv4_get_gw <dev_num>\n"
-        "  dev_num        device number as returned by net_add_device";
+        "  dev_num        device number as returned by net_add_device\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -3443,7 +3490,7 @@ cmd_net_ipv4_set_gw(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: net_ipv4_set_gw <dev_num> <gw>\n"
         "  dev_num        device number as returned by net_add_device\n"
-        "  gw             a.b.c.d";
+        "  gw             a.b.c.d\n";
     if (argc != 3) {
         fputs(usage, ctx->fout);
         return;
@@ -3466,7 +3513,7 @@ cmd_net_arp_get_count(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: net_arp_get_count <dev_num>\n"
-        "  dev_num        device number as returned by net_add_device";
+        "  dev_num        device number as returned by net_add_device\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -3488,7 +3535,7 @@ cmd_net_arp_get_entry(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: net_arp_get_entry <dev_num> <arp_num>\n"
         "  dev_num        device number as returned by net_add_device\n"
-        "  arp_num        arp number as returned by net_add_device";
+        "  arp_num        arp number as returned by net_add_device\n";
     if (argc != 3) {
         fputs(usage, ctx->fout);
         return;
@@ -3525,7 +3572,7 @@ cmd_net_arp_add_entry(struct shell_ctx *ctx, int argc, char **argv) {
         "  addr           IP addr\n"
         "  mac            ethernet addr\n"
         "  status         see ARP.inc\n"
-        "  ttl            Time to live";
+        "  ttl            Time to live\n";
     if (argc != 6) {
         fputs(usage, ctx->fout);
         return;
@@ -3553,7 +3600,7 @@ cmd_net_arp_del_entry(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: net_arp_del_entry <dev_num> <arp_num>\n"
         "  dev_num        device number as returned by net_add_device\n"
-        "  arp_num        arp number as returned by net_add_device";
+        "  arp_num        arp number as returned by net_add_device\n";
     if (argc != 3) {
         fputs(usage, ctx->fout);
         return;
@@ -3575,7 +3622,7 @@ cmd_osloop(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: osloop";
+        "usage: osloop\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -3591,7 +3638,7 @@ cmd_bg_set_size(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: bg_set_size <xsize> <ysize>\n"
         "  xsize          in pixels\n"
-        "  ysize          in pixels";
+        "  ysize          in pixels\n";
     if (argc != 3) {
         fputs(usage, ctx->fout);
         return;
@@ -3609,7 +3656,7 @@ cmd_bg_put_pixel(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: bg_put_pixel <offset> <color>\n"
         "  offset         in bytes, (x+y*xsize)*3\n"
-        "  color          in hex";
+        "  color          in hex\n";
     if (argc != 3) {
         fputs(usage, ctx->fout);
         return;
@@ -3626,7 +3673,7 @@ cmd_bg_redraw(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     (void)argv;
     const char *usage = \
-        "usage: bg_redraw";
+        "usage: bg_redraw\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -3641,7 +3688,7 @@ cmd_bg_set_mode(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: bg_set_mode <mode>\n"
-        "  mode           1 = tile, 2 = stretch";
+        "  mode           1 = tile, 2 = stretch\n";
     if (argc != 3) {
         fputs(usage, ctx->fout);
         return;
@@ -3658,7 +3705,7 @@ cmd_bg_put_img(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: bg_put_img <image> <offset>\n"
         "  image          file\n"
-        "  offset         in bytes, (x+y*xsize)*3";
+        "  offset         in bytes, (x+y*xsize)*3\n";
     if (argc != 4) {
         fputs(usage, ctx->fout);
         return;
@@ -3680,7 +3727,7 @@ static void
 cmd_board_get(struct shell_ctx *ctx, int argc, char **argv) {
     (void)argv;
     const char *usage = \
-        "usage: board_get [-l]\n";
+        "usage: board_get [-l] [-n]\n";
     if (argc > 2) {
         fputs(usage, ctx->fout);
         return;
@@ -3731,7 +3778,7 @@ static void
 cmd_board_put(struct shell_ctx *ctx, int argc, char **argv) {
     (void)argv;
     const char *usage = \
-        "usage: board_putchar <char>\n";
+        "usage: board_put <char>\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -3746,7 +3793,7 @@ static void
 cmd_bg_map(struct shell_ctx *ctx, int argc, char **argv) {
     (void)argv;
     const char *usage = \
-        "usage: bg_map";
+        "usage: bg_map\n";
     if (argc != 1) {
         fputs(usage, ctx->fout);
         return;
@@ -3762,7 +3809,7 @@ cmd_bg_unmap(struct shell_ctx *ctx, int argc, char **argv) {
     (void)ctx;
     const char *usage = \
         "usage: bg_unmap <addr>\n"
-        "  addr           return value of bg_map";
+        "  addr           return value of bg_map\n";
     if (argc != 2) {
         fputs(usage, ctx->fout);
         return;
@@ -3915,7 +3962,7 @@ static void
 cmd_help(struct shell_ctx *ctx, int argc, char **argv) {
     const char *usage = \
         "usage: help [command]\n"
-        "  command        help on this command usage";
+        "  command        help on this command usage\n";
     switch (argc) {
     case 1:
         fputs(usage, ctx->fout);
@@ -3943,6 +3990,7 @@ cmd_help(struct shell_ctx *ctx, int argc, char **argv) {
 
 void *
 run_test(struct shell_ctx *ctx) {
+    mtx_lock(&ctx->cmd_mutex);
     int is_tty = isatty(fileno(ctx->fin));
     char **argv = (char**)calloc(sizeof(char*), (MAX_COMMAND_ARGS + 1));
     bestlineSetCompletionCallback(completion);
@@ -3982,12 +4030,13 @@ run_test(struct shell_ctx *ctx) {
     free(argv);
     bestlineHistorySave(ctx->hist_file);
 
+    mtx_unlock(&ctx->cmd_mutex);
     return NULL;
 }
 
 struct shell_ctx *
 shell_init(int reproducible, const char *hist_file, struct umka_ctx *umka,
-           struct umka_io *io, FILE *fin, FILE *fout) {
+           struct umka_io *io, FILE *fin, FILE *fout, const int *running) {
     struct shell_ctx *ctx = malloc(sizeof(struct shell_ctx));
     ctx->umka = umka;
     ctx->io = io;
@@ -3996,6 +4045,9 @@ shell_init(int reproducible, const char *hist_file, struct umka_ctx *umka,
     ctx->var = NULL;
     ctx->fin = fin;
     ctx->fout = fout;
+    ctx->running = running;
+    cnd_init(&ctx->cmd_done);
+    mtx_init(&ctx->cmd_mutex, mtx_plain);
     return ctx;
 }
 
diff --git a/shell.h b/shell.h
index 18ae50f..e8f4aac 100644
--- a/shell.h
+++ b/shell.h
@@ -11,6 +11,7 @@
 #define SHELL_H_INCLUDED
 
 #include <stdio.h>
+#include <threads.h>
 #include "umka.h"
 #include "io.h"
 
@@ -40,11 +41,15 @@ struct shell_ctx {
     struct shell_var *var;
     FILE *fin;
     FILE *fout;
+    const int *running;
+    cnd_t cmd_done;
+    mtx_t cmd_mutex;
+
 };
 
 struct shell_ctx *
 shell_init(int reproducible, const char *hist_file, struct umka_ctx *umka,
-           struct umka_io *io, FILE *fin, FILE *fout);
+           struct umka_io *io, FILE *fin, FILE *fout, const int *running);
 
 void
 shell_close(struct shell_ctx *shell);
@@ -52,4 +57,7 @@ shell_close(struct shell_ctx *shell);
 void *
 run_test(struct shell_ctx *ctx);
 
+void
+umka_run_cmd_sync(struct shell_ctx *ctx);
+
 #endif  // SHELL_H_INCLUDED
diff --git a/system.inc b/system.inc
index a65ae07..277de1e 100644
--- a/system.inc
+++ b/system.inc
@@ -1,3 +1,4 @@
+; /usr/include/asm/unistd_32.h
 SYS_EXIT    = 1
 SYS_READ    = 3
 SYS_WRITE   = 4
@@ -5,6 +6,7 @@ SYS_OPEN    = 5
 SYS_CLOSE   = 6
 SYS_PAUSE   = 29
 SYS_LLSEEK  = 140
+SYS_FUTEX   = 240
 
 SEEK_SET    = 0
 SEEK_CUR    = 1
diff --git a/umka.h b/umka.h
index 821399d..4945dc8 100644
--- a/umka.h
+++ b/umka.h
@@ -588,14 +588,6 @@ STDCALL void
 kos_set_mouse_data(uint32_t btn_state, int32_t xmoving, int32_t ymoving,
                    int32_t vscroll, int32_t hscroll);
 
-static inline void
-umka_mouse_move(int lbheld, int mbheld, int rbheld, int xabs, int32_t xmoving,
-                int yabs, int32_t ymoving, int32_t hscroll, int32_t vscroll) {
-    uint32_t btn_state = lbheld + (rbheld << 1) + (mbheld << 2) +
-                         (yabs << 30) + (xabs << 31);
-    kos_set_mouse_data(btn_state, xmoving, ymoving, vscroll, hscroll);
-}
-
 STDCALL net_buff_t *
 kos_net_buff_alloc(size_t size);
 
@@ -2414,4 +2406,47 @@ umka_set_keyboard_data(uint32_t scancode) {
         : "eax", "edx", "memory", "cc");
 }
 
+#define CMD_BUF_LEN 0x10
+
+enum {
+    UMKA_CMD_NONE,
+    UMKA_CMD_SET_MOUSE_DATA,
+    UMKA_CMD_SYS_PROCESS_INFO,
+    UMKA_CMD_SYS_GET_MOUSE_POS_SCREEN,
+};
+
+enum {
+    UMKA_CMD_STATUS_EMPTY,
+    UMKA_CMD_STATUS_READY,
+    UMKA_CMD_STATUS_DONE,
+};
+
+struct cmd_set_mouse_data {
+    uint32_t btn_state;
+    int32_t xmoving;
+    int32_t ymoving;
+    int32_t vscroll;
+    int32_t hscroll;
+};
+
+struct cmd_sys_process_info {
+    int32_t pid;
+    void *param;
+};
+
+struct cmd_ret_sys_get_mouse_pos_screen {
+    struct point16s pos;
+};
+
+struct umka_cmd {
+    uint32_t status;
+    uint32_t type;
+    union {
+        struct cmd_set_mouse_data set_mouse_data;
+    } arg;
+    union {
+        struct cmd_ret_sys_get_mouse_pos_screen sys_get_mouse_pos_screen;
+    } ret;
+};
+
 #endif  // UMKA_H_INCLUDED
diff --git a/umka_fuse.c b/umka_fuse.c
index 38e2085..6ac7a27 100644
--- a/umka_fuse.c
+++ b/umka_fuse.c
@@ -24,7 +24,6 @@
 #include <fcntl.h>
 #include "io.h"
 #include "vdisk.h"
-#include "umka.h"
 
 #define DIRENTS_TO_READ 100
 
diff --git a/umka_gen_devices_dat.c b/umka_gen_devices_dat.c
index 0821c02..c017694 100644
--- a/umka_gen_devices_dat.c
+++ b/umka_gen_devices_dat.c
@@ -17,7 +17,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include "umka.h"
-#include "util.h"
+#include "umkart.h"
 #include <pci.h>
 
 #define UMKA_DEFAULT_DISPLAY_WIDTH 400
diff --git a/umka_os.c b/umka_os.c
index e431d0d..6764fb1 100644
--- a/umka_os.c
+++ b/umka_os.c
@@ -8,13 +8,13 @@
 */
 
 #include <arpa/inet.h>
-#include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <netinet/in.h>
 #define __USE_GNU
 #include <signal.h>
+#include <stdatomic.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -30,8 +30,7 @@
 #include <threads.h>
 #include <SDL2/SDL.h>
 #include "umka.h"
-#include "util.h"
-#include "umka_os.h"
+#include "umkart.h"
 #include "bestline.h"
 #include "optparse.h"
 #include "shell.h"
@@ -42,8 +41,6 @@
 
 #define THREAD_STACK_SIZE 0x100000
 
-#define CMD_BUF_LEN 0x10000
-
 struct umka_os_ctx {
     struct umka_ctx *umka;
     struct umka_io *io;
@@ -53,8 +50,6 @@ struct umka_os_ctx {
 
 struct umka_os_ctx *os;
 
-uint8_t cmd_buf[CMD_BUF_LEN];
-
 char history_filename[PATH_MAX];
 
 static void
@@ -89,7 +84,7 @@ umka_os_init(FILE *fin, FILE *fout, FILE *fboardlog) {
     ctx->umka = umka_init();
     ctx->io = io_init(&ctx->umka->running);
     ctx->shell = shell_init(SHELL_LOG_NONREPRODUCIBLE, history_filename,
-                            ctx->umka, ctx->io, fin, fout);
+                            ctx->umka, ctx->io, fin, fout, &ctx->umka->running);
     return ctx;
 }
 
@@ -101,15 +96,6 @@ void build_history_filename() {
     sprintf(history_filename, "%s/%s", dir_name, HIST_FILE_BASENAME);
 }
 
-/*
-static void
-monitor(void) {
-    umka_sti();
-    fprintf(stderr, "Start monitor thread\n");
-    __asm__ __inline__ __volatile__ ("jmp $");
-}
-*/
-
 void umka_thread_net_drv(void);
 
 struct itimerval timeout = {.it_value = {.tv_sec = 0, .tv_usec = 10000},
@@ -251,16 +237,29 @@ sdlthr(void *arg) {
     return 0;
 }
 
-int
+uint32_t
+umka_run_cmd_wait_test(/* void *wait_param in ebx */) {
+    appdata_t *app;
+    __asm__ __volatile__ __inline__ ("":"=b"(app)::);
+    struct umka_cmd *cmd = (struct umka_cmd*)app->wait_param;
+    return (uint32_t)(atomic_load_explicit(&cmd->status, memory_order_acquire) == UMKA_CMD_STATUS_READY);
+}
+
+static void
+umka_thread_cmd_runner() {
+    umka_sti();
+    while (1) {
+        kos_wait_events(umka_run_cmd_wait_test, umka_cmd_buf);
+        umka_run_cmd_sync(os->shell);
+    }
+}
+
+static int
 umka_monitor(void *arg) {
     (void)arg;
-    union sigval sval = (union sigval){.sival_int = 14};
-
-    pid_t mypid = getpid();
-    char *line;
-    while((line = bestline(">"))) {
-        sigqueue(mypid, SIGUSR2, sval);
-    }
+    os->shell->fin = stdin;
+    os->shell->fout = stdout;
+    run_test(os->shell);
     return 0;
 }
 
@@ -445,16 +444,13 @@ main(int argc, char *argv[]) {
 
     kos_attach_int_handler(14, hw_int_mouse, NULL);
 
-//    thread_start(0, monitor, THREAD_STACK_SIZE);
     thread_start(1, umka_thread_board, THREAD_STACK_SIZE);
+    thread_start(1, umka_thread_cmd_runner, THREAD_STACK_SIZE);
     kos_thread_t start = (kos_thread_t)(KOS_APP_BASE + app->menuet.start);
     thread_start(0, start, THREAD_STACK_SIZE);
 
     dump_procs();
 
-    fflush(stdin);
-    fflush(stdout);
-    fflush(stderr);
     thrd_t thrd_monitor;
     thrd_create(&thrd_monitor, umka_monitor, NULL);
 
@@ -463,7 +459,7 @@ main(int argc, char *argv[]) {
 
     setitimer(ITIMER_REAL, &timeout, NULL);
 
-    os->umka->running = 1;
+    atomic_store_explicit(&os->umka->running, 1, memory_order_release);
     umka_osloop();   // doesn't return
 
     if (coverage)
diff --git a/umka_os.h b/umka_os.h
deleted file mode 100644
index 1078ee1..0000000
--- a/umka_os.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-    SPDX-License-Identifier: GPL-2.0-or-later
-
-    UMKa - User-Mode KolibriOS developer tools
-    umka_os - kind of KolibriOS anykernel
-
-    Copyright (C) 2023  Ivan Baravy <dunkaist@gmail.com>
-*/
-
-#include "umka.h"
-
-enum {
-    UMKA_CMD_NONE,
-    UMKA_CMD_SET_MOUSE_DATA,
-    UMKA_CMD_SYS_PROCESS_INFO,
-    UMKA_CMD_SYS_GET_MOUSE_POS_SCREEN,
-};
-
-enum {
-    UMKA_CMD_STATUS_EMPTY,
-    UMKA_CMD_STATUS_READY,
-    UMKA_CMD_STATUS_DONE,
-};
-
-struct cmd_set_mouse_data {
-    uint32_t btn_state;
-    int32_t xmoving;
-    int32_t ymoving;
-    int32_t vscroll;
-    int32_t hscroll;
-};
-
-struct cmd_sys_process_info {
-    int32_t pid;
-    void *param;
-};
-
-struct cmd_ret_sys_get_mouse_pos_screen {
-    struct point16s pos;
-};
-
-struct umka_cmd {
-    uint32_t status;
-    uint32_t type;
-    union {
-        struct cmd_set_mouse_data set_mouse_data;
-    } arg;
-    union {
-        struct cmd_ret_sys_get_mouse_pos_screen sys_get_mouse_pos_screen;
-    } ret;
-};
diff --git a/umka_os.us b/umka_os.us
index e1a3872..9df1605 100644
--- a/umka_os.us
+++ b/umka_os.us
@@ -1,4 +1,4 @@
-umka_set_boot_params --bpp32
+umka_set_boot_params --bpp 32
 umka_boot
 ramdisk_init ../img/kolibri.raw
 set_skin /sys/DEFAULT.SKN
diff --git a/umka_shell.c b/umka_shell.c
index f0debea..3cf6d2e 100644
--- a/umka_shell.c
+++ b/umka_shell.c
@@ -19,7 +19,6 @@
 #include "optparse.h"
 #include "shell.h"
 #include "io.h"
-#include "umka.h"
 #include "trace.h"
 
 #define HIST_FILE_BASENAME ".umka_shell.history"
@@ -38,7 +37,7 @@ umka_shell_init(int reproducible, FILE *fin, FILE *fout) {
     ctx->umka = umka_init();
     ctx->io = io_init(&ctx->umka->running);
     ctx->shell = shell_init(reproducible, history_filename, ctx->umka, ctx->io,
-                            fin, fout);
+                            fin, fout, &ctx->umka->running);
     return ctx;
 }
 
diff --git a/util.c b/umkart.c
similarity index 95%
rename from util.c
rename to umkart.c
index e89060b..db1b421 100644
--- a/util.c
+++ b/umkart.c
@@ -6,8 +6,11 @@
     Copyright (C) 2021, 2023  Ivan Baravy <dunkaist@gmail.com>
 */
 
+#include <stdatomic.h>
 #include <stdio.h>
+#include <threads.h>
 #include "umka.h"
+#include "shell.h"
 
 struct devices_dat_entry {
     uint8_t fun:3;
@@ -20,7 +23,9 @@ struct devices_dat_entry {
     uint32_t pad2;
 };
 
-STDCALL void*
+struct umka_cmd umka_cmd_buf[CMD_BUF_LEN];
+
+static STDCALL void*
 dump_devices_dat_iter(struct pci_dev *node, void *arg) {
     FILE *f = arg;
     if (node->gsi) {
@@ -73,7 +78,7 @@ copy_display_bpp24_to_rgb888(void *to) {
     }
 }
 
-void
+static void
 copy_display_bpp32_to_rgb888(void *to) {
     memcpy(to, kos_lfb_base, kos_display.width*kos_display.height*4);
 }
diff --git a/util.h b/umkart.h
similarity index 78%
rename from util.h
rename to umkart.h
index d2f3168..10f34cb 100644
--- a/util.h
+++ b/umkart.h
@@ -9,6 +9,11 @@
 #ifndef UTIL_H_INCLUDED
 #define UTIL_H_INCLUDED
 
+#include "umka.h"
+#include "shell.h"
+
+extern struct umka_cmd umka_cmd_buf[CMD_BUF_LEN];
+
 void
 dump_devices_dat(const char *filename);