D50690.1783803580.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D50690.1783803580.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
	@@ -750,8 +750,8 @@

	mixer_setrecsrc(m, 0); /* Set default input. */

	- pdev = make_dev(&mixer_cdevsw, SND_DEV_CTL, UID_ROOT, GID_WHEEL, 0666,
	- "mixer%d", unit);
	+ pdev = make_dev(&mixer_cdevsw, 0, UID_ROOT, GID_WHEEL, 0666, "mixer%d",
	+ unit);
	pdev->si_drv1 = m;
	snddev->mixer_dev = pdev;

	diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c
	--- a/sys/dev/sound/pcm/sndstat.c
	+++ b/sys/dev/sound/pcm/sndstat.c
	@@ -1438,8 +1438,8 @@
	sndstat_sysinit(void *p)
	{
	sx_init(&sndstat_lock, "sndstat lock");
	- sndstat_dev = make_dev(&sndstat_cdevsw, SND_DEV_STATUS,
	- UID_ROOT, GID_WHEEL, 0644, "sndstat");
	+ sndstat_dev = make_dev(&sndstat_cdevsw, 0, UID_ROOT, GID_WHEEL, 0644,
	+ "sndstat");
	}
	SYSINIT(sndstat_sysinit, SI_SUB_DRIVERS, SI_ORDER_FIRST, sndstat_sysinit, NULL);

	diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
	--- a/sys/dev/sound/pcm/sound.h
	+++ b/sys/dev/sound/pcm/sound.h
	@@ -148,13 +148,6 @@
	#define RANGE(var, low, high) (var) = \
	(((var)<(low))? (low) : ((var)>(high))? (high) : (var))

	-enum {
	- SND_DEV_CTL = 0, /* Control port /dev/mixer */
	- SND_DEV_MIDIN, /* Raw midi access */
	- SND_DEV_DSP, /* Digitized voice /dev/dsp */
	- SND_DEV_STATUS, /* /dev/sndstat */
	-};
	-
	#define DSP_DEFAULT_SPEED 8000

	extern int snd_unit;