Deleted Added
full compact
es137x.c (119853) es137x.c (126695)
1/*
2 * Support the ENSONIQ AudioPCI board and Creative Labs SoundBlaster PCI
3 * boards based on the ES1370, ES1371 and ES1373 chips.
4 *
5 * Copyright (c) 1999 Russell Cattelan <cattelan@thebarn.com>
6 * Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
7 * Copyright (c) 1998 by Joachim Kuebart. All rights reserved.
8 *

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

54
55#include <dev/pci/pcireg.h>
56#include <dev/pci/pcivar.h>
57
58#include <sys/sysctl.h>
59
60#include "mixer_if.h"
61
1/*
2 * Support the ENSONIQ AudioPCI board and Creative Labs SoundBlaster PCI
3 * boards based on the ES1370, ES1371 and ES1373 chips.
4 *
5 * Copyright (c) 1999 Russell Cattelan <cattelan@thebarn.com>
6 * Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
7 * Copyright (c) 1998 by Joachim Kuebart. All rights reserved.
8 *

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

54
55#include <dev/pci/pcireg.h>
56#include <dev/pci/pcivar.h>
57
58#include <sys/sysctl.h>
59
60#include "mixer_if.h"
61
62SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/es137x.c 119853 2003-09-07 16:28:03Z cg $");
62SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/es137x.c 126695 2004-03-06 15:52:42Z matk $");
63
64static int debug = 0;
65SYSCTL_INT(_debug, OID_AUTO, es_debug, CTLFLAG_RW, &debug, 0, "");
66
67#define MEM_MAP_REG 0x14
68
69/* PCI IDs of supported chips */
70#define ES1370_PCI_ID 0x50001274

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

919 /*filter*/NULL, /*filterarg*/NULL,
920 /*maxsize*/es->bufsz, /*nsegments*/1, /*maxsegz*/0x3ffff,
921 /*flags*/0, /*lockfunc*/busdma_lock_mutex,
922 /*lockarg*/&Giant, &es->parent_dmat) != 0) {
923 device_printf(dev, "unable to create dma tag\n");
924 goto bad;
925 }
926
63
64static int debug = 0;
65SYSCTL_INT(_debug, OID_AUTO, es_debug, CTLFLAG_RW, &debug, 0, "");
66
67#define MEM_MAP_REG 0x14
68
69/* PCI IDs of supported chips */
70#define ES1370_PCI_ID 0x50001274

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

919 /*filter*/NULL, /*filterarg*/NULL,
920 /*maxsize*/es->bufsz, /*nsegments*/1, /*maxsegz*/0x3ffff,
921 /*flags*/0, /*lockfunc*/busdma_lock_mutex,
922 /*lockarg*/&Giant, &es->parent_dmat) != 0) {
923 device_printf(dev, "unable to create dma tag\n");
924 goto bad;
925 }
926
927 snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld",
927 snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld %s",
928 (es->regtype == SYS_RES_IOPORT)? "io" : "memory",
928 (es->regtype == SYS_RES_IOPORT)? "io" : "memory",
929 rman_get_start(es->reg), rman_get_start(es->irq));
929 rman_get_start(es->reg), rman_get_start(es->irq),PCM_KLDSTRING(snd_es137x));
930
931 if (pcm_register(dev, es, 1, 1)) goto bad;
932 pcm_addchan(dev, PCMDIR_REC, ct, es);
933 pcm_addchan(dev, PCMDIR_PLAY, ct, es);
934 pcm_setstatus(dev, status);
935
936 return 0;
937

--- 48 unchanged lines hidden ---
930
931 if (pcm_register(dev, es, 1, 1)) goto bad;
932 pcm_addchan(dev, PCMDIR_REC, ct, es);
933 pcm_addchan(dev, PCMDIR_PLAY, ct, es);
934 pcm_setstatus(dev, status);
935
936 return 0;
937

--- 48 unchanged lines hidden ---