Module Name:    src
Committed By:   jmcneill
Date:           Sun Jul 31 15:58:25 UTC 2011

Modified Files:
        src/sys/dev/i2c: i2c.c

Log Message:
add rescan support


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/i2c/i2c.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/i2c.c
diff -u src/sys/dev/i2c/i2c.c:1.25 src/sys/dev/i2c/i2c.c:1.26
--- src/sys/dev/i2c/i2c.c:1.25	Mon Mar  1 17:35:21 2010
+++ src/sys/dev/i2c/i2c.c	Sun Jul 31 15:58:25 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: i2c.c,v 1.25 2010/03/01 17:35:21 njoly Exp $	*/
+/*	$NetBSD: i2c.c,v 1.26 2011/07/31 15:58:25 jmcneill Exp $	*/
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.25 2010/03/01 17:35:21 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.26 2011/07/31 15:58:25 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -119,6 +119,13 @@
 }
 
 static int
+iic_rescan(device_t self, const char *ifattr, const int *locators)
+{
+	config_search_ia(iic_search, self, ifattr, NULL);
+	return 0;
+}
+
+static int
 iic_match(device_t parent, cfdata_t cf, void *aux)
 {
 
@@ -275,7 +282,7 @@
 		 * Attach all i2c devices described in the kernel
 		 * configuration file.
 		 */
-		config_search_ia(iic_search, self, "iic", NULL);
+		iic_rescan(self, "iic", NULL);
 	}
 }
 
@@ -429,5 +436,5 @@
 }
 
 
-CFATTACH_DECL_NEW(iic, sizeof(struct iic_softc),
-    iic_match, iic_attach, NULL, NULL);
+CFATTACH_DECL2_NEW(iic, sizeof(struct iic_softc),
+    iic_match, iic_attach, NULL, NULL, iic_rescan, NULL);

Reply via email to