Module Name: src
Committed By: macallan
Date: Thu Jan 14 02:21:19 UTC 2010
Modified Files:
src/sys/dev/ic: cs4231.c
Log Message:
set a delta value on the master channel and move it to the outputs class so
volume control via PMF works
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/ic/cs4231.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/cs4231.c
diff -u src/sys/dev/ic/cs4231.c:1.23 src/sys/dev/ic/cs4231.c:1.24
--- src/sys/dev/ic/cs4231.c:1.23 Mon Apr 28 20:23:49 2008
+++ src/sys/dev/ic/cs4231.c Thu Jan 14 02:21:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4231.c,v 1.23 2008/04/28 20:23:49 martin Exp $ */
+/* $NetBSD: cs4231.c,v 1.24 2010/01/14 02:21:19 macallan Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4231.c,v 1.23 2008/04/28 20:23:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4231.c,v 1.24 2010/01/14 02:21:19 macallan Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -489,6 +489,7 @@
dip->next = dip->prev = AUDIO_MIXER_LAST;
strcpy(dip->label.name, AudioNmaster);
dip->un.v.num_channels = 2;
+ dip->un.v.delta = 16;
strcpy(dip->un.v.units.name, AudioNvolume);
break;
@@ -586,7 +587,7 @@
dip->type = AUDIO_MIXER_CLASS;
dip->mixer_class = CSAUDIO_MONITOR_CLASS;
dip->next = dip->prev = AUDIO_MIXER_LAST;
- strcpy(dip->label.name, AudioCmonitor);
+ strcpy(dip->label.name, AudioCoutputs);
break;
case CSAUDIO_RECORD_CLASS: /* record source class */
