- 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, 18 insertions, 6 deletions

diff --git a/sys/dev/acpica/acpi_thermal.c b/sys/dev/acpica/acpi_thermal.c
index 45398fe..273729c 100644
--- a/sys/dev/acpica/acpi_thermal.c
+++ b/sys/dev/acpica/acpi_thermal.c
@@ -36,6 +36,12 @@
 
 #include <dev/acpica/acpivar.h>
 
+/*
+ * Hooks for the ACPI CA debugging infrastructure
+ */
+#define _COMPONENT	THERMAL_CONTROL
+MODULE_NAME("THERMAL")
+
 #define TZ_KELVTOC(x)	(((x) - 2732) / 10), (((x) - 2732) % 10)
 
 struct acpi_tz_softc {
@@ -66,11 +72,15 @@ DRIVER_MODULE(acpi_tz, acpi, acpi_tz_driver, acpi_tz_devclass, 0, 0);
 static int
 acpi_tz_probe(device_t dev)
 {
-    if (acpi_get_type(dev) == ACPI_TYPE_THERMAL) {
+
+    FUNCTION_TRACE(__FUNCTION__);
+
+    if ((acpi_get_type(dev) == ACPI_TYPE_THERMAL) &&
+	!acpi_disabled("thermal")) {
 	device_set_desc(dev, "thermal zone");
-	return(0);
+	return_VALUE(0);
     }
-    return(ENXIO);
+    return_VALUE(ENXIO);
 }
 
 static int
@@ -81,6 +91,8 @@ acpi_tz_attach(device_t dev)
     ACPI_BUFFER			buf;
     ACPI_STATUS			status;
 
+    FUNCTION_TRACE(__FUNCTION__);
+
     sc = device_get_softc(dev);
     sc->tz_dev = dev;
     sc->tz_handle = acpi_get_handle(dev);
@@ -89,14 +101,14 @@ acpi_tz_attach(device_t dev)
     buf.Length = sizeof(param);
     if ((status = AcpiEvaluateObject(sc->tz_handle, "_TMP", NULL, &buf)) != AE_OK) {
 	device_printf(sc->tz_dev, "can't fetch temperature - %s\n", acpi_strerror(status));
-	return(ENXIO);
+	return_VALUE(ENXIO);
     }
     if (param[0] != ACPI_TYPE_NUMBER) {
 	device_printf(sc->tz_dev, "%s._TMP does not evaluate to ACPI_TYPE_NUMBER\n", 
 		      acpi_name(sc->tz_handle));
-	return(ENXIO);
+	return_VALUE(ENXIO);
     }
     device_printf(sc->tz_dev, "current temperature %d.%dC\n", TZ_KELVTOC(param[1]));
     
-    return(0);
+    return_VALUE(0);
 }