update main #1

Merged
Sinipelto merged 240 commits from Bananymous/banan-os:main into main 2023-11-20 13:20:51 +02:00
1 changed files with 4 additions and 1 deletions
Showing only changes of commit f312c3a4d7 - Show all commits

View File

@ -211,7 +211,10 @@ namespace Kernel
if (memcmp(header->signature, "FACP", 4) == 0) if (memcmp(header->signature, "FACP", 4) == 0)
{ {
auto* fadt = (FADT*)header; auto* fadt = (FADT*)header;
paddr_t dsdt_paddr = fadt->x_dsdt;
paddr_t dsdt_paddr = 0;
if (fadt->length > 140) // 140 is the offset of x_dsdt
dsdt_paddr = fadt->x_dsdt;
if (dsdt_paddr == 0 || !PageTable::is_valid_pointer(dsdt_paddr)) if (dsdt_paddr == 0 || !PageTable::is_valid_pointer(dsdt_paddr))
dsdt_paddr = fadt->dsdt; dsdt_paddr = fadt->dsdt;