Page MenuHomeFreeBSD
Files F149607494

D55932.diff
No OneTemporary
Actions

D55932.diff
View Options

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2157,10 +2157,6 @@
#
# Following options are intended for debugging/testing purposes:
#
-# SND_DEBUG Enable extra debugging code that includes
-# sanity checking and possible increase of
-# verbosity.
-#
# SND_DIAGNOSTIC Similar in a spirit of INVARIANTS/DIAGNOSTIC,
# zero tolerance against inconsistencies.
#
@@ -2182,7 +2178,6 @@
# SND_OLDSTEREO Only 2 channels are allowed, effectively
# disabling multichannel processing.
#
-options SND_DEBUG
options SND_DIAGNOSTIC
options SND_FEEDER_MULTIFORMAT
options SND_FEEDER_FULL_MULTIFORMAT
diff --git a/sys/conf/options b/sys/conf/options
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -915,7 +915,6 @@
CFI_HARDWAREBYTESWAP opt_cfi.h
# Sound options
-SND_DEBUG opt_snd.h
SND_DIAGNOSTIC opt_snd.h
SND_FEEDER_MULTIFORMAT opt_snd.h
SND_FEEDER_FULL_MULTIFORMAT opt_snd.h
diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c
--- a/sys/dev/sound/pcm/feeder_chain.c
+++ b/sys/dev/sound/pcm/feeder_chain.c
@@ -126,7 +126,7 @@
static int feeder_chain_mode = FEEDER_CHAIN_DEFAULT;
-#if defined(_KERNEL) && defined(SND_DEBUG) && defined(SND_FEEDER_FULL_MULTIFORMAT)
+#if defined(_KERNEL) && defined(SND_FEEDER_FULL_MULTIFORMAT)
SYSCTL_INT(_hw_snd, OID_AUTO, feeder_chain_mode, CTLFLAG_RWTUN,
&feeder_chain_mode, 0,
"feeder chain mode "
diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c
--- a/sys/dev/sound/pcm/feeder_mixer.c
+++ b/sys/dev/sound/pcm/feeder_mixer.c
@@ -174,14 +174,6 @@
CHN_UNLOCK(ch);
continue;
}
-#ifdef SND_DEBUG
- if ((c->flags & CHN_F_DIRTY) && VCHAN_SYNC_REQUIRED(ch)) {
- if (vchan_sync(ch) != 0) {
- CHN_UNLOCK(ch);
- continue;
- }
- }
-#endif
bs = ch->bufsoft;
if (ch->flags & CHN_F_MMAP)
sndbuf_dispose(bs, NULL, sndbuf_getready(bs));
@@ -270,14 +262,6 @@
CHN_UNLOCK(ch);
continue;
}
-#ifdef SND_DEBUG
- if ((c->flags & CHN_F_DIRTY) && VCHAN_SYNC_REQUIRED(ch)) {
- if (vchan_sync(ch) != 0) {
- CHN_UNLOCK(ch);
- continue;
- }
- }
-#endif
if ((ch->flags & CHN_F_MMAP) && !(ch->flags & CHN_F_CLOSING))
sndbuf_acquire(ch->bufsoft, NULL,
sndbuf_getfree(ch->bufsoft));

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 26, 2:36 PM (14 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30227691
Default Alt Text
D55932.diff (2 KB)

Event Timeline