Deleted Added
full compact
sound.c (77269) sound.c (77843)
1/*
2 * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
3 * (C) 1997 Luigi Rizzo (luigi@iet.unipi.it)
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 * (C) 1997 Luigi Rizzo (luigi@iet.unipi.it)
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.c 77269 2001-05-27 17:22:00Z cg $
27 * $FreeBSD: head/sys/dev/sound/pcm/sound.c 77843 2001-06-06 22:17:08Z peter $
28 */
29
30#include <dev/sound/pcm/sound.h>
31#include <dev/sound/pcm/vchan.h>
32#include <sys/sysctl.h>
33#include <sys/sbuf.h>
34
35#include "feeder_if.h"

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

87#define PCMCHAN(x) ((PCMMINOR(x) & 0x00ff0000) >> 16)
88#define PCMUNIT(x) ((PCMMINOR(x) & 0x000000f0) >> 4)
89#define PCMDEV(x) (PCMMINOR(x) & 0x0000000f)
90#define PCMMKMINOR(u, d, c) ((((c) & 0xff) << 16) | (((u) & 0x0f) << 4) | ((d) & 0x0f))
91
92static devclass_t pcm_devclass;
93
94#ifdef USING_DEVFS
28 */
29
30#include <dev/sound/pcm/sound.h>
31#include <dev/sound/pcm/vchan.h>
32#include <sys/sysctl.h>
33#include <sys/sbuf.h>
34
35#include "feeder_if.h"

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

87#define PCMCHAN(x) ((PCMMINOR(x) & 0x00ff0000) >> 16)
88#define PCMUNIT(x) ((PCMMINOR(x) & 0x000000f0) >> 4)
89#define PCMDEV(x) (PCMMINOR(x) & 0x0000000f)
90#define PCMMKMINOR(u, d, c) ((((c) & 0xff) << 16) | (((u) & 0x0f) << 4) | ((d) & 0x0f))
91
92static devclass_t pcm_devclass;
93
94#ifdef USING_DEVFS
95static int snd_unit;
96TUNABLE_INT_DECL("hw.snd.unit", 0, snd_unit);
95static int snd_unit = 0;
96TUNABLE_INT("hw.snd.unit", &snd_unit);
97#endif
98
99SYSCTL_NODE(_hw, OID_AUTO, snd, CTLFLAG_RD, 0, "Sound driver");
100
101void *
102snd_mtxcreate(const char *desc)
103{
104#ifdef USING_MUTEX

--- 796 unchanged lines hidden ---
97#endif
98
99SYSCTL_NODE(_hw, OID_AUTO, snd, CTLFLAG_RD, 0, "Sound driver");
100
101void *
102snd_mtxcreate(const char *desc)
103{
104#ifdef USING_MUTEX

--- 796 unchanged lines hidden ---