Module Name: src
Committed By: msaitoh
Date: Fri Dec 16 00:02:28 UTC 2022
Modified Files:
src/share/man/man4: lm.4
src/sys/dev/ic: nslm7x.c
src/sys/dev/isa: wbsio.c wbsioreg.h
Log Message:
lm(4): Add Nuvoton NCT6797D support.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/share/man/man4/lm.4
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/ic/nslm7x.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/isa/wbsio.c
cvs rdiff -u -r1.10 -r1.11 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.37 src/share/man/man4/lm.4:1.38
--- src/share/man/man4/lm.4:1.37 Tue Oct 11 02:54:14 2022
+++ src/share/man/man4/lm.4 Fri Dec 16 00:02:28 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: lm.4,v 1.37 2022/10/11 02:54:14 msaitoh Exp $
+.\" $NetBSD: lm.4,v 1.38 2022/12/16 00:02:28 msaitoh 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.78 src/sys/dev/ic/nslm7x.c:1.79
--- src/sys/dev/ic/nslm7x.c:1.78 Sat Oct 1 07:22:56 2022
+++ src/sys/dev/ic/nslm7x.c Fri Dec 16 00:02:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.78 2022/10/01 07:22:56 msaitoh Exp $ */
+/* $NetBSD: nslm7x.c,v 1.79 2022/12/16 00:02:28 msaitoh Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.78 2022/10/01 07:22:56 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.79 2022/12/16 00:02:28 msaitoh 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.29 src/sys/dev/isa/wbsio.c:1.30
--- src/sys/dev/isa/wbsio.c:1.29 Wed Nov 2 20:38:22 2022
+++ src/sys/dev/isa/wbsio.c Fri Dec 16 00:02:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: wbsio.c,v 1.29 2022/11/02 20:38:22 andvar Exp $ */
+/* $NetBSD: wbsio.c,v 1.30 2022/12/16 00:02:28 msaitoh 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.10 src/sys/dev/isa/wbsioreg.h:1.11
--- src/sys/dev/isa/wbsioreg.h:1.10 Sat Oct 1 07:22:55 2022
+++ src/sys/dev/isa/wbsioreg.h Fri Dec 16 00:02:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: wbsioreg.h,v 1.10 2022/10/01 07:22:55 msaitoh Exp $ */
+/* $NetBSD: wbsioreg.h,v 1.11 2022/12/16 00:02:28 msaitoh 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
