ACPI: comment-out not-yet-ready code and remove extra debug

diff --git a/sys/dev/acpica5/acpi.c b/sys/dev/acpica5/acpi.c
index e0e0315..db6e1fb 100644 (file)
--- a/sys/dev/acpica5/acpi.c
+++ b/sys/dev/acpica5/acpi.c
@@ -139,7 +139,6 @@ static void acpi_probe_children(device_t bus);
 static void    acpi_probe_order(ACPI_HANDLE handle, int *order);
 static ACPI_STATUS acpi_probe_child(ACPI_HANDLE handle, UINT32 level,
                    void *context, void **status);
-BOOLEAN        acpi_MatchHid(ACPI_HANDLE h, const char *hid);
 static ACPI_STATUS acpi_EnterSleepState(struct acpi_softc *sc, int state);
 static void    acpi_shutdown_final(void *arg, int howto);
 static void    acpi_enable_fixed_events(struct acpi_softc *sc);
@@ -147,7 +146,9 @@ static int  acpi_wake_sleep_prep(ACPI_HANDLE handle, int sstate);
 static int     acpi_wake_run_prep(ACPI_HANDLE handle, int sstate);
 static int     acpi_wake_prep_walk(int sstate);
 static int     acpi_wake_sysctl_walk(device_t dev);
+#ifdef notyet
 static int     acpi_wake_set_sysctl(SYSCTL_HANDLER_ARGS);
+#endif
 static void    acpi_system_eventhandler_sleep(void *arg, int state);
 static void    acpi_system_eventhandler_wakeup(void *arg, int state);
 static int     acpi_supported_sleep_state_sysctl(SYSCTL_HANDLER_ARGS);
@@ -1085,7 +1086,6 @@ acpi_alloc_resource(device_t bus, device_t child, int type, int *rid,
             *
             * XXX: Should we handle the lookup failing?
             */
-kprintf("%s(): %d\n", __FUNCTION__, __LINE__);
            if (ACPI_SUCCESS(acpi_lookup_irq_resource(child, *rid, res, &ares)))
                acpi_config_intr(child, &ares);
            else
@@ -2644,6 +2644,7 @@ acpi_wake_prep_walk(int sstate)
 static int
 acpi_wake_sysctl_walk(device_t dev)
 {
+#ifdef notyet
     int error, i, numdevs;
     device_t *devlist;
     device_t child;
@@ -2655,7 +2656,6 @@ acpi_wake_sysctl_walk(device_t dev)
            kfree(devlist, M_TEMP);
        return (error);
     }
-#ifdef notyet
     for (i = 0; i < numdevs; i++) {
        child = devlist[i];
        acpi_wake_sysctl_walk(child);
@@ -2669,12 +2669,13 @@ acpi_wake_sysctl_walk(device_t dev)
                acpi_wake_set_sysctl, "I", "Device set to wake the system");
        }
     }
-#endif
     kfree(devlist, M_TEMP);
+#endif
 
     return (0);
 }
 
+#ifdef notyet
 /* Enable or disable wake from userland. */
 static int
 acpi_wake_set_sysctl(SYSCTL_HANDLER_ARGS)
@@ -2693,6 +2694,7 @@ acpi_wake_set_sysctl(SYSCTL_HANDLER_ARGS)
 
     return (acpi_wake_set_enable(dev, enable));
 }
+#endif
 
 /* Parse a device's _PRW into a structure. */
 int

diff --git a/sys/dev/acpica5/acpi_resource.c b/sys/dev/acpica5/acpi_resource.c
index a4d9096..c337804 100644 (file)
--- a/sys/dev/acpica5/acpi_resource.c
+++ b/sys/dev/acpica5/acpi_resource.c
@@ -706,12 +706,12 @@ acpi_sysres_attach(device_t dev)
      * the rman pool.
      */
     bus = device_get_parent(dev);
-gparent = device_get_parent(bus);
+    gparent = device_get_parent(bus);
     dev_rl = BUS_GET_RESOURCE_LIST(bus, dev);
     bus_rl = BUS_GET_RESOURCE_LIST(device_get_parent(bus), bus);
-if(bus_rl)
-kprintf("busrl is not null!\n");
-    SLIST_FOREACH(dev_rle, dev_rl, link) {
+    if(bus_rl)
+        kprintf("busrl is not null!\n");
+        SLIST_FOREACH(dev_rle, dev_rl, link) {
        if (dev_rle->type != SYS_RES_IOPORT && dev_rle->type != SYS_RES_MEMORY)
            continue;
 

diff --git a/sys/platform/pc32/apic/mpapic.c b/sys/platform/pc32/apic/mpapic.c
index 7f3750d..3990f96 100644 (file)
--- a/sys/platform/pc32/apic/mpapic.c
+++ b/sys/platform/pc32/apic/mpapic.c
@@ -554,10 +554,10 @@ io_apic_setup_intpin(int apic, int pin)
        if (cpuid > mp_naps)
                cpuid = 0;
 
-       //if (bootverbose) {
+       if (bootverbose) {
                kprintf("IOAPIC #%d intpin %d -> irq %d (CPU%d)\n",
                       apic, pin, irq, cpuid);
-       //}
+       }
 
        /*
         * Program the appropriate registers.  This routing may be 

diff --git a/sys/platform/pc32/i386/nexus.c b/sys/platform/pc32/i386/nexus.c
index a5abb7d..f021816 100644 (file)
--- a/sys/platform/pc32/i386/nexus.c
+++ b/sys/platform/pc32/i386/nexus.c
@@ -481,9 +481,6 @@ nexus_config_intr(device_t dev, device_t child, int irq, enum intr_trigger trig,
        int slot = pci_get_slot(child);
        int bus = pci_get_bus(child);
        int pin = irq + 1;
-       kprintf("%s(%s): irq: %d, trigger: %d, polarity: %d bus: %d slot: %d\n",
-                __FUNCTION__, device_get_nameunit(child), irq, trig, pol,
-                                bus, slot);
        line = pci_apic_irq(bus, slot, pin);
        if(line >= 0)
                return line;
@@ -491,9 +488,6 @@ nexus_config_intr(device_t dev, device_t child, int irq, enum intr_trigger trig,
        if(line >= 0)
                return line;
 
-        kprintf("MPTable: Unable to route for bus %d slot %d INT%c\n",
-                pci_get_bus(child), pci_get_slot(child), 'A' + pin - 1);
-
        return PCI_INVALID_IRQ;
 #else
        return irq;