Module Name: src
Committed By: pgoyette
Date: Sat Jun 4 13:25:56 UTC 2011
Modified Files:
src/sys/dev/pci: arcmsr.c
Log Message:
Update to use the new name for the sensor's private data.
XXX This driver still uses the sensor's value_min for an unrelated
XXX purpose, but changing that will have to wait for another day.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/arcmsr.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/pci/arcmsr.c
diff -u src/sys/dev/pci/arcmsr.c:1.26 src/sys/dev/pci/arcmsr.c:1.27
--- src/sys/dev/pci/arcmsr.c:1.26 Sat Nov 13 13:52:05 2010
+++ src/sys/dev/pci/arcmsr.c Sat Jun 4 13:25:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: arcmsr.c,v 1.26 2010/11/13 13:52:05 uebayasi Exp $ */
+/* $NetBSD: arcmsr.c,v 1.27 2011/06/04 13:25:56 pgoyette Exp $ */
/* $OpenBSD: arc.c,v 1.68 2007/10/27 03:28:27 dlg Exp $ */
/*
@@ -21,7 +21,7 @@
#include "bio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.26 2010/11/13 13:52:05 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.27 2011/06/04 13:25:56 pgoyette Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -1779,7 +1779,7 @@
sizeof(sc->sc_sensors[count].desc),
"disk%d volume%d (%s)", j, i, bv.bv_dev);
sc->sc_sensors[count].value_max = i;
- sc->sc_sensors[count].value_avg = j + 10;
+ sc->sc_sensors[count].private = j + 10;
if (sysmon_envsys_sensor_attach(sc->sc_sme,
&sc->sc_sensors[count]))
@@ -1835,10 +1835,10 @@
}
/* Current sensor is handling a disk volume member */
- if (edata->value_avg) {
+ if (edata->private) {
memset(&bd, 0, sizeof(bd));
bd.bd_volid = edata->value_max;
- bd.bd_diskid = edata->value_avg - 10;
+ bd.bd_diskid = edata->private - 10;
if (arc_bio_disk_volume(sc, &bd)) {
edata->value_cur = ENVSYS_DRIVE_OFFLINE;
