Deleted Added
sdiff udiff text old ( 119690 ) new ( 126695 )
full compact
csapcm.c (119690) csapcm.c (126695)
1/*
2 * Copyright (c) 1999 Seigo Tanimura
3 * All rights reserved.
4 *
5 * Portions of this source are based on cwcealdr.cpp and dhwiface.cpp in
6 * cwcealdr1.zip, the sample sources by Crystal Semiconductor.
7 * Copyright (c) 1996-1998 Crystal Semiconductor Corp.
8 *

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

33#include <dev/sound/pcm/ac97.h>
34#include <dev/sound/chip.h>
35#include <dev/sound/pci/csareg.h>
36#include <dev/sound/pci/csavar.h>
37
38#include <dev/pci/pcireg.h>
39#include <dev/pci/pcivar.h>
40
1/*
2 * Copyright (c) 1999 Seigo Tanimura
3 * All rights reserved.
4 *
5 * Portions of this source are based on cwcealdr.cpp and dhwiface.cpp in
6 * cwcealdr1.zip, the sample sources by Crystal Semiconductor.
7 * Copyright (c) 1996-1998 Crystal Semiconductor Corp.
8 *

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

33#include <dev/sound/pcm/ac97.h>
34#include <dev/sound/chip.h>
35#include <dev/sound/pci/csareg.h>
36#include <dev/sound/pci/csavar.h>
37
38#include <dev/pci/pcireg.h>
39#include <dev/pci/pcivar.h>
40
41SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/csapcm.c 119690 2003-09-02 17:30:40Z jhb $");
41SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/csapcm.c 126695 2004-03-06 15:52:42Z matk $");
42
43/* Buffer size on dma transfer. Fixed for CS416x. */
44#define CS461x_BUFFSIZE (4 * 1024)
45
46#define GOF_PER_SEC 200
47
48/* device private data */
49struct csa_info;

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

783 if (csa->card->inv_eapd)
784 ac97_setflags(codec, AC97_F_EAPD_INV);
785 if (mixer_init(dev, ac97_getmixerclass(), codec) == -1) {
786 ac97_destroy(codec);
787 csa_releaseres(csa, dev);
788 return (ENXIO);
789 }
790
42
43/* Buffer size on dma transfer. Fixed for CS416x. */
44#define CS461x_BUFFSIZE (4 * 1024)
45
46#define GOF_PER_SEC 200
47
48/* device private data */
49struct csa_info;

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

783 if (csa->card->inv_eapd)
784 ac97_setflags(codec, AC97_F_EAPD_INV);
785 if (mixer_init(dev, ac97_getmixerclass(), codec) == -1) {
786 ac97_destroy(codec);
787 csa_releaseres(csa, dev);
788 return (ENXIO);
789 }
790
791 snprintf(status, SND_STATUSLEN, "at irq %ld", rman_get_start(resp->irq));
791 snprintf(status, SND_STATUSLEN, "at irq %ld %s",
792 rman_get_start(resp->irq),PCM_KLDSTRING(snd_csa));
792
793 /* Enable interrupt. */
794 if (snd_setup_intr(dev, resp->irq, INTR_MPSAFE, csa_intr, csa, &csa->ih)) {
795 ac97_destroy(codec);
796 csa_releaseres(csa, dev);
797 return (ENXIO);
798 }
799 csa_writemem(resp, BA1_PFIE, csa_readmem(resp, BA1_PFIE) & ~0x0000f03f);

--- 50 unchanged lines hidden --- 		793
794 /* Enable interrupt. */
795 if (snd_setup_intr(dev, resp->irq, INTR_MPSAFE, csa_intr, csa, &csa->ih)) {
796 ac97_destroy(codec);
797 csa_releaseres(csa, dev);
798 return (ENXIO);
799 }
800 csa_writemem(resp, BA1_PFIE, csa_readmem(resp, BA1_PFIE) & ~0x0000f03f);

--- 50 unchanged lines hidden ---