D45137.id138276.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D45137.id138276.diff
View Options

	diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
	--- a/sys/dev/sound/pcm/mixer.c
	+++ b/sys/dev/sound/pcm/mixer.c
	@@ -1516,6 +1516,7 @@
	* Mixer extensions currently aren't supported, so
	* leave @sa oss_mixerinfo::nrext blank for now.
	*/
	+
	/**
	* @todo Fill in @sa oss_mixerinfo::priority (requires
	* touching drivers?)
	@@ -1529,13 +1530,11 @@
	* default mixer. Other devices use values 1 to 9
	* depending on the estimated probability of being the
	* default device.
	- *
	- * XXX Described by Hannu@4Front, but not found in
	- * soundcard.h.
	- strlcpy(mi->devnode, devtoname(d->mixer_dev),
	- sizeof(mi->devnode));
	- mi->legacy_device = i;
	*/
	+
	+ snprintf(mi->devnode, sizeof(mi->devnode), "/dev/mixer%d", i);
	+ mi->real_device = i;
	+
	mtx_unlock(m->lock);
	}

	diff --git a/sys/sys/soundcard.h b/sys/sys/soundcard.h
	--- a/sys/sys/soundcard.h
	+++ b/sys/sys/soundcard.h
	@@ -1925,7 +1925,9 @@
	* as the default mixer.
	*/
	int priority;
	- int filler[254]; /* Reserved */
	+ oss_devnode_t devnode;
	+ int real_device;
	+ int filler[245]; /* Reserved */
	} oss_mixerinfo;

	typedef struct oss_midi_info