This was "discussed" and nobody steps up to save it:
http://comments.gmane.org/gmane.os.openbsd.misc/217005
removing oss emulation, will remove dependency on obscure audio(4)
features we don't use since ~2009, and in turn will ease audio(4)
driver cleanup without breaking the build.
Tested on i386.
OK?
--- arch/i386/conf/files.i386.orig Fri Oct 31 16:52:36 2014
+++ arch/i386/conf/files.i386 Fri Oct 31 16:52:51 2014
@@ -264,9 +264,6 @@ file arch/i386/i386/kvm86call.S kvm86
include "compat/linux/files.linux"
file arch/i386/i386/linux_machdep.c compat_linux
-# OSS audio driver compatibility
-include "compat/ossaudio/files.ossaudio"
-
device bios {}
attach bios at mainbus
file arch/i386/i386/bios.c bios needs-count
--- compat/linux/linux_ioctl.c.orig Fri Oct 31 16:54:42 2014
+++ compat/linux/linux_ioctl.c Fri Oct 31 16:58:14 2014
@@ -48,9 +48,6 @@
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_ioctl.h>
-#include <compat/ossaudio/ossaudio.h>
-#define LINUX_TO_OSS(v) (v) /* do nothing, same ioctl() encoding */
-
/*
* Most ioctl command are just converted to their OpenBSD values,
* and passed on. The ones that take structure pointers and (flag)
@@ -71,12 +68,6 @@ linux_sys_ioctl(p, v, retval)
} */ *uap = v;
switch (LINUX_IOCGROUP(SCARG(uap, com))) {
- case 'M':
- return oss_ioctl_mixer(p, LINUX_TO_OSS(v), retval);
- case 'Q':
- return oss_ioctl_sequencer(p, LINUX_TO_OSS(v), retval);
- case 'P':
- return oss_ioctl_audio(p, LINUX_TO_OSS(v), retval);
case 't':
case 'f':
case 'T': /* XXX MIDI sequencer uses 'T' as well */
--- compat/linux/linux_ioctl.h.orig Fri Oct 31 16:55:09 2014
+++ compat/linux/linux_ioctl.h Fri Oct 31 16:58:35 2014
@@ -79,8 +79,6 @@
#define LINUX_IOCGROUP(x) _LINUX_IOC_TYPE(x)
struct linux_sys_ioctl_args;
-int linux_ioctl_audio(struct proc *, struct linux_sys_ioctl_args *,
- register_t *);
int linux_machdepioctl(struct proc *, void *, register_t *);
int linux_ioctl_termios(struct proc *, void *, register_t *);
int linux_ioctl_cdrom(struct proc *, void *, register_t *);
--- compat/ossaudio/files.ossaudio.orig Fri Oct 31 16:55:37 2014
+++ compat/ossaudio/files.ossaudio Fri Oct 31 17:05:04 2014
@@ -1,8 +0,0 @@
-# $OpenBSD: files.ossaudio,v 1.5 2011/04/05 12:50:15 guenther Exp $
-# $NetBSD: files.ossaudio,v 1.2 1997/07/20 20:35:44 pk Exp $
-#
-# Config file description for OSS (Voxware) audio driver
-# compatibility. Used by compat_linux
-# Included by ports that need it.
-
-file compat/ossaudio/ossaudio.c compat_linux
--- compat/ossaudio/ossaudio.c.orig Fri Oct 31 16:55:45 2014
+++ compat/ossaudio/ossaudio.c Fri Oct 31 17:05:04 2014
@@ -1,852 +0,0 @@
-/* $OpenBSD: ossaudio.c,v 1.16 2013/03/28 03:45:32 tedu Exp $ */
-/* $NetBSD: ossaudio.c,v 1.23 1997/10/19 07:41:52 augustss 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``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/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/audioio.h>
-
-#include <sys/syscallargs.h>
-
-#include <compat/ossaudio/ossaudio.h>
-#include <compat/ossaudio/ossaudiovar.h>
-
-#ifdef AUDIO_DEBUG
-#define DPRINTF(x) if (ossdebug) printf x
-int ossdebug = 0;
-#else
-#define DPRINTF(x)
-#endif
-
-#define TO_OSSVOL(x) ((x) * 100 / 255)
-#define FROM_OSSVOL(x) ((x) * 255 / 100)
-
-static struct audiodevinfo *getdevinfo(struct file *, struct proc *);
-
-static void setblocksize(struct file *, struct audio_info *, struct proc *);
-
-
-int
-oss_ioctl_audio(p, uap, retval)
- struct proc *p;
- struct oss_sys_ioctl_args /* {
- syscallarg(int) fd;
- syscallarg(u_long) com;
- syscallarg(caddr_t) data;
- } */ *uap;
- register_t *retval;
-{
- struct file *fp;
- struct filedesc *fdp;
- u_long com;
- struct audio_info tmpinfo;
- struct audio_offset tmpoffs;
- struct oss_audio_buf_info bufinfo;
- struct oss_count_info cntinfo;
- struct audio_encoding tmpenc;
- struct audio_bufinfo tmpab;
- u_long ldat;
- u_int u;
- int idat, idata;
- int error = 0, tmperr = 0;
- int (*ioctlf)(struct file *, u_long, caddr_t, struct proc *);
-
- fdp = p->p_fd;
- if ((fp = fd_getfile(fdp, SCARG(uap, fd))) == NULL)
- return (EBADF);
- FREF(fp);
-
- if ((fp->f_flag & (FREAD | FWRITE)) == 0) {
- FRELE(fp, p);
- return (EBADF);
- }
-
- ioctlf = fp->f_ops->fo_ioctl;
-
- com = SCARG(uap, com);
- retval[0] = 0;
-
- DPRINTF(("oss_sys_ioctl: com=%08lx\n", com));
- switch (com) {
- case OSS_SNDCTL_DSP_RESET:
- error = ioctlf(fp, AUDIO_FLUSH, (caddr_t)0, p);
- break;
- case OSS_SNDCTL_DSP_SYNC:
- error = ioctlf(fp, AUDIO_DRAIN, (caddr_t)0, p);
- break;
- case OSS_SNDCTL_DSP_POST:
- break;
- case OSS_SNDCTL_DSP_SPEED:
- AUDIO_INITINFO(&tmpinfo);
- error = copyin(SCARG(uap, data), &idat, sizeof idat);
- if (error)
- break;
- tmpinfo.play.sample_rate =
- tmpinfo.record.sample_rate = idat;
- error = ioctlf(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p);
- DPRINTF(("oss_sys_ioctl: SNDCTL_DSP_SPEED %d = %d\n",
- idat, error));
- /* FALLTHRU */
- case OSS_SOUND_PCM_READ_RATE:
- tmperr = ioctlf(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p);
- if (error >= 0)
- error = tmperr;
- idat = tmpinfo.play.sample_rate;
- tmperr = copyout(&idat, SCARG(uap, data), sizeof idat);
- if (error >= 0)
- error = tmperr;
- break;
- case OSS_SNDCTL_DSP_STEREO:
- AUDIO_INITINFO(&tmpinfo);
- error = copyin(SCARG(uap, data), &idat, sizeof idat);
- if (error)
- break;
- tmpinfo.play.channels =
- tmpinfo.record.channels = idat ? 2 : 1;
- error = ioctlf(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p);
- tmperr = ioctlf(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p);
- if (error >= 0)
- error = tmperr;
- idat = tmpinfo.play.channels - 1;
- tmperr = copyout(&idat, SCARG(uap, data), sizeof idat);
- if (error >= 0)
- error = tmperr;
- break;
- case OSS_SNDCTL_DSP_GETBLKSIZE:
- error = ioctlf(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p);
- setblocksize(fp, &tmpinfo, p);
- idat = tmpinfo.blocksize;
- tmperr = copyout(&idat, SCARG(uap, data), sizeof idat);
- if (error >= 0)
- error = tmperr;
- break;
- case OSS_SNDCTL_DSP_SETFMT:
- AUDIO_INITINFO(&tmpinfo);
- error = copyin(SCARG(uap, data), &idat, sizeof idat);
- if (error)
- break;
- switch (idat) {
- case OSS_AFMT_MU_LAW:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 8;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_ULAW;
- break;
- case OSS_AFMT_A_LAW:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 8;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_ALAW;
- break;
- case OSS_AFMT_U8:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 8;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_ULINEAR;
- break;
- case OSS_AFMT_S8:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 8;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_SLINEAR;
- break;
- case OSS_AFMT_S16_LE:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 16;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_SLINEAR_LE;
- break;
- case OSS_AFMT_S16_BE:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 16;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_SLINEAR_BE;
- break;
- case OSS_AFMT_U16_LE:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 16;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_ULINEAR_LE;
- break;
- case OSS_AFMT_U16_BE:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 16;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_ULINEAR_BE;
- break;
- default:
- error = EINVAL;
- break;
- }
- if (error)
- break;
- else
- error = ioctlf(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p);
- /* FALLTHRU */
- case OSS_SOUND_PCM_READ_BITS:
- tmperr = ioctlf(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p);
- if (error >= 0)
- error = tmperr;
- switch (tmpinfo.play.encoding) {
- case AUDIO_ENCODING_ULAW:
- idat = OSS_AFMT_MU_LAW;
- break;
- case AUDIO_ENCODING_ALAW:
- idat = OSS_AFMT_A_LAW;
- break;
- case AUDIO_ENCODING_SLINEAR_LE:
- if (tmpinfo.play.precision == 16)
- idat = OSS_AFMT_S16_LE;
- else
- idat = OSS_AFMT_S8;
- break;
- case AUDIO_ENCODING_SLINEAR_BE:
- if (tmpinfo.play.precision == 16)
- idat = OSS_AFMT_S16_BE;
- else
- idat = OSS_AFMT_S8;
- break;
- case AUDIO_ENCODING_ULINEAR_LE:
- if (tmpinfo.play.precision == 16)
- idat = OSS_AFMT_U16_LE;
- else
- idat = OSS_AFMT_U8;
- break;
- case AUDIO_ENCODING_ULINEAR_BE:
- if (tmpinfo.play.precision == 16)
- idat = OSS_AFMT_U16_BE;
- else
- idat = OSS_AFMT_U8;
- break;
- case AUDIO_ENCODING_ADPCM:
- idat = OSS_AFMT_IMA_ADPCM;
- break;
- default:
- idat = OSS_AFMT_MU_LAW; /* XXX default encoding */
- break;
- }
- tmperr = copyout(&idat, SCARG(uap, data), sizeof idat);
- if (error >= 0)
- error = tmperr;
- break;
- case OSS_SNDCTL_DSP_CHANNELS:
- AUDIO_INITINFO(&tmpinfo);
- error = copyin(SCARG(uap, data), &idat, sizeof idat);
- if (error)
- break;
- tmpinfo.play.channels =
- tmpinfo.record.channels = idat;
- error = ioctlf(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p);
- /* FALLTHRU */
- case OSS_SOUND_PCM_READ_CHANNELS:
- tmperr = ioctlf(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p);
- if (error >= 0)
- error = tmperr;
- idat = tmpinfo.play.channels;
- tmperr = copyout(&idat, SCARG(uap, data), sizeof idat);
- if (error >= 0)
- error = tmperr;
- break;
- case OSS_SOUND_PCM_WRITE_FILTER:
- case OSS_SOUND_PCM_READ_FILTER:
- error = EINVAL; /* XXX unimplemented */
- break;
- case OSS_SNDCTL_DSP_SUBDIVIDE:
- error = copyin(SCARG(uap, data), &idat, sizeof idat);
- if (error)
- break;
- error = ioctlf(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p);
- setblocksize(fp, &tmpinfo, p);
- if (error)
- break;
- if (idat == 0)
- idat = tmpinfo.play.buffer_size / tmpinfo.blocksize;
- idat = (tmpinfo.play.buffer_size / idat) & -4;
- AUDIO_INITINFO(&tmpinfo);
- tmpinfo.blocksize = idat;
- error = ioctlf(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p);
- if (error)
- break;
- idat = tmpinfo.play.buffer_size / tmpinfo.blocksize;
- error = copyout(&idat, SCARG(uap, data), sizeof idat);
- if (error)
- break;
- break;
- case OSS_SNDCTL_DSP_SETFRAGMENT:
- AUDIO_INITINFO(&tmpinfo);
- error = copyin(SCARG(uap, data), &idat, sizeof idat);
- if (error)
- break;
- if ((idat & 0xffff) < 4 || (idat & 0xffff) > 17) {
- error = EINVAL;
- break;
- }
- tmpinfo.blocksize = 1 << (idat & 0xffff);
- tmpinfo.hiwat = (idat >> 16) & 0x7fff;
- DPRINTF(("oss_audio: SETFRAGMENT blksize=%d, hiwat=%d\n",
- tmpinfo.blocksize, tmpinfo.hiwat));
- if (tmpinfo.hiwat == 0) /* 0 means set to max */
- tmpinfo.hiwat = 65536;
- error = ioctlf(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p);
- tmperr = ioctlf(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p);
- if (error >= 0)
- error = tmperr;
- u = tmpinfo.blocksize;
- for(idat = 0; u > 1; idat++, u >>= 1)
- ;
- idat |= (tmpinfo.hiwat & 0x7fff) << 16;
- tmperr = copyout(&idat, SCARG(uap, data), sizeof idat);
- if (error >= 0)
- error = tmperr;
- break;
- case OSS_SNDCTL_DSP_GETFMTS:
- for(idat = 0, tmpenc.index = 0;
- ioctlf(fp, AUDIO_GETENC, (caddr_t)&tmpenc, p) == 0;
- tmpenc.index++) {
- switch(tmpenc.encoding) {
- case AUDIO_ENCODING_ULAW:
- idat |= OSS_AFMT_MU_LAW;
- break;
- case AUDIO_ENCODING_ALAW:
- idat |= OSS_AFMT_A_LAW;
- break;
- case AUDIO_ENCODING_SLINEAR:
- idat |= OSS_AFMT_S8;
- break;
- case AUDIO_ENCODING_SLINEAR_LE:
- if (tmpenc.precision == 16)
- idat |= OSS_AFMT_S16_LE;
- else
- idat |= OSS_AFMT_S8;
- break;
- case AUDIO_ENCODING_SLINEAR_BE:
- if (tmpenc.precision == 16)
- idat |= OSS_AFMT_S16_BE;
- else
- idat |= OSS_AFMT_S8;
- break;
- case AUDIO_ENCODING_ULINEAR:
- idat |= OSS_AFMT_U8;
- break;
- case AUDIO_ENCODING_ULINEAR_LE:
- if (tmpenc.precision == 16)
- idat |= OSS_AFMT_U16_LE;
- else
- idat |= OSS_AFMT_U8;
- break;
- case AUDIO_ENCODING_ULINEAR_BE:
- if (tmpenc.precision == 16)
- idat |= OSS_AFMT_U16_BE;
- else
- idat |= OSS_AFMT_U8;
- break;
- case AUDIO_ENCODING_ADPCM:
- idat |= OSS_AFMT_IMA_ADPCM;
- break;
- default:
- break;
- }
- }
- DPRINTF(("oss_sys_ioctl: SNDCTL_DSP_GETFMTS = %x\n", idat));
- error = copyout(&idat, SCARG(uap, data), sizeof idat);
- break;
- case OSS_SNDCTL_DSP_GETOSPACE:
- error = ioctlf(fp, AUDIO_GETPRINFO, (caddr_t)&tmpab, p);
- bufinfo.fragsize = tmpab.blksize;
- bufinfo.fragstotal = tmpab.hiwat;
- bufinfo.bytes = tmpab.hiwat * tmpab.blksize - tmpab.seek;
- if (tmpab.blksize != 0)
- bufinfo.fragments = bufinfo.bytes / tmpab.blksize;
- else
- bufinfo.fragments = 0;
- tmperr = copyout(&bufinfo, SCARG(uap, data), sizeof bufinfo);
- if (error >= 0)
- error = tmperr;
- break;
- case OSS_SNDCTL_DSP_GETISPACE:
- error = ioctlf(fp, AUDIO_GETRRINFO, (caddr_t)&tmpab, p);
- bufinfo.fragsize = tmpab.blksize;
- bufinfo.fragstotal = tmpab.hiwat;
- bufinfo.bytes = tmpab.seek;
- if (tmpab.blksize != 0)
- bufinfo.fragments = bufinfo.bytes / tmpab.blksize;
- else
- bufinfo.fragments = 0;
- DPRINTF(("oss_sys_ioctl: SNDCTL_DSP_GETxSPACE = %d %d %d %d\n",
- bufinfo.fragsize, bufinfo.fragments,
- bufinfo.fragstotal, bufinfo.bytes));
- tmperr = copyout(&bufinfo, SCARG(uap, data), sizeof bufinfo);
- if (error >= 0)
- error = tmperr;
- break;
- case OSS_SNDCTL_DSP_NONBLOCK:
- idat = 1;
- error = ioctlf(fp, FIONBIO, (caddr_t)&idat, p);
- break;
- case OSS_SNDCTL_DSP_GETCAPS:
- error = ioctlf(fp, AUDIO_GETPROPS, (caddr_t)&idata, p);
- idat = OSS_DSP_CAP_TRIGGER;
- if (idata & AUDIO_PROP_FULLDUPLEX)
- idat |= OSS_DSP_CAP_DUPLEX;
- if (idata & AUDIO_PROP_MMAP)
- idat |= OSS_DSP_CAP_MMAP;
- DPRINTF(("oss_sys_ioctl: SNDCTL_DSP_GETCAPS = %x\n", idat));
- tmperr = copyout(&idat, SCARG(uap, data), sizeof idat);
- if (error >= 0)
- error = tmperr;
- break;
- case OSS_SNDCTL_DSP_SETTRIGGER:
- error = copyin(SCARG(uap, data), &idat, sizeof idat);
- if (error)
- break;
- AUDIO_INITINFO(&tmpinfo);
- if (idat & OSS_PCM_ENABLE_OUTPUT)
- tmpinfo.play.pause = 0;
- if (idat & OSS_PCM_ENABLE_INPUT)
- tmpinfo.record.pause = 0;
- error = ioctlf(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p);
- tmperr = copyout(&idat, SCARG(uap, data), sizeof idat);
- if (error >= 0)
- error = tmperr;
- /* FALLTHRU */
- case OSS_SNDCTL_DSP_GETTRIGGER:
- tmperr = ioctlf(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p);
- if (error >= 0)
- error = tmperr;
- idat = (tmpinfo.play.pause ? 0 : OSS_PCM_ENABLE_OUTPUT) |
- (tmpinfo.record.pause ? 0 : OSS_PCM_ENABLE_INPUT);
- tmperr = copyout(&idat, SCARG(uap, data), sizeof idat);
- if (error >= 0)
- error = tmperr;
- break;
- case OSS_SNDCTL_DSP_GETIPTR:
- error = ioctlf(fp, AUDIO_GETIOFFS, (caddr_t)&tmpoffs, p);
- cntinfo.bytes = tmpoffs.samples;
- cntinfo.blocks = tmpoffs.deltablks;
- cntinfo.ptr = tmpoffs.offset;
- tmperr = copyout(&cntinfo, SCARG(uap, data), sizeof cntinfo);
- if (error >= 0)
- error = tmperr;
- break;
- case OSS_SNDCTL_DSP_GETOPTR:
- error = ioctlf(fp, AUDIO_GETOOFFS, (caddr_t)&tmpoffs, p);
- cntinfo.bytes = tmpoffs.samples;
- cntinfo.blocks = tmpoffs.deltablks;
- cntinfo.ptr = tmpoffs.offset;
- tmperr = copyout(&cntinfo, SCARG(uap, data), sizeof cntinfo);
- if (error >= 0)
- error = tmperr;
- break;
- case OSS_SNDCTL_DSP_SETDUPLEX:
- idat = 1;
- error = ioctlf(fp, AUDIO_SETFD, (caddr_t)&idat, p);
- break;
- case OSS_SNDCTL_DSP_GETODELAY:
- error = ioctlf(fp, AUDIO_WSEEK, (caddr_t)&ldat, p);
- idat = (int)ldat;
- tmperr = copyout(&idat, SCARG(uap, data), sizeof idat);
- if (error >= 0)
- error = tmperr;
- break;
- case OSS_SNDCTL_DSP_MAPINBUF:
- case OSS_SNDCTL_DSP_MAPOUTBUF:
- case OSS_SNDCTL_DSP_SETSYNCRO:
- case OSS_SNDCTL_DSP_PROFILE:
- error = EINVAL; /* XXX unimplemented */
- break;
- default:
- error = EINVAL;
- break;
- }
-
- FRELE(fp, p);
- return (error);
-}
-
-/* If the mixer device should have more than MAX_MIXER_DEVS devices
- * some will not be available to Linux */
-#define MAX_MIXER_DEVS 64
-struct audiodevinfo {
- int done;
- dev_t dev;
- int16_t devmap[OSS_SOUND_MIXER_NRDEVICES],
- rdevmap[MAX_MIXER_DEVS];
- u_long devmask, recmask, stereomask;
- u_long caps, source;
-};
-
-/*
- * Collect the audio device information to allow faster
- * emulation of the Linux mixer ioctls. Cache the information
- * to eliminate the overhead of repeating all the ioctls needed
- * to collect the information.
- */
-static struct audiodevinfo *
-getdevinfo(fp, p)
- struct file *fp;
- struct proc *p;
-{
- mixer_devinfo_t mi;
- int i;
- static const struct oss_devs {
- const char *name;
- int code;
- } devs[] = {
- { AudioNmicrophone, OSS_SOUND_MIXER_MIC },
- { AudioNline, OSS_SOUND_MIXER_LINE },
- { AudioNcd, OSS_SOUND_MIXER_CD },
- { AudioNdac, OSS_SOUND_MIXER_PCM },
- { AudioNrecord, OSS_SOUND_MIXER_IMIX },
- { AudioNmaster, OSS_SOUND_MIXER_VOLUME },
- { AudioNtreble, OSS_SOUND_MIXER_TREBLE },
- { AudioNbass, OSS_SOUND_MIXER_BASS },
- { AudioNspeaker, OSS_SOUND_MIXER_SPEAKER },
- { AudioNoutput, OSS_SOUND_MIXER_OGAIN },
- { AudioNinput, OSS_SOUND_MIXER_IGAIN },
- { AudioNfmsynth, OSS_SOUND_MIXER_SYNTH },
- { AudioNmidi, OSS_SOUND_MIXER_SYNTH },
- { 0, -1 }
- };
- register const struct oss_devs *dp;
- int (*ioctlf)(struct file *, u_long, caddr_t, struct proc *) =
- fp->f_ops->fo_ioctl;
- struct vnode *vp;
- struct vattr va;
- static struct audiodevinfo devcache = { 0 };
- register struct audiodevinfo *di = &devcache;
-
- /* Figure out what device it is so we can check if the
- * cached data is valid.
- */
- vp = (struct vnode *)fp->f_data;
- if (vp->v_type != VCHR)
- return 0;
- if (VOP_GETATTR(vp, &va, p->p_ucred, p))
- return 0;
- if (di->done && di->dev == va.va_rdev)
- return di;
-
- di->done = 1;
- di->dev = va.va_rdev;
- di->devmask = 0;
- di->recmask = 0;
- di->stereomask = 0;
- di->source = -1;
- di->caps = 0;
- for(i = 0; i < OSS_SOUND_MIXER_NRDEVICES; i++)
- di->devmap[i] = -1;
- for(i = 0; i < MAX_MIXER_DEVS; i++)
- di->rdevmap[i] = -1;
- for(i = 0; i < MAX_MIXER_DEVS; i++) {
- mi.index = i;
- if (ioctlf(fp, AUDIO_MIXER_DEVINFO, (caddr_t)&mi, p) < 0)
- break;
- switch(mi.type) {
- case AUDIO_MIXER_VALUE:
- for(dp = devs; dp->name; dp++)
- if (strcmp(dp->name, mi.label.name) == 0)
- break;
- if (dp->code >= 0) {
- di->devmap[dp->code] = i;
- di->rdevmap[i] = dp->code;
- di->devmask |= 1 << dp->code;
- if (mi.un.v.num_channels == 2)
- di->stereomask |= 1 << dp->code;
- }
- break;
- case AUDIO_MIXER_ENUM:
- if (strcmp(mi.label.name, AudioNsource) == 0) {
- int j;
- di->source = i;
- for(j = 0; j < mi.un.e.num_mem; j++)
- di->recmask |= 1 <<
di->rdevmap[mi.un.e.member[j].ord];
- di->caps = OSS_SOUND_CAP_EXCL_INPUT;
- }
- break;
- case AUDIO_MIXER_SET:
- if (strcmp(mi.label.name, AudioNsource) == 0) {
- int j;
- di->source = i;
- for(j = 0; j < mi.un.s.num_mem; j++) {
- int k, mask = mi.un.s.member[j].mask;
- if (mask) {
- for(k = 0; !(mask & 1); mask
>>= 1, k++)
- ;
- di->recmask |= 1 <<
di->rdevmap[k];
- }
- }
- }
- break;
- }
- }
- return di;
-}
-
-int
-oss_ioctl_mixer(p, uap, retval)
- struct proc *p;
- struct oss_sys_ioctl_args /* {
- syscallarg(int) fd;
- syscallarg(u_long) com;
- syscallarg(caddr_t) data;
- } */ *uap;
- register_t *retval;
-{
- struct file *fp;
- struct filedesc *fdp;
- u_long com;
- struct audiodevinfo *di;
- mixer_ctrl_t mc;
- int idat;
- int i;
- int error;
- int l, r, n;
- int (*ioctlf)(struct file *, u_long, caddr_t, struct proc *);
-
- fdp = p->p_fd;
- if ((fp = fd_getfile(fdp, SCARG(uap, fd))) == NULL)
- return (EBADF);
- FREF(fp);
-
- if ((fp->f_flag & (FREAD | FWRITE)) == 0) {
- error = EBADF;
- goto out;
- }
-
- com = SCARG(uap, com);
- retval[0] = 0;
-
- di = getdevinfo(fp, p);
- if (di == 0) {
- error = EINVAL;
- goto out;
- }
-
- ioctlf = fp->f_ops->fo_ioctl;
- switch (com) {
- case OSS_SOUND_MIXER_READ_RECSRC:
- if (di->source == -1) {
- error = EINVAL;
- goto out;
- }
- mc.dev = di->source;
- if (di->caps & OSS_SOUND_CAP_EXCL_INPUT) {
- mc.type = AUDIO_MIXER_ENUM;
- error = ioctlf(fp, AUDIO_MIXER_READ, (caddr_t)&mc, p);
- if (error)
- goto out;
- idat = 1 << di->rdevmap[mc.un.ord];
- } else {
- int k;
- unsigned int mask;
- mc.type = AUDIO_MIXER_SET;
- error = ioctlf(fp, AUDIO_MIXER_READ, (caddr_t)&mc, p);
- if (error)
- goto out;
- idat = 0;
- for(mask = mc.un.mask, k = 0; mask; mask >>= 1, k++)
- if (mask & 1)
- idat |= 1 << di->rdevmap[k];
- }
- break;
- case OSS_SOUND_MIXER_READ_DEVMASK:
- idat = di->devmask;
- break;
- case OSS_SOUND_MIXER_READ_RECMASK:
- idat = di->recmask;
- break;
- case OSS_SOUND_MIXER_READ_STEREODEVS:
- idat = di->stereomask;
- break;
- case OSS_SOUND_MIXER_READ_CAPS:
- idat = di->caps;
- break;
- case OSS_SOUND_MIXER_WRITE_RECSRC:
- case OSS_SOUND_MIXER_WRITE_R_RECSRC:
- if (di->source == -1) {
- error = EINVAL;
- goto out;
- }
- mc.dev = di->source;
- error = copyin(SCARG(uap, data), &idat, sizeof idat);
- if (error)
- goto out;
- if (di->caps & OSS_SOUND_CAP_EXCL_INPUT) {
- mc.type = AUDIO_MIXER_ENUM;
- for(i = 0; i < OSS_SOUND_MIXER_NRDEVICES; i++)
- if (idat & (1 << i))
- break;
- if (i >= OSS_SOUND_MIXER_NRDEVICES ||
- di->devmap[i] == -1) {
- error = EINVAL;
- goto out;
- }
- mc.un.ord = di->devmap[i];
- } else {
- mc.type = AUDIO_MIXER_SET;
- mc.un.mask = 0;
- for(i = 0; i < OSS_SOUND_MIXER_NRDEVICES; i++) {
- if (idat & (1 << i)) {
- if (di->devmap[i] == -1) {
- error = EINVAL;
- goto out;
- }
- mc.un.mask |= 1 << di->devmap[i];
- }
- }
- }
- error = ioctlf(fp, AUDIO_MIXER_WRITE, (caddr_t)&mc, p);
- goto out;
- default:
- if (OSS_MIXER_READ(OSS_SOUND_MIXER_FIRST) <= com &&
- com < OSS_MIXER_READ(OSS_SOUND_MIXER_NRDEVICES)) {
- n = OSS_GET_DEV(com);
- if (di->devmap[n] == -1) {
- error = EINVAL;
- goto out;
- }
- doread:
- mc.dev = di->devmap[n];
- mc.type = AUDIO_MIXER_VALUE;
- mc.un.value.num_channels = di->stereomask & (1<<n) ? 2
: 1;
- error = ioctlf(fp, AUDIO_MIXER_READ, (caddr_t)&mc, p);
- if (error)
- goto out;
- if (mc.un.value.num_channels != 2) {
- l = r =
mc.un.value.level[AUDIO_MIXER_LEVEL_MONO];
- } else {
- l = mc.un.value.level[AUDIO_MIXER_LEVEL_LEFT];
- r = mc.un.value.level[AUDIO_MIXER_LEVEL_RIGHT];
- }
- idat = TO_OSSVOL(l) | (TO_OSSVOL(r) << 8);
- DPRINTF(("OSS_MIXER_READ n=%d (dev=%d) l=%d, r=%d,
idat=%04x\n",
- n, di->devmap[n], l, r, idat));
- break;
- } else if ((OSS_MIXER_WRITE_R(OSS_SOUND_MIXER_FIRST) <= com &&
- com < OSS_MIXER_WRITE_R(OSS_SOUND_MIXER_NRDEVICES))
||
- (OSS_MIXER_WRITE(OSS_SOUND_MIXER_FIRST) <= com &&
- com < OSS_MIXER_WRITE(OSS_SOUND_MIXER_NRDEVICES))) {
- n = OSS_GET_DEV(com);
- if (di->devmap[n] == -1) {
- error = EINVAL;
- goto out;
- }
- error = copyin(SCARG(uap, data), &idat, sizeof idat);
- if (error)
- goto out;
- l = FROM_OSSVOL( idat & 0xff);
- r = FROM_OSSVOL((idat >> 8) & 0xff);
- mc.dev = di->devmap[n];
- mc.type = AUDIO_MIXER_VALUE;
- if (di->stereomask & (1<<n)) {
- mc.un.value.num_channels = 2;
- mc.un.value.level[AUDIO_MIXER_LEVEL_LEFT] = l;
- mc.un.value.level[AUDIO_MIXER_LEVEL_RIGHT] = r;
- } else {
- mc.un.value.num_channels = 1;
- mc.un.value.level[AUDIO_MIXER_LEVEL_MONO] =
(l+r)/2;
- }
- DPRINTF(("OSS_MIXER_WRITE n=%d (dev=%d) l=%d, r=%d,
idat=%04x\n",
- n, di->devmap[n], l, r, idat));
- error = ioctlf(fp, AUDIO_MIXER_WRITE, (caddr_t)&mc, p);
- if (error)
- goto out;
- if (OSS_MIXER_WRITE(OSS_SOUND_MIXER_FIRST) <= com &&
- com < OSS_MIXER_WRITE(OSS_SOUND_MIXER_NRDEVICES)) {
- error = 0;
- goto out;
- }
- goto doread;
- } else {
-#ifdef AUDIO_DEBUG
- printf("oss_audio: unknown mixer ioctl %04lx\n", com);
-#endif
- error = EINVAL;
- goto out;
- }
- }
- error = copyout(&idat, SCARG(uap, data), sizeof idat);
-
-out:
- FRELE(fp, p);
- return (error);
-}
-
-/* XXX hook for sequencer emulation */
-int
-oss_ioctl_sequencer(p, uap, retval)
- struct proc *p;
- struct oss_sys_ioctl_args /* {
- syscallarg(int) fd;
- syscallarg(u_long) com;
- syscallarg(caddr_t) data;
- } */ *uap;
- register_t *retval;
-{
- struct file *fp;
- struct filedesc *fdp;
-
- fdp = p->p_fd;
- if ((fp = fd_getfile(fdp, SCARG(uap, fd))) == NULL)
- return (EBADF);
-
- if ((fp->f_flag & (FREAD | FWRITE)) == 0)
- return (EBADF);
-
- retval[0] = 0;
-
- return EINVAL;
-}
-
-/*
- * Check that the blocksize is a power of 2 as OSS wants.
- * If not, set it to be.
- */
-static void setblocksize(fp, info, p)
- struct file *fp;
- struct audio_info *info;
- struct proc *p;
-{
- struct audio_info set;
- int s;
-
- if (info->blocksize & (info->blocksize-1)) {
- for(s = 32; s < info->blocksize; s <<= 1)
- ;
- AUDIO_INITINFO(&set);
- set.blocksize = s;
- fp->f_ops->fo_ioctl(fp, AUDIO_SETINFO, (caddr_t)&set, p);
- fp->f_ops->fo_ioctl(fp, AUDIO_GETINFO, (caddr_t)info, p);
- }
-}
--- compat/ossaudio/ossaudio.h.orig Fri Oct 31 16:55:47 2014
+++ compat/ossaudio/ossaudio.h Fri Oct 31 17:05:04 2014
@@ -1,37 +0,0 @@
-/* $OpenBSD: ossaudio.h,v 1.4 2008/06/26 05:42:14 ray Exp $ */
-/* $NetBSD: ossaudio.h,v 1.5 1997/10/16 16:49:37 augustss 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``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.
- */
-
-struct oss_sys_ioctl_args;
-
-int oss_ioctl_audio(struct proc *, struct oss_sys_ioctl_args *,
- register_t *);
-int oss_ioctl_mixer(struct proc *, struct oss_sys_ioctl_args *,
- register_t *);
-int oss_ioctl_sequencer(struct proc *, struct oss_sys_ioctl_args *,
- register_t *);
--- compat/ossaudio/ossaudiovar.h.orig Fri Oct 31 16:55:53 2014
+++ compat/ossaudio/ossaudiovar.h Fri Oct 31 17:05:04 2014
@@ -1,163 +0,0 @@
-/* $OpenBSD: ossaudiovar.h,v 1.5 2008/06/26 05:42:14 ray Exp $ */
-/* $NetBSD: ossaudiovar.h,v 1.4 1997/10/16 16:49:40 augustss 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``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.
- */
-
-struct oss_sys_ioctl_args {
- syscallarg(int) fd;
- syscallarg(u_long) com;
- syscallarg(caddr_t) data;
-};
-
-#define OSS_IOCPARM_MASK 0x7f /* parameters must be < 128 bytes
*/
-#define OSS_IOC_VOID 0x00000000 /* no parameters */
-#define OSS_IOC_IN 0x40000000 /* copy in parameters */
-#define OSS_IOC_OUT 0x80000000 /* copy out parameters */
-#define OSS_IOC_INOUT (OSS_IOC_IN | OSS_IOC_OUT)
-#define _OSS_IOCTL(w,x,y,z)
((u_long)((w)|(((z)&OSS_IOCPARM_MASK)<<16)|((x)<<8)|(y)))
-#define _OSS_IO(x,y) _OSS_IOCTL(OSS_IOC_VOID, x, y, 0)
-#define _OSS_IOR(x,y,t) _OSS_IOCTL(OSS_IOC_OUT, x, y, sizeof(t))
-#define _OSS_IOW(x,y,t) _OSS_IOCTL(OSS_IOC_IN, x, y, sizeof(t))
-#define _OSS_IOWR(x,y,t) _OSS_IOCTL(OSS_IOC_INOUT, x, y, sizeof(t))
-
-#define OSS_SNDCTL_DSP_RESET _OSS_IO ('P', 0)
-#define OSS_SNDCTL_DSP_SYNC _OSS_IO ('P', 1)
-#define OSS_SNDCTL_DSP_SPEED _OSS_IOWR('P', 2, int)
-#define OSS_SOUND_PCM_READ_RATE _OSS_IOR ('P', 2, int)
-#define OSS_SNDCTL_DSP_STEREO _OSS_IOWR('P', 3, int)
-#define OSS_SNDCTL_DSP_GETBLKSIZE _OSS_IOWR('P', 4, int)
-#define OSS_SNDCTL_DSP_SETFMT _OSS_IOWR('P', 5, int)
-#define OSS_SOUND_PCM_READ_BITS _OSS_IOR ('P', 5, int)
-#define OSS_SNDCTL_DSP_CHANNELS _OSS_IOWR('P', 6, int)
-#define OSS_SOUND_PCM_READ_CHANNELS _OSS_IOR ('P', 6, int)
-#define OSS_SOUND_PCM_WRITE_FILTER _OSS_IOWR('P', 7, int)
-#define OSS_SOUND_PCM_READ_FILTER _OSS_IOR ('P', 7, int)
-#define OSS_SNDCTL_DSP_POST _OSS_IO ('P', 8)
-#define OSS_SNDCTL_DSP_SUBDIVIDE _OSS_IOWR('P', 9, int)
-#define OSS_SNDCTL_DSP_SETFRAGMENT _OSS_IOWR('P', 10, int)
-#define OSS_SNDCTL_DSP_GETFMTS _OSS_IOR ('P', 11, int)
-#define OSS_SNDCTL_DSP_GETOSPACE _OSS_IOR ('P',12, struct
oss_audio_buf_info)
-#define OSS_SNDCTL_DSP_GETISPACE _OSS_IOR ('P',13, struct
oss_audio_buf_info)
-#define OSS_SNDCTL_DSP_NONBLOCK _OSS_IO ('P',14)
-#define OSS_SNDCTL_DSP_GETCAPS _OSS_IOR ('P',15, int)
-# define OSS_DSP_CAP_REVISION 0x000000ff
-# define OSS_DSP_CAP_DUPLEX 0x00000100
-# define OSS_DSP_CAP_REALTIME 0x00000200
-# define OSS_DSP_CAP_BATCH 0x00000400
-# define OSS_DSP_CAP_COPROC 0x00000800
-# define OSS_DSP_CAP_TRIGGER 0x00001000
-# define OSS_DSP_CAP_MMAP 0x00002000
-#define OSS_SNDCTL_DSP_GETTRIGGER _OSS_IOR ('P', 16, int)
-#define OSS_SNDCTL_DSP_SETTRIGGER _OSS_IOW ('P', 16, int)
-# define OSS_PCM_ENABLE_INPUT 0x00000001
-# define OSS_PCM_ENABLE_OUTPUT 0x00000002
-#define OSS_SNDCTL_DSP_GETIPTR _OSS_IOR ('P', 17, struct
oss_count_info)
-#define OSS_SNDCTL_DSP_GETOPTR _OSS_IOR ('P', 18, struct
oss_count_info)
-#define OSS_SNDCTL_DSP_MAPINBUF _OSS_IOR ('P', 19, struct
oss_buffmem_desc)
-#define OSS_SNDCTL_DSP_MAPOUTBUF _OSS_IOR ('P', 20, struct
oss_buffmem_desc)
-#define OSS_SNDCTL_DSP_SETSYNCRO _OSS_IO ('P', 21)
-#define OSS_SNDCTL_DSP_SETDUPLEX _OSS_IO ('P', 22)
-#define OSS_SNDCTL_DSP_PROFILE _OSS_IOW ('P', 23, int)
-#define OSS_SNDCTL_DSP_GETODELAY _OSS_IOR ('P', 24, int)
-#define OSS_APF_NORMAL 0 /* Normal applications
*/
-#define OSS_APF_NETWORK 1 /* "external" delays */
-#define OSS_APF_CPUINTENS 2 /* CPU delays */
-
-#define OSS_AFMT_QUERY 0x00000000 /* Return
current fmt */
-#define OSS_AFMT_MU_LAW 0x00000001
-#define OSS_AFMT_A_LAW 0x00000002
-#define OSS_AFMT_IMA_ADPCM 0x00000004
-#define OSS_AFMT_U8 0x00000008
-#define OSS_AFMT_S16_LE 0x00000010 /* Little
endian signed 16 */
-#define OSS_AFMT_S16_BE 0x00000020 /* Big endian
signed 16 */
-#define OSS_AFMT_S8 0x00000040
-#define OSS_AFMT_U16_LE 0x00000080 /* Little
endian U16 */
-#define OSS_AFMT_U16_BE 0x00000100 /* Big endian
U16 */
-#define OSS_AFMT_MPEG 0x00000200 /* MPEG (2)
audio */
-
-/* Mixer defines */
-#define OSS_SOUND_MIXER_FIRST 0
-#define OSS_SOUND_MIXER_NRDEVICES 17
-
-#define OSS_SOUND_MIXER_VOLUME 0
-#define OSS_SOUND_MIXER_BASS 1
-#define OSS_SOUND_MIXER_TREBLE 2
-#define OSS_SOUND_MIXER_SYNTH 3
-#define OSS_SOUND_MIXER_PCM 4
-#define OSS_SOUND_MIXER_SPEAKER 5
-#define OSS_SOUND_MIXER_LINE 6
-#define OSS_SOUND_MIXER_MIC 7
-#define OSS_SOUND_MIXER_CD 8
-#define OSS_SOUND_MIXER_IMIX 9
-#define OSS_SOUND_MIXER_ALTPCM 10
-#define OSS_SOUND_MIXER_RECLEV 11
-#define OSS_SOUND_MIXER_IGAIN 12
-#define OSS_SOUND_MIXER_OGAIN 13
-#define OSS_SOUND_MIXER_LINE1 14
-#define OSS_SOUND_MIXER_LINE2 15
-#define OSS_SOUND_MIXER_LINE3 16
-
-#define OSS_SOUND_MIXER_RECSRC 0xff
-#define OSS_SOUND_MIXER_DEVMASK 0xfe
-#define OSS_SOUND_MIXER_RECMASK 0xfd
-#define OSS_SOUND_MIXER_CAPS 0xfc
-#define OSS_SOUND_CAP_EXCL_INPUT 1
-#define OSS_SOUND_MIXER_STEREODEVS 0xfb
-
-#define OSS_MIXER_READ(dev) _OSS_IOR('M', dev, int)
-
-#define OSS_SOUND_MIXER_READ_RECSRC OSS_MIXER_READ(OSS_SOUND_MIXER_RECSRC)
-#define OSS_SOUND_MIXER_READ_DEVMASK OSS_MIXER_READ(OSS_SOUND_MIXER_DEVMASK)
-#define OSS_SOUND_MIXER_READ_RECMASK OSS_MIXER_READ(OSS_SOUND_MIXER_RECMASK)
-#define OSS_SOUND_MIXER_READ_STEREODEVS
OSS_MIXER_READ(OSS_SOUND_MIXER_STEREODEVS)
-#define OSS_SOUND_MIXER_READ_CAPS OSS_MIXER_READ(OSS_SOUND_MIXER_CAPS)
-
-#define OSS_MIXER_WRITE(dev) _OSS_IOW('M', dev, int)
-#define OSS_MIXER_WRITE_R(dev) _OSS_IOWR('M', dev, int)
-
-#define OSS_SOUND_MIXER_WRITE_RECSRC OSS_MIXER_WRITE(OSS_SOUND_MIXER_RECSRC)
-#define OSS_SOUND_MIXER_WRITE_R_RECSRC
OSS_MIXER_WRITE_R(OSS_SOUND_MIXER_RECSRC)
-
-#define OSS_GET_DEV(com) ((com) & 0xff)
-
-struct oss_audio_buf_info {
- int fragments;
- int fragstotal;
- int fragsize;
- int bytes;
-};
-
-struct oss_count_info {
- int bytes;
- int blocks;
- int ptr;
-};
-
-struct oss_buffmem_desc {
- unsigned int *buffer;
- int size;
-};
