Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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???
This commit is contained in:
riastradh 2017-10-28 04:16:04 +00:00
parent 4512d56802
commit af7f88ad32
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/sequencer.c
View File

@ -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, \