[haiku-commits] haiku: hrev44623 - src/add-ons/kernel/bus_managers/acpi data/settings/kernel/drivers

From: fredrik.holmqvist@xxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Sun, 9 Sep 2012 13:33:50 +0200 (CEST)
hrev44623 adds 1 changeset to branch 'master'
old head: b772f88c88e8fbbe2f498b38d32135893beca3b8
new head: 953ca70721a5f8fe0f5aaa24ad6ac211a3097552

----------------------------------------------------------------------------

953ca70: Removing the acpi_avoid_full_init config option.
  
  I've never heard anyone that been helped by that setting.

                         [ Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev44623
Commit:      953ca70721a5f8fe0f5aaa24ad6ac211a3097552
URL:         http://cgit.haiku-os.org/haiku/commit/?id=953ca70
Author:      Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx>
Date:        Sun Sep  9 11:13:53 2012 UTC

----------------------------------------------------------------------------

2 files changed, 1 insertion(+), 13 deletions(-)
data/settings/kernel/drivers/kernel                |    4 ----
.../kernel/bus_managers/acpi/BusManager.cpp        |   10 +---------

----------------------------------------------------------------------------

diff --git a/data/settings/kernel/drivers/kernel 
b/data/settings/kernel/drivers/kernel
index 0c7fd48..3b11402 100644
--- a/data/settings/kernel/drivers/kernel
+++ b/data/settings/kernel/drivers/kernel
@@ -60,10 +60,6 @@ load_symbols true
 #acpi false
        # ACPI support, enabled by default
 
-#acpi_avoid_full_init true
-       # Avoids running _INI and _STA methods and final object initialization,
-       # which may be used to for debugging ACPI issues, false by default
-
 #disable_ioapic true
        # Disables IO-APIC support, enabled by default
 
diff --git a/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp 
b/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
index 0f2317d..d48757f 100644
--- a/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
+++ b/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
@@ -88,18 +88,14 @@ acpi_std_ops(int32 op,...)
                        ACPI_STATUS status;
                        ACPI_OBJECT arg;
                        ACPI_OBJECT_LIST parameter;
-                       uint32 flags;
                        void *settings;
                        bool acpiDisabled = false;
-                       bool acpiAvoidFullInit = false;
                        AcpiGbl_CopyDsdtLocally = true;
 
                        settings = load_driver_settings("kernel");
                        if (settings != NULL) {
                                acpiDisabled = 
!get_driver_boolean_parameter(settings, "acpi",
                                        true, true);
-                               acpiAvoidFullInit = 
get_driver_boolean_parameter(settings,
-                                       "acpi_avoid_full_init", false, false);
                                unload_driver_settings(settings);
                        }
 
@@ -186,10 +182,6 @@ acpi_std_ops(int32 op,...)
 
                        AcpiEvaluateObject(NULL, "\\_PIC", &parameter, NULL);
 
-                       flags = acpiAvoidFullInit ?
-                                       ACPI_NO_DEVICE_INIT | 
ACPI_NO_OBJECT_INIT :
-                                       ACPI_FULL_INITIALIZATION;
-
                        // FreeBSD seems to pass in the above flags here as
                        // well but specs don't define ACPI_NO_DEVICE_INIT
                        // and ACPI_NO_OBJECT_INIT here.
@@ -200,7 +192,7 @@ acpi_std_ops(int32 op,...)
                                goto err;
                        }
 
-                       status = AcpiInitializeObjects(flags);
+                       status = 
AcpiInitializeObjects(ACPI_FULL_INITIALIZATION);
                        if (ACPI_FAILURE(status)) {
                                ERROR("AcpiInitializeObjects failed (%s)\n",
                                        AcpiFormatException(status));
[haiku-commits] haiku: hrev44623 - src/add-ons/kernel/bus_managers/acpi data/settings/kernel/drivers

Other related posts:
