Sun Jan 9 15:43:21 2011 UTC ()

After consulting jmcneill@, set the state to D0 ("on") upon shutdown and
detach. A safety measure so that we do not accidentally fry anything.


(jruoho)

diff -r1.1 -r1.2 src/sys/dev/acpi/acpi_fan.c

--- src/sys/dev/acpi/acpi_fan.c 2011/01/09 15:12:34	1.1
+++ src/sys/dev/acpi/acpi_fan.c 2011/01/09 15:43:20	1.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_fan.c,v 1.1 2011/01/09 15:12:34 jruoho Exp $ */
+/*	$NetBSD: acpi_fan.c,v 1.2 2011/01/09 15:43:20 jruoho Exp $ */
 /*-
  * Copyright (c) 2011 Jukka Ruohonen <jruohonen@iki.fi>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -17,27 +17,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_fan.c,v 1.1 2011/01/09 15:12:34 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_fan.c,v 1.2 2011/01/09 15:43:20 jruoho Exp $");
 #include <sys/param.h>
 #include <sys/module.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 #include <dev/acpi/acpi_power.h>
 #include <dev/sysmon/sysmonvar.h>
 #define _COMPONENT		ACPI_RESOURCE_COMPONENT
 ACPI_MODULE_NAME		("acpi_fan")
 @@ -102,26 +102,29 @@ acpifan_attach(device_t parent, device_t
 	    acpifan_resume, acpifan_shutdown);
 	rv = AcpiGetHandle(sc->sc_node->ad_handle, "_FIF", &tmp);
 	if (ACPI_SUCCESS(rv))
 		aprint_verbose_dev(self, "ACPI 4.0 functionality present\n");
+}
 static int
 acpifan_detach(device_t self, int flags)
+{
 	struct acpifan_softc *sc = device_private(self);
 	if (sc->sc_state != ACPI_STATE_ERROR)
 		(void)acpi_power_set(sc->sc_node->ad_handle, ACPI_STATE_D0);
 	pmf_device_deregister(self);
 	acpi_power_deregister(sc->sc_node->ad_handle);
 	if (sc->sc_sme != NULL)
 		sysmon_envsys_unregister(sc->sc_sme);
 	return 0;
+}
 static bool
 acpifan_suspend(device_t self, const pmf_qual_t *qual)
+{
 	struct acpifan_softc *sc = device_private(self);
 @@ -142,27 +145,27 @@ acpifan_resume(device_t self, const pmf_
 	if (sc->sc_state != ACPI_STATE_ERROR)
 		(void)acpi_power_set(sc->sc_node->ad_handle, sc->sc_state);
 	return true;
+}
 static bool
 acpifan_shutdown(device_t self, int how)
+{
 	struct acpifan_softc *sc = device_private(self);
 	if (sc->sc_state != ACPI_STATE_ERROR)
-		(void)acpi_power_set(sc->sc_node->ad_handle, ACPI_STATE_D3);
+		(void)acpi_power_set(sc->sc_node->ad_handle, ACPI_STATE_D0);
 	return true;
+}
 static bool
 acpifan_sensor_init(device_t self)
+{
 	struct acpifan_softc *sc = device_private(self);
 	if (acpi_power_get(sc->sc_node->ad_handle, &sc->sc_state) != true)
 		return false;
 	sc->sc_sme = sysmon_envsys_create();