Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libossaudio ossaudio(3): More capability defines from OSSv4



details:   https://anonhg.NetBSD.org/src/rev/f251069e57cd
branches:  trunk
changeset: 956640:f251069e57cd
user:      nia <nia%NetBSD.org@localhost>
date:      Tue Nov 03 09:33:53 2020 +0000

description:
ossaudio(3): More capability defines from OSSv4

diffstat:

 lib/libossaudio/soundcard.h |  49 +++++++++++++++++++++++++++++++++-----------
 1 files changed, 37 insertions(+), 12 deletions(-)

diffs (63 lines):

diff -r d22bacb214d0 -r f251069e57cd lib/libossaudio/soundcard.h
--- a/lib/libossaudio/soundcard.h       Tue Nov 03 09:26:41 2020 +0000
+++ b/lib/libossaudio/soundcard.h       Tue Nov 03 09:33:53 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: soundcard.h,v 1.31 2020/10/23 09:05:20 nia Exp $       */
+/*     $NetBSD: soundcard.h,v 1.32 2020/11/03 09:33:53 nia Exp $       */
 
 /*-
  * Copyright (c) 1997, 2020 The NetBSD Foundation, Inc.
@@ -81,17 +81,42 @@
 #define SNDCTL_DSP_GETISPACE           _IOR ('P',13, struct audio_buf_info)
 #define SNDCTL_DSP_NONBLOCK            _IO  ('P',14)
 #define SNDCTL_DSP_GETCAPS             _IOR ('P',15, int)
-# define DSP_CAP_REVISION              0x000000ff
-# define DSP_CAP_DUPLEX                        0x00000100
-# define DSP_CAP_REALTIME              0x00000200
-# define DSP_CAP_BATCH                 0x00000400
-# define DSP_CAP_COPROC                        0x00000800
-# define DSP_CAP_TRIGGER               0x00001000
-# define DSP_CAP_MMAP                  0x00002000
-# define PCM_CAP_INPUT                 0x00004000
-# define PCM_CAP_OUTPUT                        0x00008000
-# define PCM_CAP_MODEM                 0x00010000
-# define PCM_CAP_HIDDEN                        0x00020000
+/* PCM_CAP_* were known as DSP_CAP_ before OSS 4.0 */
+# define DSP_CAP_REVISION              PCM_CAP_REVISION
+# define DSP_CAP_DUPLEX                        PCM_CAP_DUPLEX
+# define DSP_CAP_REALTIME              PCM_CAP_REALTIME
+# define DSP_CAP_BATCH                 PCM_CAP_BATCH
+# define DSP_CAP_COPROC                        PCM_CAP_COPROC
+# define DSP_CAP_TRIGGER               PCM_CAP_TRIGGER
+# define DSP_CAP_MMAP                  PCM_CAP_MMAP
+# define DSP_CAP_INPUT                 PCM_CAP_INPUT
+# define DSP_CAP_OUTPUT                        PCM_CAP_OUTPUT
+# define DSP_CAP_MODEM                 PCM_CAP_MODEM
+# define DSP_CAP_HIDDEN                        PCM_CAP_HIDDEN
+# define DSP_CAP_VIRTUAL               PCM_CAP_VIRTUAL
+# define DSP_CAP_ANALOGOUT             PCM_CAP_ANALOGOUT
+# define DSP_CAP_ANALOGIN              PCM_CAP_ANALOGIN
+# define DSP_CAP_DIGITALOUT            PCM_CAP_DIGITALOUT
+# define DSP_CAP_DIGITALIN             PCM_CAP_DIGITALIN
+# define DSP_CAP_ADMASK                        PCM_CAP_ADMASK
+# define PCM_CAP_REVISION              0x000000ff      /* Unused in NetBSD */
+# define PCM_CAP_DUPLEX                        0x00000100      /* Full duplex */
+# define PCM_CAP_REALTIME              0x00000200      /* Unused in NetBSD */
+# define PCM_CAP_BATCH                 0x00000400      /* Unused in NetBSD */
+# define PCM_CAP_COPROC                        0x00000800      /* Unused in NetBSD */
+# define PCM_CAP_TRIGGER               0x00001000      /* Supports SETTRIGGER */
+# define PCM_CAP_MMAP                  0x00002000      /* Supports mmap() */
+# define PCM_CAP_INPUT                 0x00004000      /* Recording device */
+# define PCM_CAP_OUTPUT                        0x00008000      /* Playback device */
+# define PCM_CAP_MODEM                 0x00010000      /* Unused in NetBSD */
+# define PCM_CAP_HIDDEN                        0x00020000      /* Unused in NetBSD */
+# define PCM_CAP_VIRTUAL               0x00040000      /* Unused in NetBSD */
+# define PCM_CAP_ANALOGOUT             0x00100000      /* Unused in NetBSD */
+# define PCM_CAP_ANALOGIN              0x00200000      /* Unused in NetBSD */
+# define PCM_CAP_DIGITALOUT            0x00400000      /* Unused in NetBSD */
+# define PCM_CAP_DIGITALIN             0x00800000      /* Unused in NetBSD */
+# define PCM_CAP_ADMASK                        0x00f00000      /* Unused in NetBSD */
+# define PCM_CAP_SPECIAL               0x01000000      /* Unused in NetBSD */
 #define SNDCTL_DSP_GETTRIGGER          _IOR ('P', 16, int)
 #define SNDCTL_DSP_SETTRIGGER          _IOW ('P', 16, int)
 # define PCM_ENABLE_INPUT              0x00000001



Home | Main Index | Thread Index | Old Index