[src/trunk]: src/sys/dev/ic set a delta value on the master channel and move ...

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8d8cf6a7cdde
branches:  trunk
changeset: 750778:8d8cf6a7cdde
user:      macallan <macallan%NetBSD.org@localhost>
date:      Thu Jan 14 02:21:19 2010 +0000

description:
set a delta value on the master channel and move it to the outputs class so
volume control via PMF works

diffstat:

 sys/dev/ic/cs4231.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 24a95fb092b1 -r 8d8cf6a7cdde sys/dev/ic/cs4231.c
--- a/sys/dev/ic/cs4231.c       Thu Jan 14 02:20:07 2010 +0000
+++ b/sys/dev/ic/cs4231.c       Thu Jan 14 02:21:19 2010 +0000
@@ -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 */