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

Kernel: Fix AML CreateFieldOp to take bit index instead of byte index

This commit is contained in:
Bananymous 2024-08-15 19:05:58 +03:00
parent e0a447bfaf
commit 51d1e47bfe
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/include/kernel/ACPI/AML/Buffer.h
View File

@ -166,27 +166,35 @@ namespace Kernel::ACPI::AML
{ {
ASSERT(context.aml_data.size() >= 1); ASSERT(context.aml_data.size() >= 1);
size_t field_bit_size = 0; bool offset_in_bytes;
size_t field_bit_size;
switch (static_cast<AML::Byte>(context.aml_data[0])) switch (static_cast<AML::Byte>(context.aml_data[0]))
{ {
case AML::Byte::CreateBitFieldOp: case AML::Byte::CreateBitFieldOp:
field_bit_size = 1; field_bit_size = 1;
offset_in_bytes = false;
break; break;
case AML::Byte::CreateByteFieldOp: case AML::Byte::CreateByteFieldOp:
field_bit_size = 8; field_bit_size = 8;
offset_in_bytes = true;
break; break;
case AML::Byte::CreateWordFieldOp: case AML::Byte::CreateWordFieldOp:
field_bit_size = 16; field_bit_size = 16;
offset_in_bytes = true;
break; break;
case AML::Byte::CreateDWordFieldOp: case AML::Byte::CreateDWordFieldOp:
field_bit_size = 32; field_bit_size = 32;
offset_in_bytes = true;
break; break;
case AML::Byte::CreateQWordFieldOp: case AML::Byte::CreateQWordFieldOp:
field_bit_size = 64; field_bit_size = 64;
offset_in_bytes = true;
break; break;
case AML::Byte::ExtOpPrefix: case AML::Byte::ExtOpPrefix:
ASSERT(context.aml_data.size() >= 2); ASSERT(context.aml_data.size() >= 2);
ASSERT(static_cast<AML::ExtOp>(context.aml_data[1]) == AML::ExtOp::CreateFieldOp); ASSERT(static_cast<AML::ExtOp>(context.aml_data[1]) == AML::ExtOp::CreateFieldOp);
field_bit_size = 0;
offset_in_bytes = false;
break; break;
default: default:
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
@ -238,7 +246,7 @@ namespace Kernel::ACPI::AML
} }
size_t field_bit_offset = static_cast<AML::Integer*>(index_node.ptr())->value; size_t field_bit_offset = static_cast<AML::Integer*>(index_node.ptr())->value;
if (field_bit_size != 1) if (offset_in_bytes)
field_bit_offset *= 8; field_bit_offset *= 8;
auto field = MUST(BAN::RefPtr<BufferField>::create(field_name->path.back(), buffer, field_bit_offset, field_bit_size)); auto field = MUST(BAN::RefPtr<BufferField>::create(field_name->path.back(), buffer, field_bit_offset, field_bit_size));