[src/trunk]: src/sys/dev/iscsi Expose some of the module framework when _MODU...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6838447162e9
branches:  trunk
changeset: 779440:6838447162e9
user:      riz <riz%NetBSD.org@localhost>
date:      Mon May 28 04:18:12 2012 +0000

description:
Expose some of the module framework when _MODULE is not defined, so
iscsi becomes a "built in" module in that case.

diffstat:

 sys/dev/iscsi/iscsi_main.c |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (67 lines):

diff -r 5ab9c69517e7 -r 6838447162e9 sys/dev/iscsi/iscsi_main.c
--- a/sys/dev/iscsi/iscsi_main.c        Mon May 28 03:43:18 2012 +0000
+++ b/sys/dev/iscsi/iscsi_main.c        Mon May 28 04:18:12 2012 +0000
@@ -483,7 +483,6 @@
 }
 
 /* Kernel Module support */
-#ifdef _MODULE
 
 #include <sys/module.h>
 
@@ -493,6 +492,7 @@
 };
 static const struct cfiattrdata *const iscsi_attrs[] = { &ibescsi_info, NULL };
 
+#ifdef _MODULE
 CFDRIVER_DECL(iscsi, DV_DULL, iscsi_attrs);
 
 static struct cfdata iscsi_cfdata[] = {
@@ -507,15 +507,19 @@
        },
        { NULL, NULL, 0, 0, NULL, 0, NULL }
 };
+#endif
 
 static int
 iscsi_modcmd(modcmd_t cmd, void *arg)
 {
+#ifdef _MODULE
        devmajor_t cmajor = NODEVMAJOR, bmajor = NODEVMAJOR;
        int error;
+#endif
 
        switch (cmd) {
        case MODULE_CMD_INIT:
+#ifdef _MODULE
                error = config_cfdriver_attach(&iscsi_cd);
                if (error) {
                        return error;
@@ -556,11 +560,12 @@
                        config_cfdriver_detach(&iscsi_cd);
                        return ENXIO;
                }
-
+#endif
                return 0;
                break;
 
        case MODULE_CMD_FINI:
+#ifdef _MODULE
                error = config_cfdata_detach(iscsi_cfdata);
                if (error)
                        return error;
@@ -568,7 +573,7 @@
                config_cfattach_detach(iscsi_cd.cd_name, &iscsi_ca);
                config_cfdriver_detach(&iscsi_cd);
                devsw_detach(NULL, &iscsi_cdevsw);
-
+#endif
                return 0;
                break;
 
@@ -581,4 +586,3 @@
                break;
        }
 }
-#endif /* _MODULE */