Deleted Added
full compact
sound.h (74763) sound.h (77269)
1/*
2 * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
3 * Copyright by Hannu Savolainen 1995
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 10 unchanged lines hidden (view full) ---

19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 *
1/*
2 * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
3 * Copyright by Hannu Savolainen 1995
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 10 unchanged lines hidden (view full) ---

19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 *
27 * $FreeBSD: head/sys/dev/sound/pcm/sound.h 74763 2001-03-24 23:10:29Z cg $
27 * $FreeBSD: head/sys/dev/sound/pcm/sound.h 77269 2001-05-27 17:22:00Z cg $
28 */
29
30/*
31 * first, include kernel header files.
32 */
33
34#ifndef _OS_H_
35#define _OS_H_

--- 57 unchanged lines hidden (view full) ---

93struct snd_mixer;
94
95#include <dev/sound/pcm/buffer.h>
96#include <dev/sound/pcm/channel.h>
97#include <dev/sound/pcm/feeder.h>
98#include <dev/sound/pcm/mixer.h>
99#include <dev/sound/pcm/dsp.h>
100
28 */
29
30/*
31 * first, include kernel header files.
32 */
33
34#ifndef _OS_H_
35#define _OS_H_

--- 57 unchanged lines hidden (view full) ---

93struct snd_mixer;
94
95#include <dev/sound/pcm/buffer.h>
96#include <dev/sound/pcm/channel.h>
97#include <dev/sound/pcm/feeder.h>
98#include <dev/sound/pcm/mixer.h>
99#include <dev/sound/pcm/dsp.h>
100
101struct snddev_channel {
102 SLIST_ENTRY(snddev_channel) link;
103 struct pcm_channel *channel;
104};
105
101#define SND_STATUSLEN 64
102/* descriptor of audio device */
103struct snddev_info {
106#define SND_STATUSLEN 64
107/* descriptor of audio device */
108struct snddev_info {
104 struct pcm_channel *play, *rec, **aplay, **arec, *fakechan;
105 int *ref;
106 unsigned playcount, reccount, chancount, maxchans;
109 SLIST_HEAD(, snddev_channel) channels;
110 struct pcm_channel **aplay, **arec, *fakechan;
111 unsigned chancount, maxchans;
107 struct snd_mixer *mixer;
108 unsigned flags;
109 void *devinfo;
110 device_t dev;
111 char status[SND_STATUSLEN];
112 struct sysctl_ctx_list sysctl_tree;
113 struct sysctl_oid *sysctl_tree_top;
114 struct mtx mutex;

--- 73 unchanged lines hidden (view full) ---

188#define BVDDB(x) if (bootverbose) x
189
190#ifndef DEB
191#define DEB(x)
192#endif
193
194SYSCTL_DECL(_hw_snd);
195
112 struct snd_mixer *mixer;
113 unsigned flags;
114 void *devinfo;
115 device_t dev;
116 char status[SND_STATUSLEN];
117 struct sysctl_ctx_list sysctl_tree;
118 struct sysctl_oid *sysctl_tree_top;
119 struct mtx mutex;

--- 73 unchanged lines hidden (view full) ---

193#define BVDDB(x) if (bootverbose) x
194
195#ifndef DEB
196#define DEB(x)
197#endif
198
199SYSCTL_DECL(_hw_snd);
200
201struct pcm_channel *pcm_chnalloc(struct snddev_info *d, int direction);
202int pcm_chnfree(struct pcm_channel *c);
203int pcm_chnref(struct pcm_channel *c, int ref);
204
205struct pcm_channel *pcm_chn_create(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, int dir, void *devinfo);
206int pcm_chn_destroy(struct pcm_channel *ch);
207int pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch);
208int pcm_chn_remove(struct snddev_info *d, struct pcm_channel *ch);
209
196int pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo);
197int pcm_register(device_t dev, void *devinfo, int numplay, int numrec);
198int pcm_unregister(device_t dev);
199int pcm_setstatus(device_t dev, char *str);
200u_int32_t pcm_getflags(device_t dev);
201void pcm_setflags(device_t dev, u_int32_t val);
202void *pcm_getdevinfo(device_t dev);
203

--- 18 unchanged lines hidden ---
210int pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo);
211int pcm_register(device_t dev, void *devinfo, int numplay, int numrec);
212int pcm_unregister(device_t dev);
213int pcm_setstatus(device_t dev, char *str);
214u_int32_t pcm_getflags(device_t dev);
215void pcm_setflags(device_t dev, u_int32_t val);
216void *pcm_getdevinfo(device_t dev);
217

--- 18 unchanged lines hidden ---