From feaaaa3e8be3b5a2b3f379e2909b8926485c7682 Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Wed, 31 Aug 2022 13:51:54 +0200
Subject: [PATCH] drivers_interactive-pc: use generic platform_drv

Ref genodelabs/genode#4578
---
 .../pkg/drivers_interactive-pc/archives       |  3 ++
 .../raw/drivers_interactive-pc/drivers.config | 54 +++++++++++++++----
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/repos/os/recipes/pkg/drivers_interactive-pc/archives b/repos/os/recipes/pkg/drivers_interactive-pc/archives
index 764954b3de..3749d1bf72 100644
--- a/repos/os/recipes/pkg/drivers_interactive-pc/archives
+++ b/repos/os/recipes/pkg/drivers_interactive-pc/archives
@@ -5,5 +5,8 @@ _/src/pc_usb_host_drv
 _/src/usb_hid_drv
 _/src/vesa_drv
 _/src/report_rom
+_/src/rom_filter
 _/src/event_filter
+_/src/pci_decode
 _/raw/drivers_interactive-pc
+_/raw/pc-devices
diff --git a/repos/os/recipes/raw/drivers_interactive-pc/drivers.config b/repos/os/recipes/raw/drivers_interactive-pc/drivers.config
index 7edf0fac53..6e8093a435 100644
--- a/repos/os/recipes/raw/drivers_interactive-pc/drivers.config
+++ b/repos/os/recipes/raw/drivers_interactive-pc/drivers.config
@@ -36,7 +36,8 @@
 			<service name="Report" />
 		</provides>
 		<config>
-			<policy label="platform_drv -> acpi"  report="acpi_drv -> acpi"/>
+			<policy label="pci_decode -> system" report="acpi_drv -> acpi"/>
+			<policy label="rom_filter -> pci_devices" report="pci_decode -> devices"/>
 			<policy label="usb_hid_drv -> report" report="usb_drv -> devices"/>
 		</config>
 		<route>
@@ -47,16 +48,48 @@
 		</route>
 	</start>
 
+	<start name="rom_filter" caps="70">
+		<resource name="RAM" quantum="1M"/>
+		<provides> <service name="ROM" /> </provides>
+		<config buffer="32K">
+			<input name="devices"/>
+			<input name="pci_devices"/>
+			<output node="devices">
+				<input name="devices"     skip_toplevel="yes"/>
+				<input name="pci_devices" skip_toplevel="yes"/>
+			</output>
+		</config>
+		<route>
+			<service name="ROM" label="pci_devices"> <child name="report_rom"/> </service>
+			<service name="LOG"> <parent/> </service>
+			<service name="PD">  <parent/> </service>
+			<service name="CPU"> <parent/> </service>
+			<service name="ROM"> <parent/> </service>
+		</route>
+	</start>
+
+	<start name="pci_decode" caps="100">
+		<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="200" managing_system="yes">
-		<binary name="legacy_pc_platform_drv"/>
 		<resource name="RAM" quantum="3M"/>
 		<provides>
 			<service name="Platform"/>
-			<service name="Acpi"/>
 		</provides>
 		<route>
-			<service name="ROM" label="system"> <child name="report_rom"/> </service>
-			<service name="ROM" label="acpi">   <child name="report_rom"/> </service>
+			<service name="ROM" label="devices"> <child name="rom_filter"/> </service>
+			<service name="Report">  <child name="report_rom"/> </service>
 			<service name="IRQ">     <parent/> </service>
 			<service name="IO_MEM">  <parent/> </service>
 			<service name="IO_PORT"> <parent/> </service>
@@ -67,11 +100,10 @@
 			<service name="Timer">   <parent/> </service>
 		</route>
 		<config>
-			<policy label_prefix="ps2_drv">  <device name="PS2"/> </policy>
-			<policy label_prefix="fb_drv">   <pci class="VGA"/> </policy>
-			<policy label_prefix="usb_drv">  <pci class="USB"/> </policy>
-			<policy label_prefix="nic_drv">  <pci class="ETHERNET"/> </policy>
-			<policy label_prefix="wifi_drv"> <pci class="WIFI"/> </policy>
+			<report devices="yes"/>
+			<policy label_prefix="ps2_drv"> <device name="ps2"/> </policy>
+			<policy label_prefix="fb_drv"  info="yes"> <pci class="VGA"/> </policy>
+			<policy label_prefix="usb_drv" info="yes"> <pci class="USB"/> </policy>
 		</config>
 	</start>
 
@@ -127,7 +159,7 @@
 	</start>
 
 	<start name="usb_hid_drv" caps="140">
-		<resource name="RAM" quantum="11M"/>
+		<resource name="RAM" quantum="10M"/>
 		<config use_report="yes"/>
 		<route>
 			<service name="ROM" label="report"> <child name="report_rom"/> </service>