diff --git a/doc/components.txt b/doc/components.txt index 5eea80d0d..a0d5dabb8 100644 --- a/doc/components.txt +++ b/doc/components.txt @@ -319,10 +319,10 @@ subdirectory of a source repository. the physical network. DHCP requests originating from the virtual NIC sessions are delegated to the physical network. -:Block: The block-device partition server at 'os/src/server/part_blk' reads +:Block: The block-device partition server at 'os/src/server/part_block' reads the partition table of a block session and exports each partition found as separate block session. For using this server, please refer to the run - script at 'os/run/part_blk'. + script at 'os/run/part_block'. :File system: The FAT file-system service allows multiple clients to concurrently access the same FAT-formatted block device. It is located @@ -382,13 +382,13 @@ Separate components: A pseudo file system that can be used as a front end to core's TRACE service. -:'os/src/server/rom_blk': +:'os/src/server/rom_block': Provides the content of a ROM file as a block session, similar to the loop-mount mechanism on Linux -:'os/src/server/ram_blk': +:'os/src/server/ram_block': Provides the content of a RAM dataspace as a block session. In contrast - to 'rom_blk', this server provides a writeable block device. + to 'rom_block', this server provides a writeable block device. :'os/src/server/terminal_log': Adapter for forwarding LOG messages to a terminal session. @@ -434,7 +434,7 @@ Separate components: The terminal crosslink service allows to terminal clients to talk to each other. -:'gems/src/server/http_blk': +:'gems/src/server/http_block': A block service that fetches a virtual block device over the network from a HTTP server. diff --git a/repos/dde_linux/run/usb_storage.run b/repos/dde_linux/run/usb_storage.run index 1fb9bc1b0..7f2c5ace8 100644 --- a/repos/dde_linux/run/usb_storage.run +++ b/repos/dde_linux/run/usb_storage.run @@ -11,7 +11,7 @@ set build_components { core init timer drivers/usb - test/blk/cli + test/block/client } lappend_if [have_spec gpio] build_components drivers/gpio @@ -69,7 +69,7 @@ append config { - + @@ -82,7 +82,7 @@ install_config $config # generic modules set boot_modules { - core ld.lib.so init timer usb_drv test-blk-cli + core ld.lib.so init timer usb_drv test-block-client } lappend_if [have_spec gpio] boot_modules [gpio_drv] diff --git a/repos/dde_rump/run/fs_rom_update_ext2.run b/repos/dde_rump/run/fs_rom_update_ext2.run index 54e843eaf..c8c2dbf63 100644 --- a/repos/dde_rump/run/fs_rom_update_ext2.run +++ b/repos/dde_rump/run/fs_rom_update_ext2.run @@ -8,7 +8,7 @@ set build_components { lib/vfs/rump server/dynamic_rom server/fs_rom - server/ram_blk + server/ram_block server/vfs } @@ -45,7 +45,7 @@ append config { - + @@ -123,7 +123,7 @@ set boot_modules { dynamic_rom ext2.img fs_rom - ram_blk + ram_block rom_logger rom_to_file rump_fs.lib.so diff --git a/repos/dde_rump/run/rump_ext2.run b/repos/dde_rump/run/rump_ext2.run index 706815bcf..2efa8d72a 100644 --- a/repos/dde_rump/run/rump_ext2.run +++ b/repos/dde_rump/run/rump_ext2.run @@ -13,7 +13,7 @@ set dd [installed_command dd] # set build_components { core init timer - server/ram_blk + server/ram_block server/rump_fs test/libc_vfs } @@ -51,7 +51,7 @@ append config { - + @@ -81,7 +81,7 @@ install_config $config # generic modules set boot_modules { - core ld.lib.so init timer test-libc_vfs ram_blk + core ld.lib.so init timer test-libc_vfs ram_block rump.lib.so rump_fs.lib.so rump_fs ext2.raw libc.lib.so vfs.lib.so } diff --git a/repos/dde_rump/run/rump_fat.run b/repos/dde_rump/run/rump_fat.run index 70d4c8f65..9183cf2d0 100644 --- a/repos/dde_rump/run/rump_fat.run +++ b/repos/dde_rump/run/rump_fat.run @@ -13,7 +13,7 @@ set dd [installed_command dd] # set build_components { core init timer - server/ram_blk + server/ram_block server/rump_fs test/libc_vfs } @@ -51,7 +51,7 @@ append config { - + @@ -82,7 +82,7 @@ install_config $config # generic modules set boot_modules { - core ld.lib.so init timer test-libc_vfs ram_blk + core ld.lib.so init timer test-libc_vfs ram_block rump.lib.so rump_fs.lib.so rump_fs fs.raw libc.lib.so vfs.lib.so } diff --git a/repos/dde_rump/run/rump_iso.run b/repos/dde_rump/run/rump_iso.run index 0bb312f5c..e2ea035d8 100644 --- a/repos/dde_rump/run/rump_iso.run +++ b/repos/dde_rump/run/rump_iso.run @@ -13,7 +13,7 @@ set mkisofs [installed_command mkisofs] set build_components { core init timer server/fs_rom - server/rom_blk + server/rom_block server/rump_fs test/iso } @@ -44,7 +44,7 @@ append config { - + @@ -87,7 +87,7 @@ install_config $config # Boot modules # set boot_modules { - core ld.lib.so init timer test-iso rom_blk + core ld.lib.so init timer test-iso rom_block rump.lib.so rump_fs.lib.so rump_fs fs.iso fs_rom } diff --git a/repos/dde_rump/run/vfs_stress_ext2.run b/repos/dde_rump/run/vfs_stress_ext2.run index aae19c356..ef4d5bd30 100644 --- a/repos/dde_rump/run/vfs_stress_ext2.run +++ b/repos/dde_rump/run/vfs_stress_ext2.run @@ -10,7 +10,7 @@ set mke2fs [installed_command mke2fs] set dd [installed_command dd] -build "core init timer test/vfs_stress server/ram_blk lib/vfs/rump" +build "core init timer test/vfs_stress server/ram_block lib/vfs/rump" # # Build EXT2-file-system image @@ -39,7 +39,7 @@ install_config { - + @@ -57,7 +57,7 @@ set boot_modules { core init ld.lib.so timer vfs_stress rump.lib.so rump_fs.lib.so vfs.lib.so vfs_rump.lib.so - ram_blk ext2.raw + ram_block ext2.raw } build_boot_image $boot_modules diff --git a/repos/dde_rump/run/vfs_stress_rump_fs.run b/repos/dde_rump/run/vfs_stress_rump_fs.run index 96dfc4695..222ca5a21 100644 --- a/repos/dde_rump/run/vfs_stress_rump_fs.run +++ b/repos/dde_rump/run/vfs_stress_rump_fs.run @@ -10,7 +10,7 @@ set mke2fs [installed_command mke2fs] set dd [installed_command dd] -build "core init timer test/vfs_stress server/ram_blk server/rump_fs" +build "core init timer test/vfs_stress server/ram_block server/rump_fs" # # Build EXT2-file-system image @@ -45,7 +45,7 @@ install_config { - + @@ -63,7 +63,7 @@ install_config { set boot_modules { core init ld.lib.so timer vfs_stress rump.lib.so rump_fs.lib.so rump_fs - ram_blk ext2.raw vfs.lib.so + ram_block ext2.raw vfs.lib.so } build_boot_image $boot_modules diff --git a/repos/gems/recipes/pkg/sculpt/archives b/repos/gems/recipes/pkg/sculpt/archives index 482040abb..02eb34d20 100644 --- a/repos/gems/recipes/pkg/sculpt/archives +++ b/repos/gems/recipes/pkg/sculpt/archives @@ -34,7 +34,7 @@ _/src/curl _/src/libssh _/src/zlib _/src/log_core -_/src/part_blk +_/src/part_block _/src/nic_router _/src/e2fsprogs-minimal _/src/nvme_drv diff --git a/repos/gems/run/depot_autopilot.run b/repos/gems/run/depot_autopilot.run index 49a893821..051bda396 100644 --- a/repos/gems/run/depot_autopilot.run +++ b/repos/gems/run/depot_autopilot.run @@ -580,8 +580,8 @@ set default_test_pkgs { test-ada test-ada_exception test-ada_secondary_stack - test-blk - test-blk_cache + test-block + test-block_cache test-clipboard test-ds_ownership test-dynamic_config @@ -616,8 +616,8 @@ set default_test_pkgs { test-mmio test-new_delete test-nic_loopback - test-part_blk_gpt - test-part_blk_mbr + test-part_block_gpt + test-part_block_mbr test-pipe test-pthread test-python @@ -631,7 +631,7 @@ set default_test_pkgs { test-rm_fault test-rm_fault_no_nox test-rm_nested - test-rom_blk + test-rom_block test-rom_filter test-rust test-sanitizer diff --git a/repos/gems/run/leitzentrale.run b/repos/gems/run/leitzentrale.run index a32dac9db..f2ea75e9b 100644 --- a/repos/gems/run/leitzentrale.run +++ b/repos/gems/run/leitzentrale.run @@ -25,8 +25,8 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/noux \ [depot_user]/src/terminal \ [depot_user]/src/posix \ - [depot_user]/src/ram_blk \ - [depot_user]/src/part_blk \ + [depot_user]/src/ram_block \ + [depot_user]/src/part_block \ [depot_user]/src/rump \ [depot_user]/src/ncurses \ [depot_user]/src/usb_block_drv \ @@ -215,7 +215,7 @@ install_config { - + diff --git a/repos/gems/src/app/sculpt_manager/model/partition.h b/repos/gems/src/app/sculpt_manager/model/partition.h index f15c3a1f7..349f4a443 100644 --- a/repos/gems/src/app/sculpt_manager/model/partition.h +++ b/repos/gems/src/app/sculpt_manager/model/partition.h @@ -135,7 +135,7 @@ struct Sculpt::Partition : List_model::Element /** - * Policy for transforming a part_blk report into a list of partitions + * Policy for transforming a part_block report into a list of partitions */ struct Sculpt::Partition_update_policy : List_model::Update_policy { diff --git a/repos/gems/src/app/sculpt_manager/model/storage_device.h b/repos/gems/src/app/sculpt_manager/model/storage_device.h index 34868fe1a..0c4d288c6 100644 --- a/repos/gems/src/app/sculpt_manager/model/storage_device.h +++ b/repos/gems/src/app/sculpt_manager/model/storage_device.h @@ -26,8 +26,8 @@ struct Sculpt::Storage_device { enum State { UNKNOWN, /* partition information not yet known */ - USED, /* part_blk is running and has reported partition info */ - RELEASED /* partition info is known but part_blk is not running */ + USED, /* part_block is running and has reported partition info */ + RELEASED /* partition info is known but part_block is not running */ }; Allocator &_alloc; @@ -49,7 +49,7 @@ struct Sculpt::Storage_device Attached_rom_dataspace _partitions_rom; - unsigned _part_blk_version = 0; + unsigned _part_block_version = 0; /** * Trigger the rediscovery of the device, e.g., after partitioning of after @@ -58,13 +58,13 @@ struct Sculpt::Storage_device void rediscover() { state = UNKNOWN; - _part_blk_version++; + _part_block_version++; Partition_update_policy policy(_alloc); partitions.update_from_xml(policy, Xml_node("")); } - void process_part_blk_report() + void process_part_block_report() { _partitions_rom.update(); @@ -106,10 +106,10 @@ struct Sculpt::Storage_device Capacity capacity, Signal_context_capability sigh) : _alloc(alloc), label(label), capacity(capacity), - _partitions_rom(env, String<80>("report -> runtime/", label, ".part_blk/partitions").string()) + _partitions_rom(env, String<80>("report -> runtime/", label, ".part_block/partitions").string()) { _partitions_rom.sigh(sigh); - process_part_blk_report(); + process_part_block_report(); } ~Storage_device() @@ -118,12 +118,12 @@ struct Sculpt::Storage_device rediscover(); } - bool part_blk_needed_for_discovery() const + bool part_block_needed_for_discovery() const { return state == UNKNOWN; } - bool part_blk_needed_for_access() const + bool part_block_needed_for_access() const { bool needed_for_access = false; partitions.for_each([&] (Partition const &partition) { @@ -142,12 +142,12 @@ struct Sculpt::Storage_device } /** - * Generate content of start node for part_blk + * Generate content of start node for part_block * * \param service_name name of server that provides the block device, or * if invalid, request block device from parent. */ - inline void gen_part_blk_start_content(Xml_generator &xml, Label const &server_name) const; + inline void gen_part_block_start_content(Xml_generator &xml, Label const &server_name) const; template void for_each_partition(FN const &fn) const @@ -205,15 +205,15 @@ struct Sculpt::Storage_device }; -void Sculpt::Storage_device::gen_part_blk_start_content(Xml_generator &xml, - Label const &server_name) const +void Sculpt::Storage_device::gen_part_block_start_content(Xml_generator &xml, + Label const &server_name) const { - xml.attribute("version", _part_blk_version); + xml.attribute("version", _part_block_version); - gen_common_start_content(xml, Label(label, ".part_blk"), + gen_common_start_content(xml, Label(label, ".part_block"), Cap_quota{100}, Ram_quota{8*1024*1024}); - gen_named_node(xml, "binary", "part_blk"); + gen_named_node(xml, "binary", "part_block"); xml.node("config", [&] () { xml.node("report", [&] () { xml.attribute("partitions", "yes"); }); @@ -238,7 +238,7 @@ void Sculpt::Storage_device::gen_part_blk_start_content(Xml_generator &xml, xml.node("parent", [&] () { xml.attribute("label", label); }); }); - gen_parent_rom_route(xml, "part_blk"); + gen_parent_rom_route(xml, "part_block"); gen_parent_rom_route(xml, "ld.lib.so"); gen_parent_route (xml); gen_parent_route (xml); diff --git a/repos/gems/src/app/sculpt_manager/model/storage_target.h b/repos/gems/src/app/sculpt_manager/model/storage_target.h index 36bb20724..2a56b8b05 100644 --- a/repos/gems/src/app/sculpt_manager/model/storage_target.h +++ b/repos/gems/src/app/sculpt_manager/model/storage_target.h @@ -74,7 +74,7 @@ struct Sculpt::Storage_target /* access partition */ else { xml.node("child", [&] () { - xml.attribute("name", Label(device, ".part_blk")); + xml.attribute("name", Label(device, ".part_block")); xml.attribute("label", partition); }); } diff --git a/repos/gems/src/app/sculpt_manager/storage.cc b/repos/gems/src/app/sculpt_manager/storage.cc index 5bad72855..e24688818 100644 --- a/repos/gems/src/app/sculpt_manager/storage.cc +++ b/repos/gems/src/app/sculpt_manager/storage.cc @@ -25,7 +25,7 @@ void Sculpt::Storage::handle_storage_devices_update() _storage_devices.block_devices.for_each([&] (Block_device &dev) { - dev.process_part_blk_report(); + dev.process_part_block_report(); if (dev.state == Storage_device::UNKNOWN) { reconfigure_runtime = true; }; @@ -44,7 +44,7 @@ void Sculpt::Storage::handle_storage_devices_update() _storage_devices.usb_storage_devices.for_each([&] (Usb_storage_device &dev) { dev.process_driver_report(); - dev.process_part_blk_report(); + dev.process_part_block_report(); if (dev.state == Storage_device::UNKNOWN) { reconfigure_runtime = true; }; @@ -91,19 +91,19 @@ void Sculpt::Storage::gen_runtime_start_nodes(Xml_generator &xml) const xml.node("start", [&] () { gen_ram_fs_start_content(xml, _ram_fs_state); }); - auto part_blk_needed_for_use = [&] (Storage_device const &dev) { + auto part_block_needed_for_use = [&] (Storage_device const &dev) { return (_sculpt_partition.device == dev.label) && _sculpt_partition.partition.valid(); }; _storage_devices.block_devices.for_each([&] (Block_device const &dev) { - if (dev.part_blk_needed_for_discovery() - || dev.part_blk_needed_for_access() - || part_blk_needed_for_use(dev)) + if (dev.part_block_needed_for_discovery() + || dev.part_block_needed_for_access() + || part_block_needed_for_use(dev)) xml.node("start", [&] () { Storage_device::Label const parent { }; - dev.gen_part_blk_start_content(xml, parent); }); }); + dev.gen_part_block_start_content(xml, parent); }); }); _storage_devices.usb_storage_devices.for_each([&] (Usb_storage_device const &dev) { @@ -111,13 +111,13 @@ void Sculpt::Storage::gen_runtime_start_nodes(Xml_generator &xml) const xml.node("start", [&] () { dev.gen_usb_block_drv_start_content(xml); }); - if (dev.part_blk_needed_for_discovery() - || dev.part_blk_needed_for_access() - || part_blk_needed_for_use(dev)) + if (dev.part_block_needed_for_discovery() + || dev.part_block_needed_for_access() + || part_block_needed_for_use(dev)) xml.node("start", [&] () { Storage_device::Label const driver = dev.usb_block_drv_name(); - dev.gen_part_blk_start_content(xml, driver); + dev.gen_part_block_start_content(xml, driver); }); }); diff --git a/repos/gems/src/server/http_blk/README b/repos/gems/src/server/http_block/README similarity index 94% rename from repos/gems/src/server/http_blk/README rename to repos/gems/src/server/http_block/README index f351967f3..4abd25d2f 100644 --- a/repos/gems/src/server/http_blk/README +++ b/repos/gems/src/server/http_block/README @@ -8,7 +8,7 @@ Usage Config file snippet: -! +! ! ! ! diff --git a/repos/gems/src/server/http_blk/http.cc b/repos/gems/src/server/http_block/http.cc similarity index 100% rename from repos/gems/src/server/http_blk/http.cc rename to repos/gems/src/server/http_block/http.cc diff --git a/repos/gems/src/server/http_blk/http.h b/repos/gems/src/server/http_block/http.h similarity index 100% rename from repos/gems/src/server/http_blk/http.h rename to repos/gems/src/server/http_block/http.h diff --git a/repos/gems/src/server/http_blk/main.cc b/repos/gems/src/server/http_block/main.cc similarity index 100% rename from repos/gems/src/server/http_blk/main.cc rename to repos/gems/src/server/http_block/main.cc diff --git a/repos/gems/src/server/http_blk/target.mk b/repos/gems/src/server/http_block/target.mk similarity index 75% rename from repos/gems/src/server/http_blk/target.mk rename to repos/gems/src/server/http_block/target.mk index 88bdea3c1..f9fcaad76 100644 --- a/repos/gems/src/server/http_blk/target.mk +++ b/repos/gems/src/server/http_block/target.mk @@ -1,4 +1,4 @@ -TARGET = http_blk +TARGET = http_block SRC_CC = main.cc http.cc LIBS = libc diff --git a/repos/libports/recipes/pkg/test-libc_vfs_block/archives b/repos/libports/recipes/pkg/test-libc_vfs_block/archives index bae457a66..0d8ebfdca 100644 --- a/repos/libports/recipes/pkg/test-libc_vfs_block/archives +++ b/repos/libports/recipes/pkg/test-libc_vfs_block/archives @@ -1,5 +1,5 @@ _/src/init _/src/test-libc_vfs_block -_/src/ram_blk +_/src/ram_block _/src/libc _/src/vfs diff --git a/repos/libports/recipes/pkg/test-libc_vfs_block/runtime b/repos/libports/recipes/pkg/test-libc_vfs_block/runtime index 2ea73e3d2..741dd9769 100644 --- a/repos/libports/recipes/pkg/test-libc_vfs_block/runtime +++ b/repos/libports/recipes/pkg/test-libc_vfs_block/runtime @@ -10,7 +10,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/repos/libports/recipes/pkg/test-solo5/archives b/repos/libports/recipes/pkg/test-solo5/archives index 2343187e5..b10cd865a 100644 --- a/repos/libports/recipes/pkg/test-solo5/archives +++ b/repos/libports/recipes/pkg/test-solo5/archives @@ -1,6 +1,6 @@ _/src/init _/src/nic_loopback -_/src/ram_blk +_/src/ram_block _/src/sequence _/src/solo5 _/src/test-solo5 diff --git a/repos/libports/recipes/pkg/test-solo5/runtime b/repos/libports/recipes/pkg/test-solo5/runtime index bb9d56ac9..2514e8743 100644 --- a/repos/libports/recipes/pkg/test-solo5/runtime +++ b/repos/libports/recipes/pkg/test-solo5/runtime @@ -11,7 +11,7 @@ - + @@ -39,7 +39,7 @@ - + diff --git a/repos/libports/run/fatfs_blkio.run b/repos/libports/run/fatfs_blkio.run index aaaff903d..61492420c 100644 --- a/repos/libports/run/fatfs_blkio.run +++ b/repos/libports/run/fatfs_blkio.run @@ -1,5 +1,5 @@ # -# \brief Test of FatFS blkio implementation +# \brief Test of FatFS block-io implementation # \author Emery Hemingway # \date 2017-07-31 # @@ -15,10 +15,10 @@ set use_sd_card_drv [expr [have_spec omap4] || [have_spec arndale] || [have_spec # use AHCI on x86 set use_ahci [expr [have_spec x86] && ![have_spec linux]] -# use ram_blk on Linux -set use_ram_blk [have_spec linux] +# use ram_block on Linux +set use_ram_block [have_spec linux] -if {[expr ![have_include "power_on/qemu"] && !$use_ram_blk]} { +if {[expr ![have_include "power_on/qemu"] && !$use_ram_block]} { puts "\nPlease setup your native sd or hard drive. Remove this fail stop"; puts "check when you have prepared your native environment.\n"; exit 0 @@ -28,7 +28,7 @@ if {[expr ![have_include "power_on/qemu"] && !$use_ram_blk]} { # Build # set build_components { - test/fatfs_blkio + test/fatfs_block_io } lappend_if $use_sd_card_drv build_components drivers/sd_card @@ -42,8 +42,8 @@ create_boot_directory set depot_pkgs "genodelabs/src/[base_src] genodelabs/src/init" -lappend_if $use_ahci depot_pkgs genodelabs/src/ahci_drv -lappend_if $use_ram_blk depot_pkgs genodelabs/src/ram_blk +lappend_if $use_ahci depot_pkgs genodelabs/src/ahci_drv +lappend_if $use_ram_block depot_pkgs genodelabs/src/ram_block import_from_depot {*}$depot_pkgs @@ -71,7 +71,7 @@ append config { - + @@ -89,7 +89,7 @@ append_if $use_ahci config { - + } @@ -100,8 +100,8 @@ append_if $use_sd_card_drv config { } -append_if $use_ram_blk config { - +append_if $use_ram_block config { + @@ -126,11 +126,11 @@ catch { exec sh -c $cmd } set boot_modules { libc.lib.so vfs.lib.so libm.lib.so - test-fatfs_blkio + test-fatfs_block_io } lappend_if $use_sd_card_drv boot_modules sd_card_drv -lappend_if $use_ram_blk boot_modules test.hda +lappend_if $use_ram_block boot_modules test.hda append_platform_drv_boot_modules @@ -143,6 +143,6 @@ append qemu_args " -nographic " append_if $use_ahci qemu_args " -drive id=disk,file=$disk_image,format=raw,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 -boot d" append_if $use_sd_card_drv qemu_args " -drive file=$disk_image,format=raw,if=sd,cache=writeback " -run_genode_until {.*child "test-fatfs_blkio" exited with exit value 0.*} 60 +run_genode_until {.*child "test-fatfs_block_io" exited with exit value 0.*} 60 exec rm -f $disk_image diff --git a/repos/libports/run/fs_rom_update_fat.run b/repos/libports/run/fs_rom_update_fat.run index 60a376e64..57efc466f 100644 --- a/repos/libports/run/fs_rom_update_fat.run +++ b/repos/libports/run/fs_rom_update_fat.run @@ -8,7 +8,7 @@ set build_components { lib/vfs/fatfs server/dynamic_rom server/fs_rom - server/ram_blk + server/ram_block server/vfs } @@ -43,7 +43,7 @@ append config { - + @@ -121,7 +121,7 @@ set boot_modules { dynamic_rom fat.img fs_rom - ram_blk + ram_block rom_logger rom_to_file timer diff --git a/repos/libports/run/libc_block.run b/repos/libports/run/libc_block.run index a008e52ef..0719e1931 100644 --- a/repos/libports/run/libc_block.run +++ b/repos/libports/run/libc_block.run @@ -1,11 +1,11 @@ set use_sd_card_drv [expr [have_spec omap4] || [have_spec arndale] || [have_spec pl180]] set use_ahci_drv [expr [have_spec x86] && ![have_spec linux]] -set use_ram_blk [have_spec linux] +set use_ram_block [have_spec linux] if {[have_spec odroid_xu]} { puts "Run script does not support this platform"; exit } -if {[expr ![have_include "power_on/qemu"] && !$use_ram_blk]} { +if {[expr ![have_include "power_on/qemu"] && !$use_ram_block]} { puts "\nPlease setup your native sd or hard drive. Remove this fail stop"; puts "check when you have prepared your native environment.\n"; exit 0 @@ -23,7 +23,7 @@ set build_components { lappend_if $use_ahci_drv build_components drivers/ahci lappend_if $use_sd_card_drv build_components drivers/sd_card -lappend_if $use_ram_blk build_components server/ram_blk +lappend_if $use_ram_block build_components server/ram_block source ${genode_dir}/repos/base/run/platform_drv.inc append_platform_drv_build_components @@ -87,8 +87,8 @@ append_if $use_sd_card_drv config { } -append_if $use_ram_blk config { - +append_if $use_ram_block config { + @@ -113,8 +113,8 @@ set boot_modules { lappend_if $use_ahci_drv boot_modules ahci_drv lappend_if $use_sd_card_drv boot_modules sd_card_drv -lappend_if $use_ram_blk boot_modules ram_blk -lappend_if $use_ram_blk boot_modules test.hda +lappend_if $use_ram_block boot_modules ram_block +lappend_if $use_ram_block boot_modules test.hda append_platform_drv_boot_modules diff --git a/repos/libports/run/libc_filesystem_test.inc b/repos/libports/run/libc_filesystem_test.inc index b850c89da..239c5670c 100644 --- a/repos/libports/run/libc_filesystem_test.inc +++ b/repos/libports/run/libc_filesystem_test.inc @@ -15,13 +15,13 @@ set use_sd_card_drv [expr [have_spec omap4] || [have_spec arndale] || [have_spec # use AHCI on x86 set use_ahci [expr [have_spec x86] && ![have_spec linux]] -# use ram_blk on Linux -set use_ram_blk [have_spec linux] +# use ram_block on Linux +set use_ram_block [have_spec linux] if {[catch { exec which $mkfs_cmd } ]} { puts stderr "Error: $mkfs_cmd not installed, aborting test"; exit } -if {[expr ![have_include "power_on/qemu"] && !$use_ram_blk]} { +if {[expr ![have_include "power_on/qemu"] && !$use_ram_block]} { puts "\nPlease setup your native sd or hard drive. Remove this fail stop"; puts "check when you have prepared your native environment.\n"; exit 0 @@ -40,7 +40,7 @@ lappend build_components test/libc_$filesystem lappend_if $use_ahci build_components drivers/ahci lappend_if $use_sd_card_drv build_components drivers/sd_card -lappend_if $use_ram_blk build_components server/ram_blk +lappend_if $use_ram_block build_components server/ram_block source ${genode_dir}/repos/base/run/platform_drv.inc append_platform_drv_build_components @@ -116,8 +116,8 @@ append_if $use_sd_card_drv config { } -append_if $use_ram_blk config { - +append_if $use_ram_block config { + @@ -145,8 +145,8 @@ append boot_modules libc_$filesystem.lib.so lappend_if $use_ahci boot_modules ahci_drv lappend_if $use_sd_card_drv boot_modules sd_card_drv -lappend_if $use_ram_blk boot_modules ram_blk -lappend_if $use_ram_blk boot_modules test.hda +lappend_if $use_ram_block boot_modules ram_block +lappend_if $use_ram_block boot_modules test.hda append_platform_drv_boot_modules diff --git a/repos/libports/run/libc_vfs_filesystem_test.inc b/repos/libports/run/libc_vfs_filesystem_test.inc index 97d75cd9a..099764126 100644 --- a/repos/libports/run/libc_vfs_filesystem_test.inc +++ b/repos/libports/run/libc_vfs_filesystem_test.inc @@ -25,13 +25,13 @@ set use_sd_card_drv [expr [have_spec omap4] || [have_spec arndale] || [have_spec # use AHCI on x86 set use_ahci [expr [have_spec x86] && ![have_spec linux]] -# use ram_blk on Linux -set use_ram_blk [have_spec linux] +# use ram_block on Linux +set use_ram_block [have_spec linux] if {[catch { exec which $mkfs_cmd } ]} { puts stderr "Error: $mkfs_cmd not installed, aborting test"; exit } -if {[expr ![have_include "power_on/qemu"] && !$use_ram_blk]} { +if {[expr ![have_include "power_on/qemu"] && !$use_ram_block]} { puts "\nPlease setup your native sd or hard drive. Remove this fail stop"; puts "check when you have prepared your native environment.\n"; exit 0 @@ -57,7 +57,7 @@ create_boot_directory set depot_pkgs "genodelabs/src/[base_src] genodelabs/src/init" lappend_if $use_ahci depot_pkgs genodelabs/src/ahci_drv -lappend_if $use_ram_blk depot_pkgs genodelabs/src/ram_blk +lappend_if $use_ram_block depot_pkgs genodelabs/src/ram_block lappend_if $use_vfs_server depot_pkgs genodelabs/src/vfs import_from_depot {*}$depot_pkgs @@ -128,8 +128,8 @@ append_if $use_sd_card_drv config { } -append_if $use_ram_blk config { - +append_if $use_ram_block config { + @@ -166,7 +166,7 @@ append boot_modules { lappend boot_modules {*}$test_boot_modules lappend_if $use_sd_card_drv boot_modules sd_card_drv -lappend_if $use_ram_blk boot_modules test.hda +lappend_if $use_ram_block boot_modules test.hda append_platform_drv_boot_modules diff --git a/repos/libports/run/libc_vfs_fs_test.inc b/repos/libports/run/libc_vfs_fs_test.inc index 5f34d5f12..5b09d795a 100644 --- a/repos/libports/run/libc_vfs_fs_test.inc +++ b/repos/libports/run/libc_vfs_fs_test.inc @@ -5,8 +5,8 @@ # set use_sd_card_drv [expr [have_spec omap4] || [have_spec arndale] || [have_spec pl180]] -set use_ahci_drv [expr [have_spec x86] && ![have_spec linux]] -set use_ram_blk [have_spec linux] +set use_ahci_drv [expr [have_spec x86] && ![have_spec linux]] +set use_ram_block [have_spec linux] set mkfs [installed_command $mkfs_cmd] if {[have_spec odroid_xu]} { @@ -25,7 +25,7 @@ lappend build_components $build_component lappend_if $use_ahci_drv build_components drivers/ahci lappend_if $use_sd_card_drv build_components drivers/sd_card -lappend_if $use_ram_blk build_components server/ram_blk +lappend_if $use_ram_block build_components server/ram_block source ${genode_dir}/repos/base/run/platform_drv.inc append_platform_drv_build_components @@ -105,8 +105,8 @@ append_if $use_sd_card_drv config { } -append_if $use_ram_blk config { - +append_if $use_ram_block config { + @@ -133,8 +133,8 @@ lappend boot_modules $binary lappend_if $use_ahci_drv boot_modules ahci_drv lappend_if $use_sd_card_drv boot_modules sd_card_drv -lappend_if $use_ram_blk boot_modules ram_blk -lappend_if $use_ram_blk boot_modules test.hda +lappend_if $use_ram_block boot_modules ram_block +lappend_if $use_ram_block boot_modules test.hda append_platform_drv_boot_modules diff --git a/repos/libports/run/solo5.run b/repos/libports/run/solo5.run index 25d4aa817..7603d05c4 100644 --- a/repos/libports/run/solo5.run +++ b/repos/libports/run/solo5.run @@ -45,7 +45,7 @@ install_config { - + @@ -78,13 +78,13 @@ install_config { build { app/sequence server/nic_loopback - server/ram_blk + server/ram_block test/solo5 } build_boot_image { nic_loopback - ram_blk + ram_block sequence solo5.lib.so solo5-test_blk diff --git a/repos/libports/src/lib/vfs/fatfs/README b/repos/libports/src/lib/vfs/fatfs/README index cdf7b9658..43ffbfa9a 100644 --- a/repos/libports/src/lib/vfs/fatfs/README +++ b/repos/libports/src/lib/vfs/fatfs/README @@ -43,4 +43,4 @@ Caching This plugin may cache some file data but schedules a full write cache flush a few seconds after any write operation. If a read caching is desired, please use the -'blk_cache' component to cache at the block device. +'block_cache' component to cache at the block device. diff --git a/repos/libports/src/test/fatfs_blkio/component.cc b/repos/libports/src/test/fatfs_block_io/component.cc similarity index 100% rename from repos/libports/src/test/fatfs_blkio/component.cc rename to repos/libports/src/test/fatfs_block_io/component.cc diff --git a/repos/libports/src/test/fatfs_blkio/target.mk b/repos/libports/src/test/fatfs_block_io/target.mk similarity index 91% rename from repos/libports/src/test/fatfs_blkio/target.mk rename to repos/libports/src/test/fatfs_block_io/target.mk index 9feef7af5..e3c7c0e44 100644 --- a/repos/libports/src/test/fatfs_blkio/target.mk +++ b/repos/libports/src/test/fatfs_block_io/target.mk @@ -1,4 +1,4 @@ -TARGET = test-fatfs_blkio +TARGET = test-fatfs_block_io LIBS = fatfs_block libc SRC_C = app4.c SRC_CC = component.cc diff --git a/repos/os/recipes/pkg/test-blk/archives b/repos/os/recipes/pkg/test-blk/archives deleted file mode 100644 index 390dee5d7..000000000 --- a/repos/os/recipes/pkg/test-blk/archives +++ /dev/null @@ -1,2 +0,0 @@ -_/src/init -_/src/test-blk diff --git a/repos/os/recipes/pkg/test-blk_cache/README b/repos/os/recipes/pkg/test-blk_cache/README deleted file mode 100644 index ced13d4ef..000000000 --- a/repos/os/recipes/pkg/test-blk_cache/README +++ /dev/null @@ -1 +0,0 @@ -Test of Block session interface provided by server/blk_cache diff --git a/repos/os/recipes/pkg/test-blk_cache/archives b/repos/os/recipes/pkg/test-blk_cache/archives deleted file mode 100644 index a472269c2..000000000 --- a/repos/os/recipes/pkg/test-blk_cache/archives +++ /dev/null @@ -1,3 +0,0 @@ -_/src/init -_/src/test-blk -_/src/blk_cache diff --git a/repos/os/recipes/pkg/test-blk/README b/repos/os/recipes/pkg/test-block/README similarity index 100% rename from repos/os/recipes/pkg/test-blk/README rename to repos/os/recipes/pkg/test-block/README diff --git a/repos/os/recipes/pkg/test-block/archives b/repos/os/recipes/pkg/test-block/archives new file mode 100644 index 000000000..45c9827b3 --- /dev/null +++ b/repos/os/recipes/pkg/test-block/archives @@ -0,0 +1,2 @@ +_/src/init +_/src/test-block diff --git a/repos/os/recipes/pkg/test-blk/hash b/repos/os/recipes/pkg/test-block/hash similarity index 100% rename from repos/os/recipes/pkg/test-blk/hash rename to repos/os/recipes/pkg/test-block/hash diff --git a/repos/os/recipes/pkg/test-blk/runtime b/repos/os/recipes/pkg/test-block/runtime similarity index 79% rename from repos/os/recipes/pkg/test-blk/runtime rename to repos/os/recipes/pkg/test-block/runtime index 5f5ad0b2d..72b1370ce 100644 --- a/repos/os/recipes/pkg/test-blk/runtime +++ b/repos/os/recipes/pkg/test-block/runtime @@ -5,13 +5,13 @@ Tests finished successfully - test-blk-cli] Error: + test-block-client] Error: - - + + @@ -30,11 +30,11 @@ - + - + diff --git a/repos/os/recipes/pkg/test-block_cache/README b/repos/os/recipes/pkg/test-block_cache/README new file mode 100644 index 000000000..c96e30355 --- /dev/null +++ b/repos/os/recipes/pkg/test-block_cache/README @@ -0,0 +1 @@ +Test of Block session interface provided by server/block_cache diff --git a/repos/os/recipes/pkg/test-block_cache/archives b/repos/os/recipes/pkg/test-block_cache/archives new file mode 100644 index 000000000..072cefacf --- /dev/null +++ b/repos/os/recipes/pkg/test-block_cache/archives @@ -0,0 +1,3 @@ +_/src/init +_/src/test-block +_/src/block_cache diff --git a/repos/os/recipes/pkg/test-blk_cache/hash b/repos/os/recipes/pkg/test-block_cache/hash similarity index 100% rename from repos/os/recipes/pkg/test-blk_cache/hash rename to repos/os/recipes/pkg/test-block_cache/hash diff --git a/repos/os/recipes/pkg/test-blk_cache/runtime b/repos/os/recipes/pkg/test-block_cache/runtime similarity index 73% rename from repos/os/recipes/pkg/test-blk_cache/runtime rename to repos/os/recipes/pkg/test-block_cache/runtime index 1cc04471b..dd7386884 100644 --- a/repos/os/recipes/pkg/test-blk_cache/runtime +++ b/repos/os/recipes/pkg/test-block_cache/runtime @@ -5,14 +5,14 @@ Tests finished successfully - test-blk-cli] Error: + test-block-client] Error: - - - + + + @@ -31,22 +31,22 @@ - + - + - + - + - + diff --git a/repos/os/recipes/pkg/test-lx_block/archives b/repos/os/recipes/pkg/test-lx_block/archives index 577ecca78..c7ae0b559 100644 --- a/repos/os/recipes/pkg/test-lx_block/archives +++ b/repos/os/recipes/pkg/test-lx_block/archives @@ -1,3 +1,3 @@ _/src/init _/src/lx_block -_/src/test-blk +_/src/test-block diff --git a/repos/os/recipes/pkg/test-lx_block/runtime b/repos/os/recipes/pkg/test-lx_block/runtime index 8a6f59263..533ed7820 100644 --- a/repos/os/recipes/pkg/test-lx_block/runtime +++ b/repos/os/recipes/pkg/test-lx_block/runtime @@ -10,7 +10,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/repos/os/recipes/pkg/test-part_blk_gpt/README b/repos/os/recipes/pkg/test-part_blk_gpt/README deleted file mode 100644 index fe5b91a71..000000000 --- a/repos/os/recipes/pkg/test-part_blk_gpt/README +++ /dev/null @@ -1 +0,0 @@ -Test part_blk server with GPT disk. diff --git a/repos/os/recipes/pkg/test-part_blk_gpt/archives b/repos/os/recipes/pkg/test-part_blk_gpt/archives deleted file mode 100644 index d25ab05d2..000000000 --- a/repos/os/recipes/pkg/test-part_blk_gpt/archives +++ /dev/null @@ -1,6 +0,0 @@ -_/src/init -_/src/report_rom -_/src/part_blk -_/src/rom_blk -_/src/test-blk -_/raw/test-part_blk_gpt diff --git a/repos/os/recipes/pkg/test-part_blk_mbr/README b/repos/os/recipes/pkg/test-part_blk_mbr/README deleted file mode 100644 index b49d774e9..000000000 --- a/repos/os/recipes/pkg/test-part_blk_mbr/README +++ /dev/null @@ -1 +0,0 @@ -Test part_blk server with MBR disk. diff --git a/repos/os/recipes/pkg/test-part_blk_mbr/archives b/repos/os/recipes/pkg/test-part_blk_mbr/archives deleted file mode 100644 index 920ebd109..000000000 --- a/repos/os/recipes/pkg/test-part_blk_mbr/archives +++ /dev/null @@ -1,6 +0,0 @@ -_/src/init -_/src/report_rom -_/src/part_blk -_/src/rom_blk -_/src/test-blk -_/raw/test-part_blk_mbr diff --git a/repos/os/recipes/pkg/test-part_block_gpt/README b/repos/os/recipes/pkg/test-part_block_gpt/README new file mode 100644 index 000000000..a93a20058 --- /dev/null +++ b/repos/os/recipes/pkg/test-part_block_gpt/README @@ -0,0 +1 @@ +Test part_block server with GPT disk. diff --git a/repos/os/recipes/pkg/test-part_block_gpt/archives b/repos/os/recipes/pkg/test-part_block_gpt/archives new file mode 100644 index 000000000..f45e24327 --- /dev/null +++ b/repos/os/recipes/pkg/test-part_block_gpt/archives @@ -0,0 +1,6 @@ +_/src/init +_/src/report_rom +_/src/part_block +_/src/rom_block +_/src/test-block +_/raw/test-part_block_gpt diff --git a/repos/os/recipes/pkg/test-part_blk_gpt/hash b/repos/os/recipes/pkg/test-part_block_gpt/hash similarity index 100% rename from repos/os/recipes/pkg/test-part_blk_gpt/hash rename to repos/os/recipes/pkg/test-part_block_gpt/hash diff --git a/repos/os/recipes/pkg/test-part_blk_gpt/runtime b/repos/os/recipes/pkg/test-part_block_gpt/runtime similarity index 78% rename from repos/os/recipes/pkg/test-part_blk_gpt/runtime rename to repos/os/recipes/pkg/test-part_block_gpt/runtime index 026051fa1..1c0f53429 100644 --- a/repos/os/recipes/pkg/test-part_blk_gpt/runtime +++ b/repos/os/recipes/pkg/test-part_block_gpt/runtime @@ -13,9 +13,9 @@ - - - + + + @@ -36,16 +36,16 @@ - + - + - + @@ -62,17 +62,17 @@ - + - + - + - + diff --git a/repos/os/recipes/pkg/test-part_block_mbr/README b/repos/os/recipes/pkg/test-part_block_mbr/README new file mode 100644 index 000000000..aeedaaef3 --- /dev/null +++ b/repos/os/recipes/pkg/test-part_block_mbr/README @@ -0,0 +1 @@ +Test part_block server with MBR disk. diff --git a/repos/os/recipes/pkg/test-part_block_mbr/archives b/repos/os/recipes/pkg/test-part_block_mbr/archives new file mode 100644 index 000000000..4c812bc6c --- /dev/null +++ b/repos/os/recipes/pkg/test-part_block_mbr/archives @@ -0,0 +1,6 @@ +_/src/init +_/src/report_rom +_/src/part_block +_/src/rom_block +_/src/test-block +_/raw/test-part_block_mbr diff --git a/repos/os/recipes/pkg/test-part_blk_mbr/hash b/repos/os/recipes/pkg/test-part_block_mbr/hash similarity index 100% rename from repos/os/recipes/pkg/test-part_blk_mbr/hash rename to repos/os/recipes/pkg/test-part_block_mbr/hash diff --git a/repos/os/recipes/pkg/test-part_blk_mbr/runtime b/repos/os/recipes/pkg/test-part_block_mbr/runtime similarity index 78% rename from repos/os/recipes/pkg/test-part_blk_mbr/runtime rename to repos/os/recipes/pkg/test-part_block_mbr/runtime index 28bdc21d6..7adda07ad 100644 --- a/repos/os/recipes/pkg/test-part_blk_mbr/runtime +++ b/repos/os/recipes/pkg/test-part_block_mbr/runtime @@ -13,9 +13,9 @@ - - - + + + @@ -36,16 +36,16 @@ - + - + - + @@ -62,17 +62,17 @@ - + - + - + - + diff --git a/repos/os/recipes/pkg/test-rom_blk/archives b/repos/os/recipes/pkg/test-rom_blk/archives deleted file mode 100644 index cfb05ce8d..000000000 --- a/repos/os/recipes/pkg/test-rom_blk/archives +++ /dev/null @@ -1,3 +0,0 @@ -_/src/init -_/src/rom_blk -_/src/test-rom_blk diff --git a/repos/os/recipes/pkg/test-rom_blk/README b/repos/os/recipes/pkg/test-rom_block/README similarity index 100% rename from repos/os/recipes/pkg/test-rom_blk/README rename to repos/os/recipes/pkg/test-rom_block/README diff --git a/repos/os/recipes/pkg/test-rom_block/archives b/repos/os/recipes/pkg/test-rom_block/archives new file mode 100644 index 000000000..0d4e15bb7 --- /dev/null +++ b/repos/os/recipes/pkg/test-rom_block/archives @@ -0,0 +1,3 @@ +_/src/init +_/src/rom_block +_/src/test-rom_block diff --git a/repos/os/recipes/pkg/test-rom_blk/hash b/repos/os/recipes/pkg/test-rom_block/hash similarity index 100% rename from repos/os/recipes/pkg/test-rom_blk/hash rename to repos/os/recipes/pkg/test-rom_block/hash diff --git a/repos/os/recipes/pkg/test-rom_blk/runtime b/repos/os/recipes/pkg/test-rom_block/runtime similarity index 87% rename from repos/os/recipes/pkg/test-rom_blk/runtime rename to repos/os/recipes/pkg/test-rom_block/runtime index fc1d8d776..319a835bf 100644 --- a/repos/os/recipes/pkg/test-rom_blk/runtime +++ b/repos/os/recipes/pkg/test-rom_block/runtime @@ -8,8 +8,8 @@ - - + + @@ -24,12 +24,12 @@ - + - + diff --git a/repos/os/recipes/raw/test-part_blk_gpt/content.mk b/repos/os/recipes/raw/test-part_blk_gpt/content.mk deleted file mode 100644 index d2f0ece53..000000000 --- a/repos/os/recipes/raw/test-part_blk_gpt/content.mk +++ /dev/null @@ -1,4 +0,0 @@ -content: ata.gpt.raw - -ata.gpt.raw: - tar -xzvf $(REP_DIR)/recipes/raw/test-part_blk_gpt/$@.tar.gz 1>/dev/null diff --git a/repos/os/recipes/raw/test-part_blk_mbr/content.mk b/repos/os/recipes/raw/test-part_blk_mbr/content.mk deleted file mode 100644 index 688f6615a..000000000 --- a/repos/os/recipes/raw/test-part_blk_mbr/content.mk +++ /dev/null @@ -1,4 +0,0 @@ -content: ata.mbr.raw - -ata.mbr.raw: - tar -xzvf $(REP_DIR)/recipes/raw/test-part_blk_mbr/$@.tar.gz 1>/dev/null diff --git a/repos/os/recipes/raw/test-part_blk_gpt/ata.gpt.raw.tar.gz b/repos/os/recipes/raw/test-part_block_gpt/ata.gpt.raw.tar.gz similarity index 100% rename from repos/os/recipes/raw/test-part_blk_gpt/ata.gpt.raw.tar.gz rename to repos/os/recipes/raw/test-part_block_gpt/ata.gpt.raw.tar.gz diff --git a/repos/os/recipes/raw/test-part_block_gpt/content.mk b/repos/os/recipes/raw/test-part_block_gpt/content.mk new file mode 100644 index 000000000..2a4b27955 --- /dev/null +++ b/repos/os/recipes/raw/test-part_block_gpt/content.mk @@ -0,0 +1,4 @@ +content: ata.gpt.raw + +ata.gpt.raw: + tar -xzvf $(REP_DIR)/recipes/raw/test-part_block_gpt/$@.tar.gz 1>/dev/null diff --git a/repos/os/recipes/raw/test-part_blk_gpt/hash b/repos/os/recipes/raw/test-part_block_gpt/hash similarity index 100% rename from repos/os/recipes/raw/test-part_blk_gpt/hash rename to repos/os/recipes/raw/test-part_block_gpt/hash diff --git a/repos/os/recipes/raw/test-part_blk_mbr/ata.gpt.raw.tar.gz b/repos/os/recipes/raw/test-part_block_mbr/ata.gpt.raw.tar.gz similarity index 100% rename from repos/os/recipes/raw/test-part_blk_mbr/ata.gpt.raw.tar.gz rename to repos/os/recipes/raw/test-part_block_mbr/ata.gpt.raw.tar.gz diff --git a/repos/os/recipes/raw/test-part_blk_mbr/ata.mbr.raw.tar.gz b/repos/os/recipes/raw/test-part_block_mbr/ata.mbr.raw.tar.gz similarity index 100% rename from repos/os/recipes/raw/test-part_blk_mbr/ata.mbr.raw.tar.gz rename to repos/os/recipes/raw/test-part_block_mbr/ata.mbr.raw.tar.gz diff --git a/repos/os/recipes/raw/test-part_block_mbr/content.mk b/repos/os/recipes/raw/test-part_block_mbr/content.mk new file mode 100644 index 000000000..c00cee05d --- /dev/null +++ b/repos/os/recipes/raw/test-part_block_mbr/content.mk @@ -0,0 +1,4 @@ +content: ata.mbr.raw + +ata.mbr.raw: + tar -xzvf $(REP_DIR)/recipes/raw/test-part_block_mbr/$@.tar.gz 1>/dev/null diff --git a/repos/os/recipes/raw/test-part_blk_mbr/hash b/repos/os/recipes/raw/test-part_block_mbr/hash similarity index 100% rename from repos/os/recipes/raw/test-part_blk_mbr/hash rename to repos/os/recipes/raw/test-part_block_mbr/hash diff --git a/repos/os/recipes/src/block_cache/content.mk b/repos/os/recipes/src/block_cache/content.mk new file mode 100644 index 000000000..9c21183d6 --- /dev/null +++ b/repos/os/recipes/src/block_cache/content.mk @@ -0,0 +1,2 @@ +SRC_DIR = src/server/block_cache +include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/blk_cache/hash b/repos/os/recipes/src/block_cache/hash similarity index 100% rename from repos/os/recipes/src/blk_cache/hash rename to repos/os/recipes/src/block_cache/hash diff --git a/repos/os/recipes/src/blk_cache/used_apis b/repos/os/recipes/src/block_cache/used_apis similarity index 100% rename from repos/os/recipes/src/blk_cache/used_apis rename to repos/os/recipes/src/block_cache/used_apis diff --git a/repos/os/recipes/src/part_blk/content.mk b/repos/os/recipes/src/part_block/content.mk similarity index 64% rename from repos/os/recipes/src/part_blk/content.mk rename to repos/os/recipes/src/part_block/content.mk index 9af9aabfc..9ee5af1c7 100644 --- a/repos/os/recipes/src/part_blk/content.mk +++ b/repos/os/recipes/src/part_block/content.mk @@ -1,3 +1,3 @@ -SRC_DIR = src/server/part_blk +SRC_DIR = src/server/part_block include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/part_blk/hash b/repos/os/recipes/src/part_block/hash similarity index 100% rename from repos/os/recipes/src/part_blk/hash rename to repos/os/recipes/src/part_block/hash diff --git a/repos/os/recipes/src/part_blk/used_apis b/repos/os/recipes/src/part_block/used_apis similarity index 100% rename from repos/os/recipes/src/part_blk/used_apis rename to repos/os/recipes/src/part_block/used_apis diff --git a/repos/os/recipes/src/rom_blk/content.mk b/repos/os/recipes/src/ram_block/content.mk similarity index 64% rename from repos/os/recipes/src/rom_blk/content.mk rename to repos/os/recipes/src/ram_block/content.mk index cf741e547..e625b9d19 100644 --- a/repos/os/recipes/src/rom_blk/content.mk +++ b/repos/os/recipes/src/ram_block/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/server/rom_blk +SRC_DIR = src/server/ram_block include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/ram_blk/hash b/repos/os/recipes/src/ram_block/hash similarity index 100% rename from repos/os/recipes/src/ram_blk/hash rename to repos/os/recipes/src/ram_block/hash diff --git a/repos/os/recipes/src/ram_blk/used_apis b/repos/os/recipes/src/ram_block/used_apis similarity index 100% rename from repos/os/recipes/src/ram_blk/used_apis rename to repos/os/recipes/src/ram_block/used_apis diff --git a/repos/os/recipes/src/blk_cache/content.mk b/repos/os/recipes/src/rom_block/content.mk similarity index 64% rename from repos/os/recipes/src/blk_cache/content.mk rename to repos/os/recipes/src/rom_block/content.mk index f3d0550d0..8f4e5568a 100644 --- a/repos/os/recipes/src/blk_cache/content.mk +++ b/repos/os/recipes/src/rom_block/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/server/blk_cache +SRC_DIR = src/server/rom_block include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/rom_blk/hash b/repos/os/recipes/src/rom_block/hash similarity index 100% rename from repos/os/recipes/src/rom_blk/hash rename to repos/os/recipes/src/rom_block/hash diff --git a/repos/os/recipes/src/rom_blk/used_apis b/repos/os/recipes/src/rom_block/used_apis similarity index 100% rename from repos/os/recipes/src/rom_blk/used_apis rename to repos/os/recipes/src/rom_block/used_apis diff --git a/repos/os/recipes/src/test-blk/content.mk b/repos/os/recipes/src/test-block/content.mk similarity index 87% rename from repos/os/recipes/src/test-blk/content.mk rename to repos/os/recipes/src/test-block/content.mk index c425a39ef..fb25613fa 100644 --- a/repos/os/recipes/src/test-blk/content.mk +++ b/repos/os/recipes/src/test-block/content.mk @@ -1,4 +1,4 @@ -SRC_DIR = src/test/blk +SRC_DIR = src/test/block include $(GENODE_DIR)/repos/base/recipes/src/content.inc MIRROR_FROM_REP_DIR := include/os diff --git a/repos/os/recipes/src/test-blk/hash b/repos/os/recipes/src/test-block/hash similarity index 100% rename from repos/os/recipes/src/test-blk/hash rename to repos/os/recipes/src/test-block/hash diff --git a/repos/os/recipes/src/test-blk/used_apis b/repos/os/recipes/src/test-block/used_apis similarity index 100% rename from repos/os/recipes/src/test-blk/used_apis rename to repos/os/recipes/src/test-block/used_apis diff --git a/repos/os/recipes/src/test-rom_blk/content.mk b/repos/os/recipes/src/test-rom_blk/content.mk deleted file mode 100644 index 2334f29dd..000000000 --- a/repos/os/recipes/src/test-rom_blk/content.mk +++ /dev/null @@ -1,2 +0,0 @@ -SRC_DIR = src/test/rom_blk -include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/ram_blk/content.mk b/repos/os/recipes/src/test-rom_block/content.mk similarity index 66% rename from repos/os/recipes/src/ram_blk/content.mk rename to repos/os/recipes/src/test-rom_block/content.mk index 1de63664e..749d9db32 100644 --- a/repos/os/recipes/src/ram_blk/content.mk +++ b/repos/os/recipes/src/test-rom_block/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/server/ram_blk +SRC_DIR = src/test/rom_block include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/test-rom_blk/hash b/repos/os/recipes/src/test-rom_block/hash similarity index 100% rename from repos/os/recipes/src/test-rom_blk/hash rename to repos/os/recipes/src/test-rom_block/hash diff --git a/repos/os/recipes/src/test-rom_blk/used_apis b/repos/os/recipes/src/test-rom_block/used_apis similarity index 100% rename from repos/os/recipes/src/test-rom_blk/used_apis rename to repos/os/recipes/src/test-rom_block/used_apis diff --git a/repos/os/run/ahci_bench.run b/repos/os/run/ahci_bench.run index 769156393..98d551bef 100644 --- a/repos/os/run/ahci_bench.run +++ b/repos/os/run/ahci_bench.run @@ -9,7 +9,7 @@ set build_components { core init timer drivers/ahci drivers/platform - test/blk/bench + test/block/bench } source ${genode_dir}/repos/base/run/platform_drv.inc @@ -62,7 +62,7 @@ append config { - + @@ -76,7 +76,7 @@ install_config $config # # Boot modules # -set boot_modules { core init timer ahci_drv test-blk-bench ld.lib.so } +set boot_modules { core init timer ahci_drv test-block-bench ld.lib.so } append_platform_drv_boot_modules diff --git a/repos/os/run/ahci_blk.run b/repos/os/run/ahci_block.run similarity index 92% rename from repos/os/run/ahci_blk.run rename to repos/os/run/ahci_block.run index cc8c4aacb..10933e05b 100644 --- a/repos/os/run/ahci_blk.run +++ b/repos/os/run/ahci_block.run @@ -9,7 +9,7 @@ set build_components { core init timer drivers/ahci server/report_rom - test/blk/cli + test/block/client } source ${genode_dir}/repos/base/run/platform_drv.inc @@ -71,7 +71,7 @@ append config { - + @@ -86,7 +86,7 @@ install_config $config # # Boot modules # -set boot_modules { core ld.lib.so init timer ahci_drv report_rom test-blk-cli } +set boot_modules { core ld.lib.so init timer ahci_drv report_rom test-block-client } append_platform_drv_boot_modules @@ -94,7 +94,7 @@ build_boot_image $boot_modules append qemu_args " -nographic -device ahci,id=ahci -boot d " append qemu_args " -drive id=disk,file=bin/ext2.raw,format=raw,if=none -device ide-hd,drive=disk,bus=ahci.0 " -append qemu_args " -drive id=cd,file=[run_dir]/../ahci_blk.iso,if=none,media=cdrom -device ide-cd,drive=cd,bus=ahci.1 " +append qemu_args " -drive id=cd,file=[run_dir]/../ahci_block.iso,if=none,media=cdrom -device ide-cd,drive=cd,bus=ahci.1 " append qemu_args " -drive id=disk2,file=bin/ext2.raw,format=raw,if=none -device ide-hd,drive=disk2,bus=ahci.2 " run_genode_until "Tests finished successfully!" 100 diff --git a/repos/os/run/block_tester.run b/repos/os/run/block_tester.run index ebf081e99..85b239eef 100644 --- a/repos/os/run/block_tester.run +++ b/repos/os/run/block_tester.run @@ -11,7 +11,7 @@ set dd [installed_command dd] set build_components { core init timer drivers/ahci - server/ram_blk + server/ram_block server/lx_block app/block_tester } @@ -155,7 +155,7 @@ install_config $config # generic modules set boot_modules { - core init timer ahci_drv ram_blk block_tester + core init timer ahci_drv ram_block block_tester ld.lib.so } diff --git a/repos/os/run/sd_card.run b/repos/os/run/sd_card.run index 1f3812394..ce8b3ed76 100644 --- a/repos/os/run/sd_card.run +++ b/repos/os/run/sd_card.run @@ -7,7 +7,7 @@ set build_components { core init timer drivers/sd_card - test/blk/cli + test/block/client } lappend_if [have_spec arndale] build_components drivers/platform lappend_if [have_spec rpi] build_components drivers/platform @@ -51,7 +51,7 @@ append config { - + } @@ -67,7 +67,7 @@ install_config $config set boot_modules { core ld.lib.so init timer sd_card_drv - test-blk-cli + test-block-client } lappend_if [have_spec arndale] boot_modules platform_drv lappend_if [have_spec rpi] boot_modules platform_drv diff --git a/repos/os/run/tz_vmm.run b/repos/os/run/tz_vmm.run index 8d592eade..4708fbec2 100644 --- a/repos/os/run/tz_vmm.run +++ b/repos/os/run/tz_vmm.run @@ -108,7 +108,7 @@ if { $mmc_rootfs } { lappend targets timer lappend targets drivers/platform lappend targets drivers/sd_card - lappend targets server/part_blk + lappend targets server/part_block } lappend_if $trusted_led targets drivers/gpio @@ -159,7 +159,7 @@ append_if $mmc_rootfs config { - + @@ -181,7 +181,7 @@ if { $mmc_rootfs } { - + " } @@ -230,7 +230,7 @@ if { $mmc_rootfs } { lappend boot_modules timer lappend boot_modules platform_drv lappend boot_modules sd_card_drv - lappend boot_modules part_blk + lappend boot_modules part_block # download and add rootfs set rootfs_uri "http://genode.org/files/release-15.11/usb_armory_tz_vmm/rootfs" diff --git a/repos/os/run/usb_block.run b/repos/os/run/usb_block.run index 847c456a7..3f2f680ff 100644 --- a/repos/os/run/usb_block.run +++ b/repos/os/run/usb_block.run @@ -9,8 +9,8 @@ set build_components { drivers/usb_host drivers/usb_block server/report_rom - test/blk/cli - test/blk/bench + test/block/client + test/block/bench } proc gpio_drv { } { if {[have_spec rpi] && [have_spec hw]} { return hw_gpio_drv } @@ -114,8 +114,8 @@ append config { - - + + @@ -137,7 +137,7 @@ install_config $config # generic modules set boot_modules { core init timer report_rom usb_block_drv - test-blk-cli test-blk-bench + test-block-client test-block-bench ld.lib.so } diff --git a/repos/os/src/server/blk_cache/chunk.h b/repos/os/src/server/block_cache/chunk.h similarity index 100% rename from repos/os/src/server/blk_cache/chunk.h rename to repos/os/src/server/block_cache/chunk.h diff --git a/repos/os/src/server/blk_cache/driver.h b/repos/os/src/server/block_cache/driver.h similarity index 100% rename from repos/os/src/server/blk_cache/driver.h rename to repos/os/src/server/block_cache/driver.h diff --git a/repos/os/src/server/blk_cache/lru.cc b/repos/os/src/server/block_cache/lru.cc similarity index 100% rename from repos/os/src/server/blk_cache/lru.cc rename to repos/os/src/server/block_cache/lru.cc diff --git a/repos/os/src/server/blk_cache/lru.h b/repos/os/src/server/block_cache/lru.h similarity index 100% rename from repos/os/src/server/blk_cache/lru.h rename to repos/os/src/server/block_cache/lru.h diff --git a/repos/os/src/server/blk_cache/main.cc b/repos/os/src/server/block_cache/main.cc similarity index 100% rename from repos/os/src/server/blk_cache/main.cc rename to repos/os/src/server/block_cache/main.cc diff --git a/repos/os/src/server/blk_cache/target.mk b/repos/os/src/server/block_cache/target.mk similarity index 74% rename from repos/os/src/server/blk_cache/target.mk rename to repos/os/src/server/block_cache/target.mk index 9a2734e99..91f454875 100644 --- a/repos/os/src/server/blk_cache/target.mk +++ b/repos/os/src/server/block_cache/target.mk @@ -1,4 +1,4 @@ -TARGET = blk_cache +TARGET = block_cache LIBS = base SRC_CC = main.cc lru.cc diff --git a/repos/os/src/server/part_blk/README b/repos/os/src/server/part_block/README similarity index 91% rename from repos/os/src/server/part_blk/README rename to repos/os/src/server/part_block/README index 41563e300..fe15fca6e 100644 --- a/repos/os/src/server/part_blk/README +++ b/repos/os/src/server/part_block/README @@ -30,7 +30,7 @@ configuration section looking for 'policy' tags. XML Syntax: ! -part_blk supports partition reporting, which can be enabled via the +part_block supports partition reporting, which can be enabled via the configuration node. See below for an example. The report looks like follows (for MBR resp. GPT). @@ -60,11 +60,11 @@ Configuration snippet with two clients and an (hypothetical) IDE driver: ! ! ! -! +! ! ! ! -! +! ! ! ! @@ -78,12 +78,12 @@ Configuration snippet with two clients and an (hypothetical) IDE driver: ! ! ! -! +! ! ! ! ! -! +! ! ! ! @@ -91,6 +91,6 @@ Configuration snippet with two clients and an (hypothetical) IDE driver: ! ! ! -! +! ! ! diff --git a/repos/os/src/server/part_blk/component.h b/repos/os/src/server/part_block/component.h similarity index 98% rename from repos/os/src/server/part_blk/component.h rename to repos/os/src/server/part_block/component.h index d5ab5cd45..b70f9b6ae 100644 --- a/repos/os/src/server/part_blk/component.h +++ b/repos/os/src/server/part_block/component.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _PART_BLK__COMPONENT_H_ -#define _PART_BLK__COMPONENT_H_ +#ifndef _PART_BLOCK__COMPONENT_H_ +#define _PART_BLOCK__COMPONENT_H_ #include #include @@ -341,4 +341,4 @@ class Block::Root : _driver(driver), _table(table) { } }; -#endif /* _PART_BLK__COMPONENT_H_ */ +#endif /* _PART_BLOCK__COMPONENT_H_ */ diff --git a/repos/os/src/server/part_blk/driver.h b/repos/os/src/server/part_block/driver.h similarity index 97% rename from repos/os/src/server/part_blk/driver.h rename to repos/os/src/server/part_block/driver.h index 296daa4dc..364029085 100644 --- a/repos/os/src/server/part_blk/driver.h +++ b/repos/os/src/server/part_block/driver.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _PART_BLK__DRIVER_H_ -#define _PART_BLK__DRIVER_H_ +#ifndef _PART_BLOCK__DRIVER_H_ +#define _PART_BLOCK__DRIVER_H_ #include #include @@ -171,4 +171,4 @@ class Block::Driver } }; -#endif /* _PART_BLK__DRIVER_H_ */ +#endif /* _PART_BLOCK__DRIVER_H_ */ diff --git a/repos/os/src/server/part_blk/fsprobe.h b/repos/os/src/server/part_block/fsprobe.h similarity index 95% rename from repos/os/src/server/part_blk/fsprobe.h rename to repos/os/src/server/part_block/fsprobe.h index 11de3af6f..09587c137 100644 --- a/repos/os/src/server/part_blk/fsprobe.h +++ b/repos/os/src/server/part_block/fsprobe.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _PART_BLK__FSPROBE_H_ -#define _PART_BLK__FSPROBE_H_ +#ifndef _PART_BLOCK__FSPROBE_H_ +#define _PART_BLOCK__FSPROBE_H_ /* Genode includes */ #include @@ -101,4 +101,4 @@ Fs::Type Fs::probe(uint8_t *p, size_t len) return Type(); } -#endif /* _PART_BLK__FSPROBE_H_ */ +#endif /* _PART_BLOCK__FSPROBE_H_ */ diff --git a/repos/os/src/server/part_blk/gpt.h b/repos/os/src/server/part_block/gpt.h similarity index 99% rename from repos/os/src/server/part_blk/gpt.h rename to repos/os/src/server/part_block/gpt.h index 1b0b36839..fbed0b1b0 100644 --- a/repos/os/src/server/part_blk/gpt.h +++ b/repos/os/src/server/part_block/gpt.h @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _PART_BLK__GPT_H_ -#define _PART_BLK__GPT_H_ +#ifndef _PART_BLOCK__GPT_H_ +#define _PART_BLOCK__GPT_H_ #include #include @@ -408,4 +408,4 @@ class Gpt : public Block::Partition_table } }; -#endif /* _PART_BLK__GUID_PARTITION_TABLE_H_ */ +#endif /* _PART_BLOCK__GUID_PARTITION_TABLE_H_ */ diff --git a/repos/os/src/server/part_blk/main.cc b/repos/os/src/server/part_block/main.cc similarity index 100% rename from repos/os/src/server/part_blk/main.cc rename to repos/os/src/server/part_block/main.cc diff --git a/repos/os/src/server/part_blk/mbr.h b/repos/os/src/server/part_block/mbr.h similarity index 98% rename from repos/os/src/server/part_blk/mbr.h rename to repos/os/src/server/part_block/mbr.h index 77a2980af..133ae5ba2 100644 --- a/repos/os/src/server/part_blk/mbr.h +++ b/repos/os/src/server/part_block/mbr.h @@ -13,8 +13,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _PART_BLK__MBR_H_ -#define _PART_BLK__MBR_H_ +#ifndef _PART_BLOCK__MBR_H_ +#define _PART_BLOCK__MBR_H_ #include #include @@ -219,4 +219,4 @@ struct Mbr_partition_table : public Block::Partition_table } }; -#endif /* _PART_BLK__MBR_H_ */ +#endif /* _PART_BLOCK__MBR_H_ */ diff --git a/repos/os/src/server/part_blk/partition_table.h b/repos/os/src/server/part_block/partition_table.h similarity index 93% rename from repos/os/src/server/part_blk/partition_table.h rename to repos/os/src/server/part_block/partition_table.h index fca95bde2..622fbb593 100644 --- a/repos/os/src/server/part_blk/partition_table.h +++ b/repos/os/src/server/part_block/partition_table.h @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _PART_BLK__PARTITION_TABLE_H_ -#define _PART_BLK__PARTITION_TABLE_H_ +#ifndef _PART_BLOCK__PARTITION_TABLE_H_ +#define _PART_BLOCK__PARTITION_TABLE_H_ #include #include @@ -83,4 +83,4 @@ struct Block::Partition_table : Genode::Interface virtual bool parse() = 0; }; -#endif /* _PART_BLK__PARTITION_TABLE_H_ */ +#endif /* _PART_BLOCK__PARTITION_TABLE_H_ */ diff --git a/repos/os/src/server/part_blk/target.mk b/repos/os/src/server/part_block/target.mk similarity index 60% rename from repos/os/src/server/part_blk/target.mk rename to repos/os/src/server/part_block/target.mk index c51a440c9..81431d554 100644 --- a/repos/os/src/server/part_blk/target.mk +++ b/repos/os/src/server/part_block/target.mk @@ -1,3 +1,3 @@ -TARGET = part_blk +TARGET = part_block LIBS = base SRC_CC = main.cc diff --git a/repos/os/src/server/ram_blk/README b/repos/os/src/server/ram_block/README similarity index 100% rename from repos/os/src/server/ram_blk/README rename to repos/os/src/server/ram_block/README diff --git a/repos/os/src/server/ram_blk/main.cc b/repos/os/src/server/ram_block/main.cc similarity index 92% rename from repos/os/src/server/ram_blk/main.cc rename to repos/os/src/server/ram_block/main.cc index 2e72af079..c796ad352 100644 --- a/repos/os/src/server/ram_blk/main.cc +++ b/repos/os/src/server/ram_block/main.cc @@ -27,15 +27,15 @@ using namespace Genode; -class Ram_blk : public Block::Driver +class Ram_block : public Block::Driver { private: /* * Noncopyable */ - Ram_blk(Ram_blk const &); - Ram_blk &operator = (Ram_blk const &); + Ram_block(Ram_block const &); + Ram_block &operator = (Ram_block const &); Env &_env; Allocator *_alloc { nullptr }; @@ -76,8 +76,8 @@ class Ram_blk : public Block::Driver /** * Construct populated RAM dataspace */ - Ram_blk(Env &env, Allocator &alloc, - const char *name, size_t block_size) + Ram_block(Env &env, Allocator &alloc, + const char *name, size_t block_size) : Block::Driver(env.ram()), _env(env), _alloc(&alloc), _rom_ds(new (_alloc) Attached_rom_dataspace(_env, name)), @@ -94,7 +94,7 @@ class Ram_blk : public Block::Driver /** * Construct empty RAM dataspace */ - Ram_blk(Env &env, size_t size, size_t block_size) + Ram_block(Env &env, size_t size, size_t block_size) : Block::Driver(env.ram()), _env(env), _size(size), @@ -104,7 +104,7 @@ class Ram_blk : public Block::Driver _ram_addr((addr_t)_ram_ds.local_addr()) { } - ~Ram_blk() { destroy(_alloc, _rom_ds); } + ~Ram_block() { destroy(_alloc, _rom_ds); } /**************************** @@ -186,11 +186,11 @@ struct Main if (use_file) { Genode::log("Creating RAM-basd block device populated by file='", Genode::Cstring(file), "' with block size ", block_size); - return new (&alloc) Ram_blk(env, alloc, file, block_size); + return new (&alloc) Ram_block(env, alloc, file, block_size); } else { Genode::log("Creating RAM-based block device with size ", size, " and block size ", block_size); - return new (&alloc) Ram_blk(env, size, block_size); + return new (&alloc) Ram_block(env, size, block_size); } } catch (...) { throw Service_denied(); } diff --git a/repos/os/src/server/ram_blk/target.mk b/repos/os/src/server/ram_block/target.mk similarity index 62% rename from repos/os/src/server/ram_blk/target.mk rename to repos/os/src/server/ram_block/target.mk index 2a4271358..c5072a0a7 100644 --- a/repos/os/src/server/ram_blk/target.mk +++ b/repos/os/src/server/ram_block/target.mk @@ -1,3 +1,3 @@ -TARGET = ram_blk +TARGET = ram_block SRC_CC = main.cc LIBS = base diff --git a/repos/os/src/server/rom_blk/README b/repos/os/src/server/rom_block/README similarity index 100% rename from repos/os/src/server/rom_blk/README rename to repos/os/src/server/rom_block/README diff --git a/repos/os/src/server/rom_blk/main.cc b/repos/os/src/server/rom_block/main.cc similarity index 94% rename from repos/os/src/server/rom_blk/main.cc rename to repos/os/src/server/rom_block/main.cc index b6cddd5c4..aac22142a 100644 --- a/repos/os/src/server/rom_blk/main.cc +++ b/repos/os/src/server/rom_block/main.cc @@ -19,7 +19,7 @@ using namespace Genode; -class Rom_blk : public Block::Driver +class Rom_block : public Block::Driver { private: @@ -35,7 +35,7 @@ class Rom_blk : public Block::Driver using String = Genode::String<64UL>; - Rom_blk(Env &env, String &name, size_t blk_sz) + Rom_block(Env &env, String &name, size_t blk_sz) : Block::Driver(env.ram()), _env(env), _rom(env, name.string()), _blk_sz(blk_sz) {} @@ -92,7 +92,7 @@ struct Main Block::Driver *create() { - Rom_blk::String file; + Rom_block::String file; size_t blk_sz = 512; try { @@ -105,7 +105,7 @@ struct Main log("Using file=", file, " as device with block size ", blk_sz, "."); try { - return new (&heap) Rom_blk(env, file, blk_sz); + return new (&heap) Rom_block(env, file, blk_sz); } catch(Rom_connection::Rom_connection_failed) { error("cannot open file ", file); } diff --git a/repos/os/src/server/rom_blk/target.mk b/repos/os/src/server/rom_block/target.mk similarity index 62% rename from repos/os/src/server/rom_blk/target.mk rename to repos/os/src/server/rom_block/target.mk index 69712b7b4..130fea3c4 100644 --- a/repos/os/src/server/rom_blk/target.mk +++ b/repos/os/src/server/rom_block/target.mk @@ -1,3 +1,3 @@ -TARGET = rom_blk +TARGET = rom_block SRC_CC = main.cc LIBS = base diff --git a/repos/os/src/test/blk/cli/target.mk b/repos/os/src/test/blk/cli/target.mk deleted file mode 100644 index 9e8ae2c31..000000000 --- a/repos/os/src/test/blk/cli/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -TARGET = test-blk-cli -SRC_CC = main.cc -LIBS = base diff --git a/repos/os/src/test/blk/srv/target.mk b/repos/os/src/test/blk/srv/target.mk deleted file mode 100644 index 578ea5ac1..000000000 --- a/repos/os/src/test/blk/srv/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -TARGET = test-blk-srv -SRC_CC = main.cc -LIBS = base diff --git a/repos/os/src/test/blk/bench/main.cc b/repos/os/src/test/block/bench/main.cc similarity index 100% rename from repos/os/src/test/blk/bench/main.cc rename to repos/os/src/test/block/bench/main.cc diff --git a/repos/os/src/test/block/bench/target.mk b/repos/os/src/test/block/bench/target.mk new file mode 100644 index 000000000..b6c6adaab --- /dev/null +++ b/repos/os/src/test/block/bench/target.mk @@ -0,0 +1,3 @@ +TARGET = test-block-bench +SRC_CC = main.cc +LIBS = base diff --git a/repos/os/src/test/blk/cli/main.cc b/repos/os/src/test/block/client/main.cc similarity index 100% rename from repos/os/src/test/blk/cli/main.cc rename to repos/os/src/test/block/client/main.cc diff --git a/repos/os/src/test/block/client/target.mk b/repos/os/src/test/block/client/target.mk new file mode 100644 index 000000000..8a27c6cbf --- /dev/null +++ b/repos/os/src/test/block/client/target.mk @@ -0,0 +1,3 @@ +TARGET = test-block-client +SRC_CC = main.cc +LIBS = base diff --git a/repos/os/src/test/blk/srv/main.cc b/repos/os/src/test/block/server/main.cc similarity index 100% rename from repos/os/src/test/blk/srv/main.cc rename to repos/os/src/test/block/server/main.cc diff --git a/repos/os/src/test/block/server/target.mk b/repos/os/src/test/block/server/target.mk new file mode 100644 index 000000000..f12cdf0dc --- /dev/null +++ b/repos/os/src/test/block/server/target.mk @@ -0,0 +1,3 @@ +TARGET = test-block-server +SRC_CC = main.cc +LIBS = base diff --git a/repos/os/src/test/rom_blk/target.mk b/repos/os/src/test/rom_blk/target.mk deleted file mode 100644 index a7ccab986..000000000 --- a/repos/os/src/test/rom_blk/target.mk +++ /dev/null @@ -1,3 +0,0 @@ -TARGET = test-rom_blk -SRC_CC = main.cc -LIBS = base diff --git a/repos/os/src/test/rom_blk/main.cc b/repos/os/src/test/rom_block/main.cc similarity index 100% rename from repos/os/src/test/rom_blk/main.cc rename to repos/os/src/test/rom_block/main.cc diff --git a/repos/os/src/test/blk/bench/target.mk b/repos/os/src/test/rom_block/target.mk similarity index 56% rename from repos/os/src/test/blk/bench/target.mk rename to repos/os/src/test/rom_block/target.mk index cba9d1721..6946a8d6d 100644 --- a/repos/os/src/test/blk/bench/target.mk +++ b/repos/os/src/test/rom_block/target.mk @@ -1,3 +1,3 @@ -TARGET = test-blk-bench +TARGET = test-rom_block SRC_CC = main.cc LIBS = base diff --git a/repos/ports/run/seoul.inc b/repos/ports/run/seoul.inc index 6c665d639..609c5fcfc 100644 --- a/repos/ports/run/seoul.inc +++ b/repos/ports/run/seoul.inc @@ -30,7 +30,7 @@ set build_components { if {$use_fancy_stuff} { set use_framebuffer 1 } lappend_if $use_usb build_components drivers/usb -lappend_if $use_block_ram build_components server/ram_blk +lappend_if $use_block_ram build_components server/ram_block lappend_if $use_block_sata build_components drivers/ahci lappend_if $use_nic_session build_components drivers/nic lappend_if $use_nic_bridge build_components server/nic_bridge @@ -43,7 +43,7 @@ lappend_if $use_fancy_stuff build_components app/launchpad lappend_if $use_fancy_stuff build_components server/nitlog lappend_if $use_fancy_stuff build_components server/report_rom lappend_if $use_genode_iso build_components server/iso9660 -lappend_if $use_genode_iso build_components server/rom_blk +lappend_if $use_genode_iso build_components server/rom_block lappend_if $use_top build_components app/top append_platform_drv_build_components @@ -192,14 +192,14 @@ append_if $use_block_sata config { } append_if $use_block_ram config { - + } append_if $use_genode_iso config { - + @@ -209,7 +209,7 @@ append_if $use_genode_iso config { - + } @@ -415,7 +415,7 @@ set boot_modules { lappend_if [expr !$use_usb] boot_modules ps2_drv lappend_if $use_usb boot_modules usb_drv -lappend_if $use_block_ram boot_modules ram_blk +lappend_if $use_block_ram boot_modules ram_block lappend_if $use_block_sata boot_modules ahci_drv lappend_if $use_nic_session boot_modules nic_drv lappend_if $use_nic_bridge boot_modules nic_bridge @@ -430,7 +430,7 @@ lappend_if $use_fancy_stuff boot_modules nitlog lappend_if $use_fancy_stuff boot_modules launchpad-config lappend_if $use_fancy_stuff boot_modules report_rom -lappend_if $use_genode_iso boot_modules rom_blk +lappend_if $use_genode_iso boot_modules rom_block lappend_if $use_genode_iso boot_modules iso9660 lappend_if $use_genode_iso boot_modules genode.iso diff --git a/repos/ports/run/vbox_win.inc b/repos/ports/run/vbox_win.inc index 38d40594d..ccdfabf82 100644 --- a/repos/ports/run/vbox_win.inc +++ b/repos/ports/run/vbox_win.inc @@ -292,7 +292,7 @@ for { set i 1} { $i <= $use_vms } { incr i} { append_if [expr $use_rumpfs] config_of_app { } append_if [expr !$use_rumpfs] config_of_app { - } + } append config_of_app " diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index 09bbbd8af..f3795bc65 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -29,7 +29,7 @@ if {[have_spec nova]} { append build_components { core init timer - server/part_blk + server/part_block server/fs_rom drivers/ahci drivers/framebuffer @@ -98,10 +98,10 @@ append config { - + - + @@ -144,7 +144,7 @@ append_if [expr $use_rumpfs] config { - + } @@ -365,7 +365,7 @@ install_config $config append boot_modules { core init timer - part_blk ahci_drv fs_rom + part_block ahci_drv fs_rom ld.lib.so libc.lib.so vfs.lib.so libm.lib.so libc_pipe.lib.so libc_terminal.lib.so libiconv.lib.so stdcxx.lib.so