1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 11:48:10 +00:00

ACPI: Examine bit width in Generic address structure before asserting

Also, the switch-case flow is simplified for IO access within a Generic
address strucuture's handling.
This commit is contained in:
Liav A 2020-03-11 14:28:17 +02:00 committed by Andreas Kling
parent 5d7855adea
commit b13417ddb4
3 changed files with 35 additions and 16 deletions

View file

@ -154,29 +154,24 @@ namespace ACPI {
{
switch (structure.address_space) {
case (u8)GenericAddressStructure::AddressSpace::SystemIO: {
dbg() << "ACPI: Sending value 0x" << String::format("%x", value) << " to " << IOAddress(structure.address);
IOAddress address(structure.address);
dbg() << "ACPI: Sending value 0x" << String::format("%x", value) << " to " << address;
switch (structure.access_size) {
case (u8)GenericAddressStructure::AccessSize::Byte: {
IO::out8(structure.address, value);
break;
}
case (u8)GenericAddressStructure::AccessSize::Word: {
IO::out16(structure.address, value);
break;
}
case (u8)GenericAddressStructure::AccessSize::DWord: {
IO::out32(structure.address, value);
break;
}
case (u8)GenericAddressStructure::AccessSize::QWord: {
dbg() << "Trying to send QWord to IO port";
ASSERT_NOT_REACHED();
break;
}
default:
// FIXME: Determine if for reset register we can actually determine the right IO operation.
case (u8)GenericAddressStructure::AccessSize::Undefined: {
dbg() << "ACPI Warning: Unknown access size " << structure.access_size;
IO::out8(structure.address, value);
ASSERT(structure.bit_width != (u8)GenericAddressStructure::BitWidth::QWord);
ASSERT(structure.bit_width != (u8)GenericAddressStructure::BitWidth::Undefined);
dbg() << "ACPI: Bit Width - " << structure.bit_width << " bits";
address.out(value, structure.bit_width);
break;
}
default:
address.out(value, (8 << (structure.access_size - 1)));
break;
}
return;