From 030575592cafb24ba1f88341ee70aec11d95f040 Mon Sep 17 00:00:00 2001 From: Aiken Harris Date: Mon, 11 Aug 2025 23:30:40 +0200 Subject: [PATCH] Revert 'Fix broken HlpInitializeAcpiSystemDescriptionTable implementation' --- xtoskrnl/hl/acpi.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/xtoskrnl/hl/acpi.c b/xtoskrnl/hl/acpi.c index 1200742..28d9ef7 100644 --- a/xtoskrnl/hl/acpi.c +++ b/xtoskrnl/hl/acpi.c @@ -139,11 +139,12 @@ XTAPI XTSTATUS HlpInitializeAcpiCache(VOID) { - ACPI_DESCRIPTION_HEADER Rsdt; + PACPI_DESCRIPTION_HEADER Rsdt; XTSTATUS Status; /* Initialize ACPI cache list */ RtlInitializeListHead(&HlpAcpiCacheList); + /* Get XSDT/RSDT */ Status = HlpInitializeAcpiSystemDescriptionTable(&Rsdt); if(Status != STATUS_SUCCESS) @@ -153,7 +154,7 @@ HlpInitializeAcpiCache(VOID) } /* Cache XSDT/RSDT table */ - HlpCacheAcpiTable(&Rsdt); + HlpCacheAcpiTable(Rsdt); /* Return success */ return STATUS_SUCCESS; @@ -171,7 +172,7 @@ HlpInitializeAcpiCache(VOID) */ XTAPI XTSTATUS -HlpInitializeAcpiSystemDescriptionTable(OUT PACPI_DESCRIPTION_HEADER AcpiTable) +HlpInitializeAcpiSystemDescriptionTable(OUT PACPI_DESCRIPTION_HEADER *AcpiTable) { PHYSICAL_ADDRESS RsdpAddress, RsdtAddress; PSYSTEM_RESOURCE_HEADER ResourceHeader; @@ -181,7 +182,7 @@ HlpInitializeAcpiSystemDescriptionTable(OUT PACPI_DESCRIPTION_HEADER AcpiTable) XTSTATUS Status; /* Assume ACPI table not found */ - AcpiTable = NULL; + *AcpiTable = NULL; /* Get ACPI system resource */ Status = KeGetSystemResource(SystemResourceAcpi, &ResourceHeader); @@ -249,7 +250,7 @@ HlpInitializeAcpiSystemDescriptionTable(OUT PACPI_DESCRIPTION_HEADER AcpiTable) } /* Get ACPI table header and return success */ - AcpiTable = &Rsdt->Header; + *AcpiTable = &Rsdt->Header; return STATUS_SUCCESS; }