[src/trunk]: src/sys/dev Back out extern struct cfdriver -> ioconf.h change t...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ad2182750400
branches:  trunk
changeset: 357126:ad2182750400
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Oct 28 04:16:04 2017 +0000

description:
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:

 sys/dev/sequencer.c |  18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diffs (39 lines):

diff -r 5385a4e499a9 -r ad2182750400 sys/dev/sequencer.c
--- a/sys/dev/sequencer.c       Sat Oct 28 03:59:11 2017 +0000
+++ b/sys/dev/sequencer.c       Sat Oct 28 04:16:04 2017 +0000
@@ -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 @@
 
 #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, \