[src/trunk]: src/sys/dev Refactoring of order of auto config combinations. M...

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

details:   https://anonhg.NetBSD.org/src/rev/0ae263abcb32
branches:  trunk
changeset: 825676:0ae263abcb32
user:      nat <nat%NetBSD.org@localhost>
date:      Fri Jul 28 02:53:54 2017 +0000

description:
Refactoring of order of auto config combinations.  Most common formats
come first.

Do not exceed AUDIO_MAX_CHANNELS.

Addresses PR kern/52435.

diffstat:

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

diffs (29 lines):

diff -r 83e0183ca15f -r 0ae263abcb32 sys/dev/audio.c
--- a/sys/dev/audio.c   Fri Jul 28 01:36:40 2017 +0000
+++ b/sys/dev/audio.c   Fri Jul 28 02:53:54 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.372 2017/07/28 01:36:40 nat Exp $  */
+/*     $NetBSD: audio.c,v 1.373 2017/07/28 02:53:54 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.372 2017/07/28 01:36:40 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.373 2017/07/28 02:53:54 nat Exp $");
 
 #ifdef _KERNEL_OPT
 #include "audio.h"
@@ -447,8 +447,8 @@
        .channels = 1,
 };
 
-int auto_config_precision[] = { 32, 16, 8 };
-int auto_config_channels[] = { 32, 24, 16, 8, 6, 4, 2, 1};
+int auto_config_precision[] = { 16, 8, 32 };
+int auto_config_channels[] = { 2, AUDIO_MAX_CHANNELS, 10, 8, 6, 4, 1 };
 int auto_config_freq[] = { 48000, 44100, 96000, 192000, 32000,
                           22050, 16000, 11025, 8000, 4000 };