Module Name: src
Committed By: martin
Date: Thu Jan 19 10:40:25 UTC 2023
Modified Files:
src/share/man/man4 [netbsd-9]: lm.4
src/sys/dev/ic [netbsd-9]: nslm7x.c
src/sys/dev/isa [netbsd-9]: wbsio.c wbsioreg.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1568):
share/man/man4/lm.4: revision 1.38
sys/dev/ic/nslm7x.c: revision 1.79
sys/dev/isa/wbsio.c: revision 1.30
sys/dev/isa/wbsioreg.h: revision 1.11
lm(4): Add Nuvoton NCT6797D support.
To generate a diff of this commit:
cvs rdiff -u -r1.36.4.1 -r1.36.4.2 src/share/man/man4/lm.4
cvs rdiff -u -r1.73.2.1 -r1.73.2.2 src/sys/dev/ic/nslm7x.c
cvs rdiff -u -r1.25.2.1 -r1.25.2.2 src/sys/dev/isa/wbsio.c
cvs rdiff -u -r1.9.2.1 -r1.9.2.2 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.36.4.1 src/share/man/man4/lm.4:1.36.4.2
--- src/share/man/man4/lm.4:1.36.4.1 Sat Oct 15 09:45:54 2022
+++ src/share/man/man4/lm.4 Thu Jan 19 10:40:25 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: lm.4,v 1.36.4.1 2022/10/15 09:45:54 martin Exp $
+.\" $NetBSD: lm.4,v 1.36.4.2 2023/01/19 10:40:25 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 October 11, 2022
+.Dd December 15, 2022
.Dt LM 4
.Os
.Sh NAME
@@ -91,7 +91,7 @@ Nuvoton
.Em NCT6106D ,
.Em NCT6779D
and
-.Em NCT679[1235689]D .
+.Em NCT679[12356789]D .
.It
Winbond
.Em W83627HF* ,
Index: src/sys/dev/ic/nslm7x.c
diff -u src/sys/dev/ic/nslm7x.c:1.73.2.1 src/sys/dev/ic/nslm7x.c:1.73.2.2
--- src/sys/dev/ic/nslm7x.c:1.73.2.1 Sat Oct 15 09:45:54 2022
+++ src/sys/dev/ic/nslm7x.c Thu Jan 19 10:40:25 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.73.2.1 2022/10/15 09:45:54 martin Exp $ */
+/* $NetBSD: nslm7x.c,v 1.73.2.2 2023/01/19 10:40:25 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.73.2.1 2022/10/15 09:45:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.73.2.2 2023/01/19 10:40:25 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2156,6 +2156,7 @@ static const struct wb_product wbsio_pro
{ WBSIO_ID_NCT6793D, "NCT6793D", nct6779d_sensors, NULL },
{ WBSIO_ID_NCT6795D, "NCT6795D", nct6779d_sensors, NULL },
{ WBSIO_ID_NCT6796D, "NCT6796D", nct6779d_sensors, NULL },
+ { WBSIO_ID_NCT6797D, "NCT6797D", 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.25.2.1 src/sys/dev/isa/wbsio.c:1.25.2.2
--- src/sys/dev/isa/wbsio.c:1.25.2.1 Sat Oct 15 09:45:54 2022
+++ src/sys/dev/isa/wbsio.c Thu Jan 19 10:40:25 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: wbsio.c,v 1.25.2.1 2022/10/15 09:45:54 martin Exp $ */
+/* $NetBSD: wbsio.c,v 1.25.2.2 2023/01/19 10:40:25 martin Exp $ */
/* $OpenBSD: wbsio.c,v 1.10 2015/03/14 03:38:47 jsg Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis <kette...@openbsd.org>
@@ -98,6 +98,7 @@ static const struct wbsio_product {
{ WBSIO_ID_NCT6793D, 12, "NCT6793D" },
{ WBSIO_ID_NCT6795D, 12, "NCT6795D" },
{ WBSIO_ID_NCT6796D, 13, "NCT6796D" },
+ { WBSIO_ID_NCT6797D, 13, "NCT6797D" },
{ WBSIO_ID_NCT6798D, 13, "NCT6798D" },
{ WBSIO_ID_NCT6799D, 13, "NCT6799D" },
};
Index: src/sys/dev/isa/wbsioreg.h
diff -u src/sys/dev/isa/wbsioreg.h:1.9.2.1 src/sys/dev/isa/wbsioreg.h:1.9.2.2
--- src/sys/dev/isa/wbsioreg.h:1.9.2.1 Sat Oct 15 09:45:54 2022
+++ src/sys/dev/isa/wbsioreg.h Thu Jan 19 10:40:25 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: wbsioreg.h,v 1.9.2.1 2022/10/15 09:45:54 martin Exp $ */
+/* $NetBSD: wbsioreg.h,v 1.9.2.2 2023/01/19 10:40:25 martin Exp $ */
/* $OpenBSD: wbsioreg.h,v 1.4 2015/01/02 23:02:54 chris Exp $ */
/*
@@ -71,6 +71,7 @@
#define WBSIO_ID_NCT6793D 0xd12
#define WBSIO_ID_NCT6795D 0xd35
#define WBSIO_ID_NCT6796D 0xd420 /* 13bits */
+#define WBSIO_ID_NCT6797D 0xd450
#define WBSIO_ID_NCT6798D 0xd428
#define WBSIO_ID_NCT6799D 0xd800
