From d4fb4ebd675bcb3b6a3b307b172cdafd43b58710 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 29 Dec 2015 11:26:20 -0500 Subject: [PATCH] ACPI: Remove manual address space handler initialization. These are now done in AcpiInitializeSubsystem(), as part of the early init so they can be present when the tables are loaded. Should fix ACPI not working since the merge. --- .../kernel/bus_managers/acpi/BusManager.cpp | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp b/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp index fda246661a..48254f76d6 100644 --- a/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp +++ b/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp @@ -231,25 +231,6 @@ acpi_std_ops(int32 op,...) "AcpiLoadTables failed")) goto err; - /* Install the default address space handlers. */ - if (checkAndLogFailure(AcpiInstallAddressSpaceHandler( - ACPI_ROOT_OBJECT, ACPI_ADR_SPACE_SYSTEM_MEMORY, - ACPI_DEFAULT_HANDLER, NULL, NULL), - "Could not initialise SystemMemory handler:")) - goto err; - - if (checkAndLogFailure(AcpiInstallAddressSpaceHandler( - ACPI_ROOT_OBJECT, ACPI_ADR_SPACE_SYSTEM_IO, - ACPI_DEFAULT_HANDLER, NULL, NULL), - "Could not initialise SystemIO handler:")) - goto err; - - if (checkAndLogFailure(AcpiInstallAddressSpaceHandler( - ACPI_ROOT_OBJECT, ACPI_ADR_SPACE_PCI_CONFIG, - ACPI_DEFAULT_HANDLER, NULL, NULL), - "Could not initialise PciConfig handler:")) - goto err; - arg.Integer.Type = ACPI_TYPE_INTEGER; arg.Integer.Value = apic_available() ? APIC_MODE : PIC_MODE;