diff --git a/linux/io.c b/linux/io.c index 4f4db58..db067c3 100644 --- a/linux/io.c +++ b/linux/io.c @@ -7,9 +7,31 @@ Copyright (C) 2023 Ivan Baravy */ +#include #include #include "io.h" +struct umka_io { + int change_task; + int uring_fd; +}; + +void * +io_init(int change_task) { + struct umka_io *io = malloc(sizeof(struct umka_io)); + io->change_task = change_task; + if (change_task) { + io->uring_fd = 1; + } + return io; +} + +void +io_close(void *userdata) { + struct umka_io *io = (struct umka_io*)userdata; + free(io); +} + ssize_t io_read(int fd, void *buf, size_t count, int change_task) { (void)change_task; diff --git a/shell.c b/shell.c index eb9f0f9..3ac3a51 100644 --- a/shell.c +++ b/shell.c @@ -408,14 +408,27 @@ static void cmd_umka_init(struct shell_ctx *ctx, int argc, char **argv) { (void)ctx; const char *usage = \ - "usage: umka_init"; - (void)argv; - if (argc != 1) { + "usage: umka_init \n" + " number or string: 1=shell, 2=fuse, 3=os"; + if (argc != 2) { puts(usage); return; } + const char *tool_str = argv[1]; + unsigned tool; + if (!strcmp(tool_str, "1") || !strcmp(tool_str, "shell")) { + tool = UMKA_SHELL; + } else if (!strcmp(tool_str, "2") || !strcmp(tool_str, "fuse")) { + tool = UMKA_FUSE; + } else if (!strcmp(tool_str, "3") || !strcmp(tool_str, "os")) { + tool = UMKA_OS; + } else { + printf("[!] bad tool value: '%s'\n", tool_str); + return; + } + COVERAGE_ON(); - umka_init(); + umka_init(tool); COVERAGE_OFF(); } diff --git a/test/001_#f70_#f70s1_#xfs_#s05k_ls_all_dir_types_ftype1.ref.log b/test/001_#f70_#f70s1_#xfs_#s05k_ls_all_dir_types_ftype1.ref.log index 6a16f61..c62b6a7 100644 --- a/test/001_#f70_#f70s1_#xfs_#s05k_ls_all_dir_types_ftype1.ref.log +++ b/test/001_#f70_#f70s1_#xfs_#s05k_ls_all_dir_types_ftype1.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_v4_ftype1_s05k_b2k_n8k.qcow2 hd0 -c 0 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/001_#f70_#f70s1_#xfs_#s05k_ls_all_dir_types_ftype1.t b/test/001_#f70_#f70s1_#xfs_#s05k_ls_all_dir_types_ftype1.t index f9af915..a8b3c30 100644 --- a/test/001_#f70_#f70s1_#xfs_#s05k_ls_all_dir_types_ftype1.t +++ b/test/001_#f70_#f70s1_#xfs_#s05k_ls_all_dir_types_ftype1.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_v4_ftype1_s05k_b2k_n8k.qcow2 hd0 -c 0 disk_add ../img/xfs_short_dir_i8.qcow2 hd1 -c 0 diff --git a/test/002_#f70_#f70s1_#xfs_#s05k_ls_all_dir_types_ftype0.ref.log b/test/002_#f70_#f70s1_#xfs_#s05k_ls_all_dir_types_ftype0.ref.log index 84bff88..7837864 100644 --- a/test/002_#f70_#f70s1_#xfs_#s05k_ls_all_dir_types_ftype0.ref.log +++ b/test/002_#f70_#f70s1_#xfs_#s05k_ls_all_dir_types_ftype0.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_v4_ftype0_s05k_b2k_n8k.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/002_#f70_#f70s1_#xfs_#s05k_ls_all_dir_types_ftype0.t b/test/002_#f70_#f70s1_#xfs_#s05k_ls_all_dir_types_ftype0.t index 548f9e0..27057a1 100644 --- a/test/002_#f70_#f70s1_#xfs_#s05k_ls_all_dir_types_ftype0.t +++ b/test/002_#f70_#f70s1_#xfs_#s05k_ls_all_dir_types_ftype0.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_v4_ftype0_s05k_b2k_n8k.qcow2 hd0 -c 524288 ls70 /hd0/1/sf_empty ls70 /hd0/1/sf diff --git a/test/003_#f70_#f70s0_#xfs_#s05k_read_without_holes.ref.log b/test/003_#f70_#f70s0_#xfs_#s05k_read_without_holes.ref.log index 741e127..68e1922 100644 --- a/test/003_#f70_#f70s0_#xfs_#s05k_read_without_holes.ref.log +++ b/test/003_#f70_#f70s0_#xfs_#s05k_read_without_holes.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_v4_files_s05k_b4k_n8k.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/003_#f70_#f70s0_#xfs_#s05k_read_without_holes.t b/test/003_#f70_#f70s0_#xfs_#s05k_read_without_holes.t index 7e64389..edec23b 100644 --- a/test/003_#f70_#f70s0_#xfs_#s05k_read_without_holes.t +++ b/test/003_#f70_#f70s0_#xfs_#s05k_read_without_holes.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_v4_files_s05k_b4k_n8k.qcow2 hd0 -c 524288 # zero length read70 /hd0/1/no_hole 0 0 -b diff --git a/test/004_#f70_#f70s5_#xfs_stat.ref.log b/test/004_#f70_#f70s5_#xfs_stat.ref.log index 57a1080..82d592d 100644 --- a/test/004_#f70_#f70s5_#xfs_stat.ref.log +++ b/test/004_#f70_#f70s5_#xfs_stat.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_v4_files_s05k_b4k_n8k.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/004_#f70_#f70s5_#xfs_stat.t b/test/004_#f70_#f70s5_#xfs_stat.t index 51746c8..20a9048 100644 --- a/test/004_#f70_#f70s5_#xfs_stat.t +++ b/test/004_#f70_#f70s5_#xfs_stat.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_v4_files_s05k_b4k_n8k.qcow2 hd0 -c 524288 stat70 /hd0/1/ stat70 /hd0/1/hole_begin diff --git a/test/005_#f30_#xfs_cur_dir.ref.log b/test/005_#f30_#xfs_cur_dir.ref.log index 6e2ef21..3596891 100644 --- a/test/005_#f30_#xfs_cur_dir.ref.log +++ b/test/005_#f30_#xfs_cur_dir.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_v4_files_s05k_b4k_n8k.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/005_#f30_#xfs_cur_dir.t b/test/005_#f30_#xfs_cur_dir.t index 164aee5..882b4ca 100644 --- a/test/005_#f30_#xfs_cur_dir.t +++ b/test/005_#f30_#xfs_cur_dir.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_v4_files_s05k_b4k_n8k.qcow2 hd0 -c 524288 pwd cd /hd0 diff --git a/test/006_#f70_#f70s0_#xfs_#s05k_read_with_holes.ref.log b/test/006_#f70_#f70s0_#xfs_#s05k_read_with_holes.ref.log index e3654a5..2692088 100644 --- a/test/006_#f70_#f70s0_#xfs_#s05k_read_with_holes.ref.log +++ b/test/006_#f70_#f70s0_#xfs_#s05k_read_with_holes.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_v4_files_s05k_b4k_n8k.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/006_#f70_#f70s0_#xfs_#s05k_read_with_holes.t b/test/006_#f70_#f70s0_#xfs_#s05k_read_with_holes.t index 49dd35c..de3495f 100644 --- a/test/006_#f70_#f70s0_#xfs_#s05k_read_with_holes.t +++ b/test/006_#f70_#f70s0_#xfs_#s05k_read_with_holes.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_v4_files_s05k_b4k_n8k.qcow2 hd0 -c 524288 # hole begin # zero length diff --git a/test/007_#f70_#xfs_#lookup_all.ref.log b/test/007_#f70_#xfs_#lookup_all.ref.log index 609a8d6..78758ae 100644 --- a/test/007_#f70_#xfs_#lookup_all.ref.log +++ b/test/007_#f70_#xfs_#lookup_all.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_v4_ftype1_s05k_b2k_n8k.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/007_#f70_#xfs_#lookup_all.t b/test/007_#f70_#xfs_#lookup_all.t index bdf3a54..0bb5f82 100644 --- a/test/007_#f70_#xfs_#lookup_all.t +++ b/test/007_#f70_#xfs_#lookup_all.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_v4_ftype1_s05k_b2k_n8k.qcow2 hd0 -c 524288 stat70 /hd0/1/sf_empty stat70 /hd0/1/sf_empty/. diff --git a/test/008_#f70_#f70s1_#xfs_#s4k_ls_all_dir_types_ftype0.ref.log b/test/008_#f70_#f70s1_#xfs_#s4k_ls_all_dir_types_ftype0.ref.log index 1a0598c..26d42b2 100644 --- a/test/008_#f70_#f70s1_#xfs_#s4k_ls_all_dir_types_ftype0.ref.log +++ b/test/008_#f70_#f70s1_#xfs_#s4k_ls_all_dir_types_ftype0.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_v4_ftype0_s4k_b4k_n8k.qcow2 hd0 -c 524288 /hd0: sector_size=4096, capacity=77312 (302 MiB), num_partitions=1 /hd0/1: fs=xfs, start=256 (1 MiB), length=76800 (300 MiB) diff --git a/test/008_#f70_#f70s1_#xfs_#s4k_ls_all_dir_types_ftype0.t b/test/008_#f70_#f70s1_#xfs_#s4k_ls_all_dir_types_ftype0.t index 0b26801..3287c6b 100644 --- a/test/008_#f70_#f70s1_#xfs_#s4k_ls_all_dir_types_ftype0.t +++ b/test/008_#f70_#f70s1_#xfs_#s4k_ls_all_dir_types_ftype0.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_v4_ftype0_s4k_b4k_n8k.qcow2 hd0 -c 524288 ls70 /hd0/1/sf ls70 /hd0/1/block diff --git a/test/009_#f70_#f70s0_#f70s1_#xfs_#s05k_#xattr.ref.log b/test/009_#f70_#f70s0_#f70s1_#xfs_#s05k_#xattr.ref.log index 04eea59..b595df6 100644 --- a/test/009_#f70_#f70s0_#f70s1_#xfs_#s05k_#xattr.ref.log +++ b/test/009_#f70_#f70s0_#f70s1_#xfs_#s05k_#xattr.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_v4_ftype0_s05k_b2k_n8k_xattr.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/009_#f70_#f70s0_#f70s1_#xfs_#s05k_#xattr.t b/test/009_#f70_#f70s0_#f70s1_#xfs_#s05k_#xattr.t index 2a34000..13d9d06 100644 --- a/test/009_#f70_#f70s0_#f70s1_#xfs_#s05k_#xattr.t +++ b/test/009_#f70_#f70s0_#f70s1_#xfs_#s05k_#xattr.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_v4_ftype0_s05k_b2k_n8k_xattr.qcow2 hd0 -c 524288 ls70 /hd0/1/sf_empty ls70 /hd0/1/sf diff --git a/test/010_#f70_#xfs_#lookup_#xattr_all.ref.log b/test/010_#f70_#xfs_#lookup_#xattr_all.ref.log index 4ef32ce..163401c 100644 --- a/test/010_#f70_#xfs_#lookup_#xattr_all.ref.log +++ b/test/010_#f70_#xfs_#lookup_#xattr_all.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_v4_ftype0_s05k_b2k_n8k_xattr.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/010_#f70_#xfs_#lookup_#xattr_all.t b/test/010_#f70_#xfs_#lookup_#xattr_all.t index 5bed320..dd5e09b 100644 --- a/test/010_#f70_#xfs_#lookup_#xattr_all.t +++ b/test/010_#f70_#xfs_#lookup_#xattr_all.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_v4_ftype0_s05k_b2k_n8k_xattr.qcow2 hd0 -c 524288 stat70 /hd0/1/sf_empty stat70 /hd0/1/sf_empty/. diff --git a/test/011_#f70_#f70s1_#xfs_#lookup_#unicode_all.ref.log b/test/011_#f70_#f70s1_#xfs_#lookup_#unicode_all.ref.log index 51b98af..e4b2eae 100644 --- a/test/011_#f70_#f70s1_#xfs_#lookup_#unicode_all.ref.log +++ b/test/011_#f70_#f70s1_#xfs_#lookup_#unicode_all.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_v4_unicode.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/011_#f70_#f70s1_#xfs_#lookup_#unicode_all.t b/test/011_#f70_#f70s1_#xfs_#lookup_#unicode_all.t index 456b31e..63fab1b 100644 --- a/test/011_#f70_#f70s1_#xfs_#lookup_#unicode_all.t +++ b/test/011_#f70_#f70s1_#xfs_#lookup_#unicode_all.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_v4_unicode.qcow2 hd0 -c 524288 stat80 /hd0/1/dir0 diff --git a/test/012_#f70_#f70s1_#xfs_#v5_#s05k_ls_all_dir_types_ftype1.ref.log b/test/012_#f70_#f70s1_#xfs_#v5_#s05k_ls_all_dir_types_ftype1.ref.log index 341c971..54d8026 100644 --- a/test/012_#f70_#f70s1_#xfs_#v5_#s05k_ls_all_dir_types_ftype1.ref.log +++ b/test/012_#f70_#f70s1_#xfs_#v5_#s05k_ls_all_dir_types_ftype1.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_v5_ftype1_s05k_b2k_n8k.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/012_#f70_#f70s1_#xfs_#v5_#s05k_ls_all_dir_types_ftype1.t b/test/012_#f70_#f70s1_#xfs_#v5_#s05k_ls_all_dir_types_ftype1.t index 2ec8c52..228fbc9 100644 --- a/test/012_#f70_#f70s1_#xfs_#v5_#s05k_ls_all_dir_types_ftype1.t +++ b/test/012_#f70_#f70s1_#xfs_#v5_#s05k_ls_all_dir_types_ftype1.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_v5_ftype1_s05k_b2k_n8k.qcow2 hd0 -c 524288 ls70 /hd0/1/sf_empty ls70 /hd0/1/sf diff --git a/test/013_#f70_#xfs_#v5_#lookup_all.ref.log b/test/013_#f70_#xfs_#v5_#lookup_all.ref.log index aa57633..fb4cf5a 100644 --- a/test/013_#f70_#xfs_#v5_#lookup_all.ref.log +++ b/test/013_#f70_#xfs_#v5_#lookup_all.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_v5_ftype1_s05k_b2k_n8k.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/013_#f70_#xfs_#v5_#lookup_all.t b/test/013_#f70_#xfs_#v5_#lookup_all.t index fda5457..edf0595 100644 --- a/test/013_#f70_#xfs_#v5_#lookup_all.t +++ b/test/013_#f70_#xfs_#v5_#lookup_all.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_v5_ftype1_s05k_b2k_n8k.qcow2 hd0 -c 524288 stat70 /hd0/1/sf_empty stat70 /hd0/1/sf_empty/. diff --git a/test/014_#f70_#f70s0_#xfs_#v5_#s05k_read_with_holes.ref.log b/test/014_#f70_#f70s0_#xfs_#v5_#s05k_read_with_holes.ref.log index 2ec6f74..729c574 100644 --- a/test/014_#f70_#f70s0_#xfs_#v5_#s05k_read_with_holes.ref.log +++ b/test/014_#f70_#f70s0_#xfs_#v5_#s05k_read_with_holes.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_v5_files_s05k_b4k_n8k.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/014_#f70_#f70s0_#xfs_#v5_#s05k_read_with_holes.t b/test/014_#f70_#f70s0_#xfs_#v5_#s05k_read_with_holes.t index bd32ff1..53e3291 100644 --- a/test/014_#f70_#f70s0_#xfs_#v5_#s05k_read_with_holes.t +++ b/test/014_#f70_#f70s0_#xfs_#v5_#s05k_read_with_holes.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_v5_files_s05k_b4k_n8k.qcow2 hd0 -c 524288 # hole begin # zero length diff --git a/test/015_#f70_#f70s0_#xfs_#v5_#s05k_read_without_holes.ref.log b/test/015_#f70_#f70s0_#xfs_#v5_#s05k_read_without_holes.ref.log index acd0c80..0e01031 100644 --- a/test/015_#f70_#f70s0_#xfs_#v5_#s05k_read_without_holes.ref.log +++ b/test/015_#f70_#f70s0_#xfs_#v5_#s05k_read_without_holes.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_v5_files_s05k_b4k_n8k.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/015_#f70_#f70s0_#xfs_#v5_#s05k_read_without_holes.t b/test/015_#f70_#f70s0_#xfs_#v5_#s05k_read_without_holes.t index 329d8b5..7b1e315 100644 --- a/test/015_#f70_#f70s0_#xfs_#v5_#s05k_read_without_holes.t +++ b/test/015_#f70_#f70s0_#xfs_#v5_#s05k_read_without_holes.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_v5_files_s05k_b4k_n8k.qcow2 hd0 -c 524288 # zero length read70 /hd0/1/no_hole 0 0 -b diff --git a/test/016_#f01_#draw_all.ref.log b/test/016_#f01_#draw_all.ref.log index fc91d16..3446522 100644 --- a/test/016_#f01_#draw_all.ref.log +++ b/test/016_#f01_#draw_all.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> set_mouse_pos_screen 40 30 /> #disk_add ../img/kolibri.raw rd -c 0 /> ramdisk_init ../img/kolibri.raw diff --git a/test/016_#f01_#draw_all.t b/test/016_#f01_#draw_all.t index b3e042b..2067325 100644 --- a/test/016_#f01_#draw_all.t +++ b/test/016_#f01_#draw_all.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell set_mouse_pos_screen 40 30 #disk_add ../img/kolibri.raw rd -c 0 ramdisk_init ../img/kolibri.raw diff --git a/test/017_#f70_#f70s0_#xfs_#s05k_read_above_4GiB.ref.log b/test/017_#f70_#f70s0_#xfs_#s05k_read_above_4GiB.ref.log index 9c5592d..f4c7400 100644 --- a/test/017_#f70_#f70s0_#xfs_#s05k_read_above_4GiB.ref.log +++ b/test/017_#f70_#f70s0_#xfs_#s05k_read_above_4GiB.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_v4_files_s05k_b4k_n8k.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/017_#f70_#f70s0_#xfs_#s05k_read_above_4GiB.t b/test/017_#f70_#f70s0_#xfs_#s05k_read_above_4GiB.t index af0d21a..dafdc70 100644 --- a/test/017_#f70_#f70s0_#xfs_#s05k_read_above_4GiB.t +++ b/test/017_#f70_#f70s0_#xfs_#s05k_read_above_4GiB.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_v4_files_s05k_b4k_n8k.qcow2 hd0 -c 524288 read70 /hd0/1/4GiB_plus 0x3ff4 11 -b diff --git a/test/018_#xfs_#coverage_all.ref.log b/test/018_#xfs_#coverage_all.ref.log index ffbb8cb..b05b12d 100644 --- a/test/018_#xfs_#coverage_all.ref.log +++ b/test/018_#xfs_#coverage_all.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/jfs.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=32768 (16 MiB), num_partitions=1 /hd0/1: fs=???, start=2048 (1 MiB), length=28672 (14 MiB) diff --git a/test/018_#xfs_#coverage_all.t b/test/018_#xfs_#coverage_all.t index fe8ace1..4f8f465 100644 --- a/test/018_#xfs_#coverage_all.t +++ b/test/018_#xfs_#coverage_all.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/jfs.qcow2 hd0 -c 524288 disk_del hd0 disk_add ../img/xfs_borg_bit.qcow2 hd0 -c 524288 diff --git a/test/019_#xfs_deep_btree.ref.log b/test/019_#xfs_deep_btree.ref.log index fd9f688..764cfee 100644 --- a/test/019_#xfs_deep_btree.ref.log +++ b/test/019_#xfs_deep_btree.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_v4_btrees_l2.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/019_#xfs_deep_btree.t b/test/019_#xfs_deep_btree.t index c2ccaf6..9a02953 100644 --- a/test/019_#xfs_deep_btree.t +++ b/test/019_#xfs_deep_btree.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_v4_btrees_l2.qcow2 hd0 -c 524288 ls80 /hd0/1/dir_btree_l2 -f 0 -c 1 diff --git a/test/021_#i40_all.ref.log b/test/021_#i40_all.ref.log index f97cef4..97c27c3 100644 --- a/test/021_#i40_all.ref.log +++ b/test/021_#i40_all.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> i40 18 16 eax = 00040000 262144 262144 ebx = 00000010 16 16 diff --git a/test/021_#i40_all.t b/test/021_#i40_all.t index 61ad73d..266b2eb 100644 --- a/test/021_#i40_all.t +++ b/test/021_#i40_all.t @@ -1,2 +1,2 @@ -umka_init +umka_init shell i40 18 16 diff --git a/test/044_#f01_#draw_winmap.ref.log b/test/044_#f01_#draw_winmap.ref.log index 0b0e8ea..44f09c4 100644 --- a/test/044_#f01_#draw_winmap.ref.log +++ b/test/044_#f01_#draw_winmap.ref.log @@ -1,5 +1,5 @@ /> umka_set_boot_params --x_res 44 --y_res 44 -/> umka_init +/> umka_init shell /> ramdisk_init ../img/kolibri.raw /rd: sector_size=512, capacity=2880 (1440 kiB), num_partitions=1 /rd/1: fs=fat, start=0 (0 B), length=2880 (1440 kiB) diff --git a/test/044_#f01_#draw_winmap.t b/test/044_#f01_#draw_winmap.t index 66901e0..04b8eb9 100644 --- a/test/044_#f01_#draw_winmap.t +++ b/test/044_#f01_#draw_winmap.t @@ -1,5 +1,5 @@ umka_set_boot_params --x_res 44 --y_res 44 -umka_init +umka_init shell ramdisk_init ../img/kolibri.raw set_skin /sys/DEFAULT.SKN diff --git a/test/045_#f70_#fat32_test0.ref.log b/test/045_#f70_#fat32_test0.ref.log index 923e8a1..9054f64 100644 --- a/test/045_#f70_#fat32_test0.ref.log +++ b/test/045_#f70_#fat32_test0.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/fat32_test0.raw hd0 -c 0 /hd0: sector_size=512, capacity=131072 (64 MiB), num_partitions=1 /hd0/1: fs=fat, start=2048 (1 MiB), length=126976 (62 MiB) diff --git a/test/045_#f70_#fat32_test0.t b/test/045_#f70_#fat32_test0.t index 2b67a6f..f5a630e 100644 --- a/test/045_#f70_#fat32_test0.t +++ b/test/045_#f70_#fat32_test0.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/fat32_test0.raw hd0 -c 0 ls80 /hd0/1/ read70 /hd0/1/A 0 16388096 -h diff --git a/test/046_#f70_#f70s1_#fat_#exfat_#s05k_ls.ref.log b/test/046_#f70_#f70s1_#fat_#exfat_#s05k_ls.ref.log index b6ef04e..b9dad9e 100644 --- a/test/046_#f70_#f70s1_#fat_#exfat_#s05k_ls.ref.log +++ b/test/046_#f70_#f70s1_#fat_#exfat_#s05k_ls.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/exfat_s05k_c16k_b16k.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=exfat, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/046_#f70_#f70s1_#fat_#exfat_#s05k_ls.t b/test/046_#f70_#f70s1_#fat_#exfat_#s05k_ls.t index d82d876..0cc5f6a 100644 --- a/test/046_#f70_#f70s1_#fat_#exfat_#s05k_ls.t +++ b/test/046_#f70_#f70s1_#fat_#exfat_#s05k_ls.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/exfat_s05k_c16k_b16k.qcow2 hd0 -c 524288 ls70 /hd0/1/dir_0 -f 0 -c 0 diff --git a/test/047_#f70_#f70s1_#fat_#exfat_#s05k_stat.ref.log b/test/047_#f70_#f70s1_#fat_#exfat_#s05k_stat.ref.log index 5718dfb..f1b8547 100644 --- a/test/047_#f70_#f70s1_#fat_#exfat_#s05k_stat.ref.log +++ b/test/047_#f70_#f70s1_#fat_#exfat_#s05k_stat.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/exfat_s05k_c8k_b8k.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=exfat, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/047_#f70_#f70s1_#fat_#exfat_#s05k_stat.t b/test/047_#f70_#f70s1_#fat_#exfat_#s05k_stat.t index 0378cf6..e29dc04 100644 --- a/test/047_#f70_#f70s1_#fat_#exfat_#s05k_stat.t +++ b/test/047_#f70_#f70s1_#fat_#exfat_#s05k_stat.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/exfat_s05k_c8k_b8k.qcow2 hd0 -c 524288 stat70 /hd0/1/dir_000 diff --git a/test/049_#keyboard_#input_all.ref.log b/test/049_#keyboard_#input_all.ref.log index 97c0fb1..f8787d0 100644 --- a/test/049_#keyboard_#input_all.ref.log +++ b/test/049_#keyboard_#input_all.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> /> get_keyboard_mode keyboard_mode: 0 - ASCII diff --git a/test/049_#keyboard_#input_all.t b/test/049_#keyboard_#input_all.t index 9bafbb1..e02868d 100644 --- a/test/049_#keyboard_#input_all.t +++ b/test/049_#keyboard_#input_all.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell get_keyboard_mode get_keyboard_lang diff --git a/test/050_#mouse_#input_all.ref.log b/test/050_#mouse_#input_all.ref.log index f98495c..364fdc8 100644 --- a/test/050_#mouse_#input_all.ref.log +++ b/test/050_#mouse_#input_all.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> /> get_mouse_pos_screen x y: 200 150 diff --git a/test/050_#mouse_#input_all.t b/test/050_#mouse_#input_all.t index 38cec5c..2dafb99 100644 --- a/test/050_#mouse_#input_all.t +++ b/test/050_#mouse_#input_all.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell get_mouse_pos_screen get_mouse_pos_window diff --git a/test/051_#draw_#cursor_all.ref.log b/test/051_#draw_#cursor_all.ref.log index 149dcf8..3f062bb 100644 --- a/test/051_#draw_#cursor_all.ref.log +++ b/test/051_#draw_#cursor_all.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> #set_mouse_pos_screen 40 30 /> ramdisk_init ../img/kolibri.raw /rd: sector_size=512, capacity=2880 (1440 kiB), num_partitions=1 diff --git a/test/051_#draw_#cursor_all.t b/test/051_#draw_#cursor_all.t index 0399730..9892ab6 100644 --- a/test/051_#draw_#cursor_all.t +++ b/test/051_#draw_#cursor_all.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell #set_mouse_pos_screen 40 30 ramdisk_init ../img/kolibri.raw set_skin /sys/DEFAULT.SKN diff --git a/test/053_#userevent_all.t b/test/053_#userevent_all.t index 882c32f..b567a23 100644 --- a/test/053_#userevent_all.t +++ b/test/053_#userevent_all.t @@ -1,3 +1,3 @@ -umka_init +umka_init shell check_for_event check_for_event diff --git a/test/054_#draw_#cursor_#osloop_resize.ref.log b/test/054_#draw_#cursor_#osloop_resize.ref.log index 4847088..c972502 100644 --- a/test/054_#draw_#cursor_#osloop_resize.ref.log +++ b/test/054_#draw_#cursor_#osloop_resize.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> /> ramdisk_init ../img/kolibri.raw /rd: sector_size=512, capacity=2880 (1440 kiB), num_partitions=1 diff --git a/test/054_#draw_#cursor_#osloop_resize.t b/test/054_#draw_#cursor_#osloop_resize.t index e6a2991..53fcf9b 100644 --- a/test/054_#draw_#cursor_#osloop_resize.t +++ b/test/054_#draw_#cursor_#osloop_resize.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell ramdisk_init ../img/kolibri.raw set_skin /sys/DEFAULT.SKN diff --git a/test/055_#xfs_#bigtime_all.ref.log b/test/055_#xfs_#bigtime_all.ref.log index 0fdf72d..f64f597 100644 --- a/test/055_#xfs_#bigtime_all.ref.log +++ b/test/055_#xfs_#bigtime_all.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_bigtime.qcow2 hd0 -c 0 /hd0: sector_size=512, capacity=618496 (302 MiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=614400 (300 MiB) diff --git a/test/055_#xfs_#bigtime_all.t b/test/055_#xfs_#bigtime_all.t index 7a5b3ec..de6b06c 100644 --- a/test/055_#xfs_#bigtime_all.t +++ b/test/055_#xfs_#bigtime_all.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_bigtime.qcow2 hd0 -c 0 ls70 /hd0/1/ ls70 /hd0/1/dira diff --git a/test/056_#xfs_#nrext64_all.ref.log b/test/056_#xfs_#nrext64_all.ref.log index 8cddf47..3f67884 100644 --- a/test/056_#xfs_#nrext64_all.ref.log +++ b/test/056_#xfs_#nrext64_all.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_nrext64.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=6291456 (3 GiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=6287360 (3070 MiB) diff --git a/test/056_#xfs_#nrext64_all.t b/test/056_#xfs_#nrext64_all.t index 3c354e2..641c21a 100644 --- a/test/056_#xfs_#nrext64_all.t +++ b/test/056_#xfs_#nrext64_all.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_nrext64.qcow2 hd0 -c 524288 stat70 /hd0/1/dir_sf stat70 /hd0/1/dir_block diff --git a/test/057_#xfs_#lookup_#v5_all.ref.log b/test/057_#xfs_#lookup_#v5_all.ref.log index 8cdbbad..f363ce2 100644 --- a/test/057_#xfs_#lookup_#v5_all.ref.log +++ b/test/057_#xfs_#lookup_#v5_all.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_lookup_v5.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=10485760 (5 GiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=10481664 (5118 MiB) diff --git a/test/057_#xfs_#lookup_#v5_all.t b/test/057_#xfs_#lookup_#v5_all.t index 3006fb7..fa8263b 100644 --- a/test/057_#xfs_#lookup_#v5_all.t +++ b/test/057_#xfs_#lookup_#v5_all.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_lookup_v5.qcow2 hd0 -c 524288 cd /hd0/1/dir_sf stat70 d0000000000/d0000000000 diff --git a/test/058_#xfs_#lookup_#v4_all.ref.log b/test/058_#xfs_#lookup_#v4_all.ref.log index 0adb7bf..c39bc26 100644 --- a/test/058_#xfs_#lookup_#v4_all.ref.log +++ b/test/058_#xfs_#lookup_#v4_all.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_lookup_v4.qcow2 hd0 -c 1048576 /hd0: sector_size=512, capacity=6291456 (3 GiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=6287360 (3070 MiB) diff --git a/test/058_#xfs_#lookup_#v4_all.t b/test/058_#xfs_#lookup_#v4_all.t index 65afcf2..028b455 100644 --- a/test/058_#xfs_#lookup_#v4_all.t +++ b/test/058_#xfs_#lookup_#v4_all.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_lookup_v4.qcow2 hd0 -c 1048576 cd /hd0/1/dir_sf stat70 d0000000000/d0000000000 diff --git a/test/059_#gpt_all.ref.log b/test/059_#gpt_all.ref.log index 1827f3a..c32e86b 100644 --- a/test/059_#gpt_all.ref.log +++ b/test/059_#gpt_all.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/gpt_partitions_s05k.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=2097152 (1 GiB), num_partitions=24 /hd0/1: fs=???, start=2048 (1 MiB), length=2048 (1 MiB) diff --git a/test/059_#gpt_all.t b/test/059_#gpt_all.t index 8422670..dc5a82a 100644 --- a/test/059_#gpt_all.t +++ b/test/059_#gpt_all.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/gpt_partitions_s05k.qcow2 hd0 -c 524288 disk_del hd0 disk_add ../img/gpt_partitions_s4k.qcow2 hd0 -c 524288 diff --git a/test/060_#f70_#f70s1_#ext_#ext2_#s05k_ls_all_dir_types.ref.log b/test/060_#f70_#f70s1_#ext_#ext2_#s05k_ls_all_dir_types.ref.log index 0ab7756..e5abf63 100644 --- a/test/060_#f70_#f70s1_#ext_#ext2_#s05k_ls_all_dir_types.ref.log +++ b/test/060_#f70_#f70s1_#ext_#ext2_#s05k_ls_all_dir_types.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/ext2_s05k.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=10485760 (5 GiB), num_partitions=1 /hd0/1: fs=ext, start=2048 (1 MiB), length=10481664 (5118 MiB) diff --git a/test/060_#f70_#f70s1_#ext_#ext2_#s05k_ls_all_dir_types.t b/test/060_#f70_#f70s1_#ext_#ext2_#s05k_ls_all_dir_types.t index 4c65830..ece9d0c 100644 --- a/test/060_#f70_#f70s1_#ext_#ext2_#s05k_ls_all_dir_types.t +++ b/test/060_#f70_#f70s1_#ext_#ext2_#s05k_ls_all_dir_types.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/ext2_s05k.qcow2 hd0 -c 524288 ls70 /hd0/1/dir_a ls70 /hd0/1/dir_b diff --git a/test/061_#f70_#f70s1_#ext_#ext4_#s05k_ls_all_dir_types.ref.log b/test/061_#f70_#f70s1_#ext_#ext4_#s05k_ls_all_dir_types.ref.log index 445b58f..91c75ae 100644 --- a/test/061_#f70_#f70s1_#ext_#ext4_#s05k_ls_all_dir_types.ref.log +++ b/test/061_#f70_#f70s1_#ext_#ext4_#s05k_ls_all_dir_types.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/ext4_s05k.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=10485760 (5 GiB), num_partitions=1 /hd0/1: fs=???, start=2048 (1 MiB), length=10481664 (5118 MiB) diff --git a/test/061_#f70_#f70s1_#ext_#ext4_#s05k_ls_all_dir_types.t b/test/061_#f70_#f70s1_#ext_#ext4_#s05k_ls_all_dir_types.t index 461ef5a..e4ba9c9 100644 --- a/test/061_#f70_#f70s1_#ext_#ext4_#s05k_ls_all_dir_types.t +++ b/test/061_#f70_#f70s1_#ext_#ext4_#s05k_ls_all_dir_types.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/ext4_s05k.qcow2 hd0 -c 524288 ls70 /hd0/1/dir_a ls70 /hd0/1/dir_b diff --git a/test/062_#f70_#f70s1_#fat_#fat12_#s05k_ls_all_dir_types.ref.log b/test/062_#f70_#f70s1_#fat_#fat12_#s05k_ls_all_dir_types.ref.log index df17259..44e96e8 100644 --- a/test/062_#f70_#f70s1_#fat_#fat12_#s05k_ls_all_dir_types.ref.log +++ b/test/062_#f70_#f70s1_#fat_#fat12_#s05k_ls_all_dir_types.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/fat12_s05k.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=524288 (256 MiB), num_partitions=1 /hd0/1: fs=fat, start=2048 (1 MiB), length=520192 (254 MiB) diff --git a/test/062_#f70_#f70s1_#fat_#fat12_#s05k_ls_all_dir_types.t b/test/062_#f70_#f70s1_#fat_#fat12_#s05k_ls_all_dir_types.t index cd4756e..e9e740f 100644 --- a/test/062_#f70_#f70s1_#fat_#fat12_#s05k_ls_all_dir_types.t +++ b/test/062_#f70_#f70s1_#fat_#fat12_#s05k_ls_all_dir_types.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/fat12_s05k.qcow2 hd0 -c 524288 ls70 /hd0/1/dir_a ls70 /hd0/1/dir_b diff --git a/test/063_#f70_#f70s1_#fat_#fat16_#s05k_ls_all_dir_types.ref.log b/test/063_#f70_#f70s1_#fat_#fat16_#s05k_ls_all_dir_types.ref.log index 1d3287c..4f2ea1e 100644 --- a/test/063_#f70_#f70s1_#fat_#fat16_#s05k_ls_all_dir_types.ref.log +++ b/test/063_#f70_#f70s1_#fat_#fat16_#s05k_ls_all_dir_types.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/fat16_s05k.qcow2 hd0 -c 524288 /hd0: sector_size=512, capacity=8388608 (4 GiB), num_partitions=1 /hd0/1: fs=fat, start=2048 (1 MiB), length=8384481 (4292854272 B) diff --git a/test/063_#f70_#f70s1_#fat_#fat16_#s05k_ls_all_dir_types.t b/test/063_#f70_#f70s1_#fat_#fat16_#s05k_ls_all_dir_types.t index f21712d..d4590f3 100644 --- a/test/063_#f70_#f70s1_#fat_#fat16_#s05k_ls_all_dir_types.t +++ b/test/063_#f70_#f70s1_#fat_#fat16_#s05k_ls_all_dir_types.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/fat16_s05k.qcow2 hd0 -c 524288 ls70 /hd0/1/dir_a ls70 /hd0/1/dir_b diff --git a/test/064_#f70_#f70s1_#xfs_#xfsv5_#s05k_#samehash_ls_all_dir_types.ref.log b/test/064_#f70_#f70s1_#xfs_#xfsv5_#s05k_#samehash_ls_all_dir_types.ref.log index 282652a..573cb81 100644 --- a/test/064_#f70_#f70s1_#xfs_#xfsv5_#s05k_#samehash_ls_all_dir_types.ref.log +++ b/test/064_#f70_#f70s1_#xfs_#xfsv5_#s05k_#samehash_ls_all_dir_types.ref.log @@ -1,4 +1,4 @@ -/> umka_init +/> umka_init shell /> disk_add ../img/xfs_samehash_s05k.raw hd0 -c 0 /hd0: sector_size=512, capacity=2097152 (1 GiB), num_partitions=1 /hd0/1: fs=xfs, start=2048 (1 MiB), length=2093056 (1022 MiB) diff --git a/test/064_#f70_#f70s1_#xfs_#xfsv5_#s05k_#samehash_ls_all_dir_types.t b/test/064_#f70_#f70s1_#xfs_#xfsv5_#s05k_#samehash_ls_all_dir_types.t index 4a03db3..028ac4f 100644 --- a/test/064_#f70_#f70s1_#xfs_#xfsv5_#s05k_#samehash_ls_all_dir_types.t +++ b/test/064_#f70_#f70s1_#xfs_#xfsv5_#s05k_#samehash_ls_all_dir_types.t @@ -1,4 +1,4 @@ -umka_init +umka_init shell disk_add ../img/xfs_samehash_s05k.raw hd0 -c 0 ls70 /hd0/1/dir_sf ls70 /hd0/1/dir_block diff --git a/umka.asm b/umka.asm index 4b3d25e..c338a02 100644 --- a/umka.asm +++ b/umka.asm @@ -555,7 +555,9 @@ proc kos_eth_input c uses ebx esi edi ebp, buffer_ptr ret endp -proc umka_init c uses ebx esi edi ebp +proc umka_init c uses ebx esi edi ebp, _tool + mov eax, [_tool] + mov [umka_tool], eax mov [umka_initialized], 1 call umka._.check_alignment diff --git a/umka.h b/umka.h index 4bc7b81..60af83b 100644 --- a/umka.h +++ b/umka.h @@ -533,7 +533,7 @@ void irq0(int signo, siginfo_t *info, void *context); void -umka_init(void); +umka_init(int tool); void i40(void); @@ -1037,9 +1037,10 @@ typedef struct { _Static_assert(sizeof(appdata_t) == 256, "must be 0x100 bytes long"); -#define UMKA_SHELL 1u -#define UMKA_FUSE 2u -#define UMKA_OS 3u +#define UMKA_SHELL 1 +#define UMKA_FUSE 2 +#define UMKA_OS 3 +#define UMKA_GEN_DEVICES_DAT 4 #define MAX_PRIORITY 0 // highest, used for kernel tasks #define USER_PRIORITY 1 // default diff --git a/umka_fuse.c b/umka_fuse.c index 5bbb4a2..02078b9 100644 --- a/umka_fuse.c +++ b/umka_fuse.c @@ -150,7 +150,7 @@ main(int argc, char *argv[]) { kos_boot.y_res = UMKA_DEFAULT_DISPLAY_HEIGHT; kos_boot.pitch = UMKA_DEFAULT_DISPLAY_WIDTH*4; // 32bpp - umka_init(); + umka_init(UMKA_FUSE); struct vdisk *umka_disk = vdisk_init(argv[2], 1, 0u, 0); disk_t *disk = disk_add(&umka_disk->diskfunc, "hd0", umka_disk, 0); disk_media_changed(disk, 1); diff --git a/umka_gen_devices_dat.c b/umka_gen_devices_dat.c index 0821c02..dd0fa8b 100644 --- a/umka_gen_devices_dat.c +++ b/umka_gen_devices_dat.c @@ -150,7 +150,7 @@ main () { strcpy(pci_path, PCI_BASE_DIR); - umka_init(); + umka_init(UMKA_GEN_DEVICES_DAT); kos_acpi_aml_init(); ctx = kos_acpi_aml_new_thread(); kos_acpi_dev_size = MAX_PCI_DEVICES*16;