Deleted Added
full compact
es137x.c (56154) es137x.c (56249)
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 <gandalf@vilnya.demon.co.uk>
7 * Copyright (c) 1998 by Joachim Kuebart. All rights reserved.
8 *

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

33 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
34 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
35 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
36 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
37 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
38 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
39 * OF THE POSSIBILITY OF SUCH DAMAGE.
40 *
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 <gandalf@vilnya.demon.co.uk>
7 * Copyright (c) 1998 by Joachim Kuebart. All rights reserved.
8 *

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

33 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
34 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
35 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
36 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
37 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
38 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
39 * OF THE POSSIBILITY OF SUCH DAMAGE.
40 *
41 * $FreeBSD: head/sys/dev/sound/pci/es137x.c 56154 2000-01-17 07:54:00Z peter $
41 * $FreeBSD: head/sys/dev/sound/pci/es137x.c 56249 2000-01-18 17:13:43Z cg $
42 */
43
44/*
45 * Part of this code was heavily inspired by the linux driver from
46 * Thomas Sailer (sailer@ife.ee.ethz.ch)
47 * Just about everything has been touched and reworked in some way but
48 * the all the underlying sequences/timing/register values are from
49 * Thomas' code.

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

769 }
770
771 if (pci_get_devid(dev) == ES1371_PCI_ID ||
772 pci_get_devid(dev) == ES1371_PCI_ID2) {
773 if(-1 == es1371_init(es, pci_get_revid(dev))) {
774 device_printf(dev, "unable to initialize the card\n");
775 goto bad;
776 }
42 */
43
44/*
45 * Part of this code was heavily inspired by the linux driver from
46 * Thomas Sailer (sailer@ife.ee.ethz.ch)
47 * Just about everything has been touched and reworked in some way but
48 * the all the underlying sequences/timing/register values are from
49 * Thomas' code.

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

769 }
770
771 if (pci_get_devid(dev) == ES1371_PCI_ID ||
772 pci_get_devid(dev) == ES1371_PCI_ID2) {
773 if(-1 == es1371_init(es, pci_get_revid(dev))) {
774 device_printf(dev, "unable to initialize the card\n");
775 goto bad;
776 }
777 codec = ac97_create(es, es1371_rdcodec, es1371_wrcodec);
777 codec = ac97_create(dev, es, es1371_rdcodec, es1371_wrcodec);
778 if (codec == NULL) goto bad;
779 /* our init routine does everything for us */
780 /* set to NULL; flag mixer_init not to run the ac97_init */
781 /* ac97_mixer.init = NULL; */
782 mixer_init(d, &ac97_mixer, codec);
783 ct = &es1371_chantemplate;
784 } else if (pci_get_devid(dev) == ES1370_PCI_ID) {
785 if (-1 == es1370_init(es)) {

--- 62 unchanged lines hidden ---
778 if (codec == NULL) goto bad;
779 /* our init routine does everything for us */
780 /* set to NULL; flag mixer_init not to run the ac97_init */
781 /* ac97_mixer.init = NULL; */
782 mixer_init(d, &ac97_mixer, codec);
783 ct = &es1371_chantemplate;
784 } else if (pci_get_devid(dev) == ES1370_PCI_ID) {
785 if (-1 == es1370_init(es)) {

--- 62 unchanged lines hidden ---