Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/audio Revert rev1.7.



details:   https://anonhg.NetBSD.org/src/rev/4e866e6731c1
branches:  trunk
changeset: 451814:4e866e6731c1
user:      isaki <isaki%NetBSD.org@localhost>
date:      Thu Jun 06 13:08:30 2019 +0000

description:
Revert rev1.7.
Don't take care of incorrect drivers.  They should be fixed.
PR kern/54264.  OK'ed by nakayama@-san.

diffstat:

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

diffs (36 lines):

diff -r 227a1dfb529a -r 4e866e6731c1 sys/dev/audio/audio.c
--- a/sys/dev/audio/audio.c     Thu Jun 06 12:59:33 2019 +0000
+++ b/sys/dev/audio/audio.c     Thu Jun 06 13:08:30 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.10 2019/05/25 02:42:03 isaki Exp $ */
+/*     $NetBSD: audio.c,v 1.11 2019/06/06 13:08:30 isaki Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -142,7 +142,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.10 2019/05/25 02:42:03 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.11 2019/06/06 13:08:30 isaki Exp $");
 
 #ifdef _KERNEL_OPT
 #include "audio.h"
@@ -1933,17 +1933,12 @@
                         * hw_if->open() is always (FREAD | FWRITE)
                         * regardless of this open()'s flags.
                         * see also dev/isa/aria.c
-                        * but ckeck its playback or recording capability.
                         * On half duplex hardware, the flags passed to
                         * hw_if->open() is either FREAD or FWRITE.
                         * see also arch/evbarm/mini2440/audio_mini2440.c
                         */
                        if (fullduplex) {
                                hwflags = FREAD | FWRITE;
-                               if (!audio_can_playback(sc))
-                                       hwflags &= ~FWRITE;
-                               if (!audio_can_capture(sc))
-                                       hwflags &= ~FREAD;
                        } else {
                                /* Construct hwflags from af->mode. */
                                hwflags = 0;



Home | Main Index | Thread Index | Old Index