Module Name: src
Committed By: snj
Date: Thu Jul 26 20:37:42 UTC 2018
Modified Files:
src/share/man/man4 [netbsd-8]: lm.4
src/sys/dev/ic [netbsd-8]: nslm7x.c
src/sys/dev/isa [netbsd-8]: wbsio.c wbsioreg.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #927):
share/man/man4/lm.4: 1.35, 1.36
sys/dev/ic/nslm7x.c: 1.71
sys/dev/isa/wbsio.c: 1.23
sys/dev/isa/wbsioreg.h: 1.8
Add NCT6796D. Some functions of NCT6796D is extended from NCT6795D,
but this commit doesn't support them yet.
--
Add NCT6796D.
--
Remove Tn. Add serial comma.
To generate a diff of this commit:
cvs rdiff -u -r1.32.40.1 -r1.32.40.2 src/share/man/man4/lm.4
cvs rdiff -u -r1.64.10.1 -r1.64.10.2 src/sys/dev/ic/nslm7x.c
cvs rdiff -u -r1.10.10.4 -r1.10.10.5 src/sys/dev/isa/wbsio.c
cvs rdiff -u -r1.5.2.3 -r1.5.2.4 src/sys/dev/isa/wbsioreg.h
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.32.40.1 src/share/man/man4/lm.4:1.32.40.2
--- src/share/man/man4/lm.4:1.32.40.1 Wed Nov 22 14:56:30 2017
+++ src/share/man/man4/lm.4 Thu Jul 26 20:37:42 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: lm.4,v 1.32.40.1 2017/11/22 14:56:30 martin Exp $
+.\" $NetBSD: lm.4,v 1.32.40.2 2018/07/26 20:37:42 snj Exp $
.\"
.\" Copyright (c) 2000 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd July 12, 2017
+.Dd March 8, 2018
.Dt LM 4
.Os
.Sh NAME
@@ -44,8 +44,7 @@
.Sh DESCRIPTION
The
.Nm
-driver provides support for the
-.Tn National Semiconductor
+driver provides support for the National Semiconductor
LM series hardware monitors and register compatible chips to be used with
the
.Xr envsys 4
@@ -76,14 +75,14 @@ Chips supported by the
driver include:
.Bl -item -offset indent
.It
-.Tn National Semiconductor
+National Semiconductor
.Em LM78 ,
.Em LM78-J ,
-.Em LM79
+.Em LM79 ,
and
.Em LM81 .
.It
-.Tn Nuvoton
+Nuvoton
.Em NCT5104D ,
.Em NCT6775F ,
.Em NCT6776F ,
@@ -94,9 +93,11 @@ and
.Em NCT6791D ,
.Em NCT6792D ,
.Em NCT6793D ,
-.Em NCT6795D .
+.Em NCT6795D ,
+and
+.Em NCT6796D .
.It
-.Tn Winbond
+Winbond
.Em W83627HF* ,
.Em W83627THF* ,
.Em W83627EHF* ,
@@ -107,11 +108,11 @@ and
.Em W83782D* ,
.Em W83783S* ,
.Em W83791D* ,
-.Em W83791SD
+.Em W83791SD ,
and
.Em W83792D .
.It
-.Tn ASUS
+ASUS
.Em AS99127F .
.El
.Pp
Index: src/sys/dev/ic/nslm7x.c
diff -u src/sys/dev/ic/nslm7x.c:1.64.10.1 src/sys/dev/ic/nslm7x.c:1.64.10.2
--- src/sys/dev/ic/nslm7x.c:1.64.10.1 Wed Nov 22 14:56:30 2017
+++ src/sys/dev/ic/nslm7x.c Thu Jul 26 20:37:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.64.10.1 2017/11/22 14:56:30 martin Exp $ */
+/* $NetBSD: nslm7x.c,v 1.64.10.2 2018/07/26 20:37:42 snj Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.64.10.1 2017/11/22 14:56:30 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.64.10.2 2018/07/26 20:37:42 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2155,6 +2155,7 @@ static const struct wb_product wbsio_pro
{ WBSIO_ID_NCT6792D, "NCT6792D", nct6779d_sensors, NULL },
{ WBSIO_ID_NCT6793D, "NCT6793D", nct6779d_sensors, NULL },
{ WBSIO_ID_NCT6795D, "NCT6795D", nct6779d_sensors, NULL },
+ { WBSIO_ID_NCT6796D, "NCT6796D", nct6779d_sensors, NULL },
{ 0, NULL, NULL, NULL }
};
Index: src/sys/dev/isa/wbsio.c
diff -u src/sys/dev/isa/wbsio.c:1.10.10.4 src/sys/dev/isa/wbsio.c:1.10.10.5
--- src/sys/dev/isa/wbsio.c:1.10.10.4 Sat May 5 15:08:14 2018
+++ src/sys/dev/isa/wbsio.c Thu Jul 26 20:37:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: wbsio.c,v 1.10.10.4 2018/05/05 15:08:14 martin Exp $ */
+/* $NetBSD: wbsio.c,v 1.10.10.5 2018/07/26 20:37:42 snj Exp $ */
/* $OpenBSD: wbsio.c,v 1.10 2015/03/14 03:38:47 jsg Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis <kette...@openbsd.org>
@@ -97,6 +97,7 @@ static const struct wbsio_product {
{ WBSIO_ID_NCT6792D, true, "NCT6792D" },
{ WBSIO_ID_NCT6793D, true, "NCT6793D" },
{ WBSIO_ID_NCT6795D, true, "NCT6795D" },
+ { WBSIO_ID_NCT6796D, true, "NCT6796D" },
};
static const struct wbsio_product *wbsio_lookup(uint8_t id, uint8_t rev);
Index: src/sys/dev/isa/wbsioreg.h
diff -u src/sys/dev/isa/wbsioreg.h:1.5.2.3 src/sys/dev/isa/wbsioreg.h:1.5.2.4
--- src/sys/dev/isa/wbsioreg.h:1.5.2.3 Mon Feb 19 18:50:35 2018
+++ src/sys/dev/isa/wbsioreg.h Thu Jul 26 20:37:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: wbsioreg.h,v 1.5.2.3 2018/02/19 18:50:35 snj Exp $ */
+/* $NetBSD: wbsioreg.h,v 1.5.2.4 2018/07/26 20:37:42 snj Exp $ */
/* $OpenBSD: wbsioreg.h,v 1.4 2015/01/02 23:02:54 chris Exp $ */
/*
@@ -70,6 +70,7 @@
#define WBSIO_ID_NCT6792D 0xc91
#define WBSIO_ID_NCT6793D 0xd12
#define WBSIO_ID_NCT6795D 0xd35
+#define WBSIO_ID_NCT6796D 0xd42
/* Strapping Function Result */
#define WBSIO_SFR_24M48M 0x01
