summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorKlemens Nanni <kn@cvs.openbsd.org>2022-10-18 08:22:20 +0000
committerKlemens Nanni <kn@cvs.openbsd.org>2022-10-18 08:22:20 +0000
commit66930f4d1adf5ea8af5d0d189d6a0f7fdfe49b38 (patch)
treeb457c10a038e868d1cc1f91029b4495b731d0d26 /sys
parent60397c03b21b720ceb291de2d8f579531e0fc033 (diff)
Remove unused AUDIO_PROP_{MMAP,INDEPENDENT}
AUDIO_PROP_FULLDUPLEX is the only audio(9) in use, the other two died with commit 1cf2860827c8ca659d8097d8da94a5ae5b888c53 Author: ratchov <ratchov@openbsd.org> Date: Thu Jun 25 06:43:45 2015 +0000 Reimplement the audio driver in a simpler way, removing unused/unusable functionality. Same API and ABI except for the removed bits and no behaviour change for programs using libsndio. With help from armani@ and mpi@, thanks. but remained defined and set in drivers. and the following merely moved them when they were dead code already: commit 9215aa3dfad387bca877a805534df6dcfe8722eb Author: ratchov <ratchov@openbsd.org> Date: Wed Aug 31 07:22:43 2016 +0000 Delete unused ioctls and associated macros. Move macros that are still used internally by low-level drivers from sys/audioio.h to dev/audio_if.h instead of deleting them. None of this is used in base or ports; codesearch.debian.net only shows AUDIO_PROP_{CAPTURE,PLAYBACK} in firefox-esr, mozjs and cubeb. ratchov points out that audio_if.h and audioio.h are private interfaces and the codesearch shows SunOS and NetBSD bits (#ifdef'd out on OpenBSD). OK ratchov
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/macppc/dev/awacs.c4
-rw-r--r--sys/arch/macppc/dev/i2s.c4
-rw-r--r--sys/dev/audio_if.h4
-rw-r--r--sys/dev/isa/ad1848.c5
-rw-r--r--sys/dev/isa/ess.c6
-rw-r--r--sys/dev/isa/gus.c5
-rw-r--r--sys/dev/isa/sbdsp.c5
-rw-r--r--sys/dev/pci/auacer.c5
-rw-r--r--sys/dev/pci/auglx.c4
-rw-r--r--sys/dev/pci/auich.c4
-rw-r--r--sys/dev/pci/auixp.c4
-rw-r--r--sys/dev/pci/autri.c5
-rw-r--r--sys/dev/pci/auvia.c8
-rw-r--r--sys/dev/pci/azalia.c4
-rw-r--r--sys/dev/pci/cmpci.c4
-rw-r--r--sys/dev/pci/cs4280.c4
-rw-r--r--sys/dev/pci/cs4281.c10
-rw-r--r--sys/dev/pci/eap.c5
-rw-r--r--sys/dev/pci/emuxki.c5
-rw-r--r--sys/dev/pci/envy.c4
-rw-r--r--sys/dev/pci/esa.c5
-rw-r--r--sys/dev/pci/eso.c5
-rw-r--r--sys/dev/pci/fms.c5
-rw-r--r--sys/dev/pci/maestro.c4
-rw-r--r--sys/dev/pci/neo.c4
-rw-r--r--sys/dev/pci/sv.c4
-rw-r--r--sys/dev/pci/yds.c5
-rw-r--r--sys/dev/tc/bba.c4
28 files changed, 56 insertions, 79 deletions
diff --git a/sys/arch/macppc/dev/awacs.c b/sys/arch/macppc/dev/awacs.c
index 38c7ed6b411..03272138ac6 100644
--- a/sys/arch/macppc/dev/awacs.c
+++ b/sys/arch/macppc/dev/awacs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: awacs.c,v 1.37 2022/03/21 19:22:39 miod Exp $ */
+/* $OpenBSD: awacs.c,v 1.38 2022/10/18 08:22:18 kn Exp $ */
/* $NetBSD: awacs.c,v 1.4 2001/02/26 21:07:51 wiz Exp $ */
/*-
@@ -873,7 +873,7 @@ awacs_allocm(void *h, int dir, size_t size, int type, int flags)
int
awacs_get_props(void *h)
{
- return AUDIO_PROP_FULLDUPLEX /* | AUDIO_PROP_MMAP */;
+ return AUDIO_PROP_FULLDUPLEX;
}
int
diff --git a/sys/arch/macppc/dev/i2s.c b/sys/arch/macppc/dev/i2s.c
index b87711a0497..f8f3595ac41 100644
--- a/sys/arch/macppc/dev/i2s.c
+++ b/sys/arch/macppc/dev/i2s.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i2s.c,v 1.35 2022/10/15 08:41:18 jsg Exp $ */
+/* $OpenBSD: i2s.c,v 1.36 2022/10/18 08:22:18 kn Exp $ */
/* $NetBSD: i2s.c,v 1.1 2003/12/27 02:19:34 grant Exp $ */
/*-
@@ -583,7 +583,7 @@ i2s_round_buffersize(void *h, int dir, size_t size)
int
i2s_get_props(void *h)
{
- return AUDIO_PROP_FULLDUPLEX /* | AUDIO_PROP_MMAP */;
+ return AUDIO_PROP_FULLDUPLEX;
}
int
diff --git a/sys/dev/audio_if.h b/sys/dev/audio_if.h
index c5adaf579cd..b01b57caf41 100644
--- a/sys/dev/audio_if.h
+++ b/sys/dev/audio_if.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: audio_if.h,v 1.38 2022/03/21 19:22:40 miod Exp $ */
+/* $OpenBSD: audio_if.h,v 1.39 2022/10/18 08:22:18 kn Exp $ */
/* $NetBSD: audio_if.h,v 1.24 1998/01/10 14:07:25 tv Exp $ */
/*
@@ -44,8 +44,6 @@
* get_props
*/
#define AUDIO_PROP_FULLDUPLEX 0x01
-#define AUDIO_PROP_MMAP 0x02
-#define AUDIO_PROP_INDEPENDENT 0x04
#define AUDIO_BPS(bits) (bits) <= 8 ? 1 : ((bits) <= 16 ? 2 : 4)
diff --git a/sys/dev/isa/ad1848.c b/sys/dev/isa/ad1848.c
index 68e9a891f1e..bb2b95277a1 100644
--- a/sys/dev/isa/ad1848.c
+++ b/sys/dev/isa/ad1848.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ad1848.c,v 1.46 2022/01/09 05:42:42 jsg Exp $ */
+/* $OpenBSD: ad1848.c,v 1.47 2022/10/18 08:22:18 kn Exp $ */
/* $NetBSD: ad1848.c,v 1.45 1998/01/30 02:02:38 augustss Exp $ */
/*
@@ -1464,6 +1464,5 @@ ad1848_get_props(void *addr)
{
struct ad1848_softc *sc = addr;
- return AUDIO_PROP_MMAP |
- (sc->mode == 2 ? AUDIO_PROP_FULLDUPLEX : 0);
+ return (sc->mode == 2 ? AUDIO_PROP_FULLDUPLEX : 0);
}
diff --git a/sys/dev/isa/ess.c b/sys/dev/isa/ess.c
index c0298cacfb4..d7d7308967d 100644
--- a/sys/dev/isa/ess.c
+++ b/sys/dev/isa/ess.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ess.c,v 1.28 2022/03/21 19:22:40 miod Exp $ */
+/* $OpenBSD: ess.c,v 1.29 2022/10/18 08:22:18 kn Exp $ */
/* $NetBSD: ess.c,v 1.44.4.1 1999/06/21 01:18:00 thorpej Exp $ */
/*
@@ -2074,13 +2074,13 @@ ess_round_buffersize(void *addr, int direction, size_t size)
int
ess_1788_get_props(void *addr)
{
- return (AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT);
+ return (0);
}
int
ess_1888_get_props(void *addr)
{
- return (AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT | AUDIO_PROP_FULLDUPLEX);
+ return (AUDIO_PROP_FULLDUPLEX);
}
/* ============================================
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c
index fbe64587fd2..091491c7a7b 100644
--- a/sys/dev/isa/gus.c
+++ b/sys/dev/isa/gus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gus.c,v 1.51 2022/08/29 06:08:04 jsg Exp $ */
+/* $OpenBSD: gus.c,v 1.52 2022/10/18 08:22:18 kn Exp $ */
/* $NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $ */
/*-
@@ -2698,8 +2698,7 @@ int
gus_get_props(void *addr)
{
struct gus_softc *sc = addr;
- return AUDIO_PROP_MMAP |
- (sc->sc_recdrq == sc->sc_drq ? 0 : AUDIO_PROP_FULLDUPLEX);
+ return (sc->sc_recdrq == sc->sc_drq ? 0 : AUDIO_PROP_FULLDUPLEX);
}
int
diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c
index 84845094c92..4ca26c110ef 100644
--- a/sys/dev/isa/sbdsp.c
+++ b/sys/dev/isa/sbdsp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbdsp.c,v 1.40 2022/01/09 05:42:44 jsg Exp $ */
+/* $OpenBSD: sbdsp.c,v 1.41 2022/10/18 08:22:18 kn Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -2116,8 +2116,7 @@ int
sbdsp_get_props(void *addr)
{
struct sbdsp_softc *sc = addr;
- return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT |
- (sc->sc_fullduplex ? AUDIO_PROP_FULLDUPLEX : 0);
+ return (sc->sc_fullduplex ? AUDIO_PROP_FULLDUPLEX : 0);
}
#if NMIDI > 0
diff --git a/sys/dev/pci/auacer.c b/sys/dev/pci/auacer.c
index ad840a08458..ea4e821be25 100644
--- a/sys/dev/pci/auacer.c
+++ b/sys/dev/pci/auacer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auacer.c,v 1.25 2022/03/21 19:22:40 miod Exp $ */
+/* $OpenBSD: auacer.c,v 1.26 2022/10/18 08:22:18 kn Exp $ */
/* $NetBSD: auacer.c,v 1.3 2004/11/10 04:20:26 kent Exp $ */
/*-
@@ -642,8 +642,7 @@ auacer_round_buffersize(void *v, int direction, size_t size)
int
auacer_get_props(void *v)
{
- return (AUDIO_PROP_INDEPENDENT | AUDIO_PROP_FULLDUPLEX |
- AUDIO_PROP_MMAP);
+ return (AUDIO_PROP_FULLDUPLEX);
}
static void
diff --git a/sys/dev/pci/auglx.c b/sys/dev/pci/auglx.c
index 7902c382002..310ea89330d 100644
--- a/sys/dev/pci/auglx.c
+++ b/sys/dev/pci/auglx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auglx.c,v 1.20 2022/03/21 19:22:40 miod Exp $ */
+/* $OpenBSD: auglx.c,v 1.21 2022/10/18 08:22:19 kn Exp $ */
/*
* Copyright (c) 2008 Marc Balmer <mbalmer@openbsd.org>
@@ -627,7 +627,7 @@ auglx_round_buffersize(void *v, int direction, size_t size)
int
auglx_get_props(void *v)
{
- return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT | AUDIO_PROP_FULLDUPLEX;
+ return AUDIO_PROP_FULLDUPLEX;
}
int
diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index f03c0e3bdb1..19173946d51 100644
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auich.c,v 1.116 2022/03/21 19:22:40 miod Exp $ */
+/* $OpenBSD: auich.c,v 1.117 2022/10/18 08:22:19 kn Exp $ */
/*
* Copyright (c) 2000,2001 Michael Shalayeff
@@ -927,7 +927,7 @@ auich_round_buffersize(void *v, int direction, size_t size)
int
auich_get_props(void *v)
{
- return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT | AUDIO_PROP_FULLDUPLEX;
+ return AUDIO_PROP_FULLDUPLEX;
}
int
diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c
index 92f57fd2676..5120c387b80 100644
--- a/sys/dev/pci/auixp.c
+++ b/sys/dev/pci/auixp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auixp.c,v 1.48 2022/03/21 19:22:40 miod Exp $ */
+/* $OpenBSD: auixp.c,v 1.49 2022/10/18 08:22:19 kn Exp $ */
/* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */
/*
@@ -449,7 +449,7 @@ int
auixp_get_props(void *hdl)
{
- return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT | AUDIO_PROP_FULLDUPLEX;
+ return AUDIO_PROP_FULLDUPLEX;
}
diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c
index 306aa674509..6d18e2b8b43 100644
--- a/sys/dev/pci/autri.c
+++ b/sys/dev/pci/autri.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autri.c,v 1.47 2022/03/21 19:22:40 miod Exp $ */
+/* $OpenBSD: autri.c,v 1.48 2022/10/18 08:22:19 kn Exp $ */
/*
* Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
@@ -1034,8 +1034,7 @@ autri_find_dma(struct autri_softc *sc, void *addr)
int
autri_get_props(void *addr)
{
- return (AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT |
- AUDIO_PROP_FULLDUPLEX);
+ return (AUDIO_PROP_FULLDUPLEX);
}
void
diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c
index a2b7923f3a7..71fa8387af0 100644
--- a/sys/dev/pci/auvia.c
+++ b/sys/dev/pci/auvia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auvia.c,v 1.63 2022/03/21 19:22:41 miod Exp $ */
+/* $OpenBSD: auvia.c,v 1.64 2022/10/18 08:22:19 kn Exp $ */
/* $NetBSD: auvia.c,v 1.28 2002/11/04 16:38:49 kent Exp $ */
/*-
@@ -801,11 +801,7 @@ auvia_round_buffersize(void *addr, int direction, size_t bufsize)
int
auvia_get_props(void *addr)
{
- int props;
-
- props = AUDIO_PROP_MMAP|AUDIO_PROP_INDEPENDENT|AUDIO_PROP_FULLDUPLEX;
-
- return props;
+ return AUDIO_PROP_FULLDUPLEX;
}
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c
index 8725e96340f..7ae062469a3 100644
--- a/sys/dev/pci/azalia.c
+++ b/sys/dev/pci/azalia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: azalia.c,v 1.276 2022/09/08 01:28:46 jsg Exp $ */
+/* $OpenBSD: azalia.c,v 1.277 2022/10/18 08:22:19 kn Exp $ */
/* $NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $ */
/*-
@@ -4149,7 +4149,7 @@ azalia_round_buffersize(void *v, int dir, size_t size)
int
azalia_get_props(void *v)
{
- return AUDIO_PROP_INDEPENDENT | AUDIO_PROP_FULLDUPLEX;
+ return AUDIO_PROP_FULLDUPLEX;
}
int
diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c
index 416db69f4d9..241fd82f9b2 100644
--- a/sys/dev/pci/cmpci.c
+++ b/sys/dev/pci/cmpci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmpci.c,v 1.49 2022/03/21 19:22:41 miod Exp $ */
+/* $OpenBSD: cmpci.c,v 1.50 2022/10/18 08:22:19 kn Exp $ */
/* $NetBSD: cmpci.c,v 1.25 2004/10/26 06:32:20 xtraeme Exp $ */
/*
@@ -1768,7 +1768,7 @@ cmpci_round_buffersize(void *handle, int direction, size_t bufsize)
int
cmpci_get_props(void *handle)
{
- return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT | AUDIO_PROP_FULLDUPLEX;
+ return AUDIO_PROP_FULLDUPLEX;
}
int
diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c
index 6f8d7f31ea4..c85f23807a3 100644
--- a/sys/dev/pci/cs4280.c
+++ b/sys/dev/pci/cs4280.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cs4280.c,v 1.57 2022/03/21 19:22:41 miod Exp $ */
+/* $OpenBSD: cs4280.c,v 1.58 2022/10/18 08:22:19 kn Exp $ */
/* $NetBSD: cs4280.c,v 1.5 2000/06/26 04:56:23 simonb Exp $ */
/*
@@ -1062,7 +1062,7 @@ cs4280_round_blocksize(void *hdl, int blk)
int
cs4280_get_props(void *hdl)
{
- return (AUDIO_PROP_INDEPENDENT | AUDIO_PROP_FULLDUPLEX);
+ return (AUDIO_PROP_FULLDUPLEX);
}
int
diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c
index f8bc2564982..9ab76cad5c3 100644
--- a/sys/dev/pci/cs4281.c
+++ b/sys/dev/pci/cs4281.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cs4281.c,v 1.42 2022/03/21 19:22:41 miod Exp $ */
+/* $OpenBSD: cs4281.c,v 1.43 2022/10/18 08:22:19 kn Exp $ */
/* $Tera: cs4281.c,v 1.18 2000/12/27 14:24:45 tacha Exp $ */
/*
@@ -1195,13 +1195,7 @@ cs4281_round_buffersize(void *addr, int direction, size_t size)
int
cs4281_get_props(void *addr)
{
- int retval;
-
- retval = AUDIO_PROP_INDEPENDENT | AUDIO_PROP_FULLDUPLEX;
-#ifdef MMAP_READY
- retval |= AUDIO_PROP_MMAP;
-#endif
- return (retval);
+ return (AUDIO_PROP_FULLDUPLEX);
}
/* AC97 */
diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c
index 53c8acfae5f..7d3df1ccee4 100644
--- a/sys/dev/pci/eap.c
+++ b/sys/dev/pci/eap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eap.c,v 1.61 2022/03/21 19:22:41 miod Exp $ */
+/* $OpenBSD: eap.c,v 1.62 2022/10/18 08:22:19 kn Exp $ */
/* $NetBSD: eap.c,v 1.46 2001/09/03 15:07:37 reinoud Exp $ */
/*
@@ -1498,8 +1498,7 @@ eap_free(void *addr, void *ptr, int pool)
int
eap_get_props(void *addr)
{
- return (AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT |
- AUDIO_PROP_FULLDUPLEX);
+ return (AUDIO_PROP_FULLDUPLEX);
}
enum ac97_host_flags
diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c
index 998f722d4a5..96a4e46053c 100644
--- a/sys/dev/pci/emuxki.c
+++ b/sys/dev/pci/emuxki.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: emuxki.c,v 1.58 2022/03/21 19:22:41 miod Exp $ */
+/* $OpenBSD: emuxki.c,v 1.59 2022/10/18 08:22:19 kn Exp $ */
/* $NetBSD: emuxki.c,v 1.1 2001/10/17 18:39:41 jdolecek Exp $ */
/*-
@@ -2269,8 +2269,7 @@ emuxki_round_buffersize(void *addr, int direction, size_t bsize)
int
emuxki_get_props(void *addr)
{
- return (AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT |
- AUDIO_PROP_FULLDUPLEX);
+ return (AUDIO_PROP_FULLDUPLEX);
}
int
diff --git a/sys/dev/pci/envy.c b/sys/dev/pci/envy.c
index 51689997017..378c31b1f36 100644
--- a/sys/dev/pci/envy.c
+++ b/sys/dev/pci/envy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: envy.c,v 1.84 2022/03/21 19:22:41 miod Exp $ */
+/* $OpenBSD: envy.c,v 1.85 2022/10/18 08:22:19 kn Exp $ */
/*
* Copyright (c) 2007 Alexandre Ratchov <alex@caoua.org>
*
@@ -2442,7 +2442,7 @@ envy_set_port(void *self, struct mixer_ctrl *ctl)
int
envy_get_props(void *self)
{
- return AUDIO_PROP_FULLDUPLEX | AUDIO_PROP_INDEPENDENT;
+ return AUDIO_PROP_FULLDUPLEX;
}
#if NMIDI > 0
diff --git a/sys/dev/pci/esa.c b/sys/dev/pci/esa.c
index 63c864db22f..e0026d9cfac 100644
--- a/sys/dev/pci/esa.c
+++ b/sys/dev/pci/esa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esa.c,v 1.38 2022/03/21 19:22:41 miod Exp $ */
+/* $OpenBSD: esa.c,v 1.39 2022/10/18 08:22:19 kn Exp $ */
/* $NetBSD: esa.c,v 1.12 2002/03/24 14:17:35 jmcneill Exp $ */
/*
@@ -497,8 +497,7 @@ esa_round_buffersize(void *hdl, int direction, size_t bufsize)
int
esa_get_props(void *hdl)
{
-
- return (AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT | AUDIO_PROP_FULLDUPLEX);
+ return (AUDIO_PROP_FULLDUPLEX);
}
int
diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c
index b700ddecbdc..eec3e04be4b 100644
--- a/sys/dev/pci/eso.c
+++ b/sys/dev/pci/eso.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eso.c,v 1.50 2022/03/21 19:22:41 miod Exp $ */
+/* $OpenBSD: eso.c,v 1.51 2022/10/18 08:22:19 kn Exp $ */
/* $NetBSD: eso.c,v 1.48 2006/12/18 23:13:39 kleink Exp $ */
/*
@@ -1571,8 +1571,7 @@ eso_round_buffersize(void *hdl, int direction, size_t bufsize)
int
eso_get_props(void *hdl)
{
- return (AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT |
- AUDIO_PROP_FULLDUPLEX);
+ return (AUDIO_PROP_FULLDUPLEX);
}
int
diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c
index 8e18364f857..56adec0d241 100644
--- a/sys/dev/pci/fms.c
+++ b/sys/dev/pci/fms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fms.c,v 1.33 2022/03/21 19:22:41 miod Exp $ */
+/* $OpenBSD: fms.c,v 1.34 2022/10/18 08:22:19 kn Exp $ */
/* $NetBSD: fms.c,v 1.5.4.1 2000/06/30 16:27:50 simonb Exp $ */
/*-
@@ -635,8 +635,7 @@ fms_free(void *addr, void *ptr, int pool)
int
fms_get_props(void *addr)
{
- return AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT |
- AUDIO_PROP_FULLDUPLEX;
+ return AUDIO_PROP_FULLDUPLEX;
}
int
diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c
index d6ceb0cae2c..abbcbba999d 100644
--- a/sys/dev/pci/maestro.c
+++ b/sys/dev/pci/maestro.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: maestro.c,v 1.46 2022/03/21 19:22:41 miod Exp $ */
+/* $OpenBSD: maestro.c,v 1.47 2022/10/18 08:22:19 kn Exp $ */
/* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */
/*
* FreeBSD's ESS Agogo/Maestro driver
@@ -852,7 +852,7 @@ maestro_get_props(void *self)
{
/* struct maestro_softc *sc = (struct maestro_softc *)self; */
- return (AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT); /* XXX */
+ return (0); /* XXX */
}
int
diff --git a/sys/dev/pci/neo.c b/sys/dev/pci/neo.c
index b6f984d26e1..d185889f712 100644
--- a/sys/dev/pci/neo.c
+++ b/sys/dev/pci/neo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: neo.c,v 1.37 2022/03/21 19:22:41 miod Exp $ */
+/* $OpenBSD: neo.c,v 1.38 2022/10/18 08:22:19 kn Exp $ */
/*
* Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
@@ -941,5 +941,5 @@ neo_round_buffersize(void *addr, int direction, size_t size)
int
neo_get_props(void *addr)
{
- return (AUDIO_PROP_INDEPENDENT | AUDIO_PROP_FULLDUPLEX);
+ return (AUDIO_PROP_FULLDUPLEX);
}
diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c
index 9f902d3d961..862aad78ec8 100644
--- a/sys/dev/pci/sv.c
+++ b/sys/dev/pci/sv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sv.c,v 1.40 2022/03/21 19:22:41 miod Exp $ */
+/* $OpenBSD: sv.c,v 1.41 2022/10/18 08:22:19 kn Exp $ */
/*
* Copyright (c) 1998 Constantine Paul Sapuntzakis
@@ -1311,5 +1311,5 @@ sv_free(void *addr, void *ptr, int pool)
int
sv_get_props(void *addr)
{
- return (AUDIO_PROP_MMAP | AUDIO_PROP_FULLDUPLEX);
+ return (AUDIO_PROP_FULLDUPLEX);
}
diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c
index 5657423174e..b26b3ecce67 100644
--- a/sys/dev/pci/yds.c
+++ b/sys/dev/pci/yds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yds.c,v 1.60 2022/08/29 06:08:04 jsg Exp $ */
+/* $OpenBSD: yds.c,v 1.61 2022/10/18 08:22:19 kn Exp $ */
/* $NetBSD: yds.c,v 1.5 2001/05/21 23:55:04 minoura Exp $ */
/*
@@ -1570,8 +1570,7 @@ yds_round_buffersize(void *addr, int direction, size_t size)
int
yds_get_props(void *addr)
{
- return (AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT |
- AUDIO_PROP_FULLDUPLEX);
+ return (AUDIO_PROP_FULLDUPLEX);
}
int
diff --git a/sys/dev/tc/bba.c b/sys/dev/tc/bba.c
index 840e7e85eda..2fe39dc4f91 100644
--- a/sys/dev/tc/bba.c
+++ b/sys/dev/tc/bba.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bba.c,v 1.9 2022/03/21 19:22:41 miod Exp $ */
+/* $OpenBSD: bba.c,v 1.10 2022/10/18 08:22:19 kn Exp $ */
/* $NetBSD: bba.c,v 1.38 2011/06/04 01:27:57 tsutsui Exp $ */
/*
* Copyright (c) 2011 Miodrag Vallat.
@@ -584,7 +584,7 @@ bba_intr(void *v)
int
bba_get_props(void *v)
{
- return AUDIO_PROP_MMAP | am7930_get_props(v);
+ return am7930_get_props(v);
}
int