Deleted Added
full compact
neomagic.c (58905) neomagic.c (60711)
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 58905 2000-04-01 22:24:03Z cg $
28 * $FreeBSD: head/sys/dev/sound/pci/neomagic.c 60711 2000-05-19 15:41:52Z nyan $
29 */
30
31#include <dev/sound/pcm/sound.h>
32#include <dev/sound/pcm/ac97.h>
33#include <dev/sound/pci/neomagic.h>
34#include <dev/sound/pci/neomagic-coeff.h>
35
36#include <pci/pcireg.h>

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

344 struct sc_info *sc = devinfo;
345 struct sc_chinfo *ch;
346 u_int32_t chnbuf;
347
348 chnbuf = (dir == PCMDIR_PLAY)? sc->pbuf : sc->rbuf;
349 ch = (dir == PCMDIR_PLAY)? &sc->pch : &sc->rch;
350 ch->buffer = b;
351 ch->buffer->bufsize = NM_BUFFSIZE;
29 */
30
31#include <dev/sound/pcm/sound.h>
32#include <dev/sound/pcm/ac97.h>
33#include <dev/sound/pci/neomagic.h>
34#include <dev/sound/pci/neomagic-coeff.h>
35
36#include <pci/pcireg.h>

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

344 struct sc_info *sc = devinfo;
345 struct sc_chinfo *ch;
346 u_int32_t chnbuf;
347
348 chnbuf = (dir == PCMDIR_PLAY)? sc->pbuf : sc->rbuf;
349 ch = (dir == PCMDIR_PLAY)? &sc->pch : &sc->rch;
350 ch->buffer = b;
351 ch->buffer->bufsize = NM_BUFFSIZE;
352 ch->buffer->buf = (u_int8_t *)(rman_get_bushandle(sc->buf) + chnbuf);
352 ch->buffer->buf = (u_int8_t *)(rman_get_start(sc->buf) + chnbuf);
353 if (bootverbose)
354 device_printf(sc->dev, "%s buf %p\n", (dir == PCMDIR_PLAY)?
355 "play" : "rec", ch->buffer->buf);
356 ch->parent = sc;
357 ch->channel = c;
358 ch->dir = dir;
359 return ch;
360}

--- 337 unchanged lines hidden ---
353 if (bootverbose)
354 device_printf(sc->dev, "%s buf %p\n", (dir == PCMDIR_PLAY)?
355 "play" : "rec", ch->buffer->buf);
356 ch->parent = sc;
357 ch->channel = c;
358 ch->dir = dir;
359 return ch;
360}

--- 337 unchanged lines hidden ---