Module Name: src Committed By: martin Date: Mon Jan 25 14:14:23 UTC 2021
Modified Files: src/sys/arch/arm/broadcom [netbsd-9]: bcm2835_vcaudio.c Log Message: Pull up following revision(s) (requested by nia in ticket #1188): sys/arch/arm/broadcom/bcm2835_vcaudio.c: revision 1.16 vcaudio: don't advertise CAPTURE when all functions return EINVAL To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/arch/arm/broadcom/bcm2835_vcaudio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/arm/broadcom/bcm2835_vcaudio.c diff -u src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.14 src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.14.2.1 --- src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.14 Wed May 8 13:40:14 2019 +++ src/sys/arch/arm/broadcom/bcm2835_vcaudio.c Mon Jan 25 14:14:23 2021 @@ -1,4 +1,4 @@ -/* $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 <jmcne...@invisible.ca> @@ -31,7 +31,7 @@ */ #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> @@ -159,7 +159,6 @@ static int vcaudio_set_format(void *, in 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 *); @@ -171,8 +170,6 @@ static int vcaudio_round_blocksize(void 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 **); @@ -182,7 +179,6 @@ static const struct audio_hw_if vcaudio_ .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, @@ -190,7 +186,6 @@ static const struct audio_hw_if vcaudio_ .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, }; @@ -615,12 +610,6 @@ vcaudio_halt_output(void *priv) } static int -vcaudio_halt_input(void *priv) -{ - return EINVAL; -} - -static int vcaudio_set_volume(struct vcaudio_softc *sc, enum vcaudio_dest dest, int hwvol) { @@ -805,7 +794,7 @@ vcaudio_getdev(void *priv, struct audio_ static int vcaudio_get_props(void *priv) { - return AUDIO_PROP_PLAYBACK|AUDIO_PROP_CAPTURE|AUDIO_PROP_INDEPENDENT; + return AUDIO_PROP_PLAYBACK; } static int @@ -840,13 +829,6 @@ vcaudio_trigger_output(void *priv, void 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) {