 @@ -1,14 +1,14 @@
-/*	$NetBSD: ossaudio.c,v 1.53 2020/10/20 06:53:37 nia Exp $	*/
+/*	$NetBSD: ossaudio.c,v 1.54 2020/10/20 08:57:45 nia Exp $	*/
 /*-
  * Copyright (c) 1997, 2020 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.53 2020/10/20 06:53:37 nia Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.54 2020/10/20 08:57:45 nia Exp $");
 /*
  * This is an Open Sound System compatibility layer, which provides
  * fairly complete ioctl emulation for OSSv3 and some of OSSv4.
+ *
  * The canonical OSS specification is available at
  * http://manuals.opensound.com/developer/
+ *
  * This file is similar to sys/compat/ossaudio.c with additional OSSv4
  * compatibility.
  */
 #include <string.h>
 @@ -1035,26 +1035,33 @@ mixer_oss4_ioctl(int fd, unsigned long c
 	int retval;
 	int props, caps;
 	/*
 	 * Note: it is difficult to translate the NetBSD concept of a "set"
 	 * mixer control type to the OSSv4 API, as far as I can tell.
+	 *
 	 * This means they are treated like enums, i.e. only one entry in the
 	 * set can be selected at a time.
 	 */
 	switch (com) {
 	case SNDCTL_AUDIOINFO:
 	/*
 	 * SNDCTL_AUDIOINFO_EX is intended for underlying hardware devices
 	 * that are to be opened in "exclusive mode" (bypassing the normal
 	 * kernel mixer for exclusive control). NetBSD does not support
 	 * bypassing the kernel mixer, so it's an alias of SNDCTL_AUDIOINFO.
 	 */
 	case SNDCTL_AUDIOINFO_EX:
 	case SNDCTL_ENGINEINFO:
 		devno = 0;
 		tmpai = (struct oss_audioinfo*)argp;
 		if (tmpai == NULL) {
 			errno = EINVAL;
 			return -1;
+		}
 		/*
 		 * If the input device is -1, guess the device related to
 		 * the open mixer device.
 		 */
 		if (tmpai->dev < 0) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: soundcard.h,v 1.29 2020/10/20 06:33:52 nia Exp $	*/
+/*	$NetBSD: soundcard.h,v 1.30 2020/10/20 08:57:45 nia Exp $	*/
 /*-
  * Copyright (c) 1997, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson and Nia Alarie.
+ *
  * 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.
 @@ -408,26 +408,27 @@ typedef struct oss_audioinfo {
 } oss_audioinfo;
 #define SNDCTL_SYSINFO		_IOR ('X', 1, oss_sysinfo)
 #define OSS_SYSINFO		SNDCTL_SYSINFO /* Old name */
 #define SNDCTL_MIX_NRMIX	_IOR ('X',2, int)
 #define SNDCTL_MIX_NREXT	_IOWR ('X',3, int)
 #define SNDCTL_MIX_EXTINFO	_IOWR ('X',4, oss_mixext)
 #define SNDCTL_MIX_READ		_IOWR ('X',5, oss_mixer_value)
 #define SNDCTL_MIX_WRITE	_IOWR ('X',6, oss_mixer_value)
 #define SNDCTL_AUDIOINFO	_IOWR ('X',7, oss_audioinfo)
 #define SNDCTL_MIX_ENUMINFO	_IOWR ('X',8, oss_mixer_enuminfo)
 #define SNDCTL_MIXERINFO	_IOWR ('X',10, oss_mixerinfo)
 #define SNDCTL_ENGINEINFO	_IOWR ('X',12, oss_audioinfo)
 #define SNDCTL_AUDIOINFO_EX	_IOWR ('X',13, oss_audioinfo)
 #define SNDCTL_MIX_DESCRIPTION	_IOWR ('X',14, oss_mixer_enuminfo)
 #define MIXT_DEVROOT	 	0 /* Used for default classes */
 #define MIXT_GROUP	 	1 /* Used for classes */
 #define MIXT_ONOFF	 	2 /* Used for mute controls */
 #define MIXT_ENUM	 	3 /* Used for enum controls */
 #define MIXT_MONOSLIDER	 	4 /* Used for mono and surround controls */
 #define MIXT_STEREOSLIDER 	5 /* Used for stereo controls */
 #define MIXT_MESSAGE	 	6 /* OSS compat, unused on NetBSD */
 #define MIXT_MONOVU	 	7 /* OSS compat, unused on NetBSD */
 #define MIXT_STEREOVU	 	8 /* OSS compat, unused on NetBSD */
 #define MIXT_MONOPEAK	 	9 /* OSS compat, unused on NetBSD */
 #define MIXT_STEREOPEAK		10 /* OSS compat, unused on NetBSD */