Deleted Added
full compact
aureal.c (119853) aureal.c (126695)
1/*
2 * Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

26
27#include <dev/sound/pcm/sound.h>
28#include <dev/sound/pcm/ac97.h>
29#include <dev/sound/pci/aureal.h>
30
31#include <dev/pci/pcireg.h>
32#include <dev/pci/pcivar.h>
33
1/*
2 * Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

26
27#include <dev/sound/pcm/sound.h>
28#include <dev/sound/pcm/ac97.h>
29#include <dev/sound/pci/aureal.h>
30
31#include <dev/pci/pcireg.h>
32#include <dev/pci/pcivar.h>
33
34SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/aureal.c 119853 2003-09-07 16:28:03Z cg $");
34SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/aureal.c 126695 2004-03-06 15:52:42Z matk $");
35
36/* PCI IDs of supported chips */
37#define AU8820_PCI_ID 0x000112eb
38
39/* channel interface */
40static u_int32_t au_playfmt[] = {
41 AFMT_U8,
42 AFMT_STEREO | AFMT_U8,

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

642 /*filter*/NULL, /*filterarg*/NULL,
643 /*maxsize*/AU_BUFFSIZE, /*nsegments*/1, /*maxsegz*/0x3ffff,
644 /*flags*/0, /*lockfunc*/busdma_lock_mutex,
645 /*lockarg*/&Giant, &au->parent_dmat) != 0) {
646 device_printf(dev, "unable to create dma tag\n");
647 goto bad;
648 }
649
35
36/* PCI IDs of supported chips */
37#define AU8820_PCI_ID 0x000112eb
38
39/* channel interface */
40static u_int32_t au_playfmt[] = {
41 AFMT_U8,
42 AFMT_STEREO | AFMT_U8,

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

642 /*filter*/NULL, /*filterarg*/NULL,
643 /*maxsize*/AU_BUFFSIZE, /*nsegments*/1, /*maxsegz*/0x3ffff,
644 /*flags*/0, /*lockfunc*/busdma_lock_mutex,
645 /*lockarg*/&Giant, &au->parent_dmat) != 0) {
646 device_printf(dev, "unable to create dma tag\n");
647 goto bad;
648 }
649
650 snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld",
650 snprintf(status, SND_STATUSLEN, "at %s 0x%lx irq %ld %s",
651 (type[0] == SYS_RES_IOPORT)? "io" : "memory",
651 (type[0] == SYS_RES_IOPORT)? "io" : "memory",
652 rman_get_start(reg[0]), rman_get_start(irq));
652 rman_get_start(reg[0]), rman_get_start(irq),PCM_KLDSTRING(snd_aureal));
653
654 if (pcm_register(dev, au, 1, 1)) goto bad;
655 /* pcm_addchan(dev, PCMDIR_REC, &au_chantemplate, au); */
656 pcm_addchan(dev, PCMDIR_PLAY, &auchan_class, au);
657 pcm_setstatus(dev, status);
658
659 return 0;
660

--- 26 unchanged lines hidden ---
653
654 if (pcm_register(dev, au, 1, 1)) goto bad;
655 /* pcm_addchan(dev, PCMDIR_REC, &au_chantemplate, au); */
656 pcm_addchan(dev, PCMDIR_PLAY, &auchan_class, au);
657 pcm_setstatus(dev, status);
658
659 return 0;
660

--- 26 unchanged lines hidden ---