D53520.id166205.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D53520.id166205.diff
View Options

	diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h
	--- a/sys/dev/sound/pcm/buffer.h
	+++ b/sys/dev/sound/pcm/buffer.h
	@@ -54,7 +54,7 @@
	char name[SNDBUF_NAMELEN];
	};

	-struct snd_dbuf sndbuf_create(char drv, char desc, struct pcm_channel channel);
	+struct snd_dbuf sndbuf_create(struct pcm_channel channel, const char *desc);
	void sndbuf_destroy(struct snd_dbuf *b);

	void sndbuf_dump(struct snd_dbuf b, char s, u_int32_t what);
	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
	@@ -41,12 +41,12 @@
	#include "snd_fxdiv_gen.h"

	struct snd_dbuf *
	-sndbuf_create(char drv, char desc, struct pcm_channel *channel)
	+sndbuf_create(struct pcm_channel channel, const char desc)
	{
	struct snd_dbuf *b;

	b = malloc(sizeof(*b), M_DEVBUF, M_WAITOK \| M_ZERO);
	- snprintf(b->name, SNDBUF_NAMELEN, "%s:%s", drv, desc);
	+ snprintf(b->name, SNDBUF_NAMELEN, "%s:%s", channel->name, desc);
	b->channel = channel;

	return b;
	diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
	--- a/sys/dev/sound/pcm/channel.c
	+++ b/sys/dev/sound/pcm/channel.c
	@@ -1269,8 +1269,8 @@
	goto fail;
	}

	- b = sndbuf_create(c->name, "primary", c);
	- bs = sndbuf_create(c->name, "secondary", c);
	+ b = sndbuf_create(c, "primary");
	+ bs = sndbuf_create(c, "secondary");
	if (b == NULL \|\| bs == NULL) {
	device_printf(d->dev, "%s(): failed to create %s buffer\n",
	__func__, b == NULL ? "hardware" : "software");