 @@ -1,14 +1,14 @@
-/* $NetBSD: bcm2835_vcaudio.c,v 1.14 2019/05/08 13:40:14 isaki Exp $ */
+/* $NetBSD: bcm2835_vcaudio.c,v 1.14.2.1 2021/01/25 14:14:23 martin Exp $ */
 /*-
  * Copyright (c) 2013 Jared D. McNeill <jmcneill@invisible.ca>
  * 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.
 @@ -21,27 +21,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, 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.
  */
 /*
  * VideoCore audio interface
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_vcaudio.c,v 1.14 2019/05/08 13:40:14 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_vcaudio.c,v 1.14.2.1 2021/01/25 14:14:23 martin Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <sys/kmem.h>
 #include <sys/audioio.h>
 #include <dev/audio/audio_if.h>
 #include <interface/compat/vchi_bsd.h>
 @@ -149,58 +149,53 @@ static void	vcaudio_childdet(device_t, d
 static int	vcaudio_init(struct vcaudio_softc *);
 static void	vcaudio_service_callback(void *,
     const VCHI_CALLBACK_REASON_T, void *);
 static int	vcaudio_msg_sync(struct vcaudio_softc *, VC_AUDIO_MSG_T *,
     size_t);
 static void	vcaudio_worker(void *);
 static int	vcaudio_query_format(void *, audio_format_query_t *);
 static int	vcaudio_set_format(void *, int,
     const audio_params_t *, const audio_params_t *,
     audio_filter_reg_t *, audio_filter_reg_t *);
 static int	vcaudio_halt_output(void *);
 static int	vcaudio_halt_input(void *);
 static int	vcaudio_set_port(void *, mixer_ctrl_t *);
 static int	vcaudio_get_port(void *, mixer_ctrl_t *);
 static int	vcaudio_query_devinfo(void *, mixer_devinfo_t *);
 static int	vcaudio_getdev(void *, struct audio_device *);
 static int	vcaudio_get_props(void *);
 static int	vcaudio_round_blocksize(void *, int, int,
     const audio_params_t *);
 static int	vcaudio_trigger_output(void *, void *, void *, int,
     void (*)(void *), void *, const audio_params_t *);
 static int	vcaudio_trigger_input(void *, void *, void *, int,
     void (*)(void *), void *, const audio_params_t *);
 static void	vcaudio_get_locks(void *, kmutex_t **, kmutex_t **);
 static void vcaudio_swvol_codec(audio_filter_arg_t *);
 static const struct audio_hw_if vcaudio_hw_if = {
 	.query_format = vcaudio_query_format,
 	.set_format = vcaudio_set_format,
 	.halt_output = vcaudio_halt_output,
 	.halt_input = vcaudio_halt_input,
 	.getdev = vcaudio_getdev,
 	.set_port = vcaudio_set_port,
 	.get_port = vcaudio_get_port,
 	.query_devinfo = vcaudio_query_devinfo,
 	.get_props = vcaudio_get_props,
 	.round_blocksize = vcaudio_round_blocksize,
 	.trigger_output = vcaudio_trigger_output,
 	.trigger_input = vcaudio_trigger_input,
 	.get_locks = vcaudio_get_locks,
 };
 CFATTACH_DECL2_NEW(vcaudio, sizeof(struct vcaudio_softc),
     vcaudio_match, vcaudio_attach, NULL, NULL, vcaudio_rescan,
     vcaudio_childdet);
 static int
 vcaudio_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct vchiq_attach_args *vaa = aux;
 	return !strcmp(vaa->vaa_name, "AUDS");
 @@ -605,32 +600,26 @@ vcaudio_halt_output(void *priv)
 	sc->sc_pint = NULL;
 	sc->sc_pintarg = NULL;
 	sc->sc_started = false;
 #ifdef VCAUDIO_DEBUG
 	device_printf(sc->sc_dev, "halting output\n");
 #endif
 	return error;
+}
 static int
 vcaudio_halt_input(void *priv)
 	return EINVAL;
 static int
 vcaudio_set_volume(struct vcaudio_softc *sc, enum vcaudio_dest dest,
     int hwvol)
+{
 	VC_AUDIO_MSG_T msg;
 	int error;
 	sc->sc_hwvol[dest] = hwvol;
 	if (dest != sc->sc_dest)
 		return 0;
 	vchi_service_use(sc->sc_service);
 	memset(&msg, 0, sizeof(msg));
 @@ -795,27 +784,27 @@ vcaudio_getdev(void *priv, struct audio_
 	struct vcaudio_softc *sc = priv;
 	snprintf(audiodev->name, sizeof(audiodev->name), "vchiq auds");
 	snprintf(audiodev->version, sizeof(audiodev->version),
 	    "%d", sc->sc_peer_version);
 	snprintf(audiodev->config, sizeof(audiodev->config), "vcaudio");
 	return 0;
+}
 static int
 vcaudio_get_props(void *priv)
+{
-	return AUDIO_PROP_PLAYBACK|AUDIO_PROP_CAPTURE|AUDIO_PROP_INDEPENDENT;
+	return AUDIO_PROP_PLAYBACK;
+}
 static int
 vcaudio_round_blocksize(void *priv, int bs, int mode,
     const audio_params_t *params)
+{
 	return VCAUDIO_BLOCKSIZE;
+}
 static int
 vcaudio_trigger_output(void *priv, void *start, void *end, int blksize,
     void (*intr)(void *), void *intrarg, const audio_params_t *params)
+{
 @@ -830,33 +819,26 @@ vcaudio_trigger_output(void *priv, void
 	sc->sc_ppos = 0;
 	sc->sc_pstart = start;
 	sc->sc_pend = end;
 	sc->sc_pblksize = blksize;
 	sc->sc_pblkcnt = 0;
 	sc->sc_pbytes = 0;
 	sc->sc_abytes = blksize;
 	cv_signal(&sc->sc_datacv);
 	return 0;
+}
 static int
 vcaudio_trigger_input(void *priv, void *start, void *end, int blksize,
     void (*intr)(void *), void *intrarg, const audio_params_t *params)
 	return EINVAL;
 static void
 vcaudio_get_locks(void *priv, kmutex_t **intr, kmutex_t **thread)
+{
 	struct vcaudio_softc *sc = priv;
 	*intr = &sc->sc_intr_lock;
 	*thread = &sc->sc_lock;
+}
 static void
 vcaudio_swvol_codec(audio_filter_arg_t *arg)
+{
 	struct vcaudio_softc *sc = arg->context;