ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-18 21:27:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consistently name block components

Browse Source 
This patch replaces abbreviations like "blk", "cli", and "srv" by their
full forms "block", "client", and "server".

Fixes #1258
This commit is contained in:
Norman Feske 2019-01-06 21:17:07 +01:00
parent bf62d6b896
commit 81fb10daaa
133 changed files with 289 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/components.txt
View File

@ -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.

6
repos/dde_linux/run/usb_storage.run
View File

@ -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 {
</start>
<start name="test-usb">
<resource name="RAM" quantum="2M" />
<binary name="test-blk-cli" />
<binary name="test-block-client" />
<config test_size="1M" />
</start>
</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]

6
repos/dde_rump/run/fs_rom_update_ext2.run
View File

@ -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 {
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<start name="ram_blk">
<start name="ram_block">
<resource name="RAM" quantum="16M" />
<provides><service name="Block"/></provides>
<config file="ext2.img" block_size="512"/>
@ -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

6
repos/dde_rump/run/rump_ext2.run
View File

@ -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 {
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<start name="ram_blk">
<start name="ram_block">
<resource name="RAM" quantum="20M"/>
<provides><service name="Block"/></provides>
<config file="ext2.raw" block_size="512"/>
@ -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
}

6
repos/dde_rump/run/rump_fat.run
View File

@ -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 {
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<start name="ram_blk">
<start name="ram_block">
<resource name="RAM" quantum="20M"/>
<provides><service name="Block"/></provides>
<config file="fs.raw" block_size="512"/>
@ -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
}

6
repos/dde_rump/run/rump_iso.run
View File

@ -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 {
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<start name="rom_blk">
<start name="rom_block">
<resource name="RAM" quantum="2M"/>
<provides><service name="Block"/></provides>
<config file="fs.iso" block_size="2048"/>
@ -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
}

6
repos/dde_rump/run/vfs_stress_ext2.run
View File

@ -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 {
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<start name="ram_blk">
<start name="ram_block">
<resource name="RAM" quantum="24M"/>
<provides><service name="Block"/></provides>
<config file="ext2.raw" block_size="512"/>
@ -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

6
repos/dde_rump/run/vfs_stress_rump_fs.run
View File

@ -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 {
<vfs> <fs/> </vfs>
</config>
</start>
<start name="ram_blk">
<start name="ram_block">
<resource name="RAM" quantum="24M"/>
<provides><service name="Block"/></provides>
<config file="ext2.raw" block_size="512"/>
@ -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

2
repos/gems/recipes/pkg/sculpt/archives
View File

@ -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

10
repos/gems/run/depot_autopilot.run
View File

@ -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

6
repos/gems/run/leitzentrale.run
View File

@ -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 {
</start>
<start name="ahci-2">
<binary name="ram_blk"/>
<binary name="ram_block"/>
<resource name="RAM" quantum="10M"/>
<config nofile="ahci-1.img" size="8M" block_size="512"/>
<provides> <service name="Block"/> </provides>

2
repos/gems/src/app/sculpt_manager/model/partition.h
View File

@ -135,7 +135,7 @@ struct Sculpt::Partition : List_model<Partition>::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<Partition>::Update_policy
{

34
repos/gems/src/app/sculpt_manager/model/storage_device.h
View File

@ -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("<partitions/>"));
}
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 <typename FN>
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<Cpu_session> (xml);
gen_parent_route<Pd_session> (xml);

2
repos/gems/src/app/sculpt_manager/model/storage_target.h
View File

@ -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);
});
}

22
repos/gems/src/app/sculpt_manager/storage.cc
View File

@ -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);
});
});

2
repos/gems/src/server/http_blk/README → repos/gems/src/server/http_block/README
View File

@ -8,7 +8,7 @@ Usage
Config file snippet:
!<start name="http_blk">
!<start name="http_block">
! <resource name="RAM" quantum="1M" />
! <provides><service name="Block"/></provides> <!-- Mandatory -->
! <config uri="http://kc86.genode.labs:80/file.iso" block_size=2048/>

