From 770c7548d8f8dc591f4d0f7540799757c89e9ff2 Mon Sep 17 00:00:00 2001
From: Christian Helmuth <christian.helmuth@genode-labs.com>
Date: Fri, 17 Mar 2017 16:06:48 +0100
Subject: [PATCH] acpica: fix service routing in run scenario

---
 repos/libports/run/acpica.run | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/repos/libports/run/acpica.run b/repos/libports/run/acpica.run
index 696afc6d15..273b1b303b 100644
--- a/repos/libports/run/acpica.run
+++ b/repos/libports/run/acpica.run
@@ -56,6 +56,8 @@ set config {
 			<service name="ROM"/>
 			<service name="LOG"/>
 			<service name="RM"/>
+			<service name="PD"/>
+			<service name="CPU"/>
 			<service name="IO_MEM" />
 			<service name="IO_PORT" />
 		</parent-provides>
@@ -100,10 +102,7 @@ append config {
 				<policy label="acpi_input -> acpi_lid" report="acpica -> acpi_lid"/>
 			</config>
 			<route>
-				<service name="LOG"> <parent/> </service>
-				<service name="SIGNAL"> <parent/> </service>
-				<service name="CAP"> <parent/> </service>
-				<service name="RM"> <parent/> </service>
+				<any-service> <parent/> </any-service>
 			</route>
 		</start>}
 
@@ -139,9 +138,9 @@ append config {
 				<input label="acpi" />
 			</config>
 			<route>
-				<service name="LOG"> <parent/> </service>
 				<service name="Input" label="ps2"> <child name="ps2_drv" /> </service>
 				<service name="Input" label="acpi"> <child name="acpi_input" /> </service>
+				<any-service> <parent/> </any-service>
 			</route>
 		</start>}
 
@@ -151,20 +150,17 @@ append config {
 			<provides><service name="Input"/></provides>
 			<config verbose_keyboard="no" verbose_mouse="no" verbose_scancodes="no"/>
 			<route>
-				<service name="LOG">     <parent/> </service>
-				<service name="RM">      <parent/> </service>
 				<service name="Platform"> <child name="platform_drv"/> </service>
+				<any-service> <parent/> </any-service>
 			</route>
 		</start>
 
 		<start name="test-input">
 			<resource name="RAM" quantum="1M"/>
 			<route>
-				<service name="LOG">     <parent/> </service>
-				<service name="RM">      <parent/> </service>
-
-				<service name="Input">   <child name="input_merger"/> </service>
-				<service name="Timer">   <child name="timer"/> </service>
+				<service name="Input"> <child name="input_merger"/> </service>
+				<service name="Timer"> <child name="timer"/> </service>
+				<any-service> <parent/> </any-service>
 			</route>
 		</start>}
 
@@ -191,7 +187,7 @@ append config {
 				<service name="ROM" label="acpi_ec"> <child name="acpi_state"/> </service>
 				<service name="ROM" label="acpi_fixed"> <child name="acpi_state"/> </service>
 				<service name="ROM" label="acpi_lid"> <child name="acpi_state"/> </service>
-				<service name="LOG"> <parent/> </service>
+				<any-service> <parent/> </any-service>
 			</route>
 		</start>}