From 32801cf3830d0f8f363855a62903d7cb76dcb76f Mon Sep 17 00:00:00 2001 From: augustss Date: Fri, 4 Apr 1997 15:35:54 +0000 Subject: [PATCH] * Move the Linux audio emulation into its own directory and rename it OSS (aka VoxWare) audio emulation. * Use the OSS audio emulation for Linux and FreeBSD. * Add mixer emulation to the OSS emulator. --- sys/compat/freebsd/freebsd_ioctl.c | 17 +- sys/compat/freebsd/freebsd_ioctl.h | 6 +- sys/compat/linux/arch/i386/linux_ioctl.h | 6 +- sys/compat/linux/common/linux_ioctl.c | 13 +- sys/compat/linux/common/linux_ioctl.h | 6 +- sys/compat/linux/files.linux | 3 +- sys/compat/linux/i386/linux_ioctl.h | 6 +- sys/compat/linux/include/linux_ioctl.h | 6 +- sys/compat/linux/linux_audio.c | 239 --------- sys/compat/linux/linux_audio.h | 35 -- sys/compat/linux/linux_ioctl.c | 13 +- sys/compat/linux/linux_ioctl.h | 6 +- sys/compat/ossaudio/files.ossaudio | 7 + sys/compat/ossaudio/ossaudio.c | 634 +++++++++++++++++------ sys/compat/ossaudio/ossaudio.h | 42 +- sys/compat/ossaudio/ossaudiovar.h | 130 +++++ 16 files changed, 653 insertions(+), 516 deletions(-) delete mode 100644 sys/compat/linux/linux_audio.c delete mode 100644 sys/compat/linux/linux_audio.h create mode 100644 sys/compat/ossaudio/files.ossaudio create mode 100644 sys/compat/ossaudio/ossaudiovar.h diff --git a/sys/compat/freebsd/freebsd_ioctl.c b/sys/compat/freebsd/freebsd_ioctl.c index b20ab8e0e7ce..dc7f374845f3 100644 --- a/sys/compat/freebsd/freebsd_ioctl.c +++ b/sys/compat/freebsd/freebsd_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_ioctl.c,v 1.1 1995/10/10 01:19:31 mycroft Exp $ */ +/* $NetBSD: freebsd_ioctl.c,v 1.2 1997/04/04 15:35:54 augustss Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -42,6 +42,9 @@ #include #include +#include +#define FREEBSD_TO_OSS(v) (v) /* do nothing, same ioctl() encoding */ + int freebsd_sys_ioctl(p, v, retval) struct proc *p; @@ -62,5 +65,15 @@ freebsd_sys_ioctl(p, v, retval) /* XXX - */ /* XXX - */ /* XXX - should convert machine dependent ioctl()s */ - return sys_ioctl(p, uap, retval); + + switch (FREEBSD_IOCGROUP(SCARG(uap, com))) { + case 'M': + return oss_ioctl_mixer(p, FREEBSD_TO_OSS(v), retval); + case 'Q': + return oss_ioctl_sequencer(p, FREEBSD_TO_OSS(v), retval); + case 'P': + return oss_ioctl_audio(p, FREEBSD_TO_OSS(v), retval); + default: + return sys_ioctl(p, uap, retval); + } } diff --git a/sys/compat/freebsd/freebsd_ioctl.h b/sys/compat/freebsd/freebsd_ioctl.h index 106dd33603ac..d5713eef5c4a 100644 --- a/sys/compat/freebsd/freebsd_ioctl.h +++ b/sys/compat/freebsd/freebsd_ioctl.h @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_ioctl.h,v 1.1 1995/10/10 01:19:32 mycroft Exp $ */ +/* $NetBSD: freebsd_ioctl.h,v 1.2 1997/04/04 15:35:55 augustss Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -34,4 +34,8 @@ #ifndef _FREEBSD_IOCTL_H #define _FREEBSD_IOCTL_H +#include "../linux/linux_ioctl.h" + +#define FREEBSD_IOCGROUP(x) (((x) >> 8) & 0xff) + #endif /* !_FREEBSD_IOCTL_H */ diff --git a/sys/compat/linux/arch/i386/linux_ioctl.h b/sys/compat/linux/arch/i386/linux_ioctl.h index 1de714b6362f..99bb838194d2 100644 --- a/sys/compat/linux/arch/i386/linux_ioctl.h +++ b/sys/compat/linux/arch/i386/linux_ioctl.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ioctl.h,v 1.5 1997/03/19 05:12:16 mycroft Exp $ */ +/* $NetBSD: linux_ioctl.h,v 1.6 1997/04/04 15:35:59 augustss Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -35,10 +35,6 @@ #define LINUX_IOCGROUP(x) (((x) >> 8) & 0xff) struct linux_sys_ioctl_args; -int linux_ioctl_audio __P((struct proc *, struct linux_sys_ioctl_args *, - register_t *)); -int linux_ioctl_mixer __P((struct proc *, struct linux_sys_ioctl_args *, - register_t *)); int linux_machdepioctl __P((struct proc *, void *, register_t *)); int linux_ioctl_termios __P((struct proc *, struct linux_sys_ioctl_args *, register_t *)); diff --git a/sys/compat/linux/common/linux_ioctl.c b/sys/compat/linux/common/linux_ioctl.c index d5660a05d365..a8acf509bc6f 100644 --- a/sys/compat/linux/common/linux_ioctl.c +++ b/sys/compat/linux/common/linux_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ioctl.c,v 1.15 1997/03/19 05:12:15 mycroft Exp $ */ +/* $NetBSD: linux_ioctl.c,v 1.16 1997/04/04 15:35:58 augustss Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,12 +48,15 @@ #include #include +#include +#define LINUX_TO_OSS(v) (v) /* do nothing, same ioctl() encoding */ + /* * Most ioctl command are just converted to their NetBSD values, * and passed on. The ones that take structure pointers and (flag) * values need some massaging. This is done the usual way by * allocating stackgap memory, letting the actual ioctl call do its - * work their and converting back the data afterwards. + * work there and converting back the data afterwards. */ int linux_sys_ioctl(p, v, retval) @@ -69,9 +72,11 @@ linux_sys_ioctl(p, v, retval) switch (LINUX_IOCGROUP(SCARG(uap, com))) { case 'M': - return linux_ioctl_mixer(p, uap, retval); + 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 linux_ioctl_audio(p, uap, retval); + return oss_ioctl_audio(p, LINUX_TO_OSS(v), retval); case 'T': return linux_ioctl_termios(p, uap, retval); case 0x89: diff --git a/sys/compat/linux/common/linux_ioctl.h b/sys/compat/linux/common/linux_ioctl.h index 1de714b6362f..99bb838194d2 100644 --- a/sys/compat/linux/common/linux_ioctl.h +++ b/sys/compat/linux/common/linux_ioctl.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ioctl.h,v 1.5 1997/03/19 05:12:16 mycroft Exp $ */ +/* $NetBSD: linux_ioctl.h,v 1.6 1997/04/04 15:35:59 augustss Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -35,10 +35,6 @@ #define LINUX_IOCGROUP(x) (((x) >> 8) & 0xff) struct linux_sys_ioctl_args; -int linux_ioctl_audio __P((struct proc *, struct linux_sys_ioctl_args *, - register_t *)); -int linux_ioctl_mixer __P((struct proc *, struct linux_sys_ioctl_args *, - register_t *)); int linux_machdepioctl __P((struct proc *, void *, register_t *)); int linux_ioctl_termios __P((struct proc *, struct linux_sys_ioctl_args *, register_t *)); diff --git a/sys/compat/linux/files.linux b/sys/compat/linux/files.linux index 9dd91177eccc..f614ba5dfb73 100644 --- a/sys/compat/linux/files.linux +++ b/sys/compat/linux/files.linux @@ -1,4 +1,4 @@ -# $NetBSD: files.linux,v 1.4 1996/03/08 04:55:59 mycroft Exp $ +# $NetBSD: files.linux,v 1.5 1997/04/04 15:35:56 augustss Exp $ # # Config.new file description for machine-independent Linux compat code. # Included by ports that need it. @@ -6,7 +6,6 @@ # ports should define any machine-specific files they need in their # own file lists. -file compat/linux/linux_audio.c compat_linux file compat/linux/linux_error.c compat_linux file compat/linux/linux_exec.c compat_linux file compat/linux/linux_file.c compat_linux diff --git a/sys/compat/linux/i386/linux_ioctl.h b/sys/compat/linux/i386/linux_ioctl.h index 1de714b6362f..99bb838194d2 100644 --- a/sys/compat/linux/i386/linux_ioctl.h +++ b/sys/compat/linux/i386/linux_ioctl.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ioctl.h,v 1.5 1997/03/19 05:12:16 mycroft Exp $ */ +/* $NetBSD: linux_ioctl.h,v 1.6 1997/04/04 15:35:59 augustss Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -35,10 +35,6 @@ #define LINUX_IOCGROUP(x) (((x) >> 8) & 0xff) struct linux_sys_ioctl_args; -int linux_ioctl_audio __P((struct proc *, struct linux_sys_ioctl_args *, - register_t *)); -int linux_ioctl_mixer __P((struct proc *, struct linux_sys_ioctl_args *, - register_t *)); int linux_machdepioctl __P((struct proc *, void *, register_t *)); int linux_ioctl_termios __P((struct proc *, struct linux_sys_ioctl_args *, register_t *)); diff --git a/sys/compat/linux/include/linux_ioctl.h b/sys/compat/linux/include/linux_ioctl.h index 1de714b6362f..99bb838194d2 100644 --- a/sys/compat/linux/include/linux_ioctl.h +++ b/sys/compat/linux/include/linux_ioctl.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ioctl.h,v 1.5 1997/03/19 05:12:16 mycroft Exp $ */ +/* $NetBSD: linux_ioctl.h,v 1.6 1997/04/04 15:35:59 augustss Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -35,10 +35,6 @@ #define LINUX_IOCGROUP(x) (((x) >> 8) & 0xff) struct linux_sys_ioctl_args; -int linux_ioctl_audio __P((struct proc *, struct linux_sys_ioctl_args *, - register_t *)); -int linux_ioctl_mixer __P((struct proc *, struct linux_sys_ioctl_args *, - register_t *)); int linux_machdepioctl __P((struct proc *, void *, register_t *)); int linux_ioctl_termios __P((struct proc *, struct linux_sys_ioctl_args *, register_t *)); diff --git a/sys/compat/linux/linux_audio.c b/sys/compat/linux/linux_audio.c deleted file mode 100644 index 7e510842d083..000000000000 --- a/sys/compat/linux/linux_audio.c +++ /dev/null @@ -1,239 +0,0 @@ -/* $NetBSD: linux_audio.c,v 1.5 1997/03/20 16:11:29 mycroft Exp $ */ -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include - -int -linux_ioctl_audio(p, uap, retval) - register struct proc *p; - register struct linux_sys_ioctl_args /* { - syscallarg(int) fd; - syscallarg(u_long) com; - syscallarg(caddr_t) data; - } */ *uap; - register_t *retval; -{ - register struct file *fp; - register struct filedesc *fdp; - u_long com; - struct audio_info tmpinfo; - int idat; - int error; - - fdp = p->p_fd; - if ((u_int)SCARG(uap, fd) >= fdp->fd_nfiles || - (fp = fdp->fd_ofiles[SCARG(uap, fd)]) == NULL) - return (EBADF); - - if ((fp->f_flag & (FREAD | FWRITE)) == 0) - return (EBADF); - - com = SCARG(uap, com); - retval[0] = 0; - - switch (com) { - case LINUX_SNDCTL_DSP_RESET: - error = (*fp->f_ops->fo_ioctl)(fp, AUDIO_FLUSH, (caddr_t)0, p); - if (error) - return error; - break; - case LINUX_SNDCTL_DSP_SYNC: - case LINUX_SNDCTL_DSP_POST: - error = (*fp->f_ops->fo_ioctl)(fp, AUDIO_DRAIN, (caddr_t)0, p); - if (error) - return error; - break; - case LINUX_SNDCTL_DSP_SPEED: - AUDIO_INITINFO(&tmpinfo); - error = copyin(SCARG(uap, data), &idat, sizeof idat); - if (error) - return error; - tmpinfo.play.sample_rate = - tmpinfo.record.sample_rate = idat; - (void) (*fp->f_ops->fo_ioctl)(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p); - error = (*fp->f_ops->fo_ioctl)(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p); - if (error) - return error; - idat = tmpinfo.play.sample_rate; - error = copyout(&idat, SCARG(uap, data), sizeof idat); - if (error) - return error; - break; - case LINUX_SNDCTL_DSP_STEREO: - AUDIO_INITINFO(&tmpinfo); - error = copyin(SCARG(uap, data), &idat, sizeof idat); - if (error) - return error; - tmpinfo.play.channels = - tmpinfo.record.channels = idat ? 2 : 1; - (void) (*fp->f_ops->fo_ioctl)(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p); - error = (*fp->f_ops->fo_ioctl)(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p); - if (error) - return error; - idat = tmpinfo.play.channels - 1; - error = copyout(&idat, SCARG(uap, data), sizeof idat); - if (error) - return error; - break; - case LINUX_SNDCTL_DSP_CHANNELS: - AUDIO_INITINFO(&tmpinfo); - error = copyin(SCARG(uap, data), &idat, sizeof idat); - if (error) - return error; - tmpinfo.play.channels = - tmpinfo.record.channels = idat; - (void) (*fp->f_ops->fo_ioctl)(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p); - error = (*fp->f_ops->fo_ioctl)(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p); - if (error) - return error; - idat = tmpinfo.play.channels; - error = copyout(&idat, SCARG(uap, data), sizeof idat); - if (error) - return error; - break; - case LINUX_SNDCTL_DSP_GETBLKSIZE: - error = (*fp->f_ops->fo_ioctl)(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p); - if (error) - return error; - idat = tmpinfo.blocksize; - error = copyout(&idat, SCARG(uap, data), sizeof idat); - if (error) - return error; - break; - case LINUX_SNDCTL_DSP_SETFMT: - AUDIO_INITINFO(&tmpinfo); - error = copyin(SCARG(uap, data), &idat, sizeof idat); - if (error) - return error; - switch (idat) { - case LINUX_AFMT_MU_LAW: - tmpinfo.play.precision = - tmpinfo.record.precision = 8; - tmpinfo.play.encoding = - tmpinfo.record.encoding = AUDIO_ENCODING_ULAW; - break; - case LINUX_AFMT_A_LAW: - tmpinfo.play.precision = - tmpinfo.record.precision = 8; - tmpinfo.play.encoding = - tmpinfo.record.encoding = AUDIO_ENCODING_ALAW; - break; - case LINUX_AFMT_U8: - tmpinfo.play.precision = - tmpinfo.record.precision = 8; - tmpinfo.play.encoding = - tmpinfo.record.encoding = AUDIO_ENCODING_LINEAR; - break; - case LINUX_AFMT_S16_LE: - tmpinfo.play.precision = - tmpinfo.record.precision = 16; - tmpinfo.play.encoding = - tmpinfo.record.encoding = AUDIO_ENCODING_LINEAR; - break; - default: - return EINVAL; - } - (void) (*fp->f_ops->fo_ioctl)(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p); - error = (*fp->f_ops->fo_ioctl)(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p); - if (error) - return error; - switch (tmpinfo.play.encoding) { - case AUDIO_ENCODING_ULAW: - idat = LINUX_AFMT_MU_LAW; - break; - case AUDIO_ENCODING_ALAW: - idat = LINUX_AFMT_A_LAW; - break; - case AUDIO_ENCODING_PCM16: - idat = LINUX_AFMT_S16_LE; - break; - case AUDIO_ENCODING_PCM8: - idat = LINUX_AFMT_U8; - break; - case AUDIO_ENCODING_ADPCM: - idat = LINUX_AFMT_IMA_ADPCM; - break; - } - error = copyout(&idat, SCARG(uap, data), sizeof idat); - if (error) - return error; - break; - case LINUX_SNDCTL_DSP_SETFRAGMENT: - AUDIO_INITINFO(&tmpinfo); - error = copyin(SCARG(uap, data), &idat, sizeof idat); - if (error) - return error; - if ((idat & 0xffff) < 4 || (idat & 0xffff) > 17) - return EINVAL; - tmpinfo.blocksize = 1 << (idat & 0xffff); - tmpinfo.hiwat = (idat >> 16) & 0xffff; - (void) (*fp->f_ops->fo_ioctl)(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p); - error = (*fp->f_ops->fo_ioctl)(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p); - if (error) - return error; - idat = tmpinfo.blocksize; - error = copyout(&idat, SCARG(uap, data), sizeof idat); - if (error) - return error; - break; - case LINUX_SNDCTL_DSP_GETFMTS: - idat = LINUX_AFMT_MU_LAW | LINUX_AFMT_U8 | LINUX_AFMT_S16_LE; - error = copyout(&idat, SCARG(uap, data), sizeof idat); - if (error) - return error; - break; - default: - return EINVAL; - } - - return 0; -} - -int -linux_ioctl_mixer(p, uap, retval) - register struct proc *p; - register struct linux_sys_ioctl_args /* { - syscallarg(int) fd; - syscallarg(u_long) com; - syscallarg(caddr_t) data; - } */ *uap; - register_t *retval; -{ - register struct file *fp; - register struct filedesc *fdp; - u_long com; -#if 0 - struct audio_info tmpinfo; - int idat; - int error; -#endif - - fdp = p->p_fd; - if ((u_int)SCARG(uap, fd) >= fdp->fd_nfiles || - (fp = fdp->fd_ofiles[SCARG(uap, fd)]) == NULL) - return (EBADF); - - if ((fp->f_flag & (FREAD | FWRITE)) == 0) - return (EBADF); - - com = SCARG(uap, com); - retval[0] = 0; - - switch (com) { - default: - return EINVAL; - } -} diff --git a/sys/compat/linux/linux_audio.h b/sys/compat/linux/linux_audio.h deleted file mode 100644 index 28198e742fe5..000000000000 --- a/sys/compat/linux/linux_audio.h +++ /dev/null @@ -1,35 +0,0 @@ -#define LINUX_IOCPARM_MASK 0x7f /* parameters must be < 128 bytes */ -#define LINUX_IOC_VOID 0x00000000 /* no parameters */ -#define LINUX_IOC_IN 0x40000000 /* copy in parameters */ -#define LINUX_IOC_OUT 0x80000000 /* copy out parameters */ -#define LINUX_IOC_INOUT (LINUX_IOC_IN | LINUX_IOC_OUT) -#define _LINUX_IOCTL(w,x,y,z) ((int)((w)|(((z)&LINUX_IOCPARM_MASK)<<16)|((x)<<8)|(y))) -#if 0 -#define _LINUX_IO(x,y) _LINUX_IOCTL(LINUX_IOC_VOID, x, y, 0) -#endif -#define _LINUX_IOR(x,y,t) _LINUX_IOCTL(LINUX_IOC_OUT, x, y, sizeof(t)) -#define _LINUX_IOW(x,y,t) _LINUX_IOCTL(LINUX_IOC_IN, x, y, sizeof(t)) -#define _LINUX_IOWR(x,y,t) _LINUX_IOCTL(LINUX_IOC_INOUT, x, y, sizeof(t)) - -#define LINUX_SNDCTL_DSP_RESET _LINUX_IO('P', 0) -#define LINUX_SNDCTL_DSP_SYNC _LINUX_IO('P', 1) -#define LINUX_SNDCTL_DSP_SPEED _LINUX_IOWR('P', 2, int) -#define LINUX_SNDCTL_DSP_STEREO _LINUX_IOWR('P', 3, int) -#define LINUX_SNDCTL_DSP_GETBLKSIZE _LINUX_IOWR('P', 4, int) -#define LINUX_SNDCTL_DSP_SETFMT _LINUX_IOWR('P', 5, int) -#define LINUX_SNDCTL_DSP_CHANNELS _LINUX_IOWR('P', 6, int) -#define LINUX_SNDCTL_DSP_POST _LINUX_IO('P', 8) -#define LINUX_SNDCTL_DSP_SETFRAGMENT _LINUX_IOWR('P', 10, int) -#define LINUX_SNDCTL_DSP_GETFMTS _LINUX_IOR('P', 11, int) - -#define LINUX_AFMT_QUERY 0x00000000 /* Return current fmt */ -#define LINUX_AFMT_MU_LAW 0x00000001 -#define LINUX_AFMT_A_LAW 0x00000002 -#define LINUX_AFMT_IMA_ADPCM 0x00000004 -#define LINUX_AFMT_U8 0x00000008 -#define LINUX_AFMT_S16_LE 0x00000010 /* Little endian signed 16 */ -#define LINUX_AFMT_S16_BE 0x00000020 /* Big endian signed 16 */ -#define LINUX_AFMT_S8 0x00000040 -#define LINUX_AFMT_U16_LE 0x00000080 /* Little endian U16 */ -#define LINUX_AFMT_U16_BE 0x00000100 /* Big endian U16 */ -#define LINUX_AFMT_MPEG 0x00000200 /* MPEG (2) audio */ diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index d5660a05d365..a8acf509bc6f 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ioctl.c,v 1.15 1997/03/19 05:12:15 mycroft Exp $ */ +/* $NetBSD: linux_ioctl.c,v 1.16 1997/04/04 15:35:58 augustss Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -48,12 +48,15 @@ #include #include +#include +#define LINUX_TO_OSS(v) (v) /* do nothing, same ioctl() encoding */ + /* * Most ioctl command are just converted to their NetBSD values, * and passed on. The ones that take structure pointers and (flag) * values need some massaging. This is done the usual way by * allocating stackgap memory, letting the actual ioctl call do its - * work their and converting back the data afterwards. + * work there and converting back the data afterwards. */ int linux_sys_ioctl(p, v, retval) @@ -69,9 +72,11 @@ linux_sys_ioctl(p, v, retval) switch (LINUX_IOCGROUP(SCARG(uap, com))) { case 'M': - return linux_ioctl_mixer(p, uap, retval); + 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 linux_ioctl_audio(p, uap, retval); + return oss_ioctl_audio(p, LINUX_TO_OSS(v), retval); case 'T': return linux_ioctl_termios(p, uap, retval); case 0x89: diff --git a/sys/compat/linux/linux_ioctl.h b/sys/compat/linux/linux_ioctl.h index 1de714b6362f..99bb838194d2 100644 --- a/sys/compat/linux/linux_ioctl.h +++ b/sys/compat/linux/linux_ioctl.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ioctl.h,v 1.5 1997/03/19 05:12:16 mycroft Exp $ */ +/* $NetBSD: linux_ioctl.h,v 1.6 1997/04/04 15:35:59 augustss Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -35,10 +35,6 @@ #define LINUX_IOCGROUP(x) (((x) >> 8) & 0xff) struct linux_sys_ioctl_args; -int linux_ioctl_audio __P((struct proc *, struct linux_sys_ioctl_args *, - register_t *)); -int linux_ioctl_mixer __P((struct proc *, struct linux_sys_ioctl_args *, - register_t *)); int linux_machdepioctl __P((struct proc *, void *, register_t *)); int linux_ioctl_termios __P((struct proc *, struct linux_sys_ioctl_args *, register_t *)); diff --git a/sys/compat/ossaudio/files.ossaudio b/sys/compat/ossaudio/files.ossaudio new file mode 100644 index 000000000000..088c613e1440 --- /dev/null +++ b/sys/compat/ossaudio/files.ossaudio @@ -0,0 +1,7 @@ +# $NetBSD: files.ossaudio,v 1.1 1997/04/04 15:36:00 augustss Exp $ +# +# Config.new file description for OSS (Voxware) audio driver +# compatibility. Used by e.g. compat_linux and compat_freebsd. +# Included by ports that need it. + +file compat/ossaudio/ossaudio.c compat_linux | compat_freebsd diff --git a/sys/compat/ossaudio/ossaudio.c b/sys/compat/ossaudio/ossaudio.c index d3aa26501d43..3a202608626d 100644 --- a/sys/compat/ossaudio/ossaudio.c +++ b/sys/compat/ossaudio/ossaudio.c @@ -1,8 +1,9 @@ -/* $NetBSD: ossaudio.c,v 1.5 1997/03/20 16:11:29 mycroft Exp $ */ +/* $NetBSD: ossaudio.c,v 1.6 1997/04/04 15:36:01 augustss Exp $ */ #include #include #include #include +#include #include #include #include @@ -10,16 +11,15 @@ #include -#include -#include -#include -#include -#include +#include +#include + +static struct audiodevinfo *getdevinfo __P((struct file *, struct proc *)); int -linux_ioctl_audio(p, uap, retval) +oss_ioctl_audio(p, uap, retval) register struct proc *p; - register struct linux_sys_ioctl_args /* { + register struct oss_sys_ioctl_args /* { syscallarg(int) fd; syscallarg(u_long) com; syscallarg(caddr_t) data; @@ -32,6 +32,356 @@ linux_ioctl_audio(p, uap, retval) struct audio_info tmpinfo; int idat; int error; + int (*ioctlf) __P((struct file *, u_long, caddr_t, struct proc *)); + + fdp = p->p_fd; + if ((u_int)SCARG(uap, fd) >= fdp->fd_nfiles || + (fp = fdp->fd_ofiles[SCARG(uap, fd)]) == NULL) + return (EBADF); + + if ((fp->f_flag & (FREAD | FWRITE)) == 0) + return (EBADF); + + ioctlf = fp->f_ops->fo_ioctl; + + com = SCARG(uap, com); + retval[0] = 0; + + switch (com) { + case OSS_SNDCTL_DSP_RESET: + error = ioctlf(fp, AUDIO_FLUSH, (caddr_t)0, p); + if (error) + return error; + break; + case OSS_SNDCTL_DSP_SYNC: + case OSS_SNDCTL_DSP_POST: + error = ioctlf(fp, AUDIO_DRAIN, (caddr_t)0, p); + if (error) + return error; + break; + case OSS_SNDCTL_DSP_SPEED: + AUDIO_INITINFO(&tmpinfo); + error = copyin(SCARG(uap, data), &idat, sizeof idat); + if (error) + return error; + tmpinfo.play.sample_rate = + tmpinfo.record.sample_rate = idat; + (void) ioctlf(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p); + /* fall into ... */ + case OSS_SOUND_PCM_READ_RATE: + error = ioctlf(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p); + if (error) + return error; + idat = tmpinfo.play.sample_rate; + error = copyout(&idat, SCARG(uap, data), sizeof idat); + if (error) + return error; + break; + case OSS_SNDCTL_DSP_STEREO: + AUDIO_INITINFO(&tmpinfo); + error = copyin(SCARG(uap, data), &idat, sizeof idat); + if (error) + return error; + tmpinfo.play.channels = + tmpinfo.record.channels = idat ? 2 : 1; + (void) ioctlf(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p); + error = ioctlf(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p); + if (error) + return error; + idat = tmpinfo.play.channels - 1; + error = copyout(&idat, SCARG(uap, data), sizeof idat); + if (error) + return error; + break; + case OSS_SNDCTL_DSP_GETBLKSIZE: + error = ioctlf(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p); + if (error) + return error; + idat = tmpinfo.blocksize; + error = copyout(&idat, SCARG(uap, data), sizeof idat); + if (error) + return error; + break; + case OSS_SNDCTL_DSP_SETFMT: + AUDIO_INITINFO(&tmpinfo); + error = copyin(SCARG(uap, data), &idat, sizeof idat); + if (error) + return error; + 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_LINEAR; + break; + case OSS_AFMT_S16_LE: + tmpinfo.play.precision = + tmpinfo.record.precision = 16; + tmpinfo.play.encoding = + tmpinfo.record.encoding = AUDIO_ENCODING_LINEAR; + break; + default: + return EINVAL; + } + (void) ioctlf(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p); + /* fall into ... */ + case OSS_SOUND_PCM_READ_BITS: + error = ioctlf(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p); + if (error) + return error; + 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_PCM16: + idat = OSS_AFMT_S16_LE; + break; + case AUDIO_ENCODING_PCM8: + idat = OSS_AFMT_U8; + break; + case AUDIO_ENCODING_ADPCM: + idat = OSS_AFMT_IMA_ADPCM; + break; + } + error = copyout(&idat, SCARG(uap, data), sizeof idat); + if (error) + return error; + break; + case OSS_SNDCTL_DSP_CHANNELS: + AUDIO_INITINFO(&tmpinfo); + error = copyin(SCARG(uap, data), &idat, sizeof idat); + if (error) + return error; + tmpinfo.play.channels = + tmpinfo.record.channels = idat; + (void) ioctlf(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p); + /* fall into ... */ + case OSS_SOUND_PCM_READ_CHANNELS: + error = ioctlf(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p); + if (error) + return error; + idat = tmpinfo.play.channels; + error = copyout(&idat, SCARG(uap, data), sizeof idat); + if (error) + return error; + break; + case OSS_SOUND_PCM_WRITE_FILTER: + case OSS_SOUND_PCM_READ_FILTER: + return EINVAL; /* XXX unimplemented */ + case OSS_SNDCTL_DSP_SUBDIVIDE: + return EINVAL; /* XXX unimplemented */ + case OSS_SNDCTL_DSP_SETFRAGMENT: + AUDIO_INITINFO(&tmpinfo); + error = copyin(SCARG(uap, data), &idat, sizeof idat); + if (error) + return error; + if ((idat & 0xffff) < 4 || (idat & 0xffff) > 17) + return EINVAL; + tmpinfo.blocksize = 1 << (idat & 0xffff); + tmpinfo.hiwat = (idat >> 16) & 0xffff; + (void) ioctlf(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p); + error = ioctlf(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p); + if (error) + return error; + idat = tmpinfo.blocksize; + error = copyout(&idat, SCARG(uap, data), sizeof idat); + if (error) + return error; + break; + case OSS_SNDCTL_DSP_GETFMTS: + idat = OSS_AFMT_MU_LAW | OSS_AFMT_U8 | OSS_AFMT_S16_LE; + error = copyout(&idat, SCARG(uap, data), sizeof idat); + if (error) + return error; + break; + case OSS_SNDCTL_DSP_GETOSPACE: + case OSS_SNDCTL_DSP_GETISPACE: + case OSS_SNDCTL_DSP_NONBLOCK: + return EINVAL; /* XXX unimplemented */ + case OSS_SNDCTL_DSP_GETCAPS: + idat = 0; /* XXX full duplex info should be set */ + error = copyout(&idat, SCARG(uap, data), sizeof idat); + if (error) + return error; + break; + case OSS_SNDCTL_DSP_GETTRIGGER: + case OSS_SNDCTL_DSP_SETTRIGGER: + case OSS_SNDCTL_DSP_GETIPTR: + case OSS_SNDCTL_DSP_GETOPTR: + case OSS_SNDCTL_DSP_MAPINBUF: + case OSS_SNDCTL_DSP_MAPOUTBUF: + case OSS_SNDCTL_DSP_SETSYNCRO: + case OSS_SNDCTL_DSP_SETDUPLEX: + case OSS_SNDCTL_DSP_PROFILE: + return EINVAL; /* XXX unimplemented */ + default: + return EINVAL; + } + + return 0; +} + +/* If the NetBSD mixer device should have more than 32 devices + * some will not be available to Linux */ +#define NETBSD_MAXDEVS 32 +struct audiodevinfo { + int done; + dev_t dev; + u_int16_t devmap[OSS_SOUND_MIXER_NRDEVICES], + rdevmap[NETBSD_MAXDEVS]; + 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 struct { + char *name; + int code; + } *dp, 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 }, + { AudioNvolume, OSS_SOUND_MIXER_VOLUME }, + { AudioNtreble, OSS_SOUND_MIXER_TREBLE }, + { AudioNbass, OSS_SOUND_MIXER_BASS }, + { AudioNspeaker, OSS_SOUND_MIXER_SPEAKER }, +/* { AudioNheadphone, ?? },*/ + { AudioNoutput, OSS_SOUND_MIXER_OGAIN }, + { AudioNinput, OSS_SOUND_MIXER_IGAIN }, +/* { AudioNmaster, OSS_SOUND_MIXER_MASTER },*/ +/* { AudioNstereo, ?? },*/ +/* { AudioNmono, ?? },*/ +/* { AudioNsource, ?? },*/ + { AudioNfmsynth, OSS_SOUND_MIXER_SYNTH }, +/* { AudioNwave, OSS_SOUND_MIXER_PCM },*/ +/* { AudioNmidi, ?? },*/ +/* { AudioNmixerout, ?? },*/ + { 0, -1 } + }; + int (*ioctlf) __P((struct file *, u_long, caddr_t, struct proc *)) = + fp->f_ops->fo_ioctl; + struct vnode *vp; + struct vattr va; + static struct audiodevinfo devcache = { 0 }; + 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 < NETBSD_MAXDEVS; i++) + di->rdevmap[i] = -1; + for(i = 0; i < NETBSD_MAXDEVS; 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<recmask |= 1 << di->rdevmap[k]; + } + } + } + break; + } + } + return di; +} + +int +oss_ioctl_mixer(p, uap, retval) + register struct proc *p; + register 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) __P((struct file *, u_long, caddr_t, struct proc *)); fdp = p->p_fd; if ((u_int)SCARG(uap, fd) >= fdp->fd_nfiles || @@ -44,168 +394,114 @@ linux_ioctl_audio(p, uap, retval) com = SCARG(uap, com); retval[0] = 0; - switch (com) { - case LINUX_SNDCTL_DSP_RESET: - error = (*fp->f_ops->fo_ioctl)(fp, AUDIO_FLUSH, (caddr_t)0, p); - if (error) - return error; - break; - case LINUX_SNDCTL_DSP_SYNC: - case LINUX_SNDCTL_DSP_POST: - error = (*fp->f_ops->fo_ioctl)(fp, AUDIO_DRAIN, (caddr_t)0, p); - if (error) - return error; - break; - case LINUX_SNDCTL_DSP_SPEED: - AUDIO_INITINFO(&tmpinfo); - error = copyin(SCARG(uap, data), &idat, sizeof idat); - if (error) - return error; - tmpinfo.play.sample_rate = - tmpinfo.record.sample_rate = idat; - (void) (*fp->f_ops->fo_ioctl)(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p); - error = (*fp->f_ops->fo_ioctl)(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p); - if (error) - return error; - idat = tmpinfo.play.sample_rate; - error = copyout(&idat, SCARG(uap, data), sizeof idat); - if (error) - return error; - break; - case LINUX_SNDCTL_DSP_STEREO: - AUDIO_INITINFO(&tmpinfo); - error = copyin(SCARG(uap, data), &idat, sizeof idat); - if (error) - return error; - tmpinfo.play.channels = - tmpinfo.record.channels = idat ? 2 : 1; - (void) (*fp->f_ops->fo_ioctl)(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p); - error = (*fp->f_ops->fo_ioctl)(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p); - if (error) - return error; - idat = tmpinfo.play.channels - 1; - error = copyout(&idat, SCARG(uap, data), sizeof idat); - if (error) - return error; - break; - case LINUX_SNDCTL_DSP_CHANNELS: - AUDIO_INITINFO(&tmpinfo); - error = copyin(SCARG(uap, data), &idat, sizeof idat); - if (error) - return error; - tmpinfo.play.channels = - tmpinfo.record.channels = idat; - (void) (*fp->f_ops->fo_ioctl)(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p); - error = (*fp->f_ops->fo_ioctl)(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p); - if (error) - return error; - idat = tmpinfo.play.channels; - error = copyout(&idat, SCARG(uap, data), sizeof idat); - if (error) - return error; - break; - case LINUX_SNDCTL_DSP_GETBLKSIZE: - error = (*fp->f_ops->fo_ioctl)(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p); - if (error) - return error; - idat = tmpinfo.blocksize; - error = copyout(&idat, SCARG(uap, data), sizeof idat); - if (error) - return error; - break; - case LINUX_SNDCTL_DSP_SETFMT: - AUDIO_INITINFO(&tmpinfo); - error = copyin(SCARG(uap, data), &idat, sizeof idat); - if (error) - return error; - switch (idat) { - case LINUX_AFMT_MU_LAW: - tmpinfo.play.precision = - tmpinfo.record.precision = 8; - tmpinfo.play.encoding = - tmpinfo.record.encoding = AUDIO_ENCODING_ULAW; - break; - case LINUX_AFMT_A_LAW: - tmpinfo.play.precision = - tmpinfo.record.precision = 8; - tmpinfo.play.encoding = - tmpinfo.record.encoding = AUDIO_ENCODING_ALAW; - break; - case LINUX_AFMT_U8: - tmpinfo.play.precision = - tmpinfo.record.precision = 8; - tmpinfo.play.encoding = - tmpinfo.record.encoding = AUDIO_ENCODING_LINEAR; - break; - case LINUX_AFMT_S16_LE: - tmpinfo.play.precision = - tmpinfo.record.precision = 16; - tmpinfo.play.encoding = - tmpinfo.record.encoding = AUDIO_ENCODING_LINEAR; - break; - default: - return EINVAL; - } - (void) (*fp->f_ops->fo_ioctl)(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p); - error = (*fp->f_ops->fo_ioctl)(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p); - if (error) - return error; - switch (tmpinfo.play.encoding) { - case AUDIO_ENCODING_ULAW: - idat = LINUX_AFMT_MU_LAW; - break; - case AUDIO_ENCODING_ALAW: - idat = LINUX_AFMT_A_LAW; - break; - case AUDIO_ENCODING_PCM16: - idat = LINUX_AFMT_S16_LE; - break; - case AUDIO_ENCODING_PCM8: - idat = LINUX_AFMT_U8; - break; - case AUDIO_ENCODING_ADPCM: - idat = LINUX_AFMT_IMA_ADPCM; - break; - } - error = copyout(&idat, SCARG(uap, data), sizeof idat); - if (error) - return error; - break; - case LINUX_SNDCTL_DSP_SETFRAGMENT: - AUDIO_INITINFO(&tmpinfo); - error = copyin(SCARG(uap, data), &idat, sizeof idat); - if (error) - return error; - if ((idat & 0xffff) < 4 || (idat & 0xffff) > 17) - return EINVAL; - tmpinfo.blocksize = 1 << (idat & 0xffff); - tmpinfo.hiwat = (idat >> 16) & 0xffff; - (void) (*fp->f_ops->fo_ioctl)(fp, AUDIO_SETINFO, (caddr_t)&tmpinfo, p); - error = (*fp->f_ops->fo_ioctl)(fp, AUDIO_GETINFO, (caddr_t)&tmpinfo, p); - if (error) - return error; - idat = tmpinfo.blocksize; - error = copyout(&idat, SCARG(uap, data), sizeof idat); - if (error) - return error; - break; - case LINUX_SNDCTL_DSP_GETFMTS: - idat = LINUX_AFMT_MU_LAW | LINUX_AFMT_U8 | LINUX_AFMT_S16_LE; - error = copyout(&idat, SCARG(uap, data), sizeof idat); - if (error) - return error; - break; - default: + di = getdevinfo(fp, p); + if (di == 0) return EINVAL; - } - return 0; + ioctlf = fp->f_ops->fo_ioctl; + switch (com) { + case OSS_SOUND_MIXER_READ_RECSRC: + if (di->source == -1) + return EINVAL; + 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) + return error; + 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) + return error; + idat = 0; + for(mask = mc.un.mask, k = 0; mask; mask >>= 1, k++) + 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: + if (di->source == -1) + return EINVAL; + mc.dev = di->source; + mc.type = AUDIO_MIXER_ENUM; + error = copyin(SCARG(uap, data), &idat, sizeof idat); + if (error) + return error; + for(i = 0; i < OSS_SOUND_MIXER_NRDEVICES; i++) + if (idat & (1 << i)) + mc.un.ord = di->devmap[i]; + return ioctlf(fp, AUDIO_MIXER_READ, (caddr_t)&mc, p); + default: + if (OSS_MIXER_READ(OSS_SOUND_MIXER_FIRST) <= com && + com < OSS_MIXER_READ(OSS_SOUND_MIXER_NRDEVICES)) { + n = OSS_GET_DEV(com); + mc.dev = di->devmap[n]; + mc.type = AUDIO_MIXER_VALUE; + doread: + mc.un.value.num_channels = di->stereomask & (1<> 8) * 255 / 100; + mc.dev = di->devmap[n]; + mc.type = AUDIO_MIXER_VALUE; + if (di->stereomask & (1<f_flag & (FREAD | FWRITE)) == 0) return (EBADF); +#if 0 com = SCARG(uap, com); +#endif retval[0] = 0; - switch (com) { - default: - return EINVAL; - } + return EINVAL; } diff --git a/sys/compat/ossaudio/ossaudio.h b/sys/compat/ossaudio/ossaudio.h index 28198e742fe5..4269e0d6fcc3 100644 --- a/sys/compat/ossaudio/ossaudio.h +++ b/sys/compat/ossaudio/ossaudio.h @@ -1,35 +1,9 @@ -#define LINUX_IOCPARM_MASK 0x7f /* parameters must be < 128 bytes */ -#define LINUX_IOC_VOID 0x00000000 /* no parameters */ -#define LINUX_IOC_IN 0x40000000 /* copy in parameters */ -#define LINUX_IOC_OUT 0x80000000 /* copy out parameters */ -#define LINUX_IOC_INOUT (LINUX_IOC_IN | LINUX_IOC_OUT) -#define _LINUX_IOCTL(w,x,y,z) ((int)((w)|(((z)&LINUX_IOCPARM_MASK)<<16)|((x)<<8)|(y))) -#if 0 -#define _LINUX_IO(x,y) _LINUX_IOCTL(LINUX_IOC_VOID, x, y, 0) -#endif -#define _LINUX_IOR(x,y,t) _LINUX_IOCTL(LINUX_IOC_OUT, x, y, sizeof(t)) -#define _LINUX_IOW(x,y,t) _LINUX_IOCTL(LINUX_IOC_IN, x, y, sizeof(t)) -#define _LINUX_IOWR(x,y,t) _LINUX_IOCTL(LINUX_IOC_INOUT, x, y, sizeof(t)) +/* $NetBSD: ossaudio.h,v 1.4 1997/04/04 15:36:01 augustss Exp $ */ +struct oss_sys_ioctl_args; -#define LINUX_SNDCTL_DSP_RESET _LINUX_IO('P', 0) -#define LINUX_SNDCTL_DSP_SYNC _LINUX_IO('P', 1) -#define LINUX_SNDCTL_DSP_SPEED _LINUX_IOWR('P', 2, int) -#define LINUX_SNDCTL_DSP_STEREO _LINUX_IOWR('P', 3, int) -#define LINUX_SNDCTL_DSP_GETBLKSIZE _LINUX_IOWR('P', 4, int) -#define LINUX_SNDCTL_DSP_SETFMT _LINUX_IOWR('P', 5, int) -#define LINUX_SNDCTL_DSP_CHANNELS _LINUX_IOWR('P', 6, int) -#define LINUX_SNDCTL_DSP_POST _LINUX_IO('P', 8) -#define LINUX_SNDCTL_DSP_SETFRAGMENT _LINUX_IOWR('P', 10, int) -#define LINUX_SNDCTL_DSP_GETFMTS _LINUX_IOR('P', 11, int) - -#define LINUX_AFMT_QUERY 0x00000000 /* Return current fmt */ -#define LINUX_AFMT_MU_LAW 0x00000001 -#define LINUX_AFMT_A_LAW 0x00000002 -#define LINUX_AFMT_IMA_ADPCM 0x00000004 -#define LINUX_AFMT_U8 0x00000008 -#define LINUX_AFMT_S16_LE 0x00000010 /* Little endian signed 16 */ -#define LINUX_AFMT_S16_BE 0x00000020 /* Big endian signed 16 */ -#define LINUX_AFMT_S8 0x00000040 -#define LINUX_AFMT_U16_LE 0x00000080 /* Little endian U16 */ -#define LINUX_AFMT_U16_BE 0x00000100 /* Big endian U16 */ -#define LINUX_AFMT_MPEG 0x00000200 /* MPEG (2) audio */ +int oss_ioctl_audio __P((struct proc *, struct oss_sys_ioctl_args *, + register_t *)); +int oss_ioctl_mixer __P((struct proc *, struct oss_sys_ioctl_args *, + register_t *)); +int oss_ioctl_sequencer __P((struct proc *, struct oss_sys_ioctl_args *, + register_t *)); diff --git a/sys/compat/ossaudio/ossaudiovar.h b/sys/compat/ossaudio/ossaudiovar.h new file mode 100644 index 000000000000..4b8d10dd182d --- /dev/null +++ b/sys/compat/ossaudio/ossaudiovar.h @@ -0,0 +1,130 @@ +/* $NetBSD: ossaudiovar.h,v 1.1 1997/04/04 15:36:02 augustss Exp $ */ +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) ((int)((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_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_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_IOWR('M', dev, int) + +#define OSS_SOUND_MIXER_WRITE_RECSRC OSS_MIXER_WRITE(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; +};