1 files changed, 7 insertions, 7 deletions

diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c
index 2f5f633..506a58a 100644
--- a/sys/dev/sound/pci/cs4281.c
+++ b/sys/dev/sound/pci/cs4281.c
@@ -68,8 +68,8 @@ struct sc_info;
 struct sc_chinfo {
     struct sc_info *parent;
 
-    snd_dbuf *buffer;
-    pcm_channel *channel;
+    struct snd_dbuf *buffer;
+    struct pcm_channel *channel;
 
     u_int32_t spd, fmt, bps, blksz;
 
@@ -134,7 +134,7 @@ static u_int32_t cs4281_fmts[] = {
     0
 };
 
-static pcmchan_caps cs4281_caps = {6024, 48000, cs4281_fmts, 0};
+static struct pcmchan_caps cs4281_caps = {6024, 48000, cs4281_fmts, 0};
 
 /* -------------------------------------------------------------------- */
 /* Hardware */
@@ -310,7 +310,7 @@ AC97_DECLARE(cs4281_ac97);
 /* shared rec/play channel interface */
 
 static void *
-cs4281chan_init(kobj_t obj, void *devinfo, snd_dbuf *b, pcm_channel *c, int dir)
+cs4281chan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channel *c, int dir)
 {
     struct sc_info *sc = devinfo;
     struct sc_chinfo *ch = (dir == PCMDIR_PLAY) ? &sc->pch : &sc->rch;
@@ -437,7 +437,7 @@ cs4281chan_trigger(kobj_t obj, void *data, int go)
     return 0;
 }
 
-static pcmchan_caps *
+static struct pcmchan_caps *
 cs4281chan_getcaps(kobj_t obj, void *data)
 {
     return &cs4281_caps;
@@ -810,7 +810,7 @@ cs4281_pci_attach(device_t dev)
 	goto bad;
     }
 
-    if (bus_setup_intr(dev, sc->irq, INTR_TYPE_TTY, cs4281_intr, sc, &sc->ih)) {
+    if (snd_setup_intr(dev, sc->irq, 0, cs4281_intr, sc, &sc->ih)) {
 	device_printf(dev, "unable to setup interrupt\n");
 	goto bad;
     }
@@ -962,7 +962,7 @@ static device_method_t cs4281_methods[] = {
 static driver_t cs4281_driver = {
     "pcm",
     cs4281_methods,
-    sizeof(snddev_info),
+    sizeof(struct snddev_info),
 };
 
 static devclass_t pcm_devclass;