Module Name: src
Committed By: christos
Date: Fri Dec 9 05:17:04 UTC 2016
Modified Files:
src/sys/dev: spkr.c spkr_synth.c
src/sys/dev/isa: spkr_pcppi.c
Log Message:
fix module build
XXX: spkr module is the pcppi version.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/spkr.c src/sys/dev/spkr_synth.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/isa/spkr_pcppi.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/spkr.c
diff -u src/sys/dev/spkr.c:1.2 src/sys/dev/spkr.c:1.3
--- src/sys/dev/spkr.c:1.2 Thu Dec 8 23:46:39 2016
+++ src/sys/dev/spkr.c Fri Dec 9 00:17:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr.c,v 1.2 2016/12/09 04:46:39 christos Exp $ */
+/* $NetBSD: spkr.c,v 1.3 2016/12/09 05:17:03 christos Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond ([email protected])
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.2 2016/12/09 04:46:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.3 2016/12/09 05:17:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -478,15 +478,18 @@ spkrioctl(dev_t dev, u_long cmd, void *d
return(0);
}
+#ifdef _MODULE
+extern struct cfdriver spkr_cd;
+#include "ioconf.c"
+#endif
+
int
spkr__modcmd(modcmd_t cmd, void *arg)
{
#ifdef _MODULE
devmajor_t bmajor, cmajor;
-#endif
int error = 0;
-#ifdef _MODULE
switch(cmd) {
case MODULE_CMD_INIT:
bmajor = cmajor = -1;
@@ -513,7 +516,9 @@ spkr__modcmd(modcmd_t cmd, void *arg)
error = ENOTTY;
break;
}
-#endif
return error;
+#else
+ return 0;
+#endif
}
Index: src/sys/dev/spkr_synth.c
diff -u src/sys/dev/spkr_synth.c:1.2 src/sys/dev/spkr_synth.c:1.3
--- src/sys/dev/spkr_synth.c:1.2 Thu Dec 8 23:32:39 2016
+++ src/sys/dev/spkr_synth.c Fri Dec 9 00:17:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr_synth.c,v 1.2 2016/12/09 04:32:39 christos Exp $ */
+/* $NetBSD: spkr_synth.c,v 1.3 2016/12/09 05:17:03 christos Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr_synth.c,v 1.2 2016/12/09 04:32:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_synth.c,v 1.3 2016/12/09 05:17:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,11 +77,6 @@ spkr_modcmd(modcmd_t cmd, void *arg)
return spkr__modcmd(cmd, arg);
}
-#ifdef _MODULE
-#include "ioconf.c"
-#endif
-
-
CFATTACH_DECL3_NEW(spkr_synth, 0,
spkr_probe, spkrattach, spkrdetach, NULL, NULL, NULL, DVF_DETACH_SHUTDOWN);
Index: src/sys/dev/isa/spkr_pcppi.c
diff -u src/sys/dev/isa/spkr_pcppi.c:1.3 src/sys/dev/isa/spkr_pcppi.c:1.4
--- src/sys/dev/isa/spkr_pcppi.c:1.3 Thu Dec 8 23:46:39 2016
+++ src/sys/dev/isa/spkr_pcppi.c Fri Dec 9 00:17:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr_pcppi.c,v 1.3 2016/12/09 04:46:39 christos Exp $ */
+/* $NetBSD: spkr_pcppi.c,v 1.4 2016/12/09 05:17:03 christos Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond ([email protected])
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c,v 1.3 2016/12/09 04:46:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c,v 1.4 2016/12/09 05:17:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,10 +78,6 @@ spkr_modcmd(modcmd_t cmd, void *arg)
return spkr__modcmd(cmd, arg);
}
-#ifdef _MODULE
-#include "ioconf.c"
-#endif
-
CFATTACH_DECL_NEW(spkr_pcppi, 0, spkr_probe, spkrattach, spkrdetach, NULL);
static pcppi_tag_t ppicookie;
