Module Name: src
Committed By: jmcneill
Date: Fri Jan 7 11:17:22 UTC 2011
Modified Files:
src/sys/dev/pci: if_cas.c
Added Files:
src/sys/modules/if_cas: Makefile if_cas.ioconf
Log Message:
support building cas(4) as a module
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/if_cas.c
cvs rdiff -u -r0 -r1.1 src/sys/modules/if_cas/Makefile \
src/sys/modules/if_cas/if_cas.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/pci/if_cas.c
diff -u src/sys/dev/pci/if_cas.c:1.12 src/sys/dev/pci/if_cas.c:1.13
--- src/sys/dev/pci/if_cas.c:1.12 Sat Nov 13 13:52:06 2010
+++ src/sys/dev/pci/if_cas.c Fri Jan 7 11:17:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cas.c,v 1.12 2010/11/13 13:52:06 uebayasi Exp $ */
+/* $NetBSD: if_cas.c,v 1.13 2011/01/07 11:17:22 jmcneill Exp $ */
/* $OpenBSD: if_cas.c,v 1.29 2009/11/29 16:19:38 kettenis Exp $ */
/*
@@ -44,9 +44,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.12 2010/11/13 13:52:06 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.13 2011/01/07 11:17:22 jmcneill Exp $");
+#ifndef _MODULE
#include "opt_inet.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,6 +61,7 @@
#include <sys/ioctl.h>
#include <sys/errno.h>
#include <sys/device.h>
+#include <sys/module.h>
#include <machine/endian.h>
@@ -2064,3 +2067,32 @@
sc->sc_tx_prod = bix;
}
+
+MODULE(MODULE_CLASS_DRIVER, if_cas, NULL);
+
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
+
+static int
+if_cas_modcmd(modcmd_t cmd, void *opaque)
+{
+ int error = 0;
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+#ifdef _MODULE
+ error = config_init_component(cfdriver_ioconf_cas,
+ cfattach_ioconf_cas, cfdata_ioconf_cas);
+#endif
+ return error;
+ case MODULE_CMD_FINI:
+#ifdef _MODULE
+ error = config_fini_component(cfdriver_ioconf_cas,
+ cfattach_ioconf_cas, cfdata_ioconf_cas);
+#endif
+ return error;
+ default:
+ return ENOTTY;
+ }
+}
Added files:
Index: src/sys/modules/if_cas/Makefile
diff -u /dev/null src/sys/modules/if_cas/Makefile:1.1
--- /dev/null Fri Jan 7 11:17:22 2011
+++ src/sys/modules/if_cas/Makefile Fri Jan 7 11:17:22 2011
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2011/01/07 11:17:22 jmcneill Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/dev/pci
+
+KMOD= if_cas
+IOCONF= if_cas.ioconf
+SRCS= if_cas.c
+CPPFLAGS+= -DINET
+
+WARNS= 3
+
+.include <bsd.kmodule.mk>
Index: src/sys/modules/if_cas/if_cas.ioconf
diff -u /dev/null src/sys/modules/if_cas/if_cas.ioconf:1.1
--- /dev/null Fri Jan 7 11:17:22 2011
+++ src/sys/modules/if_cas/if_cas.ioconf Fri Jan 7 11:17:22 2011
@@ -0,0 +1,10 @@
+# $NetBSD: if_cas.ioconf,v 1.1 2011/01/07 11:17:22 jmcneill Exp $
+
+ioconf cas
+
+include "conf/files"
+include "dev/pci/files.pci"
+
+pseudo-root pci*
+
+cas* at pci? dev ? function ?
