Module Name: src Committed By: nonaka Date: Wed Apr 29 03:35:09 UTC 2015
Modified Files: src/sys/dev/pci: if_iwm.c Log Message: Added control debugging output via sysctl. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/if_iwm.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/pci/if_iwm.c diff -u src/sys/dev/pci/if_iwm.c:1.31 src/sys/dev/pci/if_iwm.c:1.32 --- src/sys/dev/pci/if_iwm.c:1.31 Tue Apr 28 15:38:02 2015 +++ src/sys/dev/pci/if_iwm.c Wed Apr 29 03:35:09 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_iwm.c,v 1.31 2015/04/28 15:38:02 nonaka Exp $ */ +/* $NetBSD: if_iwm.c,v 1.32 2015/04/29 03:35:09 nonaka Exp $ */ /* OpenBSD: if_iwm.c,v 1.39 2015/03/23 00:35:19 jsg Exp */ /* @@ -105,7 +105,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.31 2015/04/28 15:38:02 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.32 2015/04/29 03:35:09 nonaka Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -116,6 +116,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1 #include <sys/proc.h> #include <sys/socket.h> #include <sys/sockio.h> +#include <sys/sysctl.h> #include <sys/systm.h> #include <sys/cpu.h> @@ -154,7 +155,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1 #ifdef IWM_DEBUG #define DPRINTF(x) do { if (iwm_debug > 0) printf x; } while (0) #define DPRINTFN(n, x) do { if (iwm_debug >= (n)) printf x; } while (0) -int iwm_debug = 1; +int iwm_debug = 0; #else #define DPRINTF(x) do { ; } while (0) #define DPRINTFN(n, x) do { ; } while (0) @@ -6910,3 +6911,29 @@ iwm_activate(device_t self, enum devact CFATTACH_DECL_NEW(iwm, sizeof(struct iwm_softc), iwm_match, iwm_attach, NULL, NULL); + +#ifdef IWM_DEBUG +SYSCTL_SETUP(sysctl_iwm, "sysctl iwm(4) subtree setup") +{ + const struct sysctlnode *rnode, *cnode; + int rc; + + if ((rc = sysctl_createv(clog, 0, NULL, &rnode, + CTLFLAG_PERMANENT, CTLTYPE_NODE, "iwm", + SYSCTL_DESCR("iwm global controls"), + NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL)) != 0) + goto err; + + /* control debugging printfs */ + if ((rc = sysctl_createv(clog, 0, &rnode, &cnode, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, + "debug", SYSCTL_DESCR("Enable debugging output"), + NULL, 0, &iwm_debug, 0, CTL_CREATE, CTL_EOL)) != 0) + goto err; + + return; + + err: + aprint_error("%s: sysctl_createv failed (rc = %d)\n", __func__, rc); +} +#endif /* IWM_DEBUG */