d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fa027af9d9
freebsd-dev/sys/dev/sound/pcm/sound.h

283 lines
8.7 KiB
C
Raw Normal View History

say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
/*
* Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
* Copyright by Hannu Savolainen 1995
* 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 AUTHOR 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 AUTHOR 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.
*
$Id$ -> $FreeBSD$
1999-09-01 06:58:27 +00:00
* $FreeBSD$
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
*/
/*
* first, include kernel header files.
*/
#ifndef _OS_H_
#define _OS_H_
Change #ifdef KERNEL to #ifdef _KERNEL in the public headers. "KERNEL" is an application space macro and the applications are supposed to be free to use it as they please (but cannot). This is consistant with the other BSD's who made this change quite some time ago. More commits to come.
1999-12-29 04:46:21 +00:00
#ifdef _KERNEL
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/ioccom.h>
#include <sys/filio.h>
#include <sys/sockio.h>
#include <sys/fcntl.h>
#include <sys/tty.h>
#include <sys/proc.h>
#include <sys/kernel.h> /* for DATA_SET */
#include <sys/module.h>
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/uio.h>
#include <sys/syslog.h>
#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/bus.h>
make this file suitable for 4-stable as well as 5-current
2000-07-18 21:23:48 +00:00
#if __FreeBSD_version > 500000
Separate the struct bio related stuff out of <sys/buf.h> into <sys/bio.h>. <sys/bio.h> is now a prerequisite for <sys/buf.h> but it shall not be made a nested include according to bdes teachings on the subject of nested includes. Diskdrivers and similar stuff below specfs::strategy() should no longer need to include <sys/buf.> unless they need caching of data. Still a few bogus uses of struct buf to track down. Repocopy by: peter
2000-05-05 09:59:14 +00:00
#include <sys/bio.h>
make this file suitable for 4-stable as well as 5-current
2000-07-18 21:23:48 +00:00
#endif
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
#include <sys/buf.h>
#include <machine/clock.h> /* for DELAY */
#include <machine/resource.h>
#include <machine/bus.h>
#include <sys/rman.h>
#include <sys/mman.h>
#include <sys/poll.h>
many changes: * add new channels to the end of the list so channels used in order of addition * de-globalise definition of struct snddev_info and provide accessor functions where necessary. * move the $FreeBSD$ tag in each .c file into a macro and allow the /dev/sndstat handler to display these when set to maximum verbosity to aid debugging. * allow each device to register its own sndstat handler to reduce the amount of groping sndstat must do in foreign structs.
2001-08-23 11:30:52 +00:00
#include <sys/sbuf.h>
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
#include <sys/soundcard.h>
Create a new sysctl node 'hw.snd' and move 'hw.sndunit' to 'hw.snd.unit'. Reviewed by: cg
2001-01-03 01:25:26 +00:00
#include <sys/sysctl.h>
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
#include <isa/isavar.h>
MFS: add kobj.h to reduce diffs from -stable
2001-03-05 16:47:35 +00:00
#include <sys/kobj.h>
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
#include <vm/vm.h>
#include <vm/pmap.h>
add defines and ifdefs so this code will compile on 4.x add spls so this code will work on 4.x
2001-06-23 17:36:51 +00:00
#undef USING_MUTEX
#undef USING_DEVFS
MFS: 4.x/5.x compatibility #defines
2001-02-27 06:58:55 +00:00
#if __FreeBSD_version > 500000
#define USING_MUTEX
#define USING_DEVFS
#endif
many changes: * add new channels to the end of the list so channels used in order of addition * de-globalise definition of struct snddev_info and provide accessor functions where necessary. * move the $FreeBSD$ tag in each .c file into a macro and allow the /dev/sndstat handler to display these when set to maximum verbosity to aid debugging. * allow each device to register its own sndstat handler to reduce the amount of groping sndstat must do in foreign structs.
2001-08-23 11:30:52 +00:00
enable per-device sysctls unconditionally
2001-03-05 15:58:05 +00:00
#define SND_DYNSYSCTL
MFS: 4.x/5.x compatibility #defines
2001-02-27 06:58:55 +00:00
remove obsolete typedefs. only define INTR_TYPE_AV if it is not already defined.
2001-07-03 12:53:09 +00:00
#ifndef INTR_MPSAFE
#define INTR_TYPE_AV INTR_TYPE_TTY
#endif
add defines and ifdefs so this code will compile on 4.x add spls so this code will work on 4.x
2001-06-23 17:36:51 +00:00
#ifndef INTR_MPSAFE
#define INTR_MPSAFE 0
#endif
mega-commit. this introduces a new buffering mechanism which results in dramatic simplification of the channel manager. as several structures have changed, we take the opportunity to move their definitions into the source files where they are used, make them private and de-typedef them. the sound drivers are updated to use snd_setup_intr instead of bus_setup_intr, and to comply with the de-typedefed structures. the ac97, mixer and channel layers have been updated with finegrained locking, as have some drivers- not all though. the rest will follow soon.
2001-03-24 23:10:29 +00:00
struct pcm_channel;
struct pcm_feeder;
struct snd_dbuf;
struct snd_mixer;
update code dealing with snd_dbuf objects to do so using a functional interface modify chn_setblocksize() to pick a default soft-blocksize appropriate to the sample rate and format in use. it will aim for a power of two size small enough to generate block sizes of at most 20ms. it will also set the hard-blocksize taking into account rate/format conversions in use. update drivers to implement setblocksize correctly: updated, tested: sb16, emu10k1, maestro, solo updated, untested: ad1816, ess, mss, sb8, csa not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686 i lack hardware to test: ad1816, csa, fm801, neomagic others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
#include <dev/sound/pcm/buffer.h>
mega-commit. this introduces a new buffering mechanism which results in dramatic simplification of the channel manager. as several structures have changed, we take the opportunity to move their definitions into the source files where they are used, make them private and de-typedef them. the sound drivers are updated to use snd_setup_intr instead of bus_setup_intr, and to comply with the de-typedefed structures. the ac97, mixer and channel layers have been updated with finegrained locking, as have some drivers- not all though. the rest will follow soon.
2001-03-24 23:10:29 +00:00
#include <dev/sound/pcm/channel.h>
rework feeder sytem to allow feeders in klds modify driver capability reporting format to list every audio format seperately- required for above and because we could not previously indicate that mono was unsupported. there should be no functional impact.
2000-08-20 22:18:56 +00:00
#include <dev/sound/pcm/feeder.h>
repo-copied to make way for newmidi, this commit updates include paths
1999-11-20 16:50:33 +00:00
#include <dev/sound/pcm/mixer.h>
#include <dev/sound/pcm/dsp.h>
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
many changes: * add new channels to the end of the list so channels used in order of addition * de-globalise definition of struct snddev_info and provide accessor functions where necessary. * move the $FreeBSD$ tag in each .c file into a macro and allow the /dev/sndstat handler to display these when set to maximum verbosity to aid debugging. * allow each device to register its own sndstat handler to reduce the amount of groping sndstat must do in foreign structs.
2001-08-23 11:30:52 +00:00
#define PCM_SOFTC_SIZE 512
beginnings of virtual playback channel support instead of using two malloced arrays for storing channel lists, use an slist. convert the sndstat device to use sbufs and optionally provide more detail about channel state. vchans are software mixed playback channels. they are not enabled by this commit. they use the feeder infrastructure to emulate normal playback channels in a manner transparent to applications, whilst providing as many channels are desired, especially suitable for devices with only one hardware playback channel. in the future they will provide additional features. those wishing to test this functionality will need to add vchan.c to sys/conf/files and use 'sysctl -w hw.snd.pcm0.vchans' to enable it. blocksize and auto-rate selection are not yet supported.
2001-05-27 17:22:00 +00:00
mega-commit. this introduces a new buffering mechanism which results in dramatic simplification of the channel manager. as several structures have changed, we take the opportunity to move their definitions into the source files where they are used, make them private and de-typedef them. the sound drivers are updated to use snd_setup_intr instead of bus_setup_intr, and to comply with the de-typedefed structures. the ac97, mixer and channel layers have been updated with finegrained locking, as have some drivers- not all though. the rest will follow soon.
2001-03-24 23:10:29 +00:00
#define SND_STATUSLEN 64
/* descriptor of audio device */
MFS: sync with peter's isadma fixup
2000-08-09 01:22:09 +00:00
#ifndef ISADMA_WRITE
#define ISADMA_WRITE B_WRITE
#define ISADMA_READ B_READ
#define ISADMA_RAW B_RAW
#endif
add module metadata. this is a hack, sound drivers will eventually present a bus to which pcm, mixer, etc will attach.
2000-07-03 20:52:27 +00:00
#define PCM_MODVER 1
#define PCM_MINVER 1
#define PCM_PREFVER PCM_MODVER
#define PCM_MAXVER 1
use a global devclass for all drivers - i'm not entirely sure why this worked before. mixer, dsp and sndstat are seperate devices - give them their own cdevsws instead of demuxing requests sent to a single cdevsw. use the si_drv1/si_drv2 fields in dev_t structures for holding information specific to an open instance of mixer/dsp. nuke /dev/{dsp,dspW,audio}[0-9]* links - this functionality is now provided using cloning. various locking fixes.
2001-06-16 21:25:10 +00:00
/*
PROPOSAL:
each unit needs:
status, mixer, dsp, dspW, audio, sequencer, midi-in, seq2, sndproc = 9 devices
dspW and audio are deprecated.
dsp needs min 64 channels, will give it 256
minor = (unit << 20) + (dev << 16) + channel
currently minor = (channel << 16) + (unit << 4) + dev
nomenclature:
/dev/pcmX/dsp.(0..255)
/dev/pcmX/dspW
/dev/pcmX/audio
/dev/pcmX/status
/dev/pcmX/mixer
[etc.]
*/
#define PCMMINOR(x) (minor(x))
#define PCMCHAN(x) ((PCMMINOR(x) & 0x00ff0000) >> 16)
#define PCMUNIT(x) ((PCMMINOR(x) & 0x000000f0) >> 4)
#define PCMDEV(x) (PCMMINOR(x) & 0x0000000f)
#define PCMMKMINOR(u, d, c) ((((c) & 0xff) << 16) | (((u) & 0x0f) << 4) | ((d) & 0x0f))
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
#define SD_F_SIMPLEX 0x00000001
add a tunable/sysctl, hw.snd.autovchans. if this is set to a value n where n > 0, n vchans will be assigned to any devices that subsequently register with a single playback channel.
2001-06-26 21:54:55 +00:00
#define SD_F_AUTOVCHAN 0x00000002
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
#define SD_F_PRIO_RD 0x10000000
#define SD_F_PRIO_WR 0x20000000
#define SD_F_PRIO_SET (SD_F_PRIO_RD | SD_F_PRIO_WR)
#define SD_F_DIR_SET 0x40000000
#define SD_F_TRANSIENT 0xf0000000
/* many variables should be reduced to a range. Here define a macro */
#define RANGE(var, low, high) (var) = \
(((var)<(low))? (low) : ((var)>(high))? (high) : (var))
- latest 2ndbuffer patch - make chn_setdir work for rec on isa cards - note: es1371 does not irq in smp Submitted by: tanimura
1999-12-29 03:46:54 +00:00
#define DSP_BUFFSIZE (8192)
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
/* make figuring out what a format is easier. got AFMT_STEREO already */
tidy up a little, add a mask for 32bit formats
2000-09-05 20:56:31 +00:00
#define AFMT_32BIT (AFMT_S32_LE | AFMT_S32_BE | AFMT_U32_LE | AFMT_U32_BE)
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
#define AFMT_16BIT (AFMT_S16_LE | AFMT_S16_BE | AFMT_U16_LE | AFMT_U16_BE)
add AFMT_8BIT for easier determination of formats
2000-11-06 22:22:52 +00:00
#define AFMT_8BIT (AFMT_U8 | AFMT_S8)
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
#define AFMT_SIGNED (AFMT_S16_LE | AFMT_S16_BE | AFMT_S8)
#define AFMT_BIGENDIAN (AFMT_S16_BE | AFMT_U16_BE)
mega-commit. this introduces a new buffering mechanism which results in dramatic simplification of the channel manager. as several structures have changed, we take the opportunity to move their definitions into the source files where they are used, make them private and de-typedef them. the sound drivers are updated to use snd_setup_intr instead of bus_setup_intr, and to comply with the de-typedefed structures. the ac97, mixer and channel layers have been updated with finegrained locking, as have some drivers- not all though. the rest will follow soon.
2001-03-24 23:10:29 +00:00
struct pcm_channel *fkchan_setup(device_t dev);
int fkchan_kill(struct pcm_channel *c);
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
use a global devclass for all drivers - i'm not entirely sure why this worked before. mixer, dsp and sndstat are seperate devices - give them their own cdevsws instead of demuxing requests sent to a single cdevsw. use the si_drv1/si_drv2 fields in dev_t structures for holding information specific to an open instance of mixer/dsp. nuke /dev/{dsp,dspW,audio}[0-9]* links - this functionality is now provided using cloning. various locking fixes.
2001-06-16 21:25:10 +00:00
/*
* Major nuber for the sound driver.
*/
#define SND_CDEV_MAJOR 30
add a tunable/sysctl, hw.snd.autovchans. if this is set to a value n where n > 0, n vchans will be assigned to any devices that subsequently register with a single playback channel.
2001-06-26 21:54:55 +00:00
#define SND_MAXVCHANS 255
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
/*
* Minor numbers for the sound driver.
*
* Unfortunately Creative called the codec chip of SB as a DSP. For this
* reason the /dev/dsp is reserved for digitized audio use. There is a
* device for true DSP processors but it will be called something else.
* In v3.0 it's /dev/sndproc but this could be a temporary solution.
*/
#define SND_DEV_CTL 0 /* Control port /dev/mixer */
#define SND_DEV_SEQ 1 /* Sequencer /dev/sequencer */
#define SND_DEV_MIDIN 2 /* Raw midi access */
#define SND_DEV_DSP 3 /* Digitized voice /dev/dsp */
#define SND_DEV_AUDIO 4 /* Sparc compatible /dev/audio */
#define SND_DEV_DSP16 5 /* Like /dev/dsp but 16 bits/sample */
#define SND_DEV_STATUS 6 /* /dev/sndstat */
/* #7 not in use now. */
#define SND_DEV_SEQ2 8 /* /dev/sequencer, level 2 interface */
#define SND_DEV_SNDPROC 9 /* /dev/sndproc for programmable devices */
#define SND_DEV_PSS SND_DEV_SNDPROC /* ? */
* add a non-reset device- will not reset the channel on open. you will have to mknod yourself for now. * don't eat the first write() * partial rvplayer fix- don't panic on unaligned writes unless our feeder chain requires them for downconversion. a fuller fix is on the way.
1999-09-28 21:43:35 +00:00
#define SND_DEV_NORESET 10
add a method for recording of specific channels for devices with more than one hardware record channel. new devices, /dev/dsprX.Y where X is unit number and Y is channel index.
2001-09-05 16:28:41 +00:00
#define SND_DEV_DSPREC 11 /* recording channels */
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
#define DSP_DEFAULT_SPEED 8000
#define ON 1
#define OFF 0
use a global devclass for all drivers - i'm not entirely sure why this worked before. mixer, dsp and sndstat are seperate devices - give them their own cdevsws instead of demuxing requests sent to a single cdevsw. use the si_drv1/si_drv2 fields in dev_t structures for holding information specific to an open instance of mixer/dsp. nuke /dev/{dsp,dspW,audio}[0-9]* links - this functionality is now provided using cloning. various locking fixes.
2001-06-16 21:25:10 +00:00
extern int snd_unit;
extern devclass_t pcm_devclass;
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
/*
* some macros for debugging purposes
* DDB/DEB to enable/disable debugging stuff
* BVDDB to enable debugging when bootverbose
*/
#define DDB(x) x /* XXX */
#define BVDDB(x) if (bootverbose) x
#ifndef DEB
#define DEB(x)
#endif
Create a new sysctl node 'hw.snd' and move 'hw.sndunit' to 'hw.snd.unit'. Reviewed by: cg
2001-01-03 01:25:26 +00:00
SYSCTL_DECL(_hw_snd);
many changes: * add new channels to the end of the list so channels used in order of addition * de-globalise definition of struct snddev_info and provide accessor functions where necessary. * move the $FreeBSD$ tag in each .c file into a macro and allow the /dev/sndstat handler to display these when set to maximum verbosity to aid debugging. * allow each device to register its own sndstat handler to reduce the amount of groping sndstat must do in foreign structs.
2001-08-23 11:30:52 +00:00
struct sysctl_ctx_list *snd_sysctl_tree(device_t dev);
struct sysctl_oid *snd_sysctl_tree_top(device_t dev);
void pcm_lock(struct snddev_info *d);
void pcm_unlock(struct snddev_info *d);
struct pcm_channel *pcm_getfakechan(struct snddev_info *d);
add a method for recording of specific channels for devices with more than one hardware record channel. new devices, /dev/dsprX.Y where X is unit number and Y is channel index.
2001-09-05 16:28:41 +00:00
struct pcm_channel *pcm_chnalloc(struct snddev_info *d, int direction, pid_t pid, int chnum);
various locking fixes, rework open logic and channel registration PR: kern/28084
2001-06-14 13:31:30 +00:00
int pcm_chnrelease(struct pcm_channel *c);
beginnings of virtual playback channel support instead of using two malloced arrays for storing channel lists, use an slist. convert the sndstat device to use sbufs and optionally provide more detail about channel state. vchans are software mixed playback channels. they are not enabled by this commit. they use the feeder infrastructure to emulate normal playback channels in a manner transparent to applications, whilst providing as many channels are desired, especially suitable for devices with only one hardware playback channel. in the future they will provide additional features. those wishing to test this functionality will need to add vchan.c to sys/conf/files and use 'sysctl -w hw.snd.pcm0.vchans' to enable it. blocksize and auto-rate selection are not yet supported.
2001-05-27 17:22:00 +00:00
int pcm_chnref(struct pcm_channel *c, int ref);
many changes: * add new channels to the end of the list so channels used in order of addition * de-globalise definition of struct snddev_info and provide accessor functions where necessary. * move the $FreeBSD$ tag in each .c file into a macro and allow the /dev/sndstat handler to display these when set to maximum verbosity to aid debugging. * allow each device to register its own sndstat handler to reduce the amount of groping sndstat must do in foreign structs.
2001-08-23 11:30:52 +00:00
int pcm_inprog(struct snddev_info *d, int delta);
beginnings of virtual playback channel support instead of using two malloced arrays for storing channel lists, use an slist. convert the sndstat device to use sbufs and optionally provide more detail about channel state. vchans are software mixed playback channels. they are not enabled by this commit. they use the feeder infrastructure to emulate normal playback channels in a manner transparent to applications, whilst providing as many channels are desired, especially suitable for devices with only one hardware playback channel. in the future they will provide additional features. those wishing to test this functionality will need to add vchan.c to sys/conf/files and use 'sysctl -w hw.snd.pcm0.vchans' to enable it. blocksize and auto-rate selection are not yet supported.
2001-05-27 17:22:00 +00:00
struct pcm_channel *pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, int dir, void *devinfo);
int pcm_chn_destroy(struct pcm_channel *ch);
don't flag the playback hardchan as busy on devices with only one of them. if a device has vchans already but they are all busy, allocate another one at open() time, up to a maximum of hw.snd.maxvchans. when creating/destroying vchans, don't make/remove a devnode for the first/last one as it replaces a hardchan.
2001-06-27 19:59:45 +00:00
int pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch, int mkdev);
int pcm_chn_remove(struct snddev_info *d, struct pcm_channel *ch, int rmdev);
beginnings of virtual playback channel support instead of using two malloced arrays for storing channel lists, use an slist. convert the sndstat device to use sbufs and optionally provide more detail about channel state. vchans are software mixed playback channels. they are not enabled by this commit. they use the feeder infrastructure to emulate normal playback channels in a manner transparent to applications, whilst providing as many channels are desired, especially suitable for devices with only one hardware playback channel. in the future they will provide additional features. those wishing to test this functionality will need to add vchan.c to sys/conf/files and use 'sysctl -w hw.snd.pcm0.vchans' to enable it. blocksize and auto-rate selection are not yet supported.
2001-05-27 17:22:00 +00:00
kobjify. this gives us several benefits, including: * easier extensibility- new optional methods can be added to ac97/mixer/channel classes without having to fixup every driver. * forward compatibility for drivers, provided no new mandatory methods are added.
2000-12-18 01:36:41 +00:00
int pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo);
change tracking of channel counts. add method for retrieving "buffersize" hints for pcm devices, adjusted for specified minimum, maximum and default values.
2001-09-18 14:50:52 +00:00
unsigned int pcm_getbuffersize(device_t dev, unsigned int min, unsigned int deflt, unsigned int max);
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
int pcm_register(device_t dev, void *devinfo, int numplay, int numrec);
change mixer api slightly change channel interface - kobj implementation coming soonish make pcm_makelinks not panic if modular add pcm_unregister() these changes support newpcm kld unloading, but this is only implemented by ds1.c
2000-09-01 20:09:24 +00:00
int pcm_unregister(device_t dev);
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
int pcm_setstatus(device_t dev, char *str);
u_int32_t pcm_getflags(device_t dev);
void pcm_setflags(device_t dev, u_int32_t val);
update the ac97 layer: * add a callback for initialising the mixer interface * support ac97 2.1 variable rate audio feature fix ac97-using drivers for the above add suspend/resume support for neomagic
2000-03-20 15:30:50 +00:00
void *pcm_getdevinfo(device_t dev);
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
add functions for sound drivers to use for locking and setting up interrupt handlers. these are not yet used, but will allow compatibility for driver modules from 5.x to 4.x.
2001-02-27 07:45:09 +00:00
int snd_setup_intr(device_t dev, struct resource *res, int flags,
driver_intr_t hand, void *param, void **cookiep);
void *snd_mtxcreate(const char *desc);
void snd_mtxfree(void *m);
void snd_mtxassert(void *m);
void snd_mtxlock(void *m);
void snd_mtxunlock(void *m);
many changes: * add new channels to the end of the list so channels used in order of addition * de-globalise definition of struct snddev_info and provide accessor functions where necessary. * move the $FreeBSD$ tag in each .c file into a macro and allow the /dev/sndstat handler to display these when set to maximum verbosity to aid debugging. * allow each device to register its own sndstat handler to reduce the amount of groping sndstat must do in foreign structs.
2001-08-23 11:30:52 +00:00
int sysctl_hw_snd_vchans(SYSCTL_HANDLER_ARGS);
typedef int (*sndstat_handler)(struct sbuf *s, device_t dev, int verbose);
int sndstat_register(device_t dev, char *str, sndstat_handler handler);
int sndstat_registerfile(char *str);
int sndstat_unregister(device_t dev);
int sndstat_unregisterfile(char *str);
- Correctly increment the channel refcount in dsp_open() such that it is no longer possible to unload the driver module while sound is playing (which resulted in a panic). - Fix a similar problem with the sndstat device that I found while looking at the above. - Append a newline character to error messages in pcm_unregister() Reviewed by: cg MFC after: 10 days
2001-09-14 20:26:03 +00:00
int sndstat_busy(void);
many changes: * add new channels to the end of the list so channels used in order of addition * de-globalise definition of struct snddev_info and provide accessor functions where necessary. * move the $FreeBSD$ tag in each .c file into a macro and allow the /dev/sndstat handler to display these when set to maximum verbosity to aid debugging. * allow each device to register its own sndstat handler to reduce the amount of groping sndstat must do in foreign structs.
2001-08-23 11:30:52 +00:00
#define SND_DECLARE_FILE(version) \
_SND_DECLARE_FILE(__LINE__, version)
#define _SND_DECLARE_FILE(uniq, version) \
__SND_DECLARE_FILE(uniq, version)
#define __SND_DECLARE_FILE(uniq, version) \
static char sndstat_vinfo[] = version; \
SYSINIT(sdf_ ## uniq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, sndstat_registerfile, sndstat_vinfo); \
SYSUNINIT(sdf_ ## uniq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, sndstat_unregisterfile, sndstat_vinfo);
say hello to newpcm. it is not yet enabled, requiring new pnp code from dfr to compile successfully. further details will be provided in the commit enabling newpcm.
1999-09-01 04:08:39 +00:00
/* usage of flags in device config entry (config file) */
#define DV_F_DRQ_MASK 0x00000007 /* mask for secondary drq */
#define DV_F_DUAL_DMA 0x00000010 /* set to use secondary dma channel */
/* ought to be made obsolete */
#define DV_F_DEV_MASK 0x0000ff00 /* force device type/class */
#define DV_F_DEV_SHIFT 8 /* force device type/class */
many changes: * add new channels to the end of the list so channels used in order of addition * de-globalise definition of struct snddev_info and provide accessor functions where necessary. * move the $FreeBSD$ tag in each .c file into a macro and allow the /dev/sndstat handler to display these when set to maximum verbosity to aid debugging. * allow each device to register its own sndstat handler to reduce the amount of groping sndstat must do in foreign structs.
2001-08-23 11:30:52 +00:00
#endif /* _KERNEL */
#endif /* _OS_H_ */
Reference in New Issue Copy Permalink