 @@ -1,14 +1,14 @@
-/*	$NetBSD: vs.c,v 1.47 2017/09/02 12:52:55 isaki Exp $	*/
+/*	$NetBSD: vs.c,v 1.48 2017/09/02 15:40:31 isaki Exp $	*/
 /*
  * Copyright (c) 2001 Tetsuya Isaki. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -20,27 +20,27 @@
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * VS - OKI MSM6258 ADPCM voice synthesizer device driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.47 2017/09/02 12:52:55 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.48 2017/09/02 15:40:31 isaki Exp $");
 #include "audio.h"
 #include "vs.h"
 #if NAUDIO > 0 && NVS > 0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/audioio.h>
 #include <dev/audio_if.h>
 #include <dev/mulaw.h>
 @@ -150,28 +150,26 @@ struct {
 	u_long rate;
 	u_char clk;
 	u_char den;
 } vs_l2r[] = {
 	{ VS_RATE_15K, VS_CLK_8MHZ, VS_SRATE_512 },
 	{ VS_RATE_10K, VS_CLK_8MHZ, VS_SRATE_768 },
 	{ VS_RATE_7K,  VS_CLK_8MHZ, VS_SRATE_1024},
 	{ VS_RATE_5K,  VS_CLK_4MHZ, VS_SRATE_768 },
 	{ VS_RATE_3K,  VS_CLK_4MHZ, VS_SRATE_1024}
 };
 #define NUM_RATE	(sizeof(vs_l2r)/sizeof(vs_l2r[0]))
 extern stream_filter_factory_t null_filter;
 static int
 vs_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct intio_attach_args *ia;
 	ia = aux;
 	if (strcmp(ia->ia_name, "vs") || vs_attached)
 		return 0;
 	if (ia->ia_addr == INTIOCF_ADDR_DEFAULT)
 		ia->ia_addr = VS_ADDR;
 	if (ia->ia_dma == INTIOCF_DMA_DEFAULT)
 		ia->ia_dma = VS_DMA;
 @@ -355,26 +353,27 @@ vs_round_sr(u_long rate)
+	}
 	if (diff * 100 / rate > 15)
 		return -1;
 	else
 		return nearest;
+}
 static int
 vs_set_params(void *hdl, int setmode, int usemode,
 	audio_params_t *play, audio_params_t *rec,
 	stream_filter_list_t *pfil, stream_filter_list_t *rfil)
+{
 	struct vs_softc *sc;
 	audio_params_t hw;
 	stream_filter_factory_t *pconv;
 	stream_filter_factory_t *rconv;
 	int rate;
 	sc = hdl;
 	DPRINTF(1, ("vs_set_params: mode=%d enc=%d rate=%d prec=%d ch=%d: ",
 		setmode, play->encoding, play->sample_rate,
 		play->precision, play->channels));
 	/* *play and *rec are identical because !AUDIO_PROP_INDEPENDENT */
 	if (play->channels != 1) {
 @@ -395,38 +394,38 @@ vs_set_params(void *hdl, int setmode, in
 	           play->encoding == AUDIO_ENCODING_SLINEAR_BE) {
 		pconv = msm6258_slinear16_to_adpcm;
 		rconv = msm6258_adpcm_to_slinear16;
 	} else {
 		DPRINTF(1, ("prec/enc not matched\n"));
 		return EINVAL;
+	}
 	sc->sc_current.rate = rate;
 	/* pfil and rfil are independent even if !AUDIO_PROP_INDEPENDENT */
 	if ((setmode & AUMODE_PLAY) != 0) {
-		pfil->append(pfil, null_filter, play);
+		hw = *play;
-		play->encoding = AUDIO_ENCODING_ADPCM;
+		hw.encoding = AUDIO_ENCODING_ADPCM;
-		play->validbits = 4;
+		hw.precision = 4;
-		play->precision = 4;
+		hw.validbits = 4;
-		pfil->append(pfil, pconv, play);
+		pfil->prepend(pfil, pconv, &hw);
+	}
 	if ((setmode & AUMODE_RECORD) != 0) {
-		rfil->append(rfil, null_filter, rec);
+		hw = *rec;
-		rec->encoding = AUDIO_ENCODING_ADPCM;
+		hw.encoding = AUDIO_ENCODING_ADPCM;
-		rec->validbits = 4;
+		hw.precision = 4;
-		rec->precision = 4;
+		hw.validbits = 4;
-		rfil->append(rfil, rconv, rec);
+		rfil->prepend(rfil, rconv, &hw);
+	}
 	DPRINTF(1, ("accepted\n"));
 	return 0;
+}
 static void
 vs_set_sr(struct vs_softc *sc, int rate)
+{
 	DPRINTF(1, ("setting sample rate to %d, %d\n",
 		 rate, (int)vs_l2r[rate].rate));
 	bus_space_write_1(sc->sc_iot, sc->sc_ppi, PPI_PORTC,