Module Name: src
Committed By: pgoyette
Date: Thu May 31 16:09:34 UTC 2012
Modified Files:
src/sys/dev/i2c: dbcool.c spdmem_i2c.c
src/sys/dev/ic: spdmem.c
Log Message:
Update handling of sysctl stuff when built as modules
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/i2c/dbcool.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/i2c/spdmem_i2c.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/spdmem.c
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/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.36 src/sys/dev/i2c/dbcool.c:1.37
--- src/sys/dev/i2c/dbcool.c:1.36 Sat Apr 28 17:27:08 2012
+++ src/sys/dev/i2c/dbcool.c Thu May 31 16:09:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool.c,v 1.36 2012/04/28 17:27:08 wiz Exp $ */
+/* $NetBSD: dbcool.c,v 1.37 2012/05/31 16:09:33 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.36 2012/04/28 17:27:08 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.37 2012/05/31 16:09:33 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1115,7 +1115,11 @@ dbcool_read_volt(struct dbcool_softc *sc
SYSCTL_SETUP(sysctl_dbcoolsetup, "sysctl dBCool subtree setup")
{
sysctl_createv(clog, 0, NULL, NULL,
+#ifdef _MODULE
+ 0,
+#else
CTLFLAG_PERMANENT,
+#endif
CTLTYPE_NODE, "hw", NULL,
NULL, 0, NULL, 0,
CTL_HW, CTL_EOL);
@@ -2178,18 +2182,23 @@ static int
dbcool_modcmd(modcmd_t cmd, void *opaque)
{
int error = 0;
+#ifdef _MODULE
+ static struct sysctllog *dbcool_sysctl_clog;
+#endif
switch (cmd) {
case MODULE_CMD_INIT:
#ifdef _MODULE
error = config_init_component(cfdriver_ioconf_dbcool,
cfattach_ioconf_dbcool, cfdata_ioconf_dbcool);
+ sysctl_dbcoolsetup(&dbcool_sysctl_clog);
#endif
return error;
case MODULE_CMD_FINI:
#ifdef _MODULE
error = config_fini_component(cfdriver_ioconf_dbcool,
cfattach_ioconf_dbcool, cfdata_ioconf_dbcool);
+ sysctl_teardown(&dbcool_sysctl_clog);
#endif
return error;
default:
Index: src/sys/dev/i2c/spdmem_i2c.c
diff -u src/sys/dev/i2c/spdmem_i2c.c:1.4 src/sys/dev/i2c/spdmem_i2c.c:1.5
--- src/sys/dev/i2c/spdmem_i2c.c:1.4 Sun Jan 22 10:36:52 2012
+++ src/sys/dev/i2c/spdmem_i2c.c Thu May 31 16:09:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: spdmem_i2c.c,v 1.4 2012/01/22 10:36:52 nakayama Exp $ */
+/* $NetBSD: spdmem_i2c.c,v 1.5 2012/05/31 16:09:33 pgoyette Exp $ */
/*
* Copyright (c) 2007 Nicolas Joly
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spdmem_i2c.c,v 1.4 2012/01/22 10:36:52 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spdmem_i2c.c,v 1.5 2012/05/31 16:09:33 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -145,18 +145,23 @@ static int
spdmem_modcmd(modcmd_t cmd, void *opaque)
{
int error = 0;
+#ifdef _MODULE
+ static struct sysctllog *spdmem_sysctl_clog;
+#endif
switch (cmd) {
case MODULE_CMD_INIT:
#ifdef _MODULE
error = config_init_component(cfdriver_ioconf_spdmem,
cfattach_ioconf_spdmem, cfdata_ioconf_spdmem);
+ sysctl_spdmem_setup(&spdmem_sysctl_clog);
#endif
return error;
case MODULE_CMD_FINI:
#ifdef _MODULE
error = config_fini_component(cfdriver_ioconf_spdmem,
cfattach_ioconf_spdmem, cfdata_ioconf_spdmem);
+ sysctl_teardown(&spdmem_sysctl_clog);
#endif
return error;
default:
Index: src/sys/dev/ic/spdmem.c
diff -u src/sys/dev/ic/spdmem.c:1.5 src/sys/dev/ic/spdmem.c:1.6
--- src/sys/dev/ic/spdmem.c:1.5 Fri Aug 19 09:46:10 2011
+++ src/sys/dev/ic/spdmem.c Thu May 31 16:09:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: spdmem.c,v 1.5 2011/08/19 09:46:10 wiz Exp $ */
+/* $NetBSD: spdmem.c,v 1.6 2012/05/31 16:09:34 pgoyette Exp $ */
/*
* Copyright (c) 2007 Nicolas Joly
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spdmem.c,v 1.5 2011/08/19 09:46:10 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spdmem.c,v 1.6 2012/05/31 16:09:34 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -276,9 +276,6 @@ spdmem_common_attach(struct spdmem_softc
* Setup our sysctl subtree, hw.spdmemN
*/
sc->sc_sysctl_log = NULL;
-#ifdef _MODULE
- sysctl_spdmem_setup(&sc->sc_sysctl_log);
-#endif
if (hw_node != CTL_EOL)
sysctl_createv(&sc->sc_sysctl_log, 0, NULL, &node,
0, CTLTYPE_NODE,
@@ -401,7 +398,12 @@ SYSCTL_SETUP(sysctl_spdmem_setup, "sysct
{
const struct sysctlnode *node;
- if (sysctl_createv(clog, 0, NULL, &node, CTLFLAG_PERMANENT,
+ if (sysctl_createv(clog, 0, NULL, &node,
+#ifdef _MODULE
+ 0,
+#else
+ CTLFLAG_PERMANENT,
+#endif
CTLTYPE_NODE, "hw", NULL, NULL, 0, NULL, 0,
CTL_HW, CTL_EOL) != 0)
return;
