diff options
| author | ariff <ariff@FreeBSD.org> | 2009-06-11 09:06:09 +0000 |
|---|---|---|
| committer | ariff <ariff@FreeBSD.org> | 2009-06-11 09:06:09 +0000 |
| commit | 2432cecd0718fc9ef57951b22971c0f74ca85ca6 (patch) | |
| tree | 359c3b24630ebca8ab1ff01f74d4f45ba1dd7ebd /sys/dev/sound/midi/midi.c | |
| parent | 3f57ef9c14686faaba8d18593186246e08ad3e59 (diff) | |
| download | FreeBSD-src-2432cecd0718fc9ef57951b22971c0f74ca85ca6.zip FreeBSD-src-2432cecd0718fc9ef57951b22971c0f74ca85ca6.tar.gz | |
Remove custom KOBJMETHOD(), CHANNEL_DECLARE() and MIXER_DECLARE()
(enabled with SND_DEBUG) that was intended to provoke build failure
due to inconsistencies.
Diffstat (limited to 'sys/dev/sound/midi/midi.c')
| -rw-r--r-- | sys/dev/sound/midi/midi.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 59ea141..4b33808 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -58,17 +58,6 @@ __FBSDID("$FreeBSD$"); #include <sys/poll.h> #include <sys/sbuf.h> #include <sys/kobj.h> -#ifdef SND_DEBUG -#undef KOBJMETHOD -#define KOBJMETHOD(NAME, FUNC) \ - { \ - &NAME##_desc, \ - (kobjop_t) ((FUNC != (NAME##_t *)NULL) ? FUNC : NULL) \ - } -#endif -#ifndef KOBJMETHOD_END -#define KOBJMETHOD_END { NULL, NULL } -#endif #include <sys/module.h> #ifdef HAVE_KERNEL_OPTION_HEADERS @@ -82,6 +71,9 @@ __FBSDID("$FreeBSD$"); #include "synth_if.h" MALLOC_DEFINE(M_MIDI, "midi buffers", "Midi data allocation area"); +#ifndef KOBJMETHOD_END +#define KOBJMETHOD_END { NULL, NULL } +#endif #define PCMMKMINOR(u, d, c) ((((c) & 0xff) << 16) | (((u) & 0x0f) << 4) | ((d) & 0x0f)) #define MIDIMKMINOR(u, d, c) PCMMKMINOR(u, d, c) |
