ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-04 17:53:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

acpica: add dependency on acpi device

Browse Source 
Issue #4679
This commit is contained in:
Alexander Boettcher 2022-12-12 15:33:06 +01:00 committed by Christian Helmuth
parent dca71dbad9
commit 661330a97a
5 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/gems/sculpt/drivers/pc
View File

@ -147,7 +147,7 @@
<policy label_suffix="-> wifi" msix="false" info="yes"> <pci class="WIFI"/> </policy> <policy label_suffix="-> wifi" msix="false" info="yes"> <pci class="WIFI"/> </policy>
<policy label_suffix="-> nic"> <pci class="ETHERNET"/> </policy> <policy label_suffix="-> nic"> <pci class="ETHERNET"/> </policy>
<policy label_suffix="-> audio"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy> <policy label_suffix="-> audio"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>
<policy label="acpica"> </policy> <policy label="acpica"> <device name="acpi"/> </policy>
</config> </config>
</start> </start>

3
repos/libports/include/acpica/acpica.h
View File

@ -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 * This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU Affero General Public License version 3. * under the terms of the GNU Affero General Public License version 3.
@ -22,7 +22,6 @@ namespace Genode {
namespace Acpica { namespace Acpica {
void init(Genode::Env &, Genode::Allocator &); void init(Genode::Env &, Genode::Allocator &);
void use_platform_drv();
} }
#endif /* _INCLUDE__ACPICA__ACPICA_H_ */ #endif /* _INCLUDE__ACPICA__ACPICA_H_ */

1
repos/libports/run/acpi_suspend.run
View File

@ -195,6 +195,7 @@ append config {
<pci class="ISABRIDGE"/> <pci class="ISABRIDGE"/>
</policy> </policy>
<policy label_prefix="acpica"> <policy label_prefix="acpica">
<device name="acpi"/>
</policy> </policy>
</config> </config>
<route> <route>

3
repos/libports/run/acpica.run
View File

@ -10,6 +10,7 @@ if {
set build_components { set build_components {
core init timer core init timer
drivers/platform drivers/platform
drivers/acpi
server/event_dump server/event_dump
app/pci_decode app/pci_decode
app/acpica app/acpica
@ -87,7 +88,7 @@ set config {
<config> <config>
<policy label_prefix="ps2_drv"> <device name="ps2"/> </policy> <policy label_prefix="ps2_drv"> <device name="ps2"/> </policy>
<policy label_prefix="usb_drv" info="yes"> <pci class="USB"/> </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> </config>
<route> <route>
<service name="ROM" label="devices"> <child name="drivers_reports"/> </service> <service name="ROM" label="devices"> <child name="drivers_reports"/> </service>

14
repos/libports/src/lib/acpica/env.cc
View File

@ -14,7 +14,7 @@
/* Genode includes */ /* Genode includes */
#include <util/reconstructible.h> #include <util/reconstructible.h>
#include <acpica/acpica.h> #include <acpica/acpica.h>
#include <platform_session/connection.h> #include <platform_session/device.h>
#include "env.h" #include "env.h"
@ -27,7 +27,8 @@ struct Acpica::Env
Genode::Env &env; Genode::Env &env;
Genode::Allocator &heap; 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) { } 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::Allocator & Acpica::heap() { return instance->heap; }
Genode::Env & Acpica::env() { return instance->env; } 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) void Acpica::init(Genode::Env &env, Genode::Allocator &heap)
{ {
instance.construct(env, heap); instance.construct(env, heap);
platform();
} }