 @@ -1,14 +1,14 @@
-/*	$NetBSD: ossaudio.c,v 1.40 2020/04/15 15:25:33 nia Exp $	*/
+/*	$NetBSD: ossaudio.c,v 1.41 2020/04/15 16:39:06 nia Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * 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.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * 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.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: ossaudio.c,v 1.40 2020/04/15 15:25:33 nia Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.41 2020/04/15 16:39:06 nia Exp $");
 /*
  * This is an OSS (Linux) sound API emulator.
  * It provides the essentials of the API.
  */
 /* XXX This file is essentially the same as sys/compat/ossaudio.c.
  * With some preprocessor magic it could be the same file.
  */
 #include <string.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 @@ -53,26 +53,27 @@ __RCSID("$NetBSD: ossaudio.c,v 1.40 2020
 #undef ioctl
 #define GET_DEV(com) ((com) & 0xff)
 #define TO_OSSVOL(x)	(((x) * 100 + 127) / 255)
 #define FROM_OSSVOL(x)	((((x) > 100 ? 100 : (x)) * 255 + 50) / 100)
 #define GETPRINFO(info, name)	\
 	(((info)->mode == AUMODE_RECORD) \
 	    ? (info)->record.name : (info)->play.name)
 static struct audiodevinfo *getdevinfo(int);
 static void setchannels(int, int, int);
 static void setblocksize(int, struct audio_info *);
 static int audio_ioctl(int, unsigned long, void *);
 static int mixer_ioctl(int, unsigned long, void *);
 static int opaque_to_enum(struct audiodevinfo *, audio_mixer_name_t *, int);
 static int enum_to_ord(struct audiodevinfo *, int);
 static int enum_to_mask(struct audiodevinfo *, int);
 #define INTARG (*(int*)argp)
 int
 _oss_ioctl(int fd, unsigned long com, ...)
+{
 @@ -340,32 +341,30 @@ audio_ioctl(int fd, unsigned long com, v
 			else
 				idat = AFMT_U8;
 			break;
 		case AUDIO_ENCODING_ADPCM:
 			idat = AFMT_IMA_ADPCM;
 			break;
 		case AUDIO_ENCODING_AC3:
 			idat = AFMT_AC3;
 			break;
+		}
 		INTARG = idat;
 		break;
 	case SNDCTL_DSP_CHANNELS:
-		AUDIO_INITINFO(&tmpinfo);
+		retval = ioctl(fd, AUDIO_GETBUFINFO, &tmpinfo);
-		tmpinfo.play.channels = INTARG;
+		if (retval < 0)
-		(void) ioctl(fd, AUDIO_SETINFO, &tmpinfo);
+			return retval;
-		AUDIO_INITINFO(&tmpinfo);
+		setchannels(fd, tmpinfo.mode, INTARG);
 		tmpinfo.record.channels = INTARG;
 		(void) ioctl(fd, AUDIO_SETINFO, &tmpinfo);
 		/* FALLTHRU */
 	case SOUND_PCM_READ_CHANNELS:
 		retval = ioctl(fd, AUDIO_GETBUFINFO, &tmpinfo);
 		if (retval < 0)
 			return retval;
 		INTARG = GETPRINFO(&tmpinfo, channels);
 		break;
 	case SOUND_PCM_WRITE_FILTER:
 	case SOUND_PCM_READ_FILTER:
 		errno = EINVAL;
 		return -1; /* XXX unimplemented */
 	case SNDCTL_DSP_SUBDIVIDE:
 		retval = ioctl(fd, AUDIO_GETBUFINFO, &tmpinfo);
 @@ -1039,26 +1038,74 @@ mixer_ioctl(int fd, unsigned long com, v
 			   com < MIXER_WRITE(SOUND_MIXER_NRDEVICES))
 				return 0;
 			goto doread;
 		} else {
 			errno = EINVAL;
 			return -1;
+		}
+	}
 	INTARG = (int)idat;
 	return 0;
+}
 /*
  * When AUDIO_SETINFO fails to set a channel count, the application's chosen
  * number is out of range of what the kernel allows.
+ *
  * When this happens, we use the current hardware settings. This is just in
  * case an application is abusing SNDCTL_DSP_CHANNELS - OSSv4 always sets and
  * returns a reasonable value, even if it wasn't what the user requested.
+ *
  * XXX: If a device is opened for both playback and recording, and supports
  * fewer channels for recording than playback, applications that do both will
  * behave very strangely. OSS doesn't allow for reporting separate channel
  * counts for recording and playback. This could be worked around by always
  * mixing recorded data up to the same number of channels as is being used
  * for playback.
  */
 static void
 setchannels(int fd, int mode, int nchannels)
+{
 	struct audio_info tmpinfo, hwfmt;
 	if (ioctl(fd, AUDIO_GETFORMAT, &hwfmt) < 0) {
 		errno = 0;
 		hwfmt.record.channels = hwfmt.play.channels = 2;
+	}
 	if (mode & AUMODE_PLAY) {
 		AUDIO_INITINFO(&tmpinfo);
 		tmpinfo.play.channels = nchannels;
 		if (ioctl(fd, AUDIO_SETINFO, &tmpinfo) < 0) {
 			errno = 0;
 			AUDIO_INITINFO(&tmpinfo);
 			tmpinfo.play.channels = hwfmt.play.channels;
 			(void)ioctl(fd, AUDIO_SETINFO, &tmpinfo);
+		}
+	}
 	if (mode & AUMODE_RECORD) {
 		AUDIO_INITINFO(&tmpinfo);
 		tmpinfo.record.channels = nchannels;
 		if (ioctl(fd, AUDIO_SETINFO, &tmpinfo) < 0) {
 			errno = 0;
 			AUDIO_INITINFO(&tmpinfo);
 			tmpinfo.record.channels = hwfmt.record.channels;
 			(void)ioctl(fd, AUDIO_SETINFO, &tmpinfo);
+		}
+	}
+}
 /*
  * Check that the blocksize is a power of 2 as OSS wants.
  * If not, set it to be.
  */
 static void
 setblocksize(int fd, struct audio_info *info)
+{
 	struct audio_info set;
 	size_t s;
 	if (info->blocksize & (info->blocksize-1)) {
 		for(s = 32; s < info->blocksize; s <<= 1)
+			;
 		AUDIO_INITINFO(&set);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ossaudio.c,v 1.80 2020/04/15 15:25:33 nia Exp $	*/
+/*	$NetBSD: ossaudio.c,v 1.81 2020/04/15 16:39:06 nia Exp $	*/
 /*-
  * Copyright (c) 1997, 2008 The NetBSD Foundation, Inc.
  * 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.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.80 2020/04/15 15:25:33 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.81 2020/04/15 16:39:06 nia Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/vnode.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 #include <sys/audioio.h>
 #include <sys/midiio.h>
 #include <sys/kauth.h>
 @@ -58,26 +58,27 @@ int ossdebug = 0;
 #define TO_OSSVOL(x)	(((x) * 100 + 127) / 255)
 #define FROM_OSSVOL(x)	((((x) > 100 ? 100 : (x)) * 255 + 50) / 100)
 #define GETPRINFO(info, name)	\
 	(((info)->mode == AUMODE_RECORD) \
 	    ? (info)->record.name : (info)->play.name)
 static struct audiodevinfo *getdevinfo(file_t *);
 static int opaque_to_enum(struct audiodevinfo *di, audio_mixer_name_t *label, int opq);
 static int enum_to_ord(struct audiodevinfo *di, int enm);
 static int enum_to_mask(struct audiodevinfo *di, int enm);
 static void setchannels(file_t *, int, int);
 static void setblocksize(file_t *, struct audio_info *);
 #ifdef AUDIO_DEBUG
 static const char *
 compat_ossaudio_getcmd(u_long cmd)
+{
 	static char buf[64];
 	switch (cmd) {
 #define _DO(_a) \
 	case _a: \
 		return # _a;
 _DO(OSS_SNDCTL_DSP_RESET)
 _DO(OSS_SNDCTL_DSP_SYNC)
 @@ -477,35 +478,33 @@ oss_ioctl_audio(struct lwp *l, const str
 			DPRINTF(("%s: SOUND_PCM_READ_BITS %d = %d\n",
 			     __func__, idat, error));
 			goto out;
+		}
 		break;
 	case OSS_SNDCTL_DSP_CHANNELS:
 		AUDIO_INITINFO(&tmpinfo);
 		error = copyin(SCARG(uap, data), &idat, sizeof idat);
 		if (error) {
 			DPRINTF(("%s: SNDCTL_DSP_CHANNELS %d\n",
 			     __func__, error));
 			goto out;
+		}
-		tmpinfo.play.channels =
+		error = ioctlf(fp, AUDIO_GETBUFINFO, &tmpinfo);
 		tmpinfo.record.channels = idat;
 		DPRINTF(("%s: SNDCTL_DSP_CHANNELS > %d\n", __func__, idat));
 		error = ioctlf(fp, AUDIO_SETINFO, &tmpinfo);
 		if (error) {
-			DPRINTF(("%s: AUDIO_SETINFO %d\n",
+			DPRINTF(("%s: AUDIO_GETBUFINFO %d\n",
 			     __func__, error));
 			goto out;
+		}
 		setchannels(fp, tmpinfo.mode, idat);
 		/* FALLTHROUGH */
 	case OSS_SOUND_PCM_READ_CHANNELS:
 		error = ioctlf(fp, AUDIO_GETBUFINFO, &tmpinfo);
 		if (error) {
 			DPRINTF(("%s: AUDIO_GETBUFINFO %d\n",
 			     __func__, error));
 			goto out;
+		}
 		idat = GETPRINFO(&tmpinfo, channels);
 		DPRINTF(("%s: SOUND_PCM_READ_CHANNELS < %d\n", __func__, idat));
 		error = copyout(&idat, SCARG(uap, data), sizeof idat);
 		if (error) {
 			DPRINTF(("%s: SOUND_PCM_READ_CHANNELS %d = %d\n",
 @@ -1522,26 +1521,74 @@ oss_ioctl_sequencer(struct lwp *l, const
 		DPRINTF(("%s: Unknown sequencer command 0x%lx\n", __func__,
 		    com));
 		error = EINVAL;
 		goto out;
+	}
 	error = copyout(&idat, SCARG(uap, data), sizeof idat);
  out:
 	fd_putfile(SCARG(uap, fd));
 	return error;
+}
 /*
  * When AUDIO_SETINFO fails to set a channel count, the application's chosen
  * number is out of range of what the kernel allows.
+ *
  * When this happens, we use the current hardware settings. This is just in
  * case an application is abusing SNDCTL_DSP_CHANNELS - OSSv4 always sets and
  * returns a reasonable value, even if it wasn't what the user requested.
+ *
  * XXX: If a device is opened for both playback and recording, and supports
  * fewer channels for recording than playback, applications that do both will
  * behave very strangely. OSS doesn't allow for reporting separate channel
  * counts for recording and playback. This could be worked around by always
  * mixing recorded data up to the same number of channels as is being used
  * for playback.
  */
 static void
 setchannels(file_t *fp, int mode, int nchannels)
+{
 	struct audio_info tmpinfo, hwfmt;
 	int (*ioctlf)(file_t *, u_long, void *);
 	ioctlf = fp->f_ops->fo_ioctl;
 	if (ioctlf(fp, AUDIO_GETFORMAT, &hwfmt) < 0) {
 		hwfmt.record.channels = hwfmt.play.channels = 2;
+	}
 	if (mode & AUMODE_PLAY) {
 		AUDIO_INITINFO(&tmpinfo);
 		tmpinfo.play.channels = nchannels;
 		if (ioctlf(fp, AUDIO_SETINFO, &tmpinfo) < 0) {
 			AUDIO_INITINFO(&tmpinfo);
 			tmpinfo.play.channels = hwfmt.play.channels;
 			(void)ioctlf(fp, AUDIO_SETINFO, &tmpinfo);
+		}
+	}
 	if (mode & AUMODE_RECORD) {
 		AUDIO_INITINFO(&tmpinfo);
 		tmpinfo.record.channels = nchannels;
 		if (ioctlf(fp, AUDIO_SETINFO, &tmpinfo) < 0) {
 			AUDIO_INITINFO(&tmpinfo);
 			tmpinfo.record.channels = hwfmt.record.channels;
 			(void)ioctlf(fp, AUDIO_SETINFO, &tmpinfo);
+		}
+	}
+}
 /*
  * Check that the blocksize is a power of 2 as OSS wants.
  * If not, set it to be.
  */
 static void
 setblocksize(file_t *fp, struct audio_info *info)
+{
 	struct audio_info set;
 	u_int s;
 	 if (info->blocksize & (info->blocksize - 1)) {
 		for(s = 32; s < info->blocksize; s <<= 1)
 			continue;
 		AUDIO_INITINFO(&set);