diff options
| author | plunky <plunky@NetBSD.org> | 2012-04-09 10:18:16 +0000 |
|---|---|---|
| committer | plunky <plunky@NetBSD.org> | 2012-04-09 10:18:16 +0000 |
| commit | 6ffe46e4b5ef02387f9daf64dd31386e5b7a5e17 (patch) | |
| tree | cd4a5b5edb6712f3043d86baa2c04c05dff36c1c /sys/dev/sequencer.c | |
| parent | 483fe891dd7a4aba4cce52d0db66d93d1a7b776b (diff) | |
Tidy up a little, the way that midi attachment code works
- change midi_attach() to omit the 'parent' arg (there are
only two callers of this and it is not used)
- change midisyn_attach() to midisyn_init(), so not needing a midi_softc,
and fix the midi_pcppi driver to set hw_if and hw_hdl directly in
its midi_softc before calling midi_attach()
- add a device_t to opl_softc structure, change opl drivers to store
the device 'self' in opl_softc and fix opl_attach() to use this
opl_softc->dev field directly rather than a field in an otherwise
unused midi_softc
- remove unnecessary midi_softc from opl and cms drivers (child device
provides that)
reviewed by mrg
Diffstat (limited to 'sys/dev/sequencer.c')
| -rw-r--r-- | sys/dev/sequencer.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c index 9ae3579aafd..0d2d0af5d8d 100644 --- a/sys/dev/sequencer.c +++ b/sys/dev/sequencer.c @@ -1,4 +1,4 @@ -/* $NetBSD: sequencer.c,v 1.54 2012/02/13 01:47:16 mrg Exp $ */ +/* $NetBSD: sequencer.c,v 1.55 2012/04/09 10:18:16 plunky 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.54 2012/02/13 01:47:16 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.55 2012/04/09 10:18:16 plunky Exp $"); #include "sequencer.h" @@ -136,7 +136,6 @@ static void seq_timeout(void *); static int seq_to_new(seq_event_t *, struct uio *); static void seq_softintr(void *); -struct midi_softc; static int midiseq_out(struct midi_dev *, u_char *, u_int, int); static struct midi_dev *midiseq_open(int, int); static void midiseq_close(struct midi_dev *); |
