Source-Changes-HG archive

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

[src/isaki-audio2]: src/sys/dev/pci Make it compilable (on this branch).



details:   https://anonhg.NetBSD.org/src/rev/926614a67ab2
branches:  isaki-audio2
changeset: 840854:926614a67ab2
user:      isaki <isaki%NetBSD.org@localhost>
date:      Sun Apr 21 07:59:01 2019 +0000

description:
Make it compilable (on this branch).
flags here is F(READ|WRITE), not AUOPEN_(READ|WRITE).

diffstat:

 sys/dev/pci/emuxki.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r 7fa5ffa3b0c1 -r 926614a67ab2 sys/dev/pci/emuxki.c
--- a/sys/dev/pci/emuxki.c      Sun Apr 21 07:55:25 2019 +0000
+++ b/sys/dev/pci/emuxki.c      Sun Apr 21 07:59:01 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: emuxki.c,v 1.67.2.1 2019/04/21 05:11:22 isaki Exp $    */
+/*     $NetBSD: emuxki.c,v 1.67.2.2 2019/04/21 07:59:01 isaki Exp $    */
 
 /*-
  * Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.67.2.1 2019/04/21 05:11:22 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.67.2.2 2019/04/21 07:59:01 isaki Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -60,6 +60,7 @@
 #include <sys/mutex.h>
 #include <sys/kmem.h>
 #include <sys/malloc.h>
+#include <sys/fcntl.h>
 
 #include <dev/audio_if.h>
 #include <dev/audiovar.h>
@@ -2043,7 +2044,7 @@
         * recording source(s) which is necessary when setting recording
         * params This will be addressed very soon
         */
-       if (flags & AUOPEN_READ) {
+       if (flags & FREAD) {
                sc->rvoice = emuxki_voice_new(sc, 0 /* EMU_VOICE_USE_RECORD */);
                if (sc->rvoice == NULL)
                        return EBUSY;
@@ -2052,7 +2053,7 @@
                sc->rvoice->dataloc.source = EMU_RECSRC_ADC;
        }
 
-       if (flags & AUOPEN_WRITE) {
+       if (flags & FWRITE) {
                sc->pvoice = emuxki_voice_new(sc, EMU_VOICE_USE_PLAY);
                if (sc->pvoice == NULL) {
                        if (sc->rvoice) {



Home | Main Index | Thread Index | Old Index