diff options
| author | Alexandre Ratchov <ratchov@cvs.openbsd.org> | 2015-05-11 06:52:37 +0000 |
|---|---|---|
| committer | Alexandre Ratchov <ratchov@cvs.openbsd.org> | 2015-05-11 06:52:37 +0000 |
| commit | dd89c635d9a50b7d33645609c7c98f4b2eda9e1c (patch) | |
| tree | 6bebf17adabcdf1d3d8dc35b7d8f6e691ca15f32 | |
| parent | cb499c42facd77434ebac9a75c6bd41df9f1ed9d (diff) | |
Remove support for ADPCM encoding which isn't used nowadays and
not available to programs anyway.
| -rw-r--r-- | sys/arch/sparc/dev/cs4231.c | 13 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/ce4231.c | 12 | ||||
| -rw-r--r-- | sys/dev/isa/ad1848.c | 5 | ||||
| -rw-r--r-- | sys/dev/sbus/cs4231.c | 13 |
4 files changed, 4 insertions, 39 deletions
diff --git a/sys/arch/sparc/dev/cs4231.c b/sys/arch/sparc/dev/cs4231.c index 89e05fc768d..097ac404cba 100644 --- a/sys/arch/sparc/dev/cs4231.c +++ b/sys/arch/sparc/dev/cs4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4231.c,v 1.33 2015/05/11 06:46:21 ratchov Exp $ */ +/* $OpenBSD: cs4231.c,v 1.34 2015/05/11 06:52:36 ratchov Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -619,12 +619,6 @@ cs4231_query_encoding(addr, fp) fp->precision = 16; fp->flags = 0; break; - case 5: - strlcpy(fp->name, AudioEadpcm, sizeof fp->name); - fp->encoding = AUDIO_ENCODING_ADPCM; - fp->precision = 8; - fp->flags = 0; - break; default: err = EINVAL; } @@ -669,11 +663,6 @@ cs4231_set_params(addr, setmode, usemode, p, r) return (EINVAL); bits = FMT_PCM8 >> 5; break; - case AUDIO_ENCODING_ADPCM: - if (p->precision != 8) - return (EINVAL); - bits = FMT_ADPCM >> 5; - break; default: return (EINVAL); } diff --git a/sys/arch/sparc64/dev/ce4231.c b/sys/arch/sparc64/dev/ce4231.c index 3352fbadf8e..5ea32287c05 100644 --- a/sys/arch/sparc64/dev/ce4231.c +++ b/sys/arch/sparc64/dev/ce4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ce4231.c,v 1.32 2015/05/11 06:46:21 ratchov Exp $ */ +/* $OpenBSD: ce4231.c,v 1.33 2015/05/11 06:52:35 ratchov Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -506,12 +506,6 @@ ce4231_query_encoding(addr, fp) fp->precision = 16; fp->flags = 0; break; - case 5: - strlcpy(fp->name, AudioEadpcm, sizeof(fp->name)); - fp->encoding = AUDIO_ENCODING_ADPCM; - fp->precision = 8; - fp->flags = 0; - break; default: err = EINVAL; } @@ -552,10 +546,6 @@ ce4231_set_params(addr, setmode, usemode, p, r) case AUDIO_ENCODING_ULINEAR_BE: p->precision = 8; break; - case AUDIO_ENCODING_ADPCM: - p->precision = 8; - bits = FMT_ADPCM >> 5; - break; default: return (EINVAL); } diff --git a/sys/dev/isa/ad1848.c b/sys/dev/isa/ad1848.c index 4dcde647b05..ad7fdc01ab7 100644 --- a/sys/dev/isa/ad1848.c +++ b/sys/dev/isa/ad1848.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ad1848.c,v 1.42 2015/05/11 06:46:21 ratchov Exp $ */ +/* $OpenBSD: ad1848.c,v 1.43 2015/05/11 06:52:35 ratchov Exp $ */ /* $NetBSD: ad1848.c,v 1.45 1998/01/30 02:02:38 augustss Exp $ */ /* @@ -979,9 +979,6 @@ ad1848_set_params(void *addr, int setmode, int usemode, struct audio_params *p, p->precision = 8; bits = FMT_ALAW; break; - case AUDIO_ENCODING_ADPCM: - bits = FMT_ADPCM; - break; case AUDIO_ENCODING_SLINEAR_LE: if (p->precision == 16) bits = FMT_TWOS_COMP; diff --git a/sys/dev/sbus/cs4231.c b/sys/dev/sbus/cs4231.c index 5798650b135..a5697d497bc 100644 --- a/sys/dev/sbus/cs4231.c +++ b/sys/dev/sbus/cs4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4231.c,v 1.34 2015/05/11 06:46:22 ratchov Exp $ */ +/* $OpenBSD: cs4231.c,v 1.35 2015/05/11 06:52:35 ratchov Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -537,12 +537,6 @@ cs4231_query_encoding(void *vsc, struct audio_encoding *fp) fp->precision = 16; fp->flags = AUDIO_ENCODINGFLAG_EMULATED; break; - case 8: - strlcpy(fp->name, AudioEadpcm, sizeof fp->name); - fp->encoding = AUDIO_ENCODING_ADPCM; - fp->precision = 8; - fp->flags = 0; - break; default: err = EINVAL; } @@ -599,11 +593,6 @@ cs4231_set_params(void *vsc, int setmode, int usemode, else return (EINVAL); break; - case AUDIO_ENCODING_ADPCM: - if (p->precision != 8) - return (EINVAL); - bits = FMT_ADPCM >> 5; - break; default: return (EINVAL); } |