Sun Jan 9 09:47:56 2011 UTC ()

Print a message if ACPI 4.0 functionality is present (in which case the
driver should be updated).


(jruoho)

diff -r1.106 -r1.107 src/sys/dev/acpi/acpi_bat.c

--- src/sys/dev/acpi/acpi_bat.c 2011/01/04 05:48:48	1.106
+++ src/sys/dev/acpi/acpi_bat.c 2011/01/09 09:47:55	1.107

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_bat.c,v 1.106 2011/01/04 05:48:48 jruoho Exp $	*/
+/*	$NetBSD: acpi_bat.c,v 1.107 2011/01/09 09:47:55 jruoho Exp $	*/
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum of By Noon Software, Inc.
+ *
  * 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.
 @@ -65,27 +65,27 @@
 /*
  * ACPI Battery Driver.
+ *
  * ACPI defines two different battery device interfaces: "Control
  * Method" batteries, in which AML methods are defined in order to get
  * battery status and set battery alarm thresholds, and a "Smart
  * Battery" device, which is an SMbus device accessed through the ACPI
  * Embedded Controller device.
+ *
  * This driver is for the "Control Method"-style battery only.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.106 2011/01/04 05:48:48 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.107 2011/01/09 09:47:55 jruoho Exp $");
 #include <sys/param.h>
 #include <sys/condvar.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/systm.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 @@ -211,26 +211,28 @@ acpibat_match(device_t parent, cfdata_t
 	return acpi_match_hid(aa->aa_node->ad_devinfo, bat_hid);
+}
 /*
  * acpibat_attach:
+ *
  *	Autoconfiguration `attach' routine.
  */
 static void
 acpibat_attach(device_t parent, device_t self, void *aux)
+{
 	struct acpibat_softc *sc = device_private(self);
 	struct acpi_attach_args *aa = aux;
 	ACPI_HANDLE tmp;
 	ACPI_STATUS rv;
 	aprint_naive(": ACPI Battery\n");
 	aprint_normal(": ACPI Battery\n");
 	sc->sc_node = aa->aa_node;
 	sc->sc_present = 0;
 	sc->sc_lcapacity = 0;
 	sc->sc_wcapacity = 0;
 	sc->sc_sme = NULL;
 	sc->sc_sensor = NULL;
 @@ -238,26 +240,34 @@ acpibat_attach(device_t parent, device_t
 	cv_init(&sc->sc_condvar, device_xname(self));
 	(void)pmf_device_register(self, NULL, acpibat_resume);
 	(void)memset(sc->sc_serial, '\0', sizeof(sc->sc_serial));
 	(void)acpi_register_notify(sc->sc_node, acpibat_notify_handler);
 	sc->sc_sensor = kmem_zalloc(ACPIBAT_COUNT *
 	    sizeof(*sc->sc_sensor), KM_SLEEP);
 	if (sc->sc_sensor == NULL)
 		return;
 	acpibat_init_envsys(self);
 	/*
 	 * If this is ever seen, the driver should be extended.
 	 */
 	rv = AcpiGetHandle(sc->sc_node->ad_handle, "_BIX", &tmp);
 	if (ACPI_SUCCESS(rv))
 		aprint_verbose_dev(self, "ACPI 4.0 functionality present\n");
+}
 /*
  * acpibat_detach:
+ *
  *	Autoconfiguration `detach' routine.
  */
 static int
 acpibat_detach(device_t self, int flags)
+{
 	struct acpibat_softc *sc = device_private(self);
 	acpi_deregister_notify(sc->sc_node);