diff options
| author | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2010-09-10 04:52:06 +0000 |
|---|---|---|
| committer | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2010-09-10 04:52:06 +0000 |
| commit | 63a05ea837ed7d3e3b1527603352006f3207e601 (patch) | |
| tree | faf525f0db84bf4f51ce1a6b554cd442659d320b /sys/dev/pci | |
| parent | 603bf4f04a941db10ee48b2f222bfd83ff76cffa (diff) | |
the open() functions give us flags like FREAD and FWRITE from sys/fcntl.h.
the AUOPEN_ macros from sys/dev/audiovar.h are for something else.
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/emuxki.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c index a61798e95ca..09042177362 100644 --- a/sys/dev/pci/emuxki.c +++ b/sys/dev/pci/emuxki.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emuxki.c,v 1.34 2010/07/15 03:43:11 jakemsr Exp $ */ +/* $OpenBSD: emuxki.c,v 1.35 2010/09/10 04:52:05 jakemsr Exp $ */ /* $NetBSD: emuxki.c,v 1.1 2001/10/17 18:39:41 jdolecek Exp $ */ /*- @@ -52,6 +52,7 @@ #include <sys/types.h> #include <sys/device.h> #include <sys/errno.h> +#include <sys/fcntl.h> #include <sys/malloc.h> #include <sys/systm.h> #include <sys/param.h> @@ -63,7 +64,6 @@ #include <dev/pci/pcidevs.h> #include <dev/audio_if.h> -#include <dev/audiovar.h> #include <dev/auconv.h> #include <dev/mulaw.h> #include <dev/ic/ac97.h> @@ -2045,7 +2045,7 @@ emuxki_open(void *addr, int flags) * 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); @@ -2054,10 +2054,10 @@ emuxki_open(void *addr, int flags) 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 (flags & AUOPEN_READ) + if (flags & FREAD) emuxki_voice_delete(sc->rvoice); return (EBUSY); } |