diff --git a/repos/os/run/usb_block.run b/repos/os/run/usb_block.run index 77370bb9b6..403b6ecf7e 100644 --- a/repos/os/run/usb_block.run +++ b/repos/os/run/usb_block.run @@ -70,7 +70,7 @@ append config { - + @@ -82,15 +82,15 @@ append_if [expr !$use_qemu] config { corresponding device. --> - + - + - + - + - + } append_if $use_qemu config { } @@ -113,9 +113,9 @@ append config { - - - + + + @@ -138,7 +138,7 @@ install_config $config set boot_modules { core init timer report_rom usb_drv usb_block_drv test-blk-cli test-blk-bench - ld.lib.so libc.lib.so + ld.lib.so } lappend_if [have_spec gpio] boot_modules [gpio_drv] @@ -160,7 +160,7 @@ if {$use_qemu} { # # Qemu opts for EHCI # -append qemu_args " -m 128 -nographic -M pc -boot order=d " +append qemu_args " -m 256 -nographic -M pc -boot order=d " append qemu_args " -drive if=none,id=disk,file=$disk_image,format=raw " append qemu_args " -device usb-ehci,id=ehci -device usb-storage,bus=ehci.0,drive=disk " diff --git a/repos/os/src/test/blk/bench/main.cc b/repos/os/src/test/blk/bench/main.cc index 39dc8fad26..d22543d364 100644 --- a/repos/os/src/test/blk/bench/main.cc +++ b/repos/os/src/test/blk/bench/main.cc @@ -109,10 +109,10 @@ class Throughput return; _stop = _timer.elapsed_ms(); - log(!_read_done ? "Read" : "Wrote", " ", _bytes / 1024, " KB in ", + log(!_read_done ? "Read" : "Wrote", " ", _bytes / 1024, " KiB in ", _stop - _start, " ms (", ((double)_bytes / (1024 * 1024)) / ((double)(_stop - _start) / 1000), - " MB/s)"); + " MiB/s)"); /* start write */ if (!_read_done ) { @@ -142,7 +142,7 @@ class Throughput _session.info(&_blk_count, &_blk_size, &blk_ops); warning("block count ", _blk_count, " size ", _blk_size); - log("read/write ", TEST_SIZE / 1024, " KB ..."); + log("read/write ", TEST_SIZE / 1024, " KiB ..."); _start = _timer.elapsed_ms(); _submit(); }