 @@ -1,14 +1,14 @@
-/*	$NetBSD: ossaudio.c,v 1.41 2020/04/15 16:39:06 nia Exp $	*/
+/*	$NetBSD: ossaudio.c,v 1.42 2020/04/19 11:27:40 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,62 +17,66 @@
  * ``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.41 2020/04/15 16:39:06 nia Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.42 2020/04/19 11:27:40 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>
 #include <sys/audioio.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include "soundcard.h"
 #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 int getvol(u_int, u_char);
 static void setvol(int, int, bool);
 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, ...)
 @@ -625,61 +629,43 @@ audio_ioctl(int fd, unsigned long com, v
 		tmpaudioinfo->max_rate = tmpinfo.play.sample_rate;
 		tmpaudioinfo->nrates = 2;
 		for (i = 0; i < tmpaudioinfo->nrates; i++)
 			tmpaudioinfo->rates[i] = tmpinfo.play.sample_rate;
 		tmpaudioinfo->min_channels = tmpinfo.play.channels;
 		tmpaudioinfo->max_channels = tmpinfo.play.channels;
 		tmpaudioinfo->binding = -1;
 		tmpaudioinfo->rate_source = -1;
 		memset(tmpaudioinfo->handle, 0, 16);
 		tmpaudioinfo->next_play_engine = 0;
 		tmpaudioinfo->next_rec_engine = 0;
 		argp = tmpaudioinfo;
 		break;
 	case SNDCTL_DSP_GETPLAYVOL:
 		retval = ioctl(fd, AUDIO_GETBUFINFO, &tmpinfo);
 		if (retval < 0)
 			return retval;
 		*(uint *)argp = tmpinfo.play.gain;
 		break;
 	case SNDCTL_DSP_SETPLAYVOL:
-		retval = ioctl(fd, AUDIO_GETBUFINFO, &tmpinfo);
+		setvol(fd, INTARG, false);
-		if (retval < 0)
+		/* FALLTHRU */
-			return retval;
+	case SNDCTL_DSP_GETPLAYVOL:
-		if (*(uint *)argp > 255)
+		retval = ioctl(fd, AUDIO_GETINFO, &tmpinfo);
 			tmpinfo.play.gain = 255;
 		else
 			tmpinfo.play.gain = *(uint *)argp;
 		retval = ioctl(fd, AUDIO_SETINFO, &tmpinfo);
 		if (retval < 0)
 			return retval;
 		break;
 	case SNDCTL_DSP_GETRECVOL:
 		retval = ioctl(fd, AUDIO_GETBUFINFO, &tmpinfo);
 		if (retval < 0)
 			return retval;
-		*(uint *)argp = tmpinfo.record.gain;
+		INTARG = getvol(tmpinfo.play.gain, tmpinfo.play.balance);
 		break;
 	case SNDCTL_DSP_SETRECVOL:
-		retval = ioctl(fd, AUDIO_GETBUFINFO, &tmpinfo);
+		setvol(fd, INTARG, true);
-		if (retval < 0)
+		/* FALLTHRU */
-			return retval;
+	case SNDCTL_DSP_GETRECVOL:
-		if (*(uint *)argp > 255)
+		retval = ioctl(fd, AUDIO_GETINFO, &tmpinfo);
 			tmpinfo.record.gain = 255;
 		else
 			tmpinfo.record.gain = *(uint *)argp;
 		retval = ioctl(fd, AUDIO_SETINFO, &tmpinfo);
 		if (retval < 0)
 			return retval;
 		INTARG = getvol(tmpinfo.record.gain, tmpinfo.record.balance);
 		break;
 	case SNDCTL_DSP_SKIP:
 	case SNDCTL_DSP_SILENCE:
 		return EINVAL;
 	case SNDCTL_DSP_SETDUPLEX:
 		idat = 1;
 		retval = ioctl(fd, AUDIO_SETFD, &idat);
 		if (retval < 0)
 			return retval;
 		break;
 	case SNDCTL_DSP_GETODELAY:
 		retval = ioctl(fd, AUDIO_GETBUFINFO, &tmpinfo);
 		if (retval < 0)
 @@ -1037,26 +1023,73 @@ mixer_ioctl(int fd, unsigned long com, v
 			if (MIXER_WRITE(SOUND_MIXER_FIRST) <= com &&
 			   com < MIXER_WRITE(SOUND_MIXER_NRDEVICES))
 				return 0;
 			goto doread;
 		} else {
 			errno = EINVAL;
 			return -1;
+		}
+	}
 	INTARG = (int)idat;
 	return 0;
+}
 static int
 getvol(u_int gain, u_char balance)
+{
 	u_int l, r;
 	if (balance == AUDIO_MID_BALANCE) {
 		l = r = gain;
 	} else if (balance < AUDIO_MID_BALANCE) {
 		l = gain;
 		r = (balance * gain) / AUDIO_MID_BALANCE;
 	} else {
 		r = gain;
 		l = ((AUDIO_RIGHT_BALANCE - balance) * gain)
 		    / AUDIO_MID_BALANCE;
+	}
 	return TO_OSSVOL(l) | (TO_OSSVOL(r) << 8);
+}
 static void
 setvol(int fd, int volume, bool record)
+{
 	u_int lgain, rgain;
 	struct audio_info tmpinfo;
 	struct audio_prinfo *prinfo;
 	AUDIO_INITINFO(&tmpinfo);
 	prinfo = record ? &tmpinfo.record : &tmpinfo.play;
 	lgain = FROM_OSSVOL((volume >> 0) & 0xff);
 	rgain = FROM_OSSVOL((volume >> 8) & 0xff);
 	if (lgain == rgain) {
 		prinfo->gain = lgain;
 		prinfo->balance = AUDIO_MID_BALANCE;
 	} else if (lgain < rgain) {
 		prinfo->gain = rgain;
 		prinfo->balance = AUDIO_RIGHT_BALANCE -
 		    (AUDIO_MID_BALANCE * lgain) / rgain;
 	} else {
 		prinfo->gain = lgain;
 		prinfo->balance = (AUDIO_MID_BALANCE * rgain) / lgain;
+	}
 	(void)ioctl(fd, AUDIO_SETINFO, &tmpinfo);
+}
 /*
  * 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