From 661330a97ac09eace5cb4d3da58b1f1c60a05453 Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Mon, 12 Dec 2022 15:33:06 +0100
Subject: [PATCH] acpica: add dependency on acpi device

Issue #4679
---
 repos/gems/sculpt/drivers/pc           |  2 +-
 repos/libports/include/acpica/acpica.h |  3 +--
 repos/libports/run/acpi_suspend.run    |  1 +
 repos/libports/run/acpica.run          |  3 ++-
 repos/libports/src/lib/acpica/env.cc   | 14 +++-----------
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/repos/gems/sculpt/drivers/pc b/repos/gems/sculpt/drivers/pc
index b1c6cb3f6a..4938145c9b 100644
--- a/repos/gems/sculpt/drivers/pc
+++ b/repos/gems/sculpt/drivers/pc
@@ -147,7 +147,7 @@
 			<policy label_suffix="-> wifi" msix="false" info="yes"> <pci class="WIFI"/> </policy>
 			<policy label_suffix="-> nic">   <pci class="ETHERNET"/> </policy>
 			<policy label_suffix="-> audio"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>
-			<policy label="acpica"> </policy>
+			<policy label="acpica"> <device name="acpi"/> </policy>
 		</config>
 	</start>
 
diff --git a/repos/libports/include/acpica/acpica.h b/repos/libports/include/acpica/acpica.h
index 34bd990bf3..9c38cc3e02 100644
--- a/repos/libports/include/acpica/acpica.h
+++ b/repos/libports/include/acpica/acpica.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2016-2017 Genode Labs GmbH
+ * Copyright (C) 2016-2022 Genode Labs GmbH
  *
  * This file is part of the Genode OS framework, which is distributed
  * under the terms of the GNU Affero General Public License version 3.
@@ -22,7 +22,6 @@ namespace Genode {
 namespace Acpica {
 
 	void init(Genode::Env &, Genode::Allocator &);
-	void use_platform_drv();
 }
 
 #endif /* _INCLUDE__ACPICA__ACPICA_H_ */
diff --git a/repos/libports/run/acpi_suspend.run b/repos/libports/run/acpi_suspend.run
index 6c9c6a5a4b..8bd59aaa95 100644
--- a/repos/libports/run/acpi_suspend.run
+++ b/repos/libports/run/acpi_suspend.run
@@ -195,6 +195,7 @@ append config {
 					<pci class="ISABRIDGE"/>
 				</policy>
 				<policy label_prefix="acpica">
+					<device name="acpi"/>
 				</policy>
 			</config>
 			<route>
diff --git a/repos/libports/run/acpica.run b/repos/libports/run/acpica.run
index 8f21613f19..9fb5e1af72 100644
--- a/repos/libports/run/acpica.run
+++ b/repos/libports/run/acpica.run
@@ -10,6 +10,7 @@ if {
 set build_components {
 	core init timer
 	drivers/platform
+	drivers/acpi
 	server/event_dump
 	app/pci_decode
 	app/acpica
@@ -87,7 +88,7 @@ set config {
 			<config>
 				<policy label_prefix="ps2_drv"> <device name="ps2"/> </policy>
 				<policy label_prefix="usb_drv" info="yes"> <pci class="USB"/> </policy>
-				<policy label_prefix="acpica"/>
+				<policy label_prefix="acpica"> <device name="acpi"/> </policy>
 			</config>
 			<route>
 				<service name="ROM" label="devices"> <child name="drivers_reports"/> </service>
diff --git a/repos/libports/src/lib/acpica/env.cc b/repos/libports/src/lib/acpica/env.cc
index 3e088229bf..2a83e7e06a 100644
--- a/repos/libports/src/lib/acpica/env.cc
+++ b/repos/libports/src/lib/acpica/env.cc
@@ -14,7 +14,7 @@
 /* Genode includes */
 #include <util/reconstructible.h>
 #include <acpica/acpica.h>
-#include <platform_session/connection.h>
+#include <platform_session/device.h>
 
 #include "env.h"
 
@@ -27,7 +27,8 @@ struct Acpica::Env
 	Genode::Env       &env;
 	Genode::Allocator &heap;
 
-	Genode::Constructible<Platform::Connection> platform;
+	Platform::Connection platform { env };
+	Platform::Device     device   { platform, "acpi" };
 
 	Env(Genode::Env &env, Genode::Allocator &heap) : env(env), heap(heap) { }
 };
@@ -37,18 +38,9 @@ static Genode::Constructible<Acpica::Env> instance;
 
 Genode::Allocator & Acpica::heap()     { return instance->heap; }
 Genode::Env       & Acpica::env()      { return instance->env; }
-Platform::Client  & Acpica::platform()
-{
-	if (!instance->platform.constructed())
-		instance->platform.construct(instance->env);
-
-	return *instance->platform;
-}
 
 
 void Acpica::init(Genode::Env &env, Genode::Allocator &heap)
 {
 	instance.construct(env, heap);
-
-	platform();
 }