 @@ -1,14 +1,14 @@
-/*	$NetBSD: ossaudio.c,v 1.38 2019/11/03 11:13:45 isaki Exp $	*/
+/*	$NetBSD: ossaudio.c,v 1.39 2020/04/15 14:54:34 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.38 2019/11/03 11:13:45 isaki Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.39 2020/04/15 14:54:34 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>
 @@ -85,27 +85,27 @@ _oss_ioctl(int fd, unsigned long com, ..
 	if (IOCGROUP(com) == 'P')
 		return audio_ioctl(fd, com, argp);
 	else if (IOCGROUP(com) == 'M')
 		return mixer_ioctl(fd, com, argp);
 	else
 		return ioctl(fd, com, argp);
+}
 static int
 audio_ioctl(int fd, unsigned long com, void *argp)
+{
-	struct audio_info tmpinfo;
+	struct audio_info tmpinfo, hwfmt;
 	struct audio_offset tmpoffs;
 	struct audio_buf_info bufinfo;
 	struct count_info cntinfo;
 	struct audio_encoding tmpenc;
 	struct oss_sysinfo tmpsysinfo;
 	struct oss_audioinfo *tmpaudioinfo;
 	audio_device_t tmpaudiodev;
 	struct stat tmpstat;
 	dev_t devno;
 	char version[32] = "4.01";
 	char license[16] = "NetBSD";
 	u_int u;
 	u_int encoding;
 @@ -124,27 +124,55 @@ audio_ioctl(int fd, unsigned long com, v
 		break;
 	case SNDCTL_DSP_SYNC:
 		retval = ioctl(fd, AUDIO_DRAIN, 0);
 		if (retval < 0)
 			return retval;
 		break;
 	case SNDCTL_DSP_POST:
 		/* This call is merely advisory, and may be a nop. */
 		break;
 	case SNDCTL_DSP_SPEED:
 		AUDIO_INITINFO(&tmpinfo);
 		tmpinfo.play.sample_rate =
 		tmpinfo.record.sample_rate = INTARG;
-		(void) ioctl(fd, AUDIO_SETINFO, &tmpinfo);
+		/*
 		 * The default NetBSD behavior if an unsupported sample rate
 		 * is set is to return an error code and keep the rate at the
 		 * default of 8000 Hz.
+		 *
 		 * However, OSS specifies that a sample rate supported by the
 		 * hardware is returned if the exact rate could not be set.
+		 *
 		 * So, if the chosen sample rate is invalid, set and return
 		 * the current hardware rate.
 		 */
 		if (ioctl(fd, AUDIO_SETINFO, &tmpinfo) < 0) {
 			/* Don't care that SETINFO failed the first time... */
 			errno = 0;
 			retval = ioctl(fd, AUDIO_GETFORMAT, &hwfmt);
 			if (retval < 0)
 				return retval;
 			retval = ioctl(fd, AUDIO_GETINFO, &tmpinfo);
 			if (retval < 0)
 				return retval;
 			tmpinfo.play.sample_rate =
 			tmpinfo.record.sample_rate =
 			    (tmpinfo.mode == AUMODE_RECORD) ?
 			    hwfmt.record.sample_rate :
 			    hwfmt.play.sample_rate;
 			retval = ioctl(fd, AUDIO_SETINFO, &tmpinfo);
 			if (retval < 0)
 				return retval;
+		}
 		/* FALLTHRU */
 	case SOUND_PCM_READ_RATE:
 		retval = ioctl(fd, AUDIO_GETBUFINFO, &tmpinfo);
 		if (retval < 0)
 			return retval;
 		INTARG = GETPRINFO(&tmpinfo, sample_rate);
 		break;
 	case SNDCTL_DSP_STEREO:
 		AUDIO_INITINFO(&tmpinfo);
 		tmpinfo.play.channels =
 		tmpinfo.record.channels = INTARG ? 2 : 1;
 		(void) ioctl(fd, AUDIO_SETINFO, &tmpinfo);
 		retval = ioctl(fd, AUDIO_GETBUFINFO, &tmpinfo);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ossaudio.c,v 1.78 2019/11/03 11:13:46 isaki Exp $	*/
+/*	$NetBSD: ossaudio.c,v 1.79 2020/04/15 14:54:34 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.78 2019/11/03 11:13:46 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.79 2020/04/15 14:54:34 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>
 @@ -165,27 +165,27 @@ compat_ossaudio_modcmd(modcmd_t cmd, voi
+	}
+}
 int
 oss_ioctl_audio(struct lwp *l, const struct oss_sys_ioctl_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 		syscallarg(u_long) com;
 		syscallarg(void *) data;
 	} */
 	file_t *fp;
 	u_long com;
-	struct audio_info tmpinfo;
+	struct audio_info tmpinfo, hwfmt;
 	struct audio_offset tmpoffs;
 	struct oss_audio_buf_info bufinfo;
 	struct oss_count_info cntinfo;
 	struct audio_encoding tmpenc;
 	u_int u;
 	u_int encoding;
 	u_int precision;
 	int idat, idata;
 	int error = 0;
 	int (*ioctlf)(file_t *, u_long, void *);
 	if ((fp = fd_getfile(SCARG(uap, fd))) == NULL)
 		return (EBADF);
 @@ -220,31 +220,61 @@ oss_ioctl_audio(struct lwp *l, const str
 		/* This call is merely advisory, and may be a nop. */
 		break;
 	case OSS_SNDCTL_DSP_SPEED:
 		AUDIO_INITINFO(&tmpinfo);
 		error = copyin(SCARG(uap, data), &idat, sizeof idat);
 		if (error) {
 			DPRINTF(("%s: SNDCTL_DSP_SPEED %d\n",
 			     __func__, error));
 			goto out;
+		}
 		tmpinfo.play.sample_rate =
 		tmpinfo.record.sample_rate = idat;
 		DPRINTF(("%s: SNDCTL_DSP_SPEED > %d\n", __func__, idat));
-		error = ioctlf(fp, AUDIO_SETINFO, &tmpinfo);
+		/*
-		if (error) {
+		 * The default NetBSD behavior if an unsupported sample rate
-			DPRINTF(("%s: SNDCTL_DSP_SPEED %d = %d\n",
+		 * is set is to return an error code and keep the rate at the
-			     __func__, idat, error));
+		 * default of 8000 Hz.
 			goto out;
 		 * However, the OSS expectation is a sample rate supported by
 		 * the hardware is returned if the exact rate could not be set.
+		 *
 		 * So, if the chosen sample rate is invalid, set and return
 		 * the current hardware rate.
 		 */
 		if (ioctlf(fp, AUDIO_SETINFO, &tmpinfo) != 0) {
 			error = ioctlf(fp, AUDIO_GETFORMAT, &hwfmt);
 			if (error) {
 				DPRINTF(("%s: AUDIO_GETFORMAT %d\n",
 				     __func__, error));
 				goto out;
+			}
 			error = ioctlf(fp, AUDIO_GETINFO, &tmpinfo);
 			if (error) {
 				DPRINTF(("%s: AUDIO_GETINFO %d\n",
 				     __func__, error));
 				goto out;
+			}
 			tmpinfo.play.sample_rate =
 			tmpinfo.record.sample_rate =
 			    (tmpinfo.mode == AUMODE_RECORD) ?
 			    hwfmt.record.sample_rate :
 			    hwfmt.play.sample_rate;
 			error = ioctlf(fp, AUDIO_SETINFO, &tmpinfo);
 			if (error) {
 				DPRINTF(("%s: SNDCTL_DSP_SPEED %d = %d\n",
 				     __func__, idat, error));
 				goto out;
+			}
+		}
 		/* FALLTHROUGH */
 	case OSS_SOUND_PCM_READ_RATE:
 		error = ioctlf(fp, AUDIO_GETBUFINFO, &tmpinfo);
 		if (error) {
 			DPRINTF(("%s: AUDIO_GETBUFINFO %d\n",
 			 __func__, error));
 			goto out;
+		}
 		idat = GETPRINFO(&tmpinfo, sample_rate);
 		DPRINTF(("%s: SNDCTL_PCM_READ_RATE < %d\n", __func__, idat));
 		error = copyout(&idat, SCARG(uap, data), sizeof idat);
 		if (error) {