Module Name: src
Committed By: nia
Date: Tue Oct 20 08:57:45 UTC 2020
Modified Files:
src/lib/libossaudio: ossaudio.c soundcard.h
Log Message:
ossaudio(3): Add SNDCTL_AUDIOINFO_EX as an alias of SNDCTL_AUDIOINFO
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/lib/libossaudio/ossaudio.c
cvs rdiff -u -r1.29 -r1.30 src/lib/libossaudio/soundcard.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libossaudio/ossaudio.c
diff -u src/lib/libossaudio/ossaudio.c:1.53 src/lib/libossaudio/ossaudio.c:1.54
--- src/lib/libossaudio/ossaudio.c:1.53 Tue Oct 20 06:53:37 2020
+++ src/lib/libossaudio/ossaudio.c Tue Oct 20 08:57:45 2020
@@ -1,4 +1,4 @@
-/* $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.
@@ -27,7 +27,7 @@
*/
#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
@@ -1045,6 +1045,13 @@ mixer_oss4_ioctl(int fd, unsigned long c
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;
Index: src/lib/libossaudio/soundcard.h
diff -u src/lib/libossaudio/soundcard.h:1.29 src/lib/libossaudio/soundcard.h:1.30
--- src/lib/libossaudio/soundcard.h:1.29 Tue Oct 20 06:33:52 2020
+++ src/lib/libossaudio/soundcard.h Tue Oct 20 08:57:45 2020
@@ -1,4 +1,4 @@
-/* $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.
@@ -418,6 +418,7 @@ typedef struct 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 */
