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

Author: mmlr
Date: 2011-05-14 18:28:43 +0200 (Sat, 14 May 2011)
New Revision: 41497
Changeset: https://dev.haiku-os.org/changeset/41497

Modified:
   haiku/trunk/data/settings/kernel/drivers/kernel
   haiku/trunk/src/add-ons/kernel/bus_managers/acpi/acpi_busman.c
Log:
* Set the actual default of the ACPI module to enabled instead of relying on the
  kernel settings file. As pointed out by Rene, there's otherwise no way to
  enable ACPI when the settings file is absent, as there's only a disable switch
  in the boot menu.
* Remove MADT dumping as it isn't really implemented. This info can actually be
  printed in the IO-APIC code now.


Modified: haiku/trunk/data/settings/kernel/drivers/kernel
===================================================================
--- haiku/trunk/data/settings/kernel/drivers/kernel     2011-05-14 14:34:12 UTC 
(rev 41496)
+++ haiku/trunk/data/settings/kernel/drivers/kernel     2011-05-14 16:28:43 UTC 
(rev 41497)
@@ -57,8 +57,8 @@
 #emergency_keys false
        # Disables emergency keys (ie. Alt-SysReq+*), enabled by default
 
-acpi true
-       # ACPI support, disabled by default
+#acpi false
+       # ACPI support, enabled by default
 
 #acpi_avoid_full_init true
        # Avoids running _INI and _STA methods and final object initialization,

Modified: haiku/trunk/src/add-ons/kernel/bus_managers/acpi/acpi_busman.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/acpi/acpi_busman.c      
2011-05-14 14:34:12 UTC (rev 41496)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/acpi/acpi_busman.c      
2011-05-14 16:28:43 UTC (rev 41497)
@@ -74,33 +74,6 @@
 }
 
 
-static void dump_madt() {
-       ACPI_STATUS status;
-       ACPI_TABLE_HEADER *madt = NULL;
-/*     ACPI_SUBTABLE_HEADER *entry;
-       void *end; */
-       int madtCount = -1;
-
-       while (true) {
-               status = AcpiGetTable (ACPI_SIG_MADT, ++madtCount, &madt);
-               if (status != AE_OK) break;
-/*
-               dprintf("acpi: MADT TABLE:\n");
-               AcpiDmDumpDataTable( madt );
-               entry = madt + 44;
-               end = madt + madt->Header.Length;
-               while (entry < end) {
-                       dprintf("\t\tType: %d\n", entry->Type);
-                       entry += entry->Length;
-               };
-*/
-       };
-
-       dprintf("acpi: You have %d MADT tables.\n", madtCount);
-
-}
-
-
 //     #pragma mark - ACPI bus manager API
 
 
@@ -117,16 +90,13 @@
                        void *settings;
                        bool acpiDisabled = false;
                        bool acpiAvoidFullInit = false;
-                       bool acpiDumpMADT = false;
 
                        settings = load_driver_settings("kernel");
                        if (settings != NULL) {
                                acpiDisabled = 
!get_driver_boolean_parameter(settings, "acpi",
-                                       false, false);
+                                       true, true);
                                acpiAvoidFullInit = 
get_driver_boolean_parameter(settings,
                                        "acpi_avoid_full_init", false, false);
-                               acpiDumpMADT = 
get_driver_boolean_parameter(settings,
-                                       "acpi_dump_MADT", false, false);
                                unload_driver_settings(settings);
                        }
 
@@ -180,8 +150,6 @@
                                goto err;
                        }
 
-                       if (acpiDumpMADT) dump_madt();
-
                        /* Install the default address space handlers. */
                        status = 
AcpiInstallAddressSpaceHandler(ACPI_ROOT_OBJECT,
                                ACPI_ADR_SPACE_SYSTEM_MEMORY, 
ACPI_DEFAULT_HANDLER, NULL, NULL);


Other related posts:

  • » [haiku-commits] r41497 - in haiku/trunk: data/settings/kernel/drivers src/add-ons/kernel/bus_managers/acpi - mmlr