Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: ACPI add easier API for calling methods with arguments

This commit is contained in:
Bananymous 2025-04-01 22:51:00 +03:00
parent 35149b6960
commit 0e085b30cc
4 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/include/kernel/ACPI/AML/Node.h
View File

@ -306,6 +306,8 @@ namespace Kernel::ACPI::AML
// If method has no return, it will return <integer 0>
BAN::ErrorOr<Node> method_call(const Scope& scope, const Node& method, BAN::Array<Reference*, 7>&& args, uint32_t call_depth = 0);
BAN::ErrorOr<Node> method_call(const Scope& scope, const Node& method,
Node&& arg0 = {}, Node&& arg1 = {}, Node&& arg2 = {}, Node&& arg3 = {}, Node&& arg4 = {}, Node&& arg5 = {}, Node&& arg6 = {});
}

2
kernel/kernel/ACPI/ACPI.cpp
View File

@ -819,7 +819,7 @@ acpi_release_global_lock:
auto index = i * 8 + (pending & ~(pending - 1));
if (m_gpe_methods[index])
if (auto ret = AML::method_call(m_gpe_scope, m_gpe_methods[index]->node, {}); ret.is_error())
if (auto ret = AML::method_call(m_gpe_scope, m_gpe_methods[index]->node, BAN::Array<AML::Reference*, 7>{}); ret.is_error())
dwarnln("Failed to evaluate _GPE {}: ", index, ret.error());
handled_event = true;

29
kernel/kernel/ACPI/AML/Node.cpp
View File

@ -2571,7 +2571,7 @@ namespace Kernel::ACPI::AML
case Node::Type::Method:
if (node.as.method.arg_count != 0)
return BAN::Error::from_errno(EFAULT);
return TRY(method_call(node_path, node, {}));
return TRY(method_call(node_path, node, BAN::Array<Reference*, 7>{}));
}
dwarnln("evaluate {}", node);
@ -2680,6 +2680,33 @@ namespace Kernel::ACPI::AML
return result;
}
BAN::ErrorOr<Node> method_call(const Scope& scope, const Node& method, Node&& arg0, Node&& arg1, Node&& arg2, Node&& arg3, Node&& arg4, Node&& arg5, Node&& arg6)
{
BAN::Array<Reference*, 7> args(nullptr);
#define INIT_ARGn(n) \
if (arg ## n.type != Node::Type::Uninitialized) \
{ \
args[n] = new Reference(); \
if (args[n] == nullptr) \
return BAN::Error::from_errno(ENOMEM); \
args[n]->ref_count = 1; \
args[n]->node = BAN::move(arg ## n); \
}
INIT_ARGn(0);
INIT_ARGn(1);
INIT_ARGn(2);
INIT_ARGn(3);
INIT_ARGn(4);
INIT_ARGn(5);
INIT_ARGn(6);
#undef INIT_ARGn
return method_call(scope, method, BAN::move(args));
}
BAN::ErrorOr<Node> parse_node(ParseContext& context, bool return_ref)
{
if (context.aml_data.empty())

2
kernel/kernel/ACPI/BatterySystem.cpp
View File

@ -41,7 +41,7 @@ namespace Kernel::ACPI
if (method_ref == nullptr)
return BAN::Error::from_errno(EFAULT);
auto result = TRY(AML::method_call(method_path, method_ref->node, {}));
auto result = TRY(AML::method_call(method_path, method_ref->node, BAN::Array<AML::Reference*, 7>{}));
if (result.type != AML::Node::Type::Package || result.as.package->num_elements < m_result_index)
return BAN::Error::from_errno(EFAULT);