Module Name: src
Committed By: phx
Date: Sun Sep 27 13:02:21 UTC 2015
Modified Files:
src/sys/dev/i2c: adm1021.c at24cxx.c lm75.c lm87.c
Log Message:
Direct config: Only match via the list of compatible hardware when we have
such a list available (ia_ncompat > 0). Otherwise fall back to matching
the device name with ia_name.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/i2c/adm1021.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/i2c/at24cxx.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/i2c/lm75.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/i2c/lm87.c
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/adm1021.c
diff -u src/sys/dev/i2c/adm1021.c:1.8 src/sys/dev/i2c/adm1021.c:1.9
--- src/sys/dev/i2c/adm1021.c:1.8 Sat Oct 27 17:18:17 2012
+++ src/sys/dev/i2c/adm1021.c Sun Sep 27 13:02:21 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: adm1021.c,v 1.8 2012/10/27 17:18:17 chs Exp $ */
+/* $NetBSD: adm1021.c,v 1.9 2015/09/27 13:02:21 phx Exp $ */
/* $OpenBSD: adm1021.c,v 1.27 2007/06/24 05:34:35 dlg Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm1021.c,v 1.8 2012/10/27 17:18:17 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm1021.c,v 1.9 2015/09/27 13:02:21 phx Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,10 +83,15 @@ admtemp_match(device_t parent, cfdata_t
} else {
/*
* Direct config - match via the list of compatible
- * hardware.
+ * hardware or simply match the device name.
*/
- if (iic_compat_match(ia, admtemp_compats))
- return 1;
+ if (ia->ia_ncompat > 0) {
+ if (iic_compat_match(ia, admtemp_compats))
+ return 1;
+ } else {
+ if (strcmp(ia->ia_name, "admtemp") == 0)
+ return 1;
+ }
}
return 0;
Index: src/sys/dev/i2c/at24cxx.c
diff -u src/sys/dev/i2c/at24cxx.c:1.19 src/sys/dev/i2c/at24cxx.c:1.20
--- src/sys/dev/i2c/at24cxx.c:1.19 Sun May 10 22:54:06 2015
+++ src/sys/dev/i2c/at24cxx.c Sun Sep 27 13:02:21 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: at24cxx.c,v 1.19 2015/05/10 22:54:06 jmcneill Exp $ */
+/* $NetBSD: at24cxx.c,v 1.20 2015/09/27 13:02:21 phx Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at24cxx.c,v 1.19 2015/05/10 22:54:06 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at24cxx.c,v 1.20 2015/09/27 13:02:21 phx Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -122,8 +122,13 @@ seeprom_match(device_t parent, cfdata_t
struct i2c_attach_args *ia = aux;
if (ia->ia_name) {
- if (iic_compat_match(ia, seeprom_compats))
- return (1);
+ if (ia->ia_ncompat > 0) {
+ if (iic_compat_match(ia, seeprom_compats))
+ return (1);
+ } else {
+ if (strcmp(ia->ia_name, "seeprom") == 0)
+ return (1);
+ }
} else {
if ((ia->ia_addr & AT24CXX_ADDRMASK) == AT24CXX_ADDR)
return (1);
Index: src/sys/dev/i2c/lm75.c
diff -u src/sys/dev/i2c/lm75.c:1.25 src/sys/dev/i2c/lm75.c:1.26
--- src/sys/dev/i2c/lm75.c:1.25 Sat Oct 27 17:18:17 2012
+++ src/sys/dev/i2c/lm75.c Sun Sep 27 13:02:21 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lm75.c,v 1.25 2012/10/27 17:18:17 chs Exp $ */
+/* $NetBSD: lm75.c,v 1.26 2015/09/27 13:02:21 phx Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lm75.c,v 1.25 2012/10/27 17:18:17 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm75.c,v 1.26 2015/09/27 13:02:21 phx Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -132,10 +132,15 @@ lmtemp_match(device_t parent, cfdata_t c
} else {
/*
* Direct config - match via the list of compatible
- * hardware.
+ * hardware or simply match the device name.
*/
- if (iic_compat_match(ia, lmtemp_compats))
- return 1;
+ if (ia->ia_ncompat > 0) {
+ if (iic_compat_match(ia, lmtemp_compats))
+ return 1;
+ } else {
+ if (strcmp(ia->ia_name, "lmtemp") == 0)
+ return 1;
+ }
}
Index: src/sys/dev/i2c/lm87.c
diff -u src/sys/dev/i2c/lm87.c:1.4 src/sys/dev/i2c/lm87.c:1.5
--- src/sys/dev/i2c/lm87.c:1.4 Mon Nov 4 15:06:26 2013
+++ src/sys/dev/i2c/lm87.c Sun Sep 27 13:02:21 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lm87.c,v 1.4 2013/11/04 15:06:26 jdc Exp $ */
+/* $NetBSD: lm87.c,v 1.5 2015/09/27 13:02:21 phx Exp $ */
/* $OpenBSD: lm87.c,v 1.20 2008/11/10 05:19:48 cnst Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lm87.c,v 1.4 2013/11/04 15:06:26 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm87.c,v 1.5 2015/09/27 13:02:21 phx Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -132,10 +132,15 @@ lmenv_match(device_t parent, cfdata_t ma
} else {
/*
* Direct config - match via the list of compatible
- * hardware.
+ * hardware or simply match the device name.
*/
- if (iic_compat_match(ia, lmenv_compats))
- return 1;
+ if (ia->ia_ncompat > 0) {
+ if (iic_compat_match(ia, lmenv_compats))
+ return 1;
+ } else {
+ if (strcmp(ia->ia_name, "lmenv") == 0)
+ return 1;
+ }
}
return 0;
