From c9d70552a422db3fdd1d2e36139501a050411d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Thu, 28 Mar 2024 11:51:18 +0100 Subject: [PATCH] Rename vfs_oss to vfs_legacy_oss Rename the old VFS OSS plugin using Audio_out and Audio_in sessions and adapt users accordingly. Issue genodelabs/genode#5167. --- .../lib/mk/{vfs_oss.mk => vfs_legacy_oss.mk} | 2 +- .../src/{vfs_oss => vfs_legacy_oss}/content.mk | 2 +- .../recipes/src/{vfs_oss => vfs_legacy_oss}/hash | 0 .../src/{vfs_oss => vfs_legacy_oss}/used_apis | 0 repos/libports/run/oss.run | 4 ++-- .../src/lib/vfs/{oss => legacy_oss}/README | 15 ++++++++------- .../src/lib/vfs/{oss => legacy_oss}/vfs_oss.cc | 4 ++-- repos/ports/recipes/pkg/vbox6-capture/archives | 2 +- repos/ports/recipes/pkg/vbox6-capture/runtime | 4 ++-- repos/ports/recipes/pkg/vbox6/archives | 2 +- repos/ports/recipes/pkg/vbox6/runtime | 4 ++-- repos/ports/run/virtualbox6.run | 2 +- 12 files changed, 21 insertions(+), 20 deletions(-) rename repos/libports/lib/mk/{vfs_oss.mk => vfs_legacy_oss.mk} (66%) rename repos/libports/recipes/src/{vfs_oss => vfs_legacy_oss}/content.mk (64%) rename repos/libports/recipes/src/{vfs_oss => vfs_legacy_oss}/hash (100%) rename repos/libports/recipes/src/{vfs_oss => vfs_legacy_oss}/used_apis (100%) rename repos/libports/src/lib/vfs/{oss => legacy_oss}/README (87%) rename repos/libports/src/lib/vfs/{oss => legacy_oss}/vfs_oss.cc (99%) diff --git a/repos/libports/lib/mk/vfs_oss.mk b/repos/libports/lib/mk/vfs_legacy_oss.mk similarity index 66% rename from repos/libports/lib/mk/vfs_oss.mk rename to repos/libports/lib/mk/vfs_legacy_oss.mk index 8ae7fc8bbc..c23a7ef47a 100644 --- a/repos/libports/lib/mk/vfs_oss.mk +++ b/repos/libports/lib/mk/vfs_legacy_oss.mk @@ -1,6 +1,6 @@ SRC_CC := vfs_oss.cc -vpath %.cc $(REP_DIR)/src/lib/vfs/oss +vpath %.cc $(REP_DIR)/src/lib/vfs/legacy_oss LIBS := libc diff --git a/repos/libports/recipes/src/vfs_oss/content.mk b/repos/libports/recipes/src/vfs_legacy_oss/content.mk similarity index 64% rename from repos/libports/recipes/src/vfs_oss/content.mk rename to repos/libports/recipes/src/vfs_legacy_oss/content.mk index 669c686f6d..59f24c699b 100644 --- a/repos/libports/recipes/src/vfs_oss/content.mk +++ b/repos/libports/recipes/src/vfs_legacy_oss/content.mk @@ -1,4 +1,4 @@ -MIRROR_FROM_REP_DIR := lib/mk/vfs_oss.mk src/lib/vfs/oss +MIRROR_FROM_REP_DIR := lib/mk/vfs_legacy_oss.mk src/lib/vfs/legacy_oss content: $(MIRROR_FROM_REP_DIR) LICENSE diff --git a/repos/libports/recipes/src/vfs_oss/hash b/repos/libports/recipes/src/vfs_legacy_oss/hash similarity index 100% rename from repos/libports/recipes/src/vfs_oss/hash rename to repos/libports/recipes/src/vfs_legacy_oss/hash diff --git a/repos/libports/recipes/src/vfs_oss/used_apis b/repos/libports/recipes/src/vfs_legacy_oss/used_apis similarity index 100% rename from repos/libports/recipes/src/vfs_oss/used_apis rename to repos/libports/recipes/src/vfs_legacy_oss/used_apis diff --git a/repos/libports/run/oss.run b/repos/libports/run/oss.run index 227d142619..3ec8a07566 100644 --- a/repos/libports/run/oss.run +++ b/repos/libports/run/oss.run @@ -11,7 +11,7 @@ if {[have_include "power_on/qemu"]} { } build { - core init timer lib/ld lib/libc lib/vfs lib/posix lib/vfs_oss + core init timer lib/ld lib/libc lib/vfs lib/posix lib/vfs_legacy_oss drivers/acpi drivers/audio drivers/platform app/pci_decode server/report_rom test/oss } @@ -103,7 +103,7 @@ install_config { - + diff --git a/repos/libports/src/lib/vfs/oss/README b/repos/libports/src/lib/vfs/legacy_oss/README similarity index 87% rename from repos/libports/src/lib/vfs/oss/README rename to repos/libports/src/lib/vfs/legacy_oss/README index 799643e29a..682e1d543f 100644 --- a/repos/libports/src/lib/vfs/oss/README +++ b/repos/libports/src/lib/vfs/legacy_oss/README @@ -1,9 +1,10 @@ -The VFS OSS plugin offers access to Genode's Audio_out and Audio_in sessions by -providing a file-system that can be mounted at arbitrary location within the VFS -of a component. It exposes a data file that can be used as 'dsp' file, e.g., -_/dev/dsp_ as is common with OSS. The support I/O control operations or rather the -properties of the pseudo-device are provided in form of a structured 'info' -file located in the directory named after the data file, e.g., _/dev/.dsp/info_. +The legacy VFS OSS plugin offers access to Genode's Audio_out and Audio_in +sessions by providing a file-system that can be mounted at arbitrary location +within the VFS of a component. It exposes a data file that can be used as 'dsp' +file, e.g., _/dev/dsp_ as is common with OSS. The support I/O control +operations or rather the properties of the pseudo-device are provided in form +of a structured 'info' file located in the directory named after the data file, +e.g., _/dev/.dsp/info_. This file may by used to query the configured parameters and has the following structure: @@ -87,6 +88,6 @@ The following config snippet illustrates its configuration: ! ! -! +! ! ! diff --git a/repos/libports/src/lib/vfs/oss/vfs_oss.cc b/repos/libports/src/lib/vfs/legacy_oss/vfs_oss.cc similarity index 99% rename from repos/libports/src/lib/vfs/oss/vfs_oss.cc rename to repos/libports/src/lib/vfs/legacy_oss/vfs_oss.cc index ad8958f9bf..f05fffb2bf 100644 --- a/repos/libports/src/lib/vfs/oss/vfs_oss.cc +++ b/repos/libports/src/lib/vfs/legacy_oss/vfs_oss.cc @@ -988,7 +988,7 @@ struct Vfs::Oss_file_system::Local_factory : File_system_factory static Name name(Xml_node config) { - return config.attribute_value("name", Name("oss")); + return config.attribute_value("name", Name("lagacy_oss")); } Data_file_system _data_fs; @@ -1207,7 +1207,7 @@ class Vfs::Oss_file_system::Compound_file_system : private Local_factory, *this } { } - static const char *name() { return "oss"; } + static const char *name() { return "legacy_oss"; } char const *type() override { return name(); } }; diff --git a/repos/ports/recipes/pkg/vbox6-capture/archives b/repos/ports/recipes/pkg/vbox6-capture/archives index fd5314ece3..d0d53e3bca 100644 --- a/repos/ports/recipes/pkg/vbox6-capture/archives +++ b/repos/ports/recipes/pkg/vbox6-capture/archives @@ -12,6 +12,6 @@ _/src/stdcxx _/src/vbox6 _/src/vfs _/src/vfs_gpu -_/src/vfs_oss +_/src/vfs_legacy_oss _/src/vfs_pipe _/src/zlib diff --git a/repos/ports/recipes/pkg/vbox6-capture/runtime b/repos/ports/recipes/pkg/vbox6-capture/runtime index fa225c54c0..1cc003f189 100644 --- a/repos/ports/recipes/pkg/vbox6-capture/runtime +++ b/repos/ports/recipes/pkg/vbox6-capture/runtime @@ -55,7 +55,7 @@ - + @@ -115,8 +115,8 @@ + - diff --git a/repos/ports/recipes/pkg/vbox6/archives b/repos/ports/recipes/pkg/vbox6/archives index fd5314ece3..d0d53e3bca 100644 --- a/repos/ports/recipes/pkg/vbox6/archives +++ b/repos/ports/recipes/pkg/vbox6/archives @@ -12,6 +12,6 @@ _/src/stdcxx _/src/vbox6 _/src/vfs _/src/vfs_gpu -_/src/vfs_oss +_/src/vfs_legacy_oss _/src/vfs_pipe _/src/zlib diff --git a/repos/ports/recipes/pkg/vbox6/runtime b/repos/ports/recipes/pkg/vbox6/runtime index a95e08eeeb..53170fbbd4 100644 --- a/repos/ports/recipes/pkg/vbox6/runtime +++ b/repos/ports/recipes/pkg/vbox6/runtime @@ -53,7 +53,7 @@ - + @@ -113,7 +113,7 @@ - + diff --git a/repos/ports/run/virtualbox6.run b/repos/ports/run/virtualbox6.run index 8b98997247..416a2a9a6f 100644 --- a/repos/ports/run/virtualbox6.run +++ b/repos/ports/run/virtualbox6.run @@ -21,7 +21,7 @@ lappend depot_archives [depot_user]/src/nitpicker lappend depot_archives [depot_user]/src/report_rom lappend depot_archives [depot_user]/src/vfs_import lappend depot_archives [depot_user]/src/vfs_pipe -lappend depot_archives [depot_user]/src/vfs_oss +lappend depot_archives [depot_user]/src/vfs_legacy_oss lappend depot_archives [depot_user]/src/mesa lappend depot_archives [depot_user]/src/expat lappend depot_archives [depot_user]/src/libdrm