From 8d746a701edbc85cce438f2a6681db52d74b5b6d Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Fri, 2 Sep 2022 13:37:36 +0200
Subject: [PATCH] drivers_nic-pc: use generic platform_drv

Ref genodelabs/genode#4578
---
 .../gems/recipes/pkg/drivers_nic-pc/archives  |  1 +
 .../recipes/raw/drivers_nic-pc/drivers.config | 25 ++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/repos/gems/recipes/pkg/drivers_nic-pc/archives b/repos/gems/recipes/pkg/drivers_nic-pc/archives
index f1cf2b2ddf..2dfdd6f505 100644
--- a/repos/gems/recipes/pkg/drivers_nic-pc/archives
+++ b/repos/gems/recipes/pkg/drivers_nic-pc/archives
@@ -2,4 +2,5 @@ _/src/platform_drv
 _/src/acpi_drv
 _/src/ipxe_nic_drv
 _/src/report_rom
+_/src/pci_decode
 _/raw/drivers_nic-pc
diff --git a/repos/gems/recipes/raw/drivers_nic-pc/drivers.config b/repos/gems/recipes/raw/drivers_nic-pc/drivers.config
index a1527c084f..8420d00037 100644
--- a/repos/gems/recipes/raw/drivers_nic-pc/drivers.config
+++ b/repos/gems/recipes/raw/drivers_nic-pc/drivers.config
@@ -38,7 +38,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="platform_drv -> devices" report="pci_decode -> devices"/>
 		</config>
 		<route>
 			<service name="LOG"> <parent/> </service>
@@ -48,16 +49,28 @@
 		</route>
 	</start>
 
-	<start name="platform_drv" caps="210" managing_system="yes">
-		<binary name="legacy_pc_platform_drv"/>
+	<start name="pci_decode">
+		<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">
 		<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="report_rom"/> </service>
 			<service name="IRQ">     <parent/> </service>
 			<service name="IO_MEM">  <parent/> </service>
 			<service name="IO_PORT"> <parent/> </service>
@@ -72,7 +85,7 @@
 		</config>
 	</start>
 
-	<start name="nic_drv" caps="120">
+	<start name="nic_drv" caps="200">
 		<binary name="ipxe_nic_drv"/>
 		<resource name="RAM" quantum="8M"/>
 		<route>