Module Name: src
Committed By: msaitoh
Date: Wed Aug 3 03:35:24 UTC 2016
Modified Files:
src/sys/dev/i2c: sdtemp.c sdtemp_reg.h
Log Message:
IDT's TSE2002GB2 has the same ID as TS3000GB2, so remove TSE2002GB2.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/i2c/sdtemp.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/i2c/sdtemp_reg.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/i2c/sdtemp.c
diff -u src/sys/dev/i2c/sdtemp.c:1.31 src/sys/dev/i2c/sdtemp.c:1.32
--- src/sys/dev/i2c/sdtemp.c:1.31 Thu Jul 28 09:11:13 2016
+++ src/sys/dev/i2c/sdtemp.c Wed Aug 3 03:35:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sdtemp.c,v 1.31 2016/07/28 09:11:13 msaitoh Exp $ */
+/* $NetBSD: sdtemp.c,v 1.32 2016/08/03 03:35:24 msaitoh Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.31 2016/07/28 09:11:13 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.32 2016/08/03 03:35:24 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -147,8 +147,6 @@ sdtemp_dev_table[] = {
"Catalyst CAT34TS02C" },
{ CAT_MANUFACTURER_ID, CAT_34TS04_DEVICE_ID, CAT_34TS04_MASK, NULL,
"Catalyst CAT34TS04" },
- { IDT_MANUFACTURER_ID, IDT_TSE2002GB2_DEVICE_ID,IDT_TSE2002GB2_MASK, CIDT,
- "Integrated Device Technology TSE2002GB2" },
{ IDT_MANUFACTURER_ID, IDT_TSE2004GB2_DEVICE_ID,IDT_TSE2004GB2_MASK, NULL,
"Integrated Device Technology TSE2004GB2" },
{ IDT_MANUFACTURER_ID, IDT_TS3000B3_DEVICE_ID, IDT_TS3000B3_MASK, CIDT,
Index: src/sys/dev/i2c/sdtemp_reg.h
diff -u src/sys/dev/i2c/sdtemp_reg.h:1.10 src/sys/dev/i2c/sdtemp_reg.h:1.11
--- src/sys/dev/i2c/sdtemp_reg.h:1.10 Thu Jul 28 09:11:13 2016
+++ src/sys/dev/i2c/sdtemp_reg.h Wed Aug 3 03:35:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sdtemp_reg.h,v 1.10 2016/07/28 09:11:13 msaitoh Exp $ */
+/* $NetBSD: sdtemp_reg.h,v 1.11 2016/08/03 03:35:24 msaitoh Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -159,12 +159,10 @@
#define IDT_TS3000B3_MASK 0xFFFF
#define IDT_TS3000GB0_DEVICE_ID 0x2913
#define IDT_TS3000GB0_MASK 0xFFFF
-#define IDT_TS3000GB2_DEVICE_ID 0x2912
+#define IDT_TS3000GB2_DEVICE_ID 0x2912 /* Also matched TSE2002GB2 */
#define IDT_TS3000GB2_MASK 0xFFFF
#define IDT_TS3001GB2_DEVICE_ID 0x3001
#define IDT_TS3001GB2_MASK 0xFFFF
-#define IDT_TSE2002GB2_DEVICE_ID 0x2912
-#define IDT_TSE2002GB2_MASK 0xFFFF
#define IDT_TSE2004GB2_DEVICE_ID 0x2214
#define IDT_TSE2004GB2_MASK 0xFFFF
