Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/onewire Add glue code to build as module.



details:   https://anonhg.NetBSD.org/src/rev/27240fc54768
branches:  trunk
changeset: 769087:27240fc54768
user:      mbalmer <mbalmer%NetBSD.org@localhost>
date:      Wed Aug 31 12:17:51 2011 +0000

description:
Add glue code to build as module.

diffstat:

 sys/dev/onewire/onewire.c |  42 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 38 insertions(+), 4 deletions(-)

diffs (81 lines):

diff -r e3ad9f944683 -r 27240fc54768 sys/dev/onewire/onewire.c
--- a/sys/dev/onewire/onewire.c Wed Aug 31 12:07:26 2011 +0000
+++ b/sys/dev/onewire/onewire.c Wed Aug 31 12:17:51 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: onewire.c,v 1.13 2009/12/06 22:49:48 dyoung Exp $ */
+/* $NetBSD: onewire.c,v 1.14 2011/08/31 12:17:51 mbalmer Exp $ */
 /*     $OpenBSD: onewire.c,v 1.1 2006/03/04 16:27:03 grange Exp $      */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: onewire.c,v 1.13 2009/12/06 22:49:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: onewire.c,v 1.14 2011/08/31 12:17:51 mbalmer Exp $");
 
 /*
  * 1-Wire bus driver.
@@ -34,6 +34,7 @@
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
+#include <sys/module.h>
 
 #include <dev/onewire/onewirereg.h>
 #include <dev/onewire/onewirevar.h>
@@ -102,7 +103,6 @@
        rw_init(&sc->sc_rwlock);
        TAILQ_INIT(&sc->sc_devs);
 
-       aprint_naive("\n");
        aprint_normal("\n");
 
        if (kthread_create(PRI_NONE, 0, NULL, onewire_thread, sc,
@@ -406,7 +406,7 @@
                 * found a new one.
                 */
                present = 0;
-               TAILQ_FOREACH(d, &sc->sc_devs, d_list) {
+               TAILQ_FOREACH(d, &sc->sc_devs, d_list) {
                        if (d->d_rom == rom) {
                                d->d_present = 1;
                                present = 1;
@@ -445,3 +445,37 @@
        }
        onewire_unlock(sc);
 }
+
+MODULE(MODULE_CLASS_DRIVER, onewire, NULL);
+
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
+
+static int
+onewire_modcmd(modcmd_t cmd, void *opaque)
+{
+       int error;
+
+       error = 0;
+       switch (cmd) {
+       case MODULE_CMD_INIT:
+#ifdef _MODULE
+               error = config_init_component(cfdriver_ioconf_onewire,
+                   cfattach_ioconf_onewire, cfdata_ioconf_onewire);
+               if (error)
+                       aprint_error("%s: unable to init component\n",
+                           onewire_cd.cd_name);
+#endif
+               break;
+       case MODULE_CMD_FINI:
+#ifdef _MODULE
+               config_fini_component(cfdriver_ioconf_onewire,
+                   cfattach_ioconf_onewire, cfdata_ioconf_onewire);
+#endif
+               break;
+       default:
+               error = ENOTTY;
+       }
+       return error;
+}



Home | Main Index | Thread Index | Old Index