Deleted Added
full compact
neomagic.c (55878) neomagic.c (56249)
1/*
2 * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
3 * All rights reserved.
4 *
5 * Derived from the public domain Linux driver
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

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

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

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

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

609 goto bad;
610 }
611
612 if (nm_init(sc) == -1) {
613 device_printf(dev, "unable to initialize the card\n");
614 goto bad;
615 }
616
29 */
30
31#include "pci.h"
32#include "pcm.h"
33
34#include <dev/sound/pcm/sound.h>
35#include <dev/sound/pcm/ac97.h>
36#include <dev/sound/pci/neomagic.h>

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

609 goto bad;
610 }
611
612 if (nm_init(sc) == -1) {
613 device_printf(dev, "unable to initialize the card\n");
614 goto bad;
615 }
616
617 codec = ac97_create(sc, nm_rdcd, nm_wrcd);
617 codec = ac97_create(dev, sc, nm_rdcd, nm_wrcd);
618 if (codec == NULL) goto bad;
619 mixer_init(d, &ac97_mixer, codec);
620
621 sc->irqid = 0;
622 sc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->irqid,
623 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE);
624 if (!sc->irq ||
625 bus_setup_intr(dev, sc->irq, INTR_TYPE_TTY, nm_intr, sc, &sc->ih)) {

--- 41 unchanged lines hidden ---
618 if (codec == NULL) goto bad;
619 mixer_init(d, &ac97_mixer, codec);
620
621 sc->irqid = 0;
622 sc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->irqid,
623 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE);
624 if (!sc->irq ||
625 bus_setup_intr(dev, sc->irq, INTR_TYPE_TTY, nm_intr, sc, &sc->ih)) {

--- 41 unchanged lines hidden ---