[src/netbsd-1-5]: src/sys/dev/usb Pull up 1.28-1.29. Make 16-bit only speake...

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

details:   https://anonhg.NetBSD.org/src/rev/7f59690f9904
branches:  netbsd-1-5
changeset: 489697:7f59690f9904
user:      augustss <augustss%NetBSD.org@localhost>
date:      Fri Oct 06 23:43:38 2000 +0000

description:
Pull up 1.28-1.29.  Make 16-bit only speakers work.
Approved by thorpej.

diffstat:

 sys/dev/usb/uaudio.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (43 lines):

diff -r 8afe0f1fad8c -r 7f59690f9904 sys/dev/usb/uaudio.c
--- a/sys/dev/usb/uaudio.c      Fri Oct 06 23:25:02 2000 +0000
+++ b/sys/dev/usb/uaudio.c      Fri Oct 06 23:43:38 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uaudio.c,v 1.27 2000/06/19 11:43:48 augustss Exp $     */
+/*     $NetBSD: uaudio.c,v 1.27.2.1 2000/10/06 23:43:38 augustss Exp $ */
 
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -2137,13 +2137,13 @@
                                pswcode = mulaw_to_slinear8;
                                rswcode = slinear8_to_mulaw;
                                enc = AUDIO_ENCODING_SLINEAR_LE;
-#if 0
                        } else if (flags & HAS_16) {
                                pswcode = mulaw_to_slinear16_le;
                                pfactor = 2;
+                               enc = AUDIO_ENCODING_SLINEAR_LE;
                                /* XXX recording not handled */
-                               enc = AUDIO_ENCODING_SLINEAR_LE;
-#endif
+                               if (setmode & AUMODE_RECORD)
+                                       return (EINVAL);
                        } else
                                return (EINVAL);
                }
@@ -2158,13 +2158,13 @@
                                pswcode = alaw_to_slinear8;
                                rswcode = slinear8_to_alaw;
                                enc = AUDIO_ENCODING_SLINEAR_LE;
-#if 0
                        } else if (flags & HAS_16) {
                                pswcode = alaw_to_slinear16_le;
                                pfactor = 2;
+                               enc = AUDIO_ENCODING_SLINEAR_LE;
                                /* XXX recording not handled */
-                               enc = AUDIO_ENCODING_SLINEAR_LE;
-#endif
+                               if (setmode & AUMODE_RECORD)
+                                       return (EINVAL);
                        } else
                                return (EINVAL);
                }