DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-21 13:46:36 +00:00
Code Issues Releases Wiki Activity

wait4系统调用支持options字段 (#398)

Browse Source
This commit is contained in:
GnoCiYeH
2023-10-09 00:58:08 +08:00
committed by GitHub
parent 2dbef7859f
commit b7b843bedd
5 changed files with 69 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/src/driver/acpi/acpi.c
View File

@ -137,14 +137,15 @@ void acpi_init()
multiboot2_iter(multiboot2_get_acpi_old_RSDP, &old_acpi, &reserved);
rsdpv1 = &(old_acpi.rsdp);
multiboot2_iter(multiboot2_get_acpi_new_RSDP, &new_acpi, &reserved);
rsdpv2 = &(new_acpi.rsdp);
// 这里有bug：当multiboot2不存在rsdpv2的时候，会导致错误
// multiboot2_iter(multiboot2_get_acpi_new_RSDP, &new_acpi, &reserved);
// rsdpv2 = &(new_acpi.rsdp);
rsdpv2 = NULL;
rs_acpi_init((uint64_t)rsdpv1);
uint64_t paddr = 0;
// An ACPI-compatible OS must use the XSDT if present
if (rsdpv2->XsdtAddress != 0x00UL)
if (rsdpv2 && rsdpv2->XsdtAddress != 0x00UL)
{
// 不要删除这段注释（因为还不确定是代码的bug，还是真机的bug）
/*