summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2017-10-28 04:16:04 +0000
committerriastradh <riastradh@NetBSD.org>2017-10-28 04:16:04 +0000
commitaf95bdfa2d6534b6d5e9e2d7a27f09c2c35881a0 (patch)
tree53397f3b831c3bfef38a0ae8e2573fa2e44fdbcf /sys/dev
parent4d2775d53813724fca3ffb210556214755879f43 (diff)
Back out extern struct cfdriver -> ioconf.h change to sequencer.c.
This broke the module build, because it needs midi_cd which is defined in another module and not declared by the ioconf.h generated from sequencer.ioconf. But... It also needs sequencer_cd, which is _also_ not declared by the ioconf.h generated from sequencer.ioconf, nor defined in the ioconf.c generated from sequencer.ioconf. Did this ever work???
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/sequencer.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c
index b0423ec547e..f3364e356dc 100644
--- a/sys/dev/sequencer.c
+++ b/sys/dev/sequencer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sequencer.c,v 1.68 2017/10/28 03:47:24 riastradh Exp $ */
+/* $NetBSD: sequencer.c,v 1.69 2017/10/28 04:16:04 riastradh Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.68 2017/10/28 03:47:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.69 2017/10/28 04:16:04 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "sequencer.h"
@@ -91,6 +91,20 @@ __KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.68 2017/10/28 03:47:24 riastradh Exp
#include "ioconf.h"
+/*
+ * XXX Kludge. This module uses midi_cd, and depends on the `midi'
+ * module, but there's no obvious way to get midi_cd declared in
+ * ioconf.h without actually pulling MIDI into the module in
+ * sys/modules/sequencer/sequencer.ioconf. Please fix me!
+ *
+ * XXX XXX XXX Apparently sequencer.ioconf doesn't actually make the
+ * sequencer cdev! Did this ever work?
+ */
+#ifdef _MODULE
+extern struct cfdriver midi_cd;
+extern struct cfdriver sequencer_cd;
+#endif
+
#define ADDTIMEVAL(a, b) ( \
(a)->tv_sec += (b)->tv_sec, \
(a)->tv_usec += (b)->tv_usec, \