Module Name: src
Committed By: jmcneill
Date: Tue Dec 28 00:49:23 UTC 2010
Modified Files:
src/sys/dev/usb: pseye.c
src/sys/modules/pseye: Makefile
Added Files:
src/sys/modules/pseye: pseye.ioconf
Log Message:
use ioconf
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/pseye.c
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/pseye/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/pseye/pseye.ioconf
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/usb/pseye.c
diff -u src/sys/dev/usb/pseye.c:1.19 src/sys/dev/usb/pseye.c:1.20
--- src/sys/dev/usb/pseye.c:1.19 Fri Dec 24 20:54:28 2010
+++ src/sys/dev/usb/pseye.c Tue Dec 28 00:49:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pseye.c,v 1.19 2010/12/24 20:54:28 jmcneill Exp $ */
+/* $NetBSD: pseye.c,v 1.20 2010/12/28 00:49:21 jmcneill Exp $ */
/*-
* Copyright (c) 2008 Jared D. McNeill <jmcne...@invisible.ca>
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.19 2010/12/24 20:54:28 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.20 2010/12/28 00:49:21 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -835,67 +835,31 @@
return 0;
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, pseye, NULL);
-static const struct cfiattrdata videobuscf_iattrdata = {
- "videobus", 0, { { NULL, NULL, 0 }, }
-};
-static const struct cfiattrdata * const pseye_attrs[] = {
- &videobuscf_iattrdata, NULL
-};
-CFDRIVER_DECL(pseye, DV_DULL, pseye_attrs);
-extern struct cfattach video_ca;
-static int pseyeloc[6] = { -1, -1, -1, -1, -1, -1 };
-static struct cfparent uhubparent = {
- "usbifif", NULL, DVUNIT_ANY
-};
-static struct cfdata pseye_cfdata[] = {
- {
- .cf_name = "pseye",
- .cf_atname = "pseye",
- .cf_unit = 0,
- .cf_fstate = FSTATE_STAR,
- .cf_loc = pseyeloc,
- .cf_flags = 0,
- .cf_pspec = &uhubparent,
- },
- { NULL, NULL, 0, 0, NULL, 0, NULL }
-};
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
static int
pseye_modcmd(modcmd_t cmd, void *opaque)
{
- int err;
-
switch (cmd) {
case MODULE_CMD_INIT:
- err = config_cfdriver_attach(&pseye_cd);
- if (err)
- return err;
- err = config_cfattach_attach("pseye", &pseye_ca);
- if (err) {
- config_cfdriver_detach(&pseye_cd);
- return err;
- }
- err = config_cfdata_attach(pseye_cfdata, 1);
- if (err) {
- config_cfattach_detach("pseye", &pseye_ca);
- config_cfdriver_detach(&pseye_cd);
- return err;
- }
+#ifdef _MODULE
+ return config_init_component(cfdriver_ioconf_pseye,
+ cfattach_ioconf_pseye, cfdata_ioconf_pseye);
+#else
return 0;
+#endif
case MODULE_CMD_FINI:
- err = config_cfdata_detach(pseye_cfdata);
- if (err)
- return err;
- config_cfattach_detach("pseye", &pseye_ca);
- config_cfdriver_detach(&pseye_cd);
+#ifdef _MODULE
+ return config_fini_component(cfdriver_ioconf_pseye,
+ cfattach_ioconf_pseye, cfdata_ioconf_pseye);
+#else
return 0;
+#endif
default:
return ENOTTY;
}
}
-
-#endif /* !_MODULE */
Index: src/sys/modules/pseye/Makefile
diff -u src/sys/modules/pseye/Makefile:1.1 src/sys/modules/pseye/Makefile:1.2
--- src/sys/modules/pseye/Makefile:1.1 Tue Feb 3 13:32:30 2009
+++ src/sys/modules/pseye/Makefile Tue Dec 28 00:49:22 2010
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2009/02/03 13:32:30 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2010/12/28 00:49:22 jmcneill Exp $
.include "../Makefile.inc"
.PATH: ${S}/dev/usb
KMOD= pseye
+IOCONF= pseye.ioconf
SRCS= pseye.c
.include <bsd.kmodule.mk>
Added files:
Index: src/sys/modules/pseye/pseye.ioconf
diff -u /dev/null src/sys/modules/pseye/pseye.ioconf:1.1
--- /dev/null Tue Dec 28 00:49:23 2010
+++ src/sys/modules/pseye/pseye.ioconf Tue Dec 28 00:49:22 2010
@@ -0,0 +1,10 @@
+# $NetBSD: pseye.ioconf,v 1.1 2010/12/28 00:49:22 jmcneill Exp $
+
+ioconf pseye
+
+include "conf/files"
+include "dev/usb/files.usb"
+
+pseudo-root uhub*
+
+pseye* at uhub?
