From 7193902cc084816aed3c96f2848ec303a53f90bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= <josef.soentgen@genode-labs.com>
Date: Fri, 19 Jun 2020 14:49:29 +0200
Subject: [PATCH] dde_bsd: properly name PCI audio driver component

Instead of the generic name, call the PCI driver 'pci_audio_drv'.

This is preliminary clean-up work before introducing the USB audio
driver.

Issue #3929.
---
 repos/base/run/platform_drv.inc                              | 2 +-
 repos/dde_bsd/recipes/pkg/bsd_audio_drv/README               | 0
 repos/dde_bsd/recipes/pkg/bsd_audio_drv/archives             | 0
 repos/dde_bsd/recipes/pkg/bsd_audio_drv/runtime              | 4 ++--
 repos/dde_bsd/run/audio_in.run                               | 5 ++++-
 .../dde_bsd/src/drivers/audio/{ => pci_audio_drv}/target.mk  | 4 +++-
 repos/ports/run/vbox_win.inc                                 | 3 ++-
 7 files changed, 12 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 repos/dde_bsd/recipes/pkg/bsd_audio_drv/README
 mode change 100755 => 100644 repos/dde_bsd/recipes/pkg/bsd_audio_drv/archives
 mode change 100755 => 100644 repos/dde_bsd/recipes/pkg/bsd_audio_drv/runtime
 rename repos/dde_bsd/src/drivers/audio/{ => pci_audio_drv}/target.mk (67%)

diff --git a/repos/base/run/platform_drv.inc b/repos/base/run/platform_drv.inc
index 7b88fdc3d3..cb8a304815 100644
--- a/repos/base/run/platform_drv.inc
+++ b/repos/base/run/platform_drv.inc
@@ -45,7 +45,7 @@ proc usb_host_drv_binary { } {
 #
 proc audio_drv_binary { } {
 	if {[have_spec linux]} { return linux_audio_drv }
-	if {[have_spec x86]}   { return audio_drv }
+	if {[have_spec x86]}   { return pci_audio_drv }
 	return no_audio_drv_available
 }
 
diff --git a/repos/dde_bsd/recipes/pkg/bsd_audio_drv/README b/repos/dde_bsd/recipes/pkg/bsd_audio_drv/README
old mode 100755
new mode 100644
diff --git a/repos/dde_bsd/recipes/pkg/bsd_audio_drv/archives b/repos/dde_bsd/recipes/pkg/bsd_audio_drv/archives
old mode 100755
new mode 100644
diff --git a/repos/dde_bsd/recipes/pkg/bsd_audio_drv/runtime b/repos/dde_bsd/recipes/pkg/bsd_audio_drv/runtime
old mode 100755
new mode 100644
index f897ac3af5..fbdd563946
--- a/repos/dde_bsd/recipes/pkg/bsd_audio_drv/runtime
+++ b/repos/dde_bsd/recipes/pkg/bsd_audio_drv/runtime
@@ -1,4 +1,4 @@
-<runtime ram="16M" caps="256" binary="audio_drv">
+<runtime ram="16M" caps="256" binary="pci_audio_drv">
 
 	<requires> <platform/> <rm/> <timer/> </requires>
 
@@ -11,7 +11,7 @@
 
 	<content>
 		<rom label="ld.lib.so"/>
-		<rom label="audio_drv"/>
+		<rom label="pci_audio_drv"/>
 	</content>
 
 </runtime>
diff --git a/repos/dde_bsd/run/audio_in.run b/repos/dde_bsd/run/audio_in.run
index db64857945..03bce3867e 100644
--- a/repos/dde_bsd/run/audio_in.run
+++ b/repos/dde_bsd/run/audio_in.run
@@ -57,6 +57,7 @@ append_platform_drv_config
 
 append config {
 	<start name="audio_drv">
+		<binary name="} [audio_drv_binary] {"/>
 		<resource name="RAM" quantum="8M"/>
 		<provides>
 			<service name="Audio_out"/>
@@ -82,9 +83,11 @@ install_config $config
 #
 
 set boot_modules {
-	core ld.lib.so init timer audio_drv test-audio_in
+	core ld.lib.so init timer test-audio_in
 }
 
+append boot_modules [audio_drv_binary]
+
 append_platform_drv_boot_modules
 
 build_boot_image $boot_modules
diff --git a/repos/dde_bsd/src/drivers/audio/target.mk b/repos/dde_bsd/src/drivers/audio/pci_audio_drv/target.mk
similarity index 67%
rename from repos/dde_bsd/src/drivers/audio/target.mk
rename to repos/dde_bsd/src/drivers/audio/pci_audio_drv/target.mk
index 5d0a08ddb2..12f3e48767 100644
--- a/repos/dde_bsd/src/drivers/audio/target.mk
+++ b/repos/dde_bsd/src/drivers/audio/pci_audio_drv/target.mk
@@ -1,7 +1,9 @@
 REQUIRES = x86 pci
-TARGET   = audio_drv
+TARGET   = pci_audio_drv
 SRC_CC   = main.cc
 LIBS     = dde_bsd_audio dde_bsd_audio_pci base
 INC_DIR += $(REP_DIR)/include
 
+vpath %.cc $(REP_DIR)/src/drivers/audio
+
 CC_CXX_WARN_STRICT =
diff --git a/repos/ports/run/vbox_win.inc b/repos/ports/run/vbox_win.inc
index f8aacdc333..06443d8b58 100644
--- a/repos/ports/run/vbox_win.inc
+++ b/repos/ports/run/vbox_win.inc
@@ -35,7 +35,7 @@ set build_components {
 set boot_modules {
 	event_filter
 	ipxe_nic_drv
-	audio_drv
+	pci_audio_drv
 	report_rom
 	dynamic_rom
 }
@@ -91,6 +91,7 @@ append config_of_app {
 		(Recording is configured to use the external mic.)
 	-->
 	<start name="audio_drv" priority="-1">
+		<binary name="pci_audio_drv"/>
 		<resource name="RAM" quantum="9M"/>
 		<provides>
 			<service name="Audio_out"/>