D55989.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D55989.diff
View Options

	diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c
	--- a/sys/dev/sound/pcm/buffer.c
	+++ b/sys/dev/sound/pcm/buffer.c
	@@ -506,29 +506,11 @@
	return 0;
	}

	-#ifdef SND_DIAGNOSTIC
	-static uint32_t snd_feeder_maxfeed = 0;
	-SYSCTL_UINT(_hw_snd, OID_AUTO, feeder_maxfeed, CTLFLAG_RD,
	- &snd_feeder_maxfeed, 0, "maximum feeder count request");
	-
	-static uint32_t snd_feeder_maxcycle = 0;
	-SYSCTL_UINT(_hw_snd, OID_AUTO, feeder_maxcycle, CTLFLAG_RD,
	- &snd_feeder_maxcycle, 0, "maximum feeder cycle");
	-#endif
	-
	/* count is number of bytes we want added to destination buffer */
	int
	sndbuf_feed(struct snd_dbuf from, struct snd_dbuf to, struct pcm_channel channel, struct pcm_feeder feeder, unsigned int count)
	{
	unsigned int cnt, maxfeed;
	-#ifdef SND_DIAGNOSTIC
	- unsigned int cycle;
	-
	- if (count > snd_feeder_maxfeed)
	- snd_feeder_maxfeed = count;
	-
	- cycle = 0;
	-#endif

	KASSERT(count > 0, ("can't feed 0 bytes"));

	@@ -544,16 +526,8 @@
	break;
	sndbuf_acquire(to, to->tmpbuf, cnt);
	count -= cnt;
	-#ifdef SND_DIAGNOSTIC
	- cycle++;
	-#endif
	} while (count != 0);

	-#ifdef SND_DIAGNOSTIC
	- if (cycle > snd_feeder_maxcycle)
	- snd_feeder_maxcycle = cycle;
	-#endif
	-
	return (0);
	}