Deleted Added
full compact
ess.c (119853) ess.c (126695)
1/*
2 * Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
3 * Copyright 1997,1998 Luigi Rizzo.
4 *
5 * Derived from files in the Voxware 3.5 distribution,
6 * Copyright by Hannu Savolainen 1994, under the same copyright
7 * conditions.
8 * All rights reserved.

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

33
34#include <dev/sound/isa/sb.h>
35#include <dev/sound/chip.h>
36
37#include <isa/isavar.h>
38
39#include "mixer_if.h"
40
1/*
2 * Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
3 * Copyright 1997,1998 Luigi Rizzo.
4 *
5 * Derived from files in the Voxware 3.5 distribution,
6 * Copyright by Hannu Savolainen 1994, under the same copyright
7 * conditions.
8 * All rights reserved.

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

33
34#include <dev/sound/isa/sb.h>
35#include <dev/sound/chip.h>
36
37#include <isa/isavar.h>
38
39#include "mixer_if.h"
40
41SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/isa/ess.c 119853 2003-09-07 16:28:03Z cg $");
41SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/isa/ess.c 126695 2004-03-06 15:52:42Z matk $");
42
43#define ESS_BUFFSIZE (4096)
44#define ABS(x) (((x) < 0)? -(x) : (x))
45
46/* audio2 never generates irqs and sounds very noisy */
47#undef ESS18XX_DUPLEX
48
49/* more accurate clocks and split audio1/audio2 rates */

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

861 goto no;
862 }
863
864 if (sc->drq2)
865 snprintf(buf, SND_STATUSLEN, ":%ld", rman_get_start(sc->drq2));
866 else
867 buf[0] = '\0';
868
42
43#define ESS_BUFFSIZE (4096)
44#define ABS(x) (((x) < 0)? -(x) : (x))
45
46/* audio2 never generates irqs and sounds very noisy */
47#undef ESS18XX_DUPLEX
48
49/* more accurate clocks and split audio1/audio2 rates */

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

861 goto no;
862 }
863
864 if (sc->drq2)
865 snprintf(buf, SND_STATUSLEN, ":%ld", rman_get_start(sc->drq2));
866 else
867 buf[0] = '\0';
868
869 snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %u",
869 snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld drq %ld%s bufsz %u %s",
870 rman_get_start(sc->io_base), rman_get_start(sc->irq),
870 rman_get_start(sc->io_base), rman_get_start(sc->irq),
871 rman_get_start(sc->drq1), buf, sc->bufsize);
871 rman_get_start(sc->drq1), buf, sc->bufsize,
872 PCM_KLDSTRING(snd_ess));
872
873 if (pcm_register(dev, sc, 1, 1))
874 goto no;
875 pcm_addchan(dev, PCMDIR_REC, &esschan_class, sc);
876 pcm_addchan(dev, PCMDIR_PLAY, &esschan_class, sc);
877 pcm_setstatus(dev, status);
878
879 return 0;

--- 131 unchanged lines hidden ---
873
874 if (pcm_register(dev, sc, 1, 1))
875 goto no;
876 pcm_addchan(dev, PCMDIR_REC, &esschan_class, sc);
877 pcm_addchan(dev, PCMDIR_PLAY, &esschan_class, sc);
878 pcm_setstatus(dev, status);
879
880 return 0;

--- 131 unchanged lines hidden ---