diff options
Diffstat (limited to 'sys/dev/sound/pci')
| -rw-r--r-- | sys/dev/sound/pci/als4000.c | 6 | ||||
| -rw-r--r-- | sys/dev/sound/pci/aureal.c | 6 | ||||
| -rw-r--r-- | sys/dev/sound/pci/cmi.c | 6 | ||||
| -rw-r--r-- | sys/dev/sound/pci/cs4281.c | 6 | ||||
| -rw-r--r-- | sys/dev/sound/pci/csa.c | 4 | ||||
| -rw-r--r-- | sys/dev/sound/pci/csapcm.c | 6 | ||||
| -rw-r--r-- | sys/dev/sound/pci/ds1.c | 6 | ||||
| -rw-r--r-- | sys/dev/sound/pci/emu10k1.c | 6 | ||||
| -rw-r--r-- | sys/dev/sound/pci/es137x.c | 6 | ||||
| -rw-r--r-- | sys/dev/sound/pci/fm801.c | 6 | ||||
| -rw-r--r-- | sys/dev/sound/pci/ich.c | 41 | ||||
| -rw-r--r-- | sys/dev/sound/pci/maestro.c | 5 | ||||
| -rw-r--r-- | sys/dev/sound/pci/maestro3.c | 6 | ||||
| -rw-r--r-- | sys/dev/sound/pci/neomagic.c | 6 | ||||
| -rw-r--r-- | sys/dev/sound/pci/solo.c | 6 | ||||
| -rw-r--r-- | sys/dev/sound/pci/t4dwave.c | 6 | ||||
| -rw-r--r-- | sys/dev/sound/pci/via82c686.c | 6 | ||||
| -rw-r--r-- | sys/dev/sound/pci/vibes.c | 7 |
18 files changed, 78 insertions, 63 deletions
diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c index 0c59aba..a554479 100644 --- a/sys/dev/sound/pci/als4000.c +++ b/sys/dev/sound/pci/als4000.c @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* @@ -44,6 +42,8 @@ #include "mixer_if.h" +SND_DECLARE_FILE("$FreeBSD$"); + /* Debugging macro's */ #undef DEB #ifndef DEB @@ -887,7 +887,7 @@ static device_method_t als_methods[] = { static driver_t als_driver = { "pcm", als_methods, - sizeof(struct snddev_info), + PCM_SOFTC_SIZE, }; DRIVER_MODULE(snd_als, pci, als_driver, pcm_devclass, 0, 0); diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c index e629a72..d79626b 100644 --- a/sys/dev/sound/pci/aureal.c +++ b/sys/dev/sound/pci/aureal.c @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include <dev/sound/pcm/sound.h> @@ -33,6 +31,8 @@ #include <pci/pcireg.h> #include <pci/pcivar.h> +SND_DECLARE_FILE("$FreeBSD$"); + /* PCI IDs of supported chips */ #define AU8820_PCI_ID 0x000112eb @@ -677,7 +677,7 @@ static device_method_t au_methods[] = { static driver_t au_driver = { "pcm", au_methods, - sizeof(struct snddev_info), + PCM_SOFTC_SIZE, }; DRIVER_MODULE(snd_aureal, pci, au_driver, pcm_devclass, 0, 0); diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index 585be33..6b6b0e7 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -38,8 +38,6 @@ * rate drifts slightly between recordings (usually 0-3%). No * differences visible in register dumps between times that work and * those that don't. - * - * $FreeBSD$ */ #include <dev/sound/pcm/sound.h> @@ -53,6 +51,8 @@ #include "mixer_if.h" +SND_DECLARE_FILE("$FreeBSD$"); + /* Supported chip ID's */ #define CMI8338A_PCI_ID 0x010013f6 #define CMI8338B_PCI_ID 0x010113f6 @@ -948,7 +948,7 @@ static device_method_t cmi_methods[] = { static driver_t cmi_driver = { "pcm", cmi_methods, - sizeof(struct snddev_info) + PCM_SOFTC_SIZE }; DRIVER_MODULE(snd_cmipci, pci, cmi_driver, pcm_devclass, 0, 0); diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c index 21a2b86..066ffb0 100644 --- a/sys/dev/sound/pci/cs4281.c +++ b/sys/dev/sound/pci/cs4281.c @@ -23,8 +23,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ - * * The order of pokes in the initiation sequence is based on Linux * driver by Thomas Sailer, gw boynton (wesb@crystal.cirrus.com), tom * woller (twoller@crystal.cirrus.com). Shingo Watanabe (nabe@nabechan.org) @@ -39,6 +37,8 @@ #include <dev/sound/pci/cs4281.h> +SND_DECLARE_FILE("$FreeBSD$"); + #define CS4281_BUFFER_SIZE 16384 /* Max fifo size for full duplex is 64 */ @@ -970,7 +970,7 @@ static device_method_t cs4281_methods[] = { static driver_t cs4281_driver = { "pcm", cs4281_methods, - sizeof(struct snddev_info), + PCM_SOFTC_SIZE, }; DRIVER_MODULE(snd_cs4281, pci, cs4281_driver, pcm_devclass, 0, 0); diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index 015ae94..4d2e506 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include <sys/param.h> @@ -50,6 +48,8 @@ #include <gnu/dev/sound/pci/csaimg.h> +SND_DECLARE_FILE("$FreeBSD$"); + /* This is the pci device id. */ #define CS4610_PCI_ID 0x60011013 #define CS4614_PCI_ID 0x60031013 diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c index 6302781..d0b30ce 100644 --- a/sys/dev/sound/pci/csapcm.c +++ b/sys/dev/sound/pci/csapcm.c @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include <sys/soundcard.h> @@ -40,6 +38,8 @@ #include <pci/pcireg.h> #include <pci/pcivar.h> +SND_DECLARE_FILE("$FreeBSD$"); + /* Buffer size on dma transfer. Fixed for CS416x. */ #define CS461x_BUFFSIZE (4 * 1024) @@ -839,7 +839,7 @@ static device_method_t pcmcsa_methods[] = { static driver_t pcmcsa_driver = { "pcm", pcmcsa_methods, - sizeof(struct snddev_info), + PCM_SOFTC_SIZE, }; DRIVER_MODULE(snd_csapcm, csa, pcmcsa_driver, pcm_devclass, 0, 0); diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c index cb1f848..726af57 100644 --- a/sys/dev/sound/pci/ds1.c +++ b/sys/dev/sound/pci/ds1.c @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include <dev/sound/pcm/sound.h> @@ -35,6 +33,8 @@ #include <dev/sound/pci/ds1.h> #include <dev/sound/pci/ds1-fw.h> +SND_DECLARE_FILE("$FreeBSD$"); + /* -------------------------------------------------------------------- */ #define DS1_CHANS 4 @@ -1068,7 +1068,7 @@ static device_method_t ds1_methods[] = { static driver_t ds1_driver = { "pcm", ds1_methods, - sizeof(struct snddev_info), + PCM_SOFTC_SIZE, }; DRIVER_MODULE(snd_ds1, pci, ds1_driver, pcm_devclass, 0, 0); diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c index 14e0837..583deac 100644 --- a/sys/dev/sound/pci/emu10k1.c +++ b/sys/dev/sound/pci/emu10k1.c @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include <dev/sound/pcm/sound.h> @@ -34,6 +32,8 @@ #include <pci/pcivar.h> #include <sys/queue.h> +SND_DECLARE_FILE("$FreeBSD$"); + /* -------------------------------------------------------------------- */ #define EMU10K1_PCI_ID 0x00021102 @@ -1544,7 +1544,7 @@ static device_method_t emu_methods[] = { static driver_t emu_driver = { "pcm", emu_methods, - sizeof(struct snddev_info), + PCM_SOFTC_SIZE, }; DRIVER_MODULE(snd_emu10k1, pci, emu_driver, pcm_devclass, 0, 0); diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index ca2fa0c..18700ad 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -37,8 +37,6 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ /* @@ -61,6 +59,8 @@ #include "mixer_if.h" +SND_DECLARE_FILE("$FreeBSD$"); + static int debug = 0; SYSCTL_INT(_debug, OID_AUTO, es_debug, CTLFLAG_RW, &debug, 0, ""); @@ -950,7 +950,7 @@ static device_method_t es_methods[] = { static driver_t es_driver = { "pcm", es_methods, - sizeof(struct snddev_info), + PCM_SOFTC_SIZE, }; DRIVER_MODULE(snd_es137x, pci, es_driver, pcm_devclass, 0, 0); diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c index 1651572..485ca4d 100644 --- a/sys/dev/sound/pci/fm801.c +++ b/sys/dev/sound/pci/fm801.c @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include <dev/sound/pcm/sound.h> @@ -31,6 +29,8 @@ #include <pci/pcireg.h> #include <pci/pcivar.h> +SND_DECLARE_FILE("$FreeBSD$"); + #define PCI_VENDOR_FORTEMEDIA 0x1319 #define PCI_DEVICE_FORTEMEDIA1 0x08011319 #define PCI_DEVICE_FORTEMEDIA2 0x08021319 /* ??? have no idea what's this... */ @@ -700,7 +700,7 @@ static device_method_t fm801_methods[] = { static driver_t fm801_driver = { "pcm", fm801_methods, - sizeof(struct snddev_info), + PCM_SOFTC_SIZE, }; DRIVER_MODULE(snd_fm801, pci, fm801_driver, pcm_devclass, 0, 0); diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c index 1031536..a4d8aea 100644 --- a/sys/dev/sound/pci/ich.c +++ b/sys/dev/sound/pci/ich.c @@ -23,8 +23,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include <dev/sound/pcm/sound.h> @@ -34,6 +32,8 @@ #include <pci/pcireg.h> #include <pci/pcivar.h> +SND_DECLARE_FILE("$FreeBSD$"); + /* -------------------------------------------------------------------- */ #define ICH_TIMEOUT 1000 /* semaphore timeout polling count */ @@ -176,7 +176,7 @@ static void ich_filldtbl(struct sc_chinfo *ch) { u_int32_t base; - int i; + int i, bs, gap; base = vtophys(sndbuf_getbuf(ch->buffer)); ch->blkcnt = sndbuf_getsize(ch->buffer) / ch->blksz; @@ -185,10 +185,22 @@ ich_filldtbl(struct sc_chinfo *ch) ch->blksz = sndbuf_getsize(ch->buffer) / ch->blkcnt; } + bs = sndbuf_getsize(ch->buffer) / ICH_DTBL_LENGTH; + gap = ICH_DTBL_LENGTH / ch->blkcnt; + for (i = 0; i < ICH_DTBL_LENGTH; i++) { + ch->dtbl[i].buffer = base + (i * bs); + ch->dtbl[i].length = bs / 2; + if (i % gap == gap - 1) + ch->dtbl[i].length |= ICH_BDC_IOC; + } +#ifdef DALEK for (i = 0; i < ICH_DTBL_LENGTH; i++) { - ch->dtbl[i].buffer = base + (ch->blksz * (i % ch->blkcnt)); - ch->dtbl[i].length = ICH_BDC_IOC | (ch->blksz / 2); + ch->dtbl[i].buffer = base; + ch->dtbl[i].length = ch->blksz / 2; + if (pos % ch->blksz == 0) + ch->dtbl[i].length |= ICH_BDC_IOC; } +#endif } static int @@ -327,7 +339,7 @@ ichchan_getptr(kobj_t obj, void *data) { struct sc_chinfo *ch = data; struct sc_info *sc = ch->parent; - u_int32_t ci, ofs, pos; + u_int32_t bs, ci, ofs, pos; ofs = 0; ci = 1234; @@ -336,9 +348,10 @@ ichchan_getptr(kobj_t obj, void *data) ofs = ich_rd(sc, ch->regbase + ICH_REG_X_PICB, 2) * 2; } - ofs = ch->blksz - ofs; - ci %= ch->blkcnt; - pos = (ch->blksz * ci) + ofs; + bs = sndbuf_getsize(ch->buffer) / ICH_DTBL_LENGTH; + ofs = bs - ofs; + pos = ci * bs; + pos += ofs; return pos; } @@ -380,17 +393,17 @@ ich_intr(void *p) st = ich_rd(sc, ch->regbase + ICH_REG_X_SR, 2); st &= ICH_X_SR_FIFOE | ICH_X_SR_BCIS | ICH_X_SR_LVBCI; if (st != 0) { - if (st & (ICH_X_SR_BCIS | ICH_X_SR_LVBCI)) { + /* clear status bit */ + ich_wr(sc, ch->regbase + ICH_REG_X_SR, st, 2); + if (st & (ICH_X_SR_BCIS/* | ICH_X_SR_LVBCI*/)) { /* block complete - update buffer */ if (ch->run) chn_intr(ch->channel); lvi = ich_rd(sc, ch->regbase + ICH_REG_X_LVI, 1); - lvi++; + lvi += ICH_DTBL_LENGTH / ch->blkcnt; lvi %= ICH_DTBL_LENGTH; ich_wr(sc, ch->regbase + ICH_REG_X_LVI, lvi, 1); } - /* clear status bit */ - ich_wr(sc, ch->regbase + ICH_REG_X_SR, st, 2); } } } @@ -606,7 +619,7 @@ static device_method_t ich_methods[] = { static driver_t ich_driver = { "pcm", ich_methods, - sizeof(struct snddev_info), + PCM_SOFTC_SIZE, }; DRIVER_MODULE(snd_ich, pci, ich_driver, pcm_devclass, 0, 0); diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c index 140d6c9..79db926 100644 --- a/sys/dev/sound/pci/maestro.c +++ b/sys/dev/sound/pci/maestro.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $Id: maestro.c,v 1.12 2000/09/06 03:32:34 taku Exp $ - * $FreeBSD$ */ /* @@ -52,6 +51,8 @@ #include <dev/sound/pci/maestro_reg.h> +SND_DECLARE_FILE("$FreeBSD$"); + #define inline __inline /* @@ -1181,7 +1182,7 @@ static device_method_t agg_methods[] = { static driver_t agg_driver = { "pcm", agg_methods, - sizeof(struct snddev_info), + PCM_SOFTC_SIZE, }; DRIVER_MODULE(snd_maestro, pci, agg_driver, pcm_devclass, 0, 0); diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index ae23316..3fd7133 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -23,8 +23,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* @@ -63,6 +61,8 @@ #include <gnu/dev/sound/pci/maestro3_reg.h> #include <gnu/dev/sound/pci/maestro3_dsp.h> +SND_DECLARE_FILE("$FreeBSD$"); + /* -------------------------------------------------------------------- */ enum {CHANGE=0, CALL=1, INTR=2, BORING=3, NONE=-1}; @@ -1493,7 +1493,7 @@ static device_method_t m3_methods[] = { static driver_t m3_driver = { "pcm", m3_methods, - sizeof(struct snddev_info), + PCM_SOFTC_SIZE, }; DRIVER_MODULE(snd_maestro3, pci, m3_driver, pcm_devclass, 0, 0); diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c index 4ba8615..a97aed4 100644 --- a/sys/dev/sound/pci/neomagic.c +++ b/sys/dev/sound/pci/neomagic.c @@ -24,8 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include <dev/sound/pcm/sound.h> @@ -36,6 +34,8 @@ #include <pci/pcireg.h> #include <pci/pcivar.h> +SND_DECLARE_FILE("$FreeBSD$"); + /* -------------------------------------------------------------------- */ #define NM_BUFFSIZE 16384 @@ -741,7 +741,7 @@ static device_method_t nm_methods[] = { static driver_t nm_driver = { "pcm", nm_methods, - sizeof(struct snddev_info), + PCM_SOFTC_SIZE, }; DRIVER_MODULE(snd_neomagic, pci, nm_driver, pcm_devclass, 0, 0); diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c index c3836f1..13f940f 100644 --- a/sys/dev/sound/pci/solo.c +++ b/sys/dev/sound/pci/solo.c @@ -21,8 +21,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include <dev/sound/pcm/sound.h> @@ -35,6 +33,8 @@ #include "mixer_if.h" +SND_DECLARE_FILE("$FreeBSD$"); + #define ESS_BUFFSIZE (16384) #define ABS(x) (((x) < 0)? -(x) : (x)) @@ -1002,7 +1002,7 @@ static device_method_t ess_methods[] = { static driver_t ess_driver = { "pcm", ess_methods, - sizeof(struct snddev_info), + PCM_SOFTC_SIZE, }; DRIVER_MODULE(snd_solo, pci, ess_driver, pcm_devclass, 0, 0); diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c index d298ef1..eb21965b 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include <dev/sound/pcm/sound.h> @@ -33,6 +31,8 @@ #include <pci/pcireg.h> #include <pci/pcivar.h> +SND_DECLARE_FILE("$FreeBSD$"); + /* -------------------------------------------------------------------- */ #define TDX_PCI_ID 0x20001023 @@ -825,7 +825,7 @@ static device_method_t tr_methods[] = { static driver_t tr_driver = { "pcm", tr_methods, - sizeof(struct snddev_info), + PCM_SOFTC_SIZE, }; DRIVER_MODULE(snd_t4dwave, pci, tr_driver, pcm_devclass, 0, 0); diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c index fafaebd..bfc2bf5 100644 --- a/sys/dev/sound/pci/via82c686.c +++ b/sys/dev/sound/pci/via82c686.c @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include <dev/sound/pcm/sound.h> @@ -35,6 +33,8 @@ #include <dev/sound/pci/via82c686.h> +SND_DECLARE_FILE("$FreeBSD$"); + #define VIA_PCI_ID 0x30581106 #define NSEGS 4 /* Number of segments in SGD table */ @@ -577,7 +577,7 @@ static device_method_t via_methods[] = { static driver_t via_driver = { "pcm", via_methods, - sizeof(struct snddev_info), + PCM_SOFTC_SIZE, }; DRIVER_MODULE(via, pci, via_driver, pcm_devclass, 0, 0); diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c index add787f..28436b8 100644 --- a/sys/dev/sound/pci/vibes.c +++ b/sys/dev/sound/pci/vibes.c @@ -26,8 +26,7 @@ * This card has the annoying habit of "clicking" when attached and * detached, haven't been able to remedy this with any combination of * muting. - * - * $FreeBSD$ */ + */ #include <dev/sound/pcm/sound.h> #include <dev/sound/pci/vibes.h> @@ -37,6 +36,8 @@ #include "mixer_if.h" +SND_DECLARE_FILE("$FreeBSD$"); + /* ------------------------------------------------------------------------- */ /* Constants */ @@ -919,7 +920,7 @@ static device_method_t sc_methods[] = { static driver_t sonicvibes_driver = { "pcm", sc_methods, - sizeof(struct snddev_info) + PCM_SOFTC_SIZE }; DRIVER_MODULE(snd_sonicvibes, pci, sonicvibes_driver, pcm_devclass, 0, 0); |
