diff options
| author |   jakemsr <jakemsr@openbsd.org> | 2007-08-08 05:51:23 +0000 |
|---|---|---|
| committer | jakemsr <jakemsr@openbsd.org> | 2007-08-08 05:51:23 +0000 |
| commit | 2f426515abc89a9f1f9472872af65cb523b5ee56 (patch) | |
| tree | 6a3d2916d8669c5f525d9a1d4211571187f4fce6 | |
| parent | Add "dma" and "ledma" as busses that potentially have the root device on them. (diff) | |
| download | wireguard-openbsd-2f426515abc89a9f1f9472872af65cb523b5ee56.tar.xz wireguard-openbsd-2f426515abc89a9f1f9472872af65cb523b5ee56.zip | |
revert the change in rev 1.60 of audio.c and the corresponding
documentation change
the audio layer is still too "imperfect" for this change
fixes problems reported aanriot, matthieu and dtucker
requested by deraadt
| -rw-r--r-- | share/man/man4/audio.4 | 7 | ||||
| -rw-r--r-- | sys/dev/audio.c | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/share/man/man4/audio.4 b/share/man/man4/audio.4 index 17afb388b6a..20761790407 100644 --- a/share/man/man4/audio.4 +++ b/share/man/man4/audio.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: audio.4,v 1.41 2007/07/06 04:40:20 jakemsr Exp $ +.\" $OpenBSD: audio.4,v 1.42 2007/08/08 05:51:23 jakemsr Exp $ .\" $NetBSD: audio.4,v 1.20 1998/05/28 17:27:15 augustss Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 6 2007 $ +.Dd $Mdocdate: August 8 2007 $ .Dt AUDIO 4 .Os .Sh NAME @@ -118,7 +118,8 @@ concurrently without interference. If a full-duplex capable .Nm audio device is opened for both reading and writing, -it will start in full-duplex playback and recording mode. +it will start in half-duplex play mode; full-duplex mode has to be set +explicitly. On either type of device, if the playback mode is paused then silence is played instead of the provided samples and, if recording is paused, then the process blocks in diff --git a/sys/dev/audio.c b/sys/dev/audio.c index 81472c45bff..11ccda51d99 100644 --- a/sys/dev/audio.c +++ b/sys/dev/audio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: audio.c,v 1.71 2007/08/02 07:24:46 jakemsr Exp $ */ +/* $OpenBSD: audio.c,v 1.72 2007/08/08 05:51:23 jakemsr Exp $ */ /* $NetBSD: audio.c,v 1.119 1999/11/09 16:50:47 augustss Exp $ */ /* @@ -940,9 +940,11 @@ audio_open(dev_t dev, struct audio_softc *sc, int flags, int ifmt, sc->sc_eof = 0; sc->sc_playdrop = 0; - sc->sc_full_duplex = + sc->sc_full_duplex = 0; +/* doesn't always work right on SB. (flags & (FWRITE|FREAD)) == (FWRITE|FREAD) && (sc->hw_if->get_props(sc->hw_hdl) & AUDIO_PROP_FULLDUPLEX); +*/ mode = 0; if (flags & FREAD) { |