Module Name: src
Committed By: riastradh
Date: Sat Oct 28 04:16:04 UTC 2017
Modified Files:
src/sys/dev: sequencer.c
Log Message:
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???
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/sequencer.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/sequencer.c
diff -u src/sys/dev/sequencer.c:1.68 src/sys/dev/sequencer.c:1.69
--- src/sys/dev/sequencer.c:1.68 Sat Oct 28 03:47:24 2017
+++ src/sys/dev/sequencer.c Sat Oct 28 04:16:04 2017
@@ -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,
#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, \