0
repos/gems/src/server/http_blk/http.cc → repos/gems/src/server/http_block/http.cc
View File

0
repos/gems/src/server/http_blk/http.h → repos/gems/src/server/http_block/http.h
View File

0
repos/gems/src/server/http_blk/main.cc → repos/gems/src/server/http_block/main.cc
View File

2
repos/gems/src/server/http_blk/target.mk → repos/gems/src/server/http_block/target.mk
View File

@ -1,4 +1,4 @@
TARGET = http_blk
TARGET = http_block
SRC_CC = main.cc http.cc
LIBS = libc

2
repos/libports/recipes/pkg/test-libc_vfs_block/archives
View File

@ -1,5 +1,5 @@
_/src/init
_/src/test-libc_vfs_block
_/src/ram_blk
_/src/ram_block
_/src/libc
_/src/vfs

4
repos/libports/recipes/pkg/test-libc_vfs_block/runtime
View File

@ -10,7 +10,7 @@
<rom label="ld.lib.so"/>
<rom label="libc.lib.so"/>
<rom label="vfs.lib.so"/>
<rom label="ram_blk"/>
<rom label="ram_block"/>
<rom label="test-libc_vfs_block"/>
</content>
@ -26,7 +26,7 @@
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<default caps="100"/>
<start name="ram_blk">
<start name="ram_block">
<resource name="RAM" quantum="2M"/>
<provides> <service name="Block"/> </provides>
<config size="16K" block_size="4096"/>

2
repos/libports/recipes/pkg/test-solo5/archives
View File

@ -1,6 +1,6 @@
_/src/init
_/src/nic_loopback
_/src/ram_blk
_/src/ram_block
_/src/sequence
_/src/solo5
_/src/test-solo5

4
repos/libports/recipes/pkg/test-solo5/runtime
View File

@ -11,7 +11,7 @@
<content>
<rom label="ld.lib.so"/>
<rom label="nic_loopback"/>
<rom label="ram_blk"/>
<rom label="ram_block"/>
<rom label="sequence"/>
<rom label="sequence"/>
<rom label="solo5.lib.so"/>
@ -39,7 +39,7 @@
<provides> <service name="Nic"/> </provides>
</start>
<start name="ram_blk" caps="96">
<start name="ram_block" caps="96">
<resource name="RAM" quantum="9M"/>
<provides> <service name="Block"/> </provides>
<config size="8M" block_size="4096"/>

28
repos/libports/run/fatfs_blkio.run
View File

