- Convert a lot of homebrew debugging output to use the ACPI CA debugging

   infrastructure.  It's not perfect, but it's a lot better than what
   we've been using so far.  The following rules apply to this:
    o BSD component names should be capitalised
    o Layer names should be taken from the non-CA set for now.  We
      may elect to add some new BSD-specific layers later.

 - Make it possible to turn off selective debugging flags or layers
   by listing them in debug.acpi.layer or debug.acpi.level prefixed
   with !.

 - Fully implement support for avoiding nodes in the ACPI namespace.
   Nodes may be listed in the debug.acpi.avoid environment variable;
   these nodes and all their children will be ignored (although still
   scanned over) by ACPI functions which scan the namespace.  Multiple
   nodes can be specified, separated by whitespace.

 - Implement support for selectively disabling ACPI subsystem components
   via the debug.acpi.disable environment variable.  The following
   components can be disabled:
    o bus	creation/scanning of the ACPI 'bus'
    o children	attachment of children to the ACPI 'bus'
    o button	the acpi_button control-method button driver
    o ec	the acpi_ec embedded-controller driver
    o isa	acpi replacement of PnP BIOS for ISA device discovery
    o lid	the control-method lid switch driver
    o pci	pci root-bus discovery
    o processor CPU power/speed management
    o thermal	system temperature detection and control
    o timer	ACPI timecounter
   Multiple components may be disabled by specifying their name(s)
   separated by whitespace.

 - Add support for ioctl registration.  ACPI subsystem components may
   register ioctl handlers with the /dev/acpi generic ioctl handler,
   allowing us to avoid the need for a multitude of /dev/acpi* control
   devices, etc.

1 files changed, 35 insertions, 17 deletions

diff --git a/sys/dev/acpica/acpi_button.c b/sys/dev/acpica/acpi_button.c
index cc6b4c2..70cad56 100644
--- a/sys/dev/acpica/acpi_button.c
+++ b/sys/dev/acpica/acpi_button.c
@@ -37,6 +37,12 @@
 
 #include <dev/acpica/acpivar.h>
 
+/*
+ * Hooks for the ACPI CA debugging infrastructure
+ */
+#define _COMPONENT	SYSTEM_CONTROL
+MODULE_NAME("BUTTON")
+
 struct acpi_button_softc {
     device_t	button_dev;
     ACPI_HANDLE	button_handle;
@@ -75,17 +81,18 @@ acpi_button_probe(device_t dev)
 
     sc = device_get_softc(dev);
     if (acpi_get_type(dev) == ACPI_TYPE_DEVICE) {
-	if (acpi_MatchHid(dev, "PNP0C0C")) {
-	    device_set_desc(dev, "Control Method Power Button Device");
-	    sc->button_type = ACPI_POWER_BUTTON;
-	    return(0);
+	if (!acpi_disabled("button")) {
+	    if (acpi_MatchHid(dev, "PNP0C0C")) {
+		device_set_desc(dev, "Control Method Power Button Device");
+		sc->button_type = ACPI_POWER_BUTTON;
+		return(0);
+	    }
+	    if (acpi_MatchHid(dev, "PNP0C0E")) {
+		device_set_desc(dev, "Control Method Sleep Button Device");
+		sc->button_type = ACPI_SLEEP_BUTTON;
+		return(0);
+	    }
 	}
-	if (acpi_MatchHid(dev, "PNP0C0E")) {
-	    device_set_desc(dev, "Control Method Sleep Button Device");
-	    sc->button_type = ACPI_SLEEP_BUTTON;
-	    return(0);
-	}
-	return(ENXIO);
     }
     return(ENXIO);
 }
@@ -96,6 +103,8 @@ acpi_button_attach(device_t dev)
     struct acpi_button_softc	*sc;
     ACPI_STATUS			status;
 
+    FUNCTION_TRACE(__FUNCTION__);
+
     sc = device_get_softc(dev);
     sc->button_dev = dev;
     sc->button_handle = acpi_get_handle(dev);
@@ -103,9 +112,9 @@ acpi_button_attach(device_t dev)
     if ((status = AcpiInstallNotifyHandler(sc->button_handle, ACPI_DEVICE_NOTIFY, 
 					   acpi_button_notify_handler, sc)) != AE_OK) {
 	device_printf(sc->button_dev, "couldn't install Notify handler - %s\n", acpi_strerror(status));
-	return(ENXIO);
+	return_VALUE(ENXIO);
     }
-    return(0);
+    return_VALUE(0);
 }
 
 static void
@@ -114,10 +123,12 @@ acpi_button_notify_pressed_for_sleep(void *arg)
     struct acpi_button_softc	*sc;
     struct acpi_softc		*acpi_sc;
 
+    FUNCTION_TRACE(__FUNCTION__);
+
     sc = (struct acpi_button_softc *)arg;
     acpi_sc = acpi_device_get_parent_softc(sc->button_dev);
     if (acpi_sc == NULL) {
-	return;
+	return_VOID;
     }
 
     switch (sc->button_type) {
@@ -128,8 +139,9 @@ acpi_button_notify_pressed_for_sleep(void *arg)
 	acpi_eventhandler_sleep_button_for_sleep((void *)acpi_sc);
 	break;
     default:
-	return;		/* unknown button type */
+	break;		/* unknown button type */
     }
+    return_VOID;
 }
 
 static void
@@ -138,10 +150,12 @@ acpi_button_notify_pressed_for_wakeup(void *arg)
     struct acpi_button_softc	*sc;
     struct acpi_softc		*acpi_sc;
 
+    FUNCTION_TRACE(__FUNCTION__);
+
     sc = (struct acpi_button_softc *)arg;
     acpi_sc = acpi_device_get_parent_softc(sc->button_dev);
     if (acpi_sc == NULL) {
-	return;
+	return_VOID;
     }
 
     switch (sc->button_type) {
@@ -152,8 +166,9 @@ acpi_button_notify_pressed_for_wakeup(void *arg)
 	acpi_eventhandler_sleep_button_for_wakeup((void *)acpi_sc);
 	break;
     default:
-	return;		/* unknown button type */
+	break;		/* unknown button type */
     }
+    return_VOID;
 }
 
 /* XXX maybe not here */
@@ -165,6 +180,8 @@ acpi_button_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context)
 {
     struct acpi_button_softc	*sc = (struct acpi_button_softc *)context;
 
+    FUNCTION_TRACE_U32(__FUNCTION__, notify);
+
     switch (notify) {
     case ACPI_NOTIFY_BUTTON_PRESSED_FOR_SLEEP:
 	AcpiOsQueueForExecution(OSD_PRIORITY_LO, acpi_button_notify_pressed_for_sleep, sc);
@@ -175,8 +192,9 @@ acpi_button_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context)
 	device_printf(sc->button_dev, "pressed for wakeup, button type: %d\n", sc->button_type);
 	break;   
     default:
-	return;		/* unknown notification value */
+	break;		/* unknown notification value */
     }
+    return_VOID;
 }