Module Name: src
Committed By: msaitoh
Date: Wed Mar 7 09:25:56 UTC 2018
Modified Files:
src/sys/dev/ic: nslm7x.c
src/sys/dev/isa: wbsio.c wbsioreg.h
Log Message:
Add NCT6796D. Some functions of NCT6796D is extended from NCT6795D,
but this commit doesn't support them yet.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/ic/nslm7x.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/isa/wbsio.c
cvs rdiff -u -r1.7 -r1.8 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/sys/dev/ic/nslm7x.c
diff -u src/sys/dev/ic/nslm7x.c:1.70 src/sys/dev/ic/nslm7x.c:1.71
--- src/sys/dev/ic/nslm7x.c:1.70 Fri Aug 18 04:07:51 2017
+++ src/sys/dev/ic/nslm7x.c Wed Mar 7 09:25:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.70 2017/08/18 04:07:51 msaitoh Exp $ */
+/* $NetBSD: nslm7x.c,v 1.71 2018/03/07 09:25:56 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.70 2017/08/18 04:07:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.71 2018/03/07 09:25:56 msaitoh 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.22 src/sys/dev/isa/wbsio.c:1.23
--- src/sys/dev/isa/wbsio.c:1.22 Tue Feb 20 01:53:39 2018
+++ src/sys/dev/isa/wbsio.c Wed Mar 7 09:25:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: wbsio.c,v 1.22 2018/02/20 01:53:39 pgoyette Exp $ */
+/* $NetBSD: wbsio.c,v 1.23 2018/03/07 09:25:56 msaitoh 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.7 src/sys/dev/isa/wbsioreg.h:1.8
--- src/sys/dev/isa/wbsioreg.h:1.7 Wed Dec 13 00:27:53 2017
+++ src/sys/dev/isa/wbsioreg.h Wed Mar 7 09:25:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: wbsioreg.h,v 1.7 2017/12/13 00:27:53 knakahara Exp $ */
+/* $NetBSD: wbsioreg.h,v 1.8 2018/03/07 09:25:56 msaitoh 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