@ -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 {
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<start name="test-fatfs_blkio">
<start name="test-fatfs_block_io">
<resource name="RAM" quantum="10M"/>
<config ld_verbose="true">
<libc stdout="/log" stderr="/log"/>
@ -89,7 +89,7 @@ append_if $use_ahci config {
<any-service> <parent /> <any-child /></any-service>
</route>
<config>
<policy label_prefix="test-fatfs_blkio" device="0"/>
<policy label_prefix="test-fatfs_block_io" device="0"/>
</config>
</start>}
@ -100,8 +100,8 @@ append_if $use_sd_card_drv config {
</start>
}
append_if $use_ram_blk config {
<start name="ram_blk">
append_if $use_ram_block config {
<start name="ram_block">
<resource name="RAM" quantum="4M" />
<provides><service name="Block"/></provides>
<config size="1M" block_size="512"/>
@ -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

6
repos/libports/run/fs_rom_update_fat.run
View File

@ -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 {
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<start name="ram_blk">
<start name="ram_block">
<resource name="RAM" quantum="8M" />
<provides><service name="Block"/></provides>
<config file="fat.img" block_size="512"/>
@ -121,7 +121,7 @@ set boot_modules {
dynamic_rom
fat.img
fs_rom
ram_blk
ram_block
rom_logger
rom_to_file
timer

14
repos/libports/run/libc_block.run
View File

@ -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 {
</start>
}
append_if $use_ram_blk config {
<start name="ram_blk">
append_if $use_ram_block config {
<start name="ram_block">
<resource name="RAM" quantum="128M" />
<provides><service name="Block"/></provides>
<config file="test.hda" block_size="512"/>
@ -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

16
repos/libports/run/libc_filesystem_test.inc
View File

@ -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 {
</start>
}
append_if $use_ram_blk config {
<start name="ram_blk">
append_if $use_ram_block config {
<start name="ram_block">
<resource name="RAM" quantum="128M" />
<provides><service name="Block"/></provides>
<config file="test.hda" block_size="512"/>
@ -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

14
repos/libports/run/libc_vfs_filesystem_test.inc
View File

@ -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 {
</start>
}
append_if $use_ram_blk config {
<start name="ram_blk">
append_if $use_ram_block config {
<start name="ram_block">
<resource name="RAM" quantum="128M" />
<provides><service name="Block"/></provides>
<config file="test.hda" block_size="512"/>
@ -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

14
repos/libports/run/libc_vfs_fs_test.inc
View File

@ -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 {
</start>
}
append_if $use_ram_blk config {
<start name="ram_blk">
append_if $use_ram_block config {
<start name="ram_block">
<resource name="RAM" quantum="128M" />
<provides><service name="Block"/></provides>
<config file="test.hda" block_size="512"/>
@ -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

6
repos/libports/run/solo5.run
View File

@ -45,7 +45,7 @@ install_config {
<provides> <service name="Nic"/> </provides>
</start>
<start name="ram_blk" caps="96">
<start name="ram_block" caps="96">
<resource name="RAM" quantum="40M"/>
<provides> <service name="Block"/> </provides>
<config size="32M" block_size="4096"/>
@ -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

2
repos/libports/src/lib/vfs/fatfs/README
View File

@ -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.

0
repos/libports/src/test/fatfs_blkio/component.cc → repos/libports/src/test/fatfs_block_io/component.cc
View File

2
repos/libports/src/test/fatfs_blkio/target.mk → repos/libports/src/test/fatfs_block_io/target.mk
View File

@ -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

2
repos/os/recipes/pkg/test-blk/archives
View File

@ -1,2 +0,0 @@
_/src/init
_/src/test-blk

1
repos/os/recipes/pkg/test-blk_cache/README
View File

@ -1 +0,0 @@
Test of Block session interface provided by server/blk_cache

3
repos/os/recipes/pkg/test-blk_cache/archives
View File

@ -1,3 +0,0 @@
_/src/init
_/src/test-blk
_/src/blk_cache

0
repos/os/recipes/pkg/test-blk/README → repos/os/recipes/pkg/test-block/README
View File

2
repos/os/recipes/pkg/test-block/archives Normal file
View File

@ -0,0 +1,2 @@
_/src/init
_/src/test-block

0
repos/os/recipes/pkg/test-blk/hash → repos/os/recipes/pkg/test-block/hash
View File

10
repos/os/recipes/pkg/test-blk/runtime → repos/os/recipes/pkg/test-block/runtime
View File

@ -5,13 +5,13 @@
<events>
<timeout meaning="failed" sec="20" />
<log meaning="succeeded">Tests finished successfully</log>
<log meaning="failed">test-blk-cli] Error: </log>
<log meaning="failed">test-block-client] Error: </log>
</events>
<content>
<rom label="ld.lib.so"/>
<rom label="test-blk-srv"/>
<rom label="test-blk-cli"/>
<rom label="test-block-server"/>
<rom label="test-block-client"/>
</content>
<config>
@ -30,11 +30,11 @@
<default-route>
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<start name="test-blk-srv" caps="200">
<start name="test-block-server" caps="200">
<resource name="RAM" quantum="10M" />
<provides><service name="Block" /></provides>
</start>
<start name="test-blk-cli" caps="200">
<start name="test-block-client" caps="200">
<resource name="RAM" quantum="50M" />
</start>
</config>

1
repos/os/recipes/pkg/test-block_cache/README Normal file
View File

@ -0,0 +1 @@
Test of Block session interface provided by server/block_cache

3
repos/os/recipes/pkg/test-block_cache/archives Normal file
View File

@ -0,0 +1,3 @@
_/src/init
_/src/test-block
_/src/block_cache

0
repos/os/recipes/pkg/test-blk_cache/hash → repos/os/recipes/pkg/test-block_cache/hash
View File

18
repos/os/recipes/pkg/test-blk_cache/runtime → repos/os/recipes/pkg/test-block_cache/runtime
View File

@ -5,14 +5,14 @@
<events>
<timeout meaning="failed" sec="20" />
<log meaning="succeeded">Tests finished successfully</log>
<log meaning="failed">test-blk-cli] Error: </log>
<log meaning="failed">test-block-client] Error: </log>
</events>
<content>
<rom label="ld.lib.so"/>
<rom label="test-blk-cli"/>
<rom label="test-blk-srv"/>
<rom label="blk_cache"/>
<rom label="test-block-client"/>
<rom label="test-block-server"/>
<rom label="block_cache"/>
</content>
<config>
@ -31,22 +31,22 @@
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<default caps="100"/>
<start name="test-blk-srv">
<start name="test-block-server">
<resource name="RAM" quantum="10M"/>
<provides><service name="Block"/></provides>
</start>
<start name="blk_cache">
<start name="block_cache">
<resource name="RAM" quantum="2704K" />
<provides><service name="Block" /></provides>
<route>
<service name="Block"><child name="test-blk-srv" /></service>
<service name="Block"><child name="test-block-server" /></service>
<any-service> <parent /> <any-child /></any-service>
</route>
</start>
<start name="test-blk-cli">
<start name="test-block-client">
<resource name="RAM" quantum="2G" />
<route>
<service name="Block"><child name="blk_cache" /></service>
<service name="Block"><child name="block_cache" /></service>
<any-service> <parent /> <any-child /></any-service>
</route>
</start>

2
repos/os/recipes/pkg/test-lx_block/archives
View File

@ -1,3 +1,3 @@
_/src/init
_/src/lx_block
_/src/test-blk
_/src/test-block

4
repos/os/recipes/pkg/test-lx_block/runtime
View File

@ -10,7 +10,7 @@
<content>
<rom label="ld.lib.so"/>
<rom label="test-blk-bench"/>
<rom label="test-block-bench"/>
<rom label="lx_block.img"/>
<rom label="lx_block"/>
</content>
@ -37,7 +37,7 @@
<provides> <service name="Block"/> </provides>
<config file="lx_block.img" block_size="4K" writeable="yes"/>
</start>
<start name="test-blk-bench">
<start name="test-block-bench">
<resource name="RAM" quantum="24M"/>
</start>
</config>

1
repos/os/recipes/pkg/test-part_blk_gpt/README
View File

@ -1 +0,0 @@
Test part_blk server with GPT disk.

6
repos/os/recipes/pkg/test-part_blk_gpt/archives
View File

@ -1,6 +0,0 @@
_/src/init
_/src/report_rom
_/src/part_blk
_/src/rom_blk
_/src/test-blk
_/raw/test-part_blk_gpt

1
repos/os/recipes/pkg/test-part_blk_mbr/README
View File

@ -1 +0,0 @@
Test part_blk server with MBR disk.

6
repos/os/recipes/pkg/test-part_blk_mbr/archives
View File

@ -1,6 +0,0 @@
_/src/init
_/src/report_rom
_/src/part_blk
_/src/rom_blk
_/src/test-blk
_/raw/test-part_blk_mbr

1
repos/os/recipes/pkg/test-part_block_gpt/README Normal file
View File

@ -0,0 +1 @@
Test part_block server with GPT disk.

6
repos/os/recipes/pkg/test-part_block_gpt/archives Normal file
View File

@ -0,0 +1,6 @@
_/src/init
_/src/report_rom
_/src/part_block
_/src/rom_block
_/src/test-block
_/raw/test-part_block_gpt

0
repos/os/recipes/pkg/test-part_blk_gpt/hash → repos/os/recipes/pkg/test-part_block_gpt/hash
View File

20
repos/os/recipes/pkg/test-part_blk_gpt/runtime → repos/os/recipes/pkg/test-part_block_gpt/runtime
View File

@ -13,9 +13,9 @@
<content>
<rom label="ld.lib.so"/>
<rom label="rom_blk"/>
<rom label="part_blk"/>
<rom label="test-blk-cli"/>
<rom label="rom_block"/>
<rom label="part_block"/>
<rom label="test-block-client"/>
<rom label="report_rom"/>
<rom label="ata.gpt.raw"/>
</content>
@ -36,16 +36,16 @@
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<default caps="100"/>
<start name="rom_blk">
<start name="rom_block">
<resource name="RAM" quantum="32M"/>
<provides><service name="Block"/></provides>
<config file="ata.gpt.raw" block_size="512"/>
</start>
<start name="part_blk">
<start name="part_block">
<resource name="RAM" quantum="10M" />
<provides><service name="Block" /></provides>
<route>
<any-service><child name="rom_blk"/> <parent/><any-child/></any-service>
<any-service><child name="rom_block"/> <parent/><any-child/></any-service>
</route>
<config use_gpt="yes">
<report partitions="yes"/>
@ -62,17 +62,17 @@
<config verbose="yes"/>
</start>
<start name="test-part1">
<binary name="test-blk-cli"/>
<binary name="test-block-client"/>
<resource name="RAM" quantum="5M" />
<route>
<any-service> <child name="part_blk" /> <parent/> <any-child/> </any-service>
<any-service> <child name="part_block" /> <parent/> <any-child/> </any-service>
</route>
</start>
<start name="test-part2">
<binary name="test-blk-cli"/>
<binary name="test-block-client"/>
<resource name="RAM" quantum="5M" />
<route>
<any-service> <child name="part_blk" /> <parent/> <any-child/> </any-service>
<any-service> <child name="part_block" /> <parent/> <any-child/> </any-service>
</route>
</start>
</config>

1
repos/os/recipes/pkg/test-part_block_mbr/README Normal file
View File

@ -0,0 +1 @@
Test part_block server with MBR disk.

6
repos/os/recipes/pkg/test-part_block_mbr/archives Normal file
View File

@ -0,0 +1,6 @@
_/src/init
_/src/report_rom
_/src/part_block
_/src/rom_block
_/src/test-block
_/raw/test-part_block_mbr

0
repos/os/recipes/pkg/test-part_blk_mbr/hash → repos/os/recipes/pkg/test-part_block_mbr/hash
View File

20
repos/os/recipes/pkg/test-part_blk_mbr/runtime → repos/os/recipes/pkg/test-part_block_mbr/runtime
View File

@ -13,9 +13,9 @@
<content>
<rom label="ld.lib.so"/>
<rom label="rom_blk"/>
<rom label="part_blk"/>
<rom label="test-blk-cli"/>
<rom label="rom_block"/>
<rom label="part_block"/>
<rom label="test-block-client"/>
<rom label="report_rom"/>
<rom label="ata.mbr.raw"/>
</content>
@ -36,16 +36,16 @@
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<default caps="100"/>
<start name="rom_blk">
<start name="rom_block">
<resource name="RAM" quantum="32M"/>
<provides><service name="Block"/></provides>
<config file="ata.mbr.raw" block_size="512"/>
</start>
<start name="part_blk">
<start name="part_block">
<resource name="RAM" quantum="10M" />
<provides><service name="Block" /></provides>
<route>
<any-service><child name="rom_blk"/> <parent/><any-child/></any-service>
<any-service><child name="rom_block"/> <parent/><any-child/></any-service>
</route>
<config>
<report partitions="yes"/>
@ -62,17 +62,17 @@
<config verbose="yes"/>
</start>
<start name="test-part1">
<binary name="test-blk-cli"/>
<binary name="test-block-client"/>
<resource name="RAM" quantum="5M" />
<route>
<any-service> <child name="part_blk" /> <parent/> <any-child/> </any-service>
<any-service> <child name="part_block" /> <parent/> <any-child/> </any-service>
</route>
</start>
<start name="test-part2">
<binary name="test-blk-cli"/>
<binary name="test-block-client"/>
<resource name="RAM" quantum="5M" />
<route>
<any-service> <child name="part_blk" /> <parent/> <any-child/> </any-service>
<any-service> <child name="part_block" /> <parent/> <any-child/> </any-service>
</route>
</start>
</config>

3
repos/os/recipes/pkg/test-rom_blk/archives
View File

@ -1,3 +0,0 @@
_/src/init
_/src/rom_blk
_/src/test-rom_blk

0
repos/os/recipes/pkg/test-rom_blk/README → repos/os/recipes/pkg/test-rom_block/README
View File

3
repos/os/recipes/pkg/test-rom_block/archives Normal file
View File

@ -0,0 +1,3 @@
_/src/init
_/src/rom_block
_/src/test-rom_block

0
repos/os/recipes/pkg/test-rom_blk/hash → repos/os/recipes/pkg/test-rom_block/hash
View File

8
repos/os/recipes/pkg/test-rom_blk/runtime → repos/os/recipes/pkg/test-rom_block/runtime
View File

@ -8,8 +8,8 @@
<content>
<rom label="ld.lib.so"/>
<rom label="test-rom_blk"/>
<rom label="rom_blk"/>
<rom label="test-rom_block"/>
<rom label="rom_block"/>
</content>
<config>
@ -24,12 +24,12 @@
<any-service> <any-child/> <parent/></any-service>
</default-route>
<default caps="100"/>
<start name="rom_blk">
<start name="rom_block">
<resource name="RAM" quantum="3M"/>
<provides><service name="Block"/></provides>
<config file="init" block_size="512"/>
</start>
<start name="test-rom_blk">
<start name="test-rom_block">
<resource name="RAM" quantum="3M"/>
<config file="init"/>
</start>

4
repos/os/recipes/raw/test-part_blk_gpt/content.mk
View File

@ -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

4
repos/os/recipes/raw/test-part_blk_mbr/content.mk
View File

@ -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

0
repos/os/recipes/raw/test-part_blk_gpt/ata.gpt.raw.tar.gz → repos/os/recipes/raw/test-part_block_gpt/ata.gpt.raw.tar.gz
View File

4
repos/os/recipes/raw/test-part_block_gpt/content.mk Normal file
View File

@ -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

0
repos/os/recipes/raw/test-part_blk_gpt/hash → repos/os/recipes/raw/test-part_block_gpt/hash
View File

0
repos/os/recipes/raw/test-part_blk_mbr/ata.gpt.raw.tar.gz → repos/os/recipes/raw/test-part_block_mbr/ata.gpt.raw.tar.gz
View File

0
repos/os/recipes/raw/test-part_blk_mbr/ata.mbr.raw.tar.gz → repos/os/recipes/raw/test-part_block_mbr/ata.mbr.raw.tar.gz
View File

4
repos/os/recipes/raw/test-part_block_mbr/content.mk Normal file
View File

@ -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

0
repos/os/recipes/raw/test-part_blk_mbr/hash → repos/os/recipes/raw/test-part_block_mbr/hash
View File

2
repos/os/recipes/src/block_cache/content.mk Normal file
View File

@ -0,0 +1,2 @@
SRC_DIR = src/server/block_cache
include $(GENODE_DIR)/repos/base/recipes/src/content.inc

0
repos/os/recipes/src/blk_cache/hash → repos/os/recipes/src/block_cache/hash
View File

0
repos/os/recipes/src/blk_cache/used_apis → repos/os/recipes/src/block_cache/used_apis
View File

2
repos/os/recipes/src/part_blk/content.mk → repos/os/recipes/src/part_block/content.mk
View File

@ -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

0
repos/os/recipes/src/part_blk/hash → repos/os/recipes/src/part_block/hash
View File

0
repos/os/recipes/src/part_blk/used_apis → repos/os/recipes/src/part_block/used_apis
View File

2
repos/os/recipes/src/rom_blk/content.mk → repos/os/recipes/src/ram_block/content.mk
View File

@ -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

0
repos/os/recipes/src/ram_blk/hash → repos/os/recipes/src/ram_block/hash
View File

0
repos/os/recipes/src/ram_blk/used_apis → repos/os/recipes/src/ram_block/used_apis
View File

2
repos/os/recipes/src/blk_cache/content.mk → repos/os/recipes/src/rom_block/content.mk
View File

@ -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

0
repos/os/recipes/src/rom_blk/hash → repos/os/recipes/src/rom_block/hash
View File

0
repos/os/recipes/src/rom_blk/used_apis → repos/os/recipes/src/rom_block/used_apis
View File

2
repos/os/recipes/src/test-blk/content.mk → repos/os/recipes/src/test-block/content.mk
View File

@ -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

0
repos/os/recipes/src/test-blk/hash → repos/os/recipes/src/test-block/hash
View File

0
repos/os/recipes/src/test-blk/used_apis → repos/os/recipes/src/test-block/used_apis
View File

2
repos/os/recipes/src/test-rom_blk/content.mk
View File

@ -1,2 +0,0 @@
SRC_DIR = src/test/rom_blk
include $(GENODE_DIR)/repos/base/recipes/src/content.inc

2
repos/os/recipes/src/ram_blk/content.mk → repos/os/recipes/src/test-rom_block/content.mk
View File

@ -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

0
repos/os/recipes/src/test-rom_blk/hash → repos/os/recipes/src/test-rom_block/hash
View File

0
repos/os/recipes/src/test-rom_blk/used_apis → repos/os/recipes/src/test-rom_block/used_apis
View File

6
repos/os/run/ahci_bench.run
View File

@ -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 {
</start>
<start name="test-ahci">
<binary name="test-blk-bench" />
<binary name="test-block-bench" />
<resource name="RAM" quantum="5M" />
<route>
<service name="Block"><child name="ahci_drv"/></service>
@ -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

8
repos/os/run/ahci_blk.run → repos/os/run/ahci_block.run
View File

@ -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 {
</route>
</start>
<start name="test-ahci">
<binary name="test-blk-cli" />
<binary name="test-block-client" />
<resource name="RAM" quantum="50M" />
<config test_size="100M"></config>
<route>
@ -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

4
repos/os/run/block_tester.run
View File

@ -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
}

6
repos/os/run/sd_card.run
View File

@ -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 {
<resource name="RAM" quantum="1M"/>
<provides><service name="Block"/></provides>
</start>
<start name="test-blk-cli">
<start name="test-block-client">
<resource name="RAM" quantum="1M" />
</start>
</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

8
repos/os/run/tz_vmm.run
View File

@ -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 {
<resource name="RAM" quantum="3M"/>
<provides><service name="Block"/></provides>
</start>
<start name="part_blk">
<start name="part_block">
<resource name="RAM" quantum="10M" />
<provides><service name="Block" /></provides>
<route>
@ -181,7 +181,7 @@ if { $mmc_rootfs } {
<block name=\"sda1\" irq=\"$tz_vmm_block_irq\"/>
</config>
<route>
<service name=\"Block\"><child name=\"part_blk\" /></service>
<service name=\"Block\"><child name=\"part_block\" /></service>
<any-service><any-child/><parent/></any-service>
</route> "
}
@ -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"

10
repos/os/run/usb_block.run
View File

@ -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 {
</start>
<start name="test-usb">
<resource name="RAM" quantum="128M"/>
<binary name="test-blk-bench"/>
<!--binary name="test-blk-cli"/-->
<binary name="test-block-bench"/>
<!--binary name="test-block-client"/-->
<config>
<libc stdout="/dev/log">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
@ -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
}

0
repos/os/src/server/blk_cache/chunk.h → repos/os/src/server/block_cache/chunk.h
View File

0
repos/os/src/server/blk_cache/driver.h → repos/os/src/server/block_cache/driver.h
View File

Some files were not shown because too many files have changed in this diff Show More