diff options
| author |   ratchov <ratchov@openbsd.org> | 2015-06-25 06:43:45 +0000 |
|---|---|---|
| committer | ratchov <ratchov@openbsd.org> | 2015-06-25 06:43:45 +0000 |
| commit | 1cf2860827c8ca659d8097d8da94a5ae5b888c53 (patch) | |
| tree | 47b8a1c39b3fdbffdbcf4b38f636f501ab45d165 /sys/dev/isa/ess.c | |
| parent | Fixed a use-after-free. When handing the L2TP Proxy-LCP, a timer was used (diff) | |
| download | wireguard-openbsd-1cf2860827c8ca659d8097d8da94a5ae5b888c53.tar.xz wireguard-openbsd-1cf2860827c8ca659d8097d8da94a5ae5b888c53.zip | |
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.
Diffstat (limited to 'sys/dev/isa/ess.c')
| -rw-r--r-- | sys/dev/isa/ess.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/isa/ess.c b/sys/dev/isa/ess.c index 22b322e907c..1e42e6bc9b3 100644 --- a/sys/dev/isa/ess.c +++ b/sys/dev/isa/ess.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ess.c,v 1.21 2015/05/11 06:46:21 ratchov Exp $ */ +/* $OpenBSD: ess.c,v 1.22 2015/06/25 06:43:46 ratchov Exp $ */ /* $NetBSD: ess.c,v 1.44.4.1 1999/06/21 01:18:00 thorpej Exp $ */ /* @@ -110,6 +110,9 @@ struct cfdriver ess_cd = { NULL, "ess", DV_DULL }; +struct audio_params ess_audio_default = + {44100, AUDIO_ENCODING_SLINEAR_LE, 16, 2, 1, 2}; + int ess_setup_sc(struct ess_softc *, int); int ess_open(void *, int); @@ -929,8 +932,8 @@ essattach(struct ess_softc *sc) * Set record and play parameters to default values defined in * generic audio driver. */ - pparams = audio_default; - rparams = audio_default; + pparams = ess_audio_default; + rparams = ess_audio_default; ess_set_params(sc, AUMODE_RECORD|AUMODE_PLAY, 0, &pparams, &rparams); /* Do a hardware reset on the mixer. */ |