diff options
author | Ariff Abdullah <ariff@FreeBSD.org> | 2009-06-11 09:06:09 +0000 |
---|---|---|
committer | Ariff Abdullah <ariff@FreeBSD.org> | 2009-06-11 09:06:09 +0000 |
commit | 5870e3c99049e681f8f64b18d1c455f509576911 (patch) | |
tree | 359c3b24630ebca8ab1ff01f74d4f45ba1dd7ebd /sys/dev/sound/pcm | |
parent | 777e045cb5d49dde42f3506b58dd109e26efca03 (diff) | |
download | src-5870e3c99049e681f8f64b18d1c455f509576911.tar.gz src-5870e3c99049e681f8f64b18d1c455f509576911.zip |
Remove custom KOBJMETHOD(), CHANNEL_DECLARE() and MIXER_DECLARE()
(enabled with SND_DEBUG) that was intended to provoke build failure
due to inconsistencies.
Notes
Notes:
svn path=/head/; revision=193979
Diffstat (limited to 'sys/dev/sound/pcm')
-rw-r--r-- | sys/dev/sound/pcm/channel.h | 11 | ||||
-rw-r--r-- | sys/dev/sound/pcm/mixer.h | 11 | ||||
-rw-r--r-- | sys/dev/sound/pcm/sound.h | 15 |
3 files changed, 4 insertions, 33 deletions
diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 6effec3ce011..6601b546a353 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -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 diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h index 4248a9c29acd..52b7cbd22aca 100644 --- a/sys/dev/sound/pcm/mixer.h +++ b/sys/dev/sound/pcm/mixer.h @@ -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 diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index cd7c183b0664..80cc64588f48 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -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; |