Module Name: src
Committed By: pgoyette
Date: Sun Mar 14 18:05:07 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_bat.c acpi_tz.c atk0110.c
Log Message:
Remove setting of edata->monitor since that member no longer exists.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/acpi/acpi_bat.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/acpi/acpi_tz.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/acpi/atk0110.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_bat.c
diff -u src/sys/dev/acpi/acpi_bat.c:1.85 src/sys/dev/acpi/acpi_bat.c:1.86
--- src/sys/dev/acpi/acpi_bat.c:1.85 Mon Mar 8 11:45:45 2010
+++ src/sys/dev/acpi/acpi_bat.c Sun Mar 14 18:05:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.85 2010/03/08 11:45:45 jruoho Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.86 2010/03/14 18:05:07 pgoyette Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.85 2010/03/08 11:45:45 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.86 2010/03/14 18:05:07 pgoyette Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -685,7 +685,6 @@
#undef INITDATA
/* Enable monitoring for the charge state sensor */
- sc->sc_sensor[ACPIBAT_CHARGE_STATE].monitor = true;
sc->sc_sensor[ACPIBAT_CHARGE_STATE].flags |= ENVSYS_FMONSTCHANGED;
/* Disable userland monitoring on these sensors */
Index: src/sys/dev/acpi/acpi_tz.c
diff -u src/sys/dev/acpi/acpi_tz.c:1.61 src/sys/dev/acpi/acpi_tz.c:1.62
--- src/sys/dev/acpi/acpi_tz.c:1.61 Fri Mar 5 14:00:17 2010
+++ src/sys/dev/acpi/acpi_tz.c Sun Mar 14 18:05:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_tz.c,v 1.61 2010/03/05 14:00:17 jruoho Exp $ */
+/* $NetBSD: acpi_tz.c,v 1.62 2010/03/14 18:05:07 pgoyette Exp $ */
/*
* Copyright (c) 2003 Jared D. McNeill <[email protected]>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.61 2010/03/05 14:00:17 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.62 2010/03/14 18:05:07 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -677,7 +677,6 @@
sc->sc_sme->sme_name = device_xname(dv);
sc->sc_sme->sme_flags = SME_DISABLE_REFRESH;
- sc->sc_temp_sensor.monitor = true;
sc->sc_temp_sensor.flags = ENVSYS_FMONLIMITS | ENVSYS_FMONNOTSUPP;
sc->sc_temp_sensor.units = ENVSYS_STEMP;
strlcpy(sc->sc_temp_sensor.desc,
@@ -686,7 +685,6 @@
goto out;
if (sc->sc_have_fan) {
- sc->sc_fan_sensor.monitor = true;
sc->sc_fan_sensor.flags =
ENVSYS_FMONLIMITS | ENVSYS_FMONNOTSUPP;
sc->sc_fan_sensor.units = ENVSYS_SFANRPM;
Index: src/sys/dev/acpi/atk0110.c
diff -u src/sys/dev/acpi/atk0110.c:1.10 src/sys/dev/acpi/atk0110.c:1.11
--- src/sys/dev/acpi/atk0110.c:1.10 Mon Mar 8 11:54:35 2010
+++ src/sys/dev/acpi/atk0110.c Sun Mar 14 18:05:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: atk0110.c,v 1.10 2010/03/08 11:54:35 cnst Exp $ */
+/* $NetBSD: atk0110.c,v 1.11 2010/03/14 18:05:07 pgoyette Exp $ */
/* $OpenBSD: atk0110.c,v 1.1 2009/07/23 01:38:16 cnst Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atk0110.c,v 1.10 2010/03/08 11:54:35 cnst Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atk0110.c,v 1.11 2010/03/14 18:05:07 pgoyette Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -246,7 +246,6 @@
as[i].h = oi[3].Integer.Value;
as[i].s.units = st;
as[i].s.flags |= ENVSYS_FMONLIMITS;
- as[i].s.monitor = true;
aprint_verbose_dev(self, "%c%i: "
"0x%08"PRIx64" %20s %5"PRIi64" / %5"PRIi64" "
"0x%"PRIx64"\n",
