Deleted Added
full compact
aureal.c (55204) aureal.c (56249)
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, WHETHER IN 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 THE POSSIBILITY 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, WHETHER IN 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 THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/dev/sound/pci/aureal.c 55204 1999-12-29 03:46:54Z cg $
26 * $FreeBSD: head/sys/dev/sound/pci/aureal.c 56249 2000-01-18 17:13:43Z cg $
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 <dev/sound/pci/aureal.h>

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

631
632 if (au_testirq(au)) device_printf(dev, "irq test failed\n");
633
634 if (au_init(dev, au) == -1) {
635 device_printf(dev, "unable to initialize the card\n");
636 goto bad;
637 }
638
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 <dev/sound/pci/aureal.h>

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

631
632 if (au_testirq(au)) device_printf(dev, "irq test failed\n");
633
634 if (au_init(dev, au) == -1) {
635 device_printf(dev, "unable to initialize the card\n");
636 goto bad;
637 }
638
639 codec = ac97_create(au, au_rdcd, au_wrcd);
639 codec = ac97_create(dev, au, au_rdcd, au_wrcd);
640 if (codec == NULL) goto bad;
641 mixer_init(d, &ac97_mixer, codec);
642
643 if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0,
644 /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
645 /*highaddr*/BUS_SPACE_MAXADDR,
646 /*filter*/NULL, /*filterarg*/NULL,
647 /*maxsize*/AU_BUFFSIZE, /*nsegments*/1, /*maxsegz*/0x3ffff,

--- 42 unchanged lines hidden ---
640 if (codec == NULL) goto bad;
641 mixer_init(d, &ac97_mixer, codec);
642
643 if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0,
644 /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
645 /*highaddr*/BUS_SPACE_MAXADDR,
646 /*filter*/NULL, /*filterarg*/NULL,
647 /*maxsize*/AU_BUFFSIZE, /*nsegments*/1, /*maxsegz*/0x3ffff,

--- 42 unchanged lines hidden ---