d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove custom KOBJMETHOD(), CHANNEL_DECLARE() and MIXER_DECLARE()

Browse Source 
(enabled with SND_DEBUG) that was intended to provoke build failure
due to inconsistencies.
This commit is contained in:
ariff 2009-06-11 09:06:09 +00:00
parent 3f57ef9c14
commit 2432cecd07
5 changed files with 11 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/sound/midi/midi.c
View File

@ -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)

15
sys/dev/sound/midi/mpu401.c
View File

@ -37,17 +37,6 @@ __FBSDID("$FreeBSD$");
#include <sys/proc.h>
#include <sys/systm.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/malloc.h>
#include <sys/bus.h> /* to get driver_intr_t */
@ -61,6 +50,10 @@ __FBSDID("$FreeBSD$");
#include "mpu_if.h"
#include "mpufoi_if.h"
#ifndef KOBJMETHOD_END
#define KOBJMETHOD_END { NULL, NULL }
#endif
#define MPU_DATAPORT 0
#define MPU_CMDPORT 1
#define MPU_STATPORT 1

11
sys/dev/sound/pcm/channel.h
View File

@ -441,15 +441,4 @@ extern int report_soft_matrix;
/* The size of a whole secondary bufhard. */
#define CHN_2NDBUFMAXSIZE (131072)
#ifdef SND_DEBUG
#define CHANNEL_DECLARE(channel) \
static struct kobj_class channel##_class = { \
.name = #channel, \
.methods = channel##_methods, \
.size = sizeof(struct kobj), \
.baseclasses = NULL, \
.refs = 0 \
}
#else
#define CHANNEL_DECLARE(name) static DEFINE_CLASS(name, name ## _methods, sizeof(struct kobj))
#endif

11
sys/dev/sound/pcm/mixer.h
View File

@ -74,15 +74,4 @@ extern int mixer_count;
#define MIXER_SIZE (512 + sizeof(struct kobj) + \
sizeof(oss_mixer_enuminfo))
#ifdef SND_DEBUG
#define MIXER_DECLARE(mixer) \
static struct kobj_class mixer##_class = { \
.name = #mixer, \
.methods = mixer##_methods, \
.size = MIXER_SIZE, \
.baseclasses = NULL, \
.refs = 0 \
}
#else
#define MIXER_DECLARE(name) static DEFINE_CLASS(name, name ## _methods, MIXER_SIZE)
#endif

15
sys/dev/sound/pcm/sound.h
View File

@ -66,17 +66,6 @@
#include <sys/soundcard.h>
#include <sys/sysctl.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 <vm/vm.h>
#include <vm/pmap.h>
@ -84,6 +73,10 @@
#include <sys/mutex.h>
#include <sys/condvar.h>
#ifndef KOBJMETHOD_END
#define KOBJMETHOD_END { NULL, NULL }
#endif
struct pcm_channel;
struct pcm_feeder;
struct snd_dbuf;