Module Name: src
Committed By: jmcneill
Date: Tue Dec 28 14:45:31 UTC 2010
Modified Files:
src/sys/dev/ir: cir.c ir.c
Added Files:
src/sys/modules/cir: Makefile cir.ioconf
src/sys/modules/ir: Makefile
Log Message:
add "ir" and "cir" modules
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/ir/cir.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ir/ir.c
cvs rdiff -u -r0 -r1.1 src/sys/modules/cir/Makefile \
src/sys/modules/cir/cir.ioconf
cvs rdiff -u -r0 -r1.1 src/sys/modules/ir/Makefile
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/ir/cir.c
diff -u src/sys/dev/ir/cir.c:1.26 src/sys/dev/ir/cir.c:1.27
--- src/sys/dev/ir/cir.c:1.26 Sun Dec 6 22:40:56 2009
+++ src/sys/dev/ir/cir.c Tue Dec 28 14:45:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cir.c,v 1.26 2009/12/06 22:40:56 dyoung Exp $ */
+/* $NetBSD: cir.c,v 1.27 2010/12/28 14:45:30 jmcneill Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cir.c,v 1.26 2009/12/06 22:40:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cir.c,v 1.27 2010/12/28 14:45:30 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,6 +41,7 @@
#include <sys/poll.h>
#include <sys/select.h>
#include <sys/vnode.h>
+#include <sys/module.h>
#include <dev/ir/ir.h>
#include <dev/ir/cirio.h>
@@ -257,3 +258,32 @@
splx(s);
return (revents);
}
+
+MODULE(MODULE_CLASS_DRIVER, cir, "ir");
+
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
+
+static int
+cir_modcmd(modcmd_t cmd, void *opaque)
+{
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+#ifdef _MODULE
+ return config_init_component(cfdriver_ioconf_cir,
+ cfattach_ioconf_cir, cfdata_ioconf_cir);
+#else
+ return 0;
+#endif
+ case MODULE_CMD_FINI:
+#ifdef _MODULE
+ return config_fini_component(cfdriver_ioconf_cir,
+ cfattach_ioconf_cir, cfdata_ioconf_cir);
+#else
+ return 0;
+#endif
+ default:
+ return ENOTTY;
+ }
+}
Index: src/sys/dev/ir/ir.c
diff -u src/sys/dev/ir/ir.c:1.5 src/sys/dev/ir/ir.c:1.6
--- src/sys/dev/ir/ir.c:1.5 Mon Apr 28 20:23:51 2008
+++ src/sys/dev/ir/ir.c Tue Dec 28 14:45:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ir.c,v 1.5 2008/04/28 20:23:51 martin Exp $ */
+/* $NetBSD: ir.c,v 1.6 2010/12/28 14:45:30 jmcneill Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,12 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ir.c,v 1.5 2008/04/28 20:23:51 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ir.c,v 1.6 2010/12/28 14:45:30 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
+#include <sys/module.h>
#include <dev/ir/ir.h>
@@ -59,3 +60,17 @@
return (UNCONF);
}
+
+MODULE(MODULE_CLASS_DRIVER, ir, NULL);
+
+static int
+ir_modcmd(modcmd_t cmd, void *opaque)
+{
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ case MODULE_CMD_FINI:
+ return 0;
+ default:
+ return ENOTTY;
+ }
+}
Added files:
Index: src/sys/modules/cir/Makefile
diff -u /dev/null src/sys/modules/cir/Makefile:1.1
--- /dev/null Tue Dec 28 14:45:31 2010
+++ src/sys/modules/cir/Makefile Tue Dec 28 14:45:30 2010
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2010/12/28 14:45:30 jmcneill Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/dev/ir
+
+KMOD= cir
+IOCONF= cir.ioconf
+SRCS= cir.c
+
+WARNS= 4
+
+.include <bsd.kmodule.mk>
Index: src/sys/modules/cir/cir.ioconf
diff -u /dev/null src/sys/modules/cir/cir.ioconf:1.1
--- /dev/null Tue Dec 28 14:45:31 2010
+++ src/sys/modules/cir/cir.ioconf Tue Dec 28 14:45:30 2010
@@ -0,0 +1,10 @@
+# $NetBSD: cir.ioconf,v 1.1 2010/12/28 14:45:30 jmcneill Exp $
+
+ioconf cir
+
+include "conf/files"
+include "dev/ir/files.ir"
+
+pseudo-root irbus*
+
+cir* at irbus?
Index: src/sys/modules/ir/Makefile
diff -u /dev/null src/sys/modules/ir/Makefile:1.1
--- /dev/null Tue Dec 28 14:45:31 2010
+++ src/sys/modules/ir/Makefile Tue Dec 28 14:45:30 2010
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2010/12/28 14:45:30 jmcneill Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/dev/ir
+
+KMOD= ir
+SRCS= ir.c
+
+WARNS= 4
+
+.include <bsd.kmodule.mk>
