Deleted Added
full compact
emu10k1.c (59657) emu10k1.c (60833)
1/*
2 * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

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

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHERIN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/dev/sound/pci/emu10k1.c 59657 2000-04-26 19:51:19Z cg $
26 * $FreeBSD: head/sys/dev/sound/pci/emu10k1.c 60833 2000-05-23 20:41:01Z jake $
27 */
28
29#include "pci.h"
30#include "pcm.h"
31
32#include <dev/sound/pcm/sound.h>
33#include <dev/sound/pcm/ac97.h>
34#include <gnu/dev/sound/pci/emu10k1.h>

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

39
40/* -------------------------------------------------------------------- */
41
42#define EMU10K1_PCI_ID 0x00021102
43#define EMU_BUFFSIZE 4096
44#undef EMUDEBUG
45
46struct emu_memblk {
27 */
28
29#include "pci.h"
30#include "pcm.h"
31
32#include <dev/sound/pcm/sound.h>
33#include <dev/sound/pcm/ac97.h>
34#include <gnu/dev/sound/pci/emu10k1.h>

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

39
40/* -------------------------------------------------------------------- */
41
42#define EMU10K1_PCI_ID 0x00021102
43#define EMU_BUFFSIZE 4096
44#undef EMUDEBUG
45
46struct emu_memblk {
47 SLIST_ENTRY(emu_memblk) link;
47 SLIST_ENTRY(struct emu_memblk) link;
48 void *buf;
49 u_int32_t pte_start, pte_size;
50};
51
52struct emu_mem {
53 u_int8_t bmap[MAXPAGES / 8];
54 u_int32_t *ptb_pages;
55 void *silent_page;
48 void *buf;
49 u_int32_t pte_start, pte_size;
50};
51
52struct emu_mem {
53 u_int8_t bmap[MAXPAGES / 8];
54 u_int32_t *ptb_pages;
55 void *silent_page;
56 SLIST_HEAD(, emu_memblk) blocks;
56 SLIST_HEAD(, struct emu_memblk) blocks;
57};
58
59struct emu_voice {
60 int vnum;
61 int b16:1, stereo:1, busy:1, running:1, ismaster:1, istracker:1;
62 int speed;
63 int start, end, vol;
64 u_int32_t buf;

--- 1148 unchanged lines hidden ---
57};
58
59struct emu_voice {
60 int vnum;
61 int b16:1, stereo:1, busy:1, running:1, ismaster:1, istracker:1;
62 int speed;
63 int start, end, vol;
64 u_int32_t buf;

--- 1148 unchanged lines hidden ---