Module Name: src
Committed By: martin
Date: Sat Oct 15 10:52:16 UTC 2022
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 #1774):
share/man/man4/lm.4: revision 1.37
sys/dev/isa/wbsio.c: revision 1.28
sys/dev/ic/nslm7x.c: revision 1.78
sys/dev/isa/wbsioreg.h: revision 1.10
Add Nuvoton NCT6799D support.
To generate a diff of this commit:
cvs rdiff -u -r1.32.40.2 -r1.32.40.3 src/share/man/man4/lm.4
cvs rdiff -u -r1.64.10.3 -r1.64.10.4 src/sys/dev/ic/nslm7x.c
cvs rdiff -u -r1.10.10.6 -r1.10.10.7 src/sys/dev/isa/wbsio.c
cvs rdiff -u -r1.5.2.5 -r1.5.2.6 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.2 src/share/man/man4/lm.4:1.32.40.3
--- src/share/man/man4/lm.4:1.32.40.2 Thu Jul 26 20:37:42 2018
+++ src/share/man/man4/lm.4 Sat Oct 15 10:52:16 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: lm.4,v 1.32.40.2 2018/07/26 20:37:42 snj Exp $
+.\" $NetBSD: lm.4,v 1.32.40.3 2022/10/15 10:52:16 martin 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 March 8, 2018
+.Dd October 11, 2022
.Dt LM 4
.Os
.Sh NAME
@@ -89,13 +89,9 @@ Nuvoton
.Em NCT6102D ,
.Em NCT6104D ,
.Em NCT6106D ,
-.Em NCT6779D ,
-.Em NCT6791D ,
-.Em NCT6792D ,
-.Em NCT6793D ,
-.Em NCT6795D ,
+.Em NCT6779D
and
-.Em NCT6796D .
+.Em NCT679[1235689]D .
.It
Winbond
.Em W83627HF* ,
Index: src/sys/dev/ic/nslm7x.c
diff -u src/sys/dev/ic/nslm7x.c:1.64.10.3 src/sys/dev/ic/nslm7x.c:1.64.10.4
--- src/sys/dev/ic/nslm7x.c:1.64.10.3 Wed Jul 17 15:43:18 2019
+++ src/sys/dev/ic/nslm7x.c Sat Oct 15 10:52:16 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.64.10.3 2019/07/17 15:43:18 martin Exp $ */
+/* $NetBSD: nslm7x.c,v 1.64.10.4 2022/10/15 10:52:16 martin 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.3 2019/07/17 15:43:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.64.10.4 2022/10/15 10:52:16 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2157,6 +2157,7 @@ static const struct wb_product wbsio_pro
{ WBSIO_ID_NCT6795D, "NCT6795D", nct6779d_sensors, NULL },
{ WBSIO_ID_NCT6796D, "NCT6796D", nct6779d_sensors, NULL },
{ WBSIO_ID_NCT6798D, "NCT6798D", nct6779d_sensors, NULL },
+ { WBSIO_ID_NCT6799D, "NCT6799D", 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.6 src/sys/dev/isa/wbsio.c:1.10.10.7
--- src/sys/dev/isa/wbsio.c:1.10.10.6 Wed Jul 17 15:43:18 2019
+++ src/sys/dev/isa/wbsio.c Sat Oct 15 10:52:16 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: wbsio.c,v 1.10.10.6 2019/07/17 15:43:18 martin Exp $ */
+/* $NetBSD: wbsio.c,v 1.10.10.7 2022/10/15 10:52:16 martin Exp $ */
/* $OpenBSD: wbsio.c,v 1.10 2015/03/14 03:38:47 jsg Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis <kette...@openbsd.org>
@@ -99,6 +99,7 @@ static const struct wbsio_product {
{ WBSIO_ID_NCT6795D, 12, "NCT6795D" },
{ WBSIO_ID_NCT6796D, 13, "NCT6796D" },
{ WBSIO_ID_NCT6798D, 13, "NCT6798D" },
+ { WBSIO_ID_NCT6799D, 13, "NCT6799D" },
};
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.5 src/sys/dev/isa/wbsioreg.h:1.5.2.6
--- src/sys/dev/isa/wbsioreg.h:1.5.2.5 Wed Jul 17 15:43:18 2019
+++ src/sys/dev/isa/wbsioreg.h Sat Oct 15 10:52:16 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: wbsioreg.h,v 1.5.2.5 2019/07/17 15:43:18 martin Exp $ */
+/* $NetBSD: wbsioreg.h,v 1.5.2.6 2022/10/15 10:52:16 martin Exp $ */
/* $OpenBSD: wbsioreg.h,v 1.4 2015/01/02 23:02:54 chris Exp $ */
/*
@@ -72,6 +72,7 @@
#define WBSIO_ID_NCT6795D 0xd35
#define WBSIO_ID_NCT6796D 0xd420 /* 13bits */
#define WBSIO_ID_NCT6798D 0xd428
+#define WBSIO_ID_NCT6799D 0xd800
/* Make the above WBSIO_ID_* vaue from WBSIO_ID, WBSIO_REV and IDbits */
#define WBSIO_MAKEID(id, rev, bits) \
