D56238.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D56238.diff
View Options

	diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h
	--- a/sys/dev/sound/pcm/feeder.h
	+++ b/sys/dev/sound/pcm/feeder.h
	@@ -63,9 +63,6 @@
	void feeder_register(void *p);
	struct feeder_class *feeder_getclass(u_int32_t type);

	-u_int32_t snd_fmtscore(u_int32_t fmt);
	-u_int32_t snd_fmtbestbit(u_int32_t fmt, u_int32_t *fmts);
	-u_int32_t snd_fmtbestchannel(u_int32_t fmt, u_int32_t *fmts);
	u_int32_t snd_fmtbest(u_int32_t fmt, u_int32_t *fmts);

	int feeder_add(struct pcm_channel c, struct feeder_class fc,
	diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
	--- a/sys/dev/sound/pcm/feeder.c
	+++ b/sys/dev/sound/pcm/feeder.c
	@@ -181,7 +181,7 @@
	#define score_val(s1) ((s1) & 0x3f00)
	#define score_cse(s1) ((s1) & 0x7f)

	-u_int32_t
	+static u_int32_t
	snd_fmtscore(u_int32_t fmt)
	{
	u_int32_t ret;
	@@ -257,13 +257,13 @@
	return best;
	}

	-u_int32_t
	+static u_int32_t
	snd_fmtbestbit(u_int32_t fmt, u_int32_t *fmts)
	{
	return snd_fmtbestfunc(fmt, fmts, 0);
	}

	-u_int32_t
	+static u_int32_t
	snd_fmtbestchannel(u_int32_t fmt, u_int32_t *fmts)
	{
	return snd_fmtbestfunc(fmt, fmts, 1);