Module Name: src
Committed By: pgoyette
Date: Mon Feb 8 23:10:35 UTC 2010
Modified Files:
src/share/man/man4: lm.4
src/sys/dev/ic: nslm7x.c
Log Message:
After reviewing the datasheets, most of the supported Winbond chips can
handles the new flags for selecting sensor type. Update code and man
page accordingly.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/share/man/man4/lm.4
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/ic/nslm7x.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/lm.4
diff -u src/share/man/man4/lm.4:1.28 src/share/man/man4/lm.4:1.29
--- src/share/man/man4/lm.4:1.28 Mon Feb 8 21:47:20 2010
+++ src/share/man/man4/lm.4 Mon Feb 8 23:10:35 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: lm.4,v 1.28 2010/02/08 21:47:20 wiz Exp $
+.\" $NetBSD: lm.4,v 1.29 2010/02/08 23:10:35 pgoyette Exp $
.\"
.\" Copyright (c) 2000 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -86,15 +86,15 @@
.It
.Tn Winbond
.Em W83627HF* ,
-.Em W83627THF ,
-.Em W83627EHF ,
-.Em W83627DHG ,
-.Em W83637HF ,
-.Em W83697HF ,
+.Em W83627THF* ,
+.Em W83627EHF* ,
+.Em W83627DHG* ,
+.Em W83637HF* ,
+.Em W83697HF* ,
.Em W83781D ,
-.Em W83782D ,
-.Em W83783S ,
-.Em W83791D ,
+.Em W83782D* ,
+.Em W83783S* ,
+.Em W83791D* ,
.Em W83791SD
and
.Em W83792D .
@@ -102,7 +102,7 @@
.Tn ASUS
.Em AS99127F .
.El
-For certain Winbond chips (identified with a * above), the
+For most of the Winbond chips (identified with a * above), the
.Em flags
configuration option can be specified to select the type of temperature
sensor:
Index: src/sys/dev/ic/nslm7x.c
diff -u src/sys/dev/ic/nslm7x.c:1.50 src/sys/dev/ic/nslm7x.c:1.51
--- src/sys/dev/ic/nslm7x.c:1.50 Mon Feb 8 21:42:01 2010
+++ src/sys/dev/ic/nslm7x.c Mon Feb 8 23:10:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.50 2010/02/08 21:42:01 pgoyette Exp $ */
+/* $NetBSD: nslm7x.c,v 1.51 2010/02/08 23:10:35 pgoyette Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.50 2010/02/08 21:42:01 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.51 2010/02/08 23:10:35 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1845,6 +1845,7 @@
case WB_CHIPID_W83627THF:
model = "W83627THF";
lm_setup_sensors(sc, w83637hf_sensors);
+ wb_temp_diode_type(sc, cf_flags);
break;
case WB_CHIPID_W83627EHF_A:
model = "W83627EHF-A";
@@ -1853,10 +1854,12 @@
case WB_CHIPID_W83627EHF:
model = "W83627EHF";
lm_setup_sensors(sc, w83627ehf_sensors);
+ wb_temp_diode_type(sc, cf_flags);
break;
case WB_CHIPID_W83627DHG:
model = "W83627DHG";
lm_setup_sensors(sc, w83627dhg_sensors);
+ wb_temp_diode_type(sc, cf_flags);
break;
case WB_CHIPID_W83637HF:
model = "W83637HF";
@@ -1865,10 +1868,12 @@
sc->vrm9 = 1;
lm_generic_banksel(sc, banksel);
lm_setup_sensors(sc, w83637hf_sensors);
+ wb_temp_diode_type(sc, cf_flags);
break;
case WB_CHIPID_W83697HF:
model = "W83697HF";
lm_setup_sensors(sc, w83697hf_sensors);
+ wb_temp_diode_type(sc, cf_flags);
break;
case WB_CHIPID_W83781D:
case WB_CHIPID_W83781D_2:
@@ -1878,14 +1883,17 @@
case WB_CHIPID_W83782D:
model = "W83782D";
lm_setup_sensors(sc, w83782d_sensors);
+ wb_temp_diode_type(sc, cf_flags);
break;
case WB_CHIPID_W83783S:
model = "W83783S";
lm_setup_sensors(sc, w83783s_sensors);
+ wb_temp_diode_type(sc, cf_flags);
break;
case WB_CHIPID_W83791D:
model = "W83791D";
lm_setup_sensors(sc, w83791d_sensors);
+ wb_temp_diode_type(sc, cf_flags);
break;
case WB_CHIPID_W83791SD:
model = "W83791SD";
