Deleted Added
full compact
sound.h (160439) sound.h (162588)
1/*-
2 * Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
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 <cg@freebsd.org>
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 160439 2006-07-17 17:43:06Z netchild $
27 * $FreeBSD: head/sys/dev/sound/pcm/sound.h 162588 2006-09-23 20:45:47Z netchild $
28 */
29
30/*
31 * first, include kernel header files.
32 */
33
34#ifndef _OS_H_
35#define _OS_H_

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

68#include <vm/pmap.h>
69
70#undef USING_MUTEX
71#undef USING_DEVFS
72
73#if __FreeBSD_version > 500000
74#include <sys/lock.h>
75#include <sys/mutex.h>
28 */
29
30/*
31 * first, include kernel header files.
32 */
33
34#ifndef _OS_H_
35#define _OS_H_

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

68#include <vm/pmap.h>
69
70#undef USING_MUTEX
71#undef USING_DEVFS
72
73#if __FreeBSD_version > 500000
74#include <sys/lock.h>
75#include <sys/mutex.h>
76#include <sys/condvar.h>
76
77#define USING_MUTEX
78#define USING_DEVFS
79#else
80#define INTR_TYPE_AV INTR_TYPE_TTY
81#define INTR_MPSAFE 0
82#endif
83
84#define SND_DYNSYSCTL
85
86struct pcm_channel;
87struct pcm_feeder;
88struct snd_dbuf;
89struct snd_mixer;
90
91#include <dev/sound/pcm/buffer.h>
92#include <dev/sound/pcm/channel.h>
93#include <dev/sound/pcm/feeder.h>
94#include <dev/sound/pcm/mixer.h>
77
78#define USING_MUTEX
79#define USING_DEVFS
80#else
81#define INTR_TYPE_AV INTR_TYPE_TTY
82#define INTR_MPSAFE 0
83#endif
84
85#define SND_DYNSYSCTL
86
87struct pcm_channel;
88struct pcm_feeder;
89struct snd_dbuf;
90struct snd_mixer;
91
92#include <dev/sound/pcm/buffer.h>
93#include <dev/sound/pcm/channel.h>
94#include <dev/sound/pcm/feeder.h>
95#include <dev/sound/pcm/mixer.h>
96#include <dev/sound/pcm/dsp.h>
95
96#define PCM_SOFTC_SIZE 512
97
98#define SND_STATUSLEN 64
99
100#define SOUND_MODVER 1
101
102#define SOUND_MINVER 1

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

188#define DSP_DEFAULT_SPEED 8000
189
190#define ON 1
191#define OFF 0
192
193extern int pcm_veto_load;
194extern int snd_unit;
195extern devclass_t pcm_devclass;
97
98#define PCM_SOFTC_SIZE 512
99
100#define SND_STATUSLEN 64
101
102#define SOUND_MODVER 1
103
104#define SOUND_MINVER 1

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

190#define DSP_DEFAULT_SPEED 8000
191
192#define ON 1
193#define OFF 0
194
195extern int pcm_veto_load;
196extern int snd_unit;
197extern devclass_t pcm_devclass;
198extern struct unrhdr *pcmsg_unrhdr;
196
197/*
198 * some macros for debugging purposes
199 * DDB/DEB to enable/disable debugging stuff
200 * BVDDB to enable debugging when bootverbose
201 */
202#define BVDDB(x) if (bootverbose) x
203

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

299 char status[SND_STATUSLEN];
300 struct sysctl_ctx_list sysctl_tree;
301 struct sysctl_oid *sysctl_tree_top;
302 struct mtx *lock;
303 struct cdev *mixer_dev;
304
305};
306
199
200/*
201 * some macros for debugging purposes
202 * DDB/DEB to enable/disable debugging stuff
203 * BVDDB to enable debugging when bootverbose
204 */
205#define BVDDB(x) if (bootverbose) x
206

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

302 char status[SND_STATUSLEN];
303 struct sysctl_ctx_list sysctl_tree;
304 struct sysctl_oid *sysctl_tree_top;
305 struct mtx *lock;
306 struct cdev *mixer_dev;
307
308};
309
310void sound_oss_sysinfo(oss_sysinfo *);
311
307#ifdef PCM_DEBUG_MTX
308#define pcm_lock(d) mtx_lock(((struct snddev_info *)(d))->lock)
309#define pcm_unlock(d) mtx_unlock(((struct snddev_info *)(d))->lock)
310#else
311void pcm_lock(struct snddev_info *d);
312void pcm_unlock(struct snddev_info *d);
313#endif
314
315#ifdef KLD_MODULE
316#define PCM_KLDSTRING(a) ("kld " # a)
317#else
318#define PCM_KLDSTRING(a) ""
319#endif
320
321#endif /* _KERNEL */
322
323#endif /* _OS_H_ */
312#ifdef PCM_DEBUG_MTX
313#define pcm_lock(d) mtx_lock(((struct snddev_info *)(d))->lock)
314#define pcm_unlock(d) mtx_unlock(((struct snddev_info *)(d))->lock)
315#else
316void pcm_lock(struct snddev_info *d);
317void pcm_unlock(struct snddev_info *d);
318#endif
319
320#ifdef KLD_MODULE
321#define PCM_KLDSTRING(a) ("kld " # a)
322#else
323#define PCM_KLDSTRING(a) ""
324#endif
325
326#endif /* _KERNEL */
327
328#endif /* _OS_H_ */