Deleted Added
full compact
vibes.c (119287) vibes.c (126695)
1/*
2 * Copyright (c) 2001 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
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

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

31#include <dev/sound/pcm/sound.h>
32#include <dev/sound/pci/vibes.h>
33
34#include <dev/pci/pcireg.h>
35#include <dev/pci/pcivar.h>
36
37#include "mixer_if.h"
38
1/*
2 * Copyright (c) 2001 Orion Hodson <O.Hodson@cs.ucl.ac.uk>
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

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

31#include <dev/sound/pcm/sound.h>
32#include <dev/sound/pci/vibes.h>
33
34#include <dev/pci/pcireg.h>
35#include <dev/pci/pcivar.h>
36
37#include "mixer_if.h"
38
39SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/vibes.c 119287 2003-08-22 07:08:17Z imp $");
39SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pci/vibes.c 126695 2004-03-06 15:52:42Z matk $");
40
41/* ------------------------------------------------------------------------- */
42/* Constants */
43
44#define SV_PCI_ID 0xca005333
45#define SV_DEFAULT_BUFSZ 16384
46#define SV_MIN_BLKSZ 128
47#define SV_INTR_PER_BUFFER 2

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

873 if (pcm_register(dev, sc, 1, 1)) {
874 device_printf(dev, "sv_attach: pcm_register fail\n");
875 goto fail;
876 }
877
878 pcm_addchan(dev, PCMDIR_PLAY, &svpchan_class, sc);
879 pcm_addchan(dev, PCMDIR_REC, &svrchan_class, sc);
880
40
41/* ------------------------------------------------------------------------- */
42/* Constants */
43
44#define SV_PCI_ID 0xca005333
45#define SV_DEFAULT_BUFSZ 16384
46#define SV_MIN_BLKSZ 128
47#define SV_INTR_PER_BUFFER 2

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

873 if (pcm_register(dev, sc, 1, 1)) {
874 device_printf(dev, "sv_attach: pcm_register fail\n");
875 goto fail;
876 }
877
878 pcm_addchan(dev, PCMDIR_PLAY, &svpchan_class, sc);
879 pcm_addchan(dev, PCMDIR_REC, &svrchan_class, sc);
880
881 snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld",
882 rman_get_start(sc->enh_reg), rman_get_start(sc->irq));
881 snprintf(status, SND_STATUSLEN, "at io 0x%lx irq %ld %s",
882 rman_get_start(sc->enh_reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_vibes));
883 pcm_setstatus(dev, status);
884
885 DEB(printf("sv_attach: succeeded\n"));
886
887 return 0;
888
889 fail:
890 if (sc->parent_dmat)

--- 56 unchanged lines hidden ---
883 pcm_setstatus(dev, status);
884
885 DEB(printf("sv_attach: succeeded\n"));
886
887 return 0;
888
889 fail:
890 if (sc->parent_dmat)

--- 56 unchanged lines hidden ---