[src/trunk]: src/sys/dev Exclude mixer channels from channel numbering.

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

details:   https://anonhg.NetBSD.org/src/rev/63c60eea2fc3
branches:  trunk
changeset: 822725:63c60eea2fc3
user:      nat <nat%NetBSD.org@localhost>
date:      Mon Apr 03 04:09:12 2017 +0000

description:
Exclude mixer channels from channel numbering.

diffstat:

 sys/dev/audio.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 1ae28a68f1ee -r 63c60eea2fc3 sys/dev/audio.c
--- a/sys/dev/audio.c   Mon Apr 03 00:42:20 2017 +0000
+++ b/sys/dev/audio.c   Mon Apr 03 04:09:12 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.319 2017/03/29 06:24:22 nat Exp $  */
+/*     $NetBSD: audio.c,v 1.320 2017/04/03 04:09:12 nat Exp $  */
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss <nathanialsloss%yahoo.com.au@localhost>
@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.319 2017/03/29 06:24:22 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.320 2017/04/03 04:09:12 nat Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -2088,6 +2088,8 @@
        SIMPLEQ_FOREACH(chan, &sc->sc_audiochan, entries) {
                if (chan == SIMPLEQ_FIRST(&sc->sc_audiochan))
                        continue;
+               if (chan->chan == MIXER_INUSE)
+                       continue;
                n = chan->chan + 1;
        }
        if (n < 0)