mixer.run: adjust to new platform driver

Issue #4656

repos/os/run/mixer.run

@@ -2,19 +2,23 @@
 # Build
 #
 
+if {[have_include "power_on/qemu"]} {
+	puts "\nTest running on Qemu is not supported.\n"
+	exit 0
+}
+
 # generic components
 set build_components {
 	core init timer
 	drivers/audio
+	drivers/platform
 	server/mixer
 	server/dynamic_rom
 	server/report_rom
+	app/pci_decode
 	test/audio_out
 }
 
-source ${genode_dir}/repos/base/run/platform_drv.inc
-append_platform_drv_build_components
-
 build $build_components
 create_boot_directory
 
@@ -40,40 +44,90 @@ set config  {
 			<any-service> <parent/> <any-child/> </any-service>
 		</default-route>
 
-		<default caps="100"/>}
+		<default caps="100"/>
 
-append_platform_drv_config
-
-append config {
 		<start name="timer">
 			<resource name="RAM" quantum="1M"/>
 			<provides><service name="Timer"/></provides>
 		</start>
 
-		<start name="audio_drv">
-			<binary name="} [audio_drv_binary] {"/>
-			<resource name="RAM" quantum="8M"/>
-			<provides><service name="Audio_out"/></provides>
-			<config/>
-		</start>
-
 		<start name="report_rom">
 			<resource name="RAM" quantum="2M"/>
-			<provides>
+			<provides> <service name="Report"/> <service name="ROM"/> </provides>
-				<service name="ROM"/>
+			<config>
-				<service name="Report"/>
+				<policy label="pci_decode -> system"    report="acpi_drv -> acpi"/>
-			</provides>
+				<policy label="platform_drv -> devices" report="pci_decode -> devices"/>
-			<config verbose="yes">
 				<policy label_prefix="to_whom_it_may_concern" report="mixer -> channel_list"/>
 			</config>
 		</start>
 
+		<start name="acpi_drv" caps="350">
+			<resource name="RAM" quantum="4M"/>
+			<route>
+				<service name="Report"> <child name="report_rom"/> </service>
+				<service name="IO_MEM"> <parent/> </service>
+				<service name="LOG">    <parent/> </service>
+				<service name="PD">     <parent/> </service>
+				<service name="RM">     <parent/> </service>
+				<service name="CPU">    <parent/> </service>
+				<service name="ROM">    <parent/> </service>
+			</route>
+		</start>
+
+		<start name="pci_decode" caps="350">
+			<resource name="RAM" quantum="1M"/>
+			<route>
+				<service name="Report">             <child name="report_rom"/> </service>
+				<service name="ROM" label="system"> <child name="report_rom"/> </service>
+				<service name="IO_MEM"> <parent/> </service>
+				<service name="LOG">    <parent/> </service>
+				<service name="PD">     <parent/> </service>
+				<service name="RM">     <parent/> </service>
+				<service name="CPU">    <parent/> </service>
+				<service name="ROM">    <parent/> </service>
+			</route>
+		</start>
+
+		<start name="platform_drv" caps="100" managing_system="yes">
+			<resource name="RAM" quantum="1M"/>
+			<provides>
+				<service name="Platform"/>
+			</provides>
+			<route>
+				<service name="ROM" label="devices"> <child name="report_rom"/> </service>
+				<service name="Timer">   <child name="timer"/> </service>
+				<service name="IRQ">     <parent/> </service>
+				<service name="IO_MEM">  <parent/> </service>
+				<service name="ROM">     <parent/> </service>
+				<service name="PD">      <parent/> </service>
+				<service name="CPU">     <parent/> </service>
+				<service name="LOG">     <parent/> </service>
+				<service name="Timer">   <parent/> </service>
+			</route>
+			<config>
+				<policy label="audio_drv -> "> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>
+			</config>
+		</start>
+
+		<start name="audio_drv" caps="150">
+			<binary name="pci_audio_drv"/>
+			<resource name="RAM" quantum="10M"/>
+			<provides>
+				<service name="Audio_in"/>
+				<service name="Audio_out"/>
+			</provides>
+			<config>
+				<mixer field="outputs.master" value="148,148"/>
+			</config>
+		</start>
+
+
 		<start name="dynamic_rom">
 			<resource name="RAM" quantum="4M"/>
 			<provides><service name="ROM"/></provides>
 			<config verbose="yes">
 				<rom name="mixer.config">
-					<inline description="client1 plays">
+					<inline description="client1 plays (volume 70%)">
 <mixer.config>
 	<default out_volume="75" volume="42" muted="false"/>
 	<channel_list>
@@ -87,7 +141,7 @@ append config {
 </mixer.config>
 					</inline>
 					<sleep milliseconds="10000" />
-					<inline description="client2 plays">
+					<inline description="client2 plays (volume 70%)">
 <mixer.config>
 	<default out_volume="75" volume="42" muted="false"/>
 	<channel_list>
@@ -101,7 +155,7 @@ append config {
 </mixer.config>
 					</inline>
 					<sleep milliseconds="10000" />
-					<inline description="both play">
+					<inline description="both play (volume 50%)">
 <mixer.config>
 	<default out_volume="75" volume="42" muted="false"/>
 	<channel_list>
@@ -175,13 +229,11 @@ if {[expr ![file exists bin/client1.f32] || ![file exists bin/client2.f32]]} {
 append boot_modules {
 	core ld.lib.so init timer
 	report_rom dynamic_rom
-	} [audio_drv_binary] { test-audio_out
+	platform_drv acpi_drv pci_decode
+	pci_audio_drv test-audio_out
 	mixer client1.f32 client2.f32
 }
 
-# platform-specific components
-append_platform_drv_boot_modules
-
 build_boot_image $boot_modules
-append qemu_args "-soundhw es1370 -nographic"
+append qemu_args " -nographic"
 run_genode_until forever