From c7dd9f1ffd54f42c28adeccae59870d692dbe956 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 6 May 1999 22:26:28 +0000 Subject: [PATCH] Use id_ointr for setting the pnp interrupt handler, it uses the oldstyle int unit argument still. --- sys/dev/pcm/isa/mss.c | 8 ++++---- sys/dev/sound/isa/mss.c | 8 ++++---- sys/i386/isa/snd/ad1848.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/dev/pcm/isa/mss.c b/sys/dev/pcm/isa/mss.c index d1dc19ca818d..8b05fa80d7cd 100644 --- a/sys/dev/pcm/isa/mss.c +++ b/sys/dev/pcm/isa/mss.c @@ -1584,7 +1584,7 @@ cs423x_attach(u_long csn, u_long vend_id, char *name, } dev->id_drq = d.drq[0] ; /* primary dma */ dev->id_irq = (1 << d.irq[0] ) ; - dev->id_intr = pcmintr ; + dev->id_ointr = pcmintr ; dev->id_flags = DV_F_DUAL_DMA | (d.drq[1] ) ; tmp_d.synth_base = d.port[1]; /* XXX check this for yamaha */ @@ -1687,7 +1687,7 @@ opti931_attach(u_long csn, u_long vend_id, char *name, } dev->id_drq = d.drq[0] ; /* primary dma */ dev->id_irq = (1 << d.irq[0] ) ; - dev->id_intr = pcmintr ; + dev->id_ointr = pcmintr ; pcmattach(dev); } @@ -1752,7 +1752,7 @@ opti925_attach(u_long csn, u_long vend_id, char *name, dev->id_drq = d.drq[0] ; /* primary dma */ dev->id_irq = (1 << d.irq[0] ) ; - dev->id_intr = pcmintr ; + dev->id_ointr = pcmintr ; dev->id_flags = DV_F_DUAL_DMA | d.drq[1] ; tmp_d.audio_fmt |= AFMT_FULLDUPLEX ; @@ -1815,7 +1815,7 @@ guspnp_attach(u_long csn, u_long vend_id, char *name, dev->id_iobase = d.port[2] - 4 ; /* room for 4 mss registers */ dev->id_drq = d.drq[1] ; /* XXX PLAY dma */ dev->id_irq = (1 << d.irq[0] ) ; - dev->id_intr = pcmintr ; + dev->id_ointr = pcmintr ; dev->id_flags = DV_F_DUAL_DMA | d.drq[0] ; /* REC dma */ tmp_d.io_base = d.port[2] - 4; diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c index d1dc19ca818d..8b05fa80d7cd 100644 --- a/sys/dev/sound/isa/mss.c +++ b/sys/dev/sound/isa/mss.c @@ -1584,7 +1584,7 @@ cs423x_attach(u_long csn, u_long vend_id, char *name, } dev->id_drq = d.drq[0] ; /* primary dma */ dev->id_irq = (1 << d.irq[0] ) ; - dev->id_intr = pcmintr ; + dev->id_ointr = pcmintr ; dev->id_flags = DV_F_DUAL_DMA | (d.drq[1] ) ; tmp_d.synth_base = d.port[1]; /* XXX check this for yamaha */ @@ -1687,7 +1687,7 @@ opti931_attach(u_long csn, u_long vend_id, char *name, } dev->id_drq = d.drq[0] ; /* primary dma */ dev->id_irq = (1 << d.irq[0] ) ; - dev->id_intr = pcmintr ; + dev->id_ointr = pcmintr ; pcmattach(dev); } @@ -1752,7 +1752,7 @@ opti925_attach(u_long csn, u_long vend_id, char *name, dev->id_drq = d.drq[0] ; /* primary dma */ dev->id_irq = (1 << d.irq[0] ) ; - dev->id_intr = pcmintr ; + dev->id_ointr = pcmintr ; dev->id_flags = DV_F_DUAL_DMA | d.drq[1] ; tmp_d.audio_fmt |= AFMT_FULLDUPLEX ; @@ -1815,7 +1815,7 @@ guspnp_attach(u_long csn, u_long vend_id, char *name, dev->id_iobase = d.port[2] - 4 ; /* room for 4 mss registers */ dev->id_drq = d.drq[1] ; /* XXX PLAY dma */ dev->id_irq = (1 << d.irq[0] ) ; - dev->id_intr = pcmintr ; + dev->id_ointr = pcmintr ; dev->id_flags = DV_F_DUAL_DMA | d.drq[0] ; /* REC dma */ tmp_d.io_base = d.port[2] - 4; diff --git a/sys/i386/isa/snd/ad1848.c b/sys/i386/isa/snd/ad1848.c index d1dc19ca818d..8b05fa80d7cd 100644 --- a/sys/i386/isa/snd/ad1848.c +++ b/sys/i386/isa/snd/ad1848.c @@ -1584,7 +1584,7 @@ cs423x_attach(u_long csn, u_long vend_id, char *name, } dev->id_drq = d.drq[0] ; /* primary dma */ dev->id_irq = (1 << d.irq[0] ) ; - dev->id_intr = pcmintr ; + dev->id_ointr = pcmintr ; dev->id_flags = DV_F_DUAL_DMA | (d.drq[1] ) ; tmp_d.synth_base = d.port[1]; /* XXX check this for yamaha */ @@ -1687,7 +1687,7 @@ opti931_attach(u_long csn, u_long vend_id, char *name, } dev->id_drq = d.drq[0] ; /* primary dma */ dev->id_irq = (1 << d.irq[0] ) ; - dev->id_intr = pcmintr ; + dev->id_ointr = pcmintr ; pcmattach(dev); } @@ -1752,7 +1752,7 @@ opti925_attach(u_long csn, u_long vend_id, char *name, dev->id_drq = d.drq[0] ; /* primary dma */ dev->id_irq = (1 << d.irq[0] ) ; - dev->id_intr = pcmintr ; + dev->id_ointr = pcmintr ; dev->id_flags = DV_F_DUAL_DMA | d.drq[1] ; tmp_d.audio_fmt |= AFMT_FULLDUPLEX ; @@ -1815,7 +1815,7 @@ guspnp_attach(u_long csn, u_long vend_id, char *name, dev->id_iobase = d.port[2] - 4 ; /* room for 4 mss registers */ dev->id_drq = d.drq[1] ; /* XXX PLAY dma */ dev->id_irq = (1 << d.irq[0] ) ; - dev->id_intr = pcmintr ; + dev->id_ointr = pcmintr ; dev->id_flags = DV_F_DUAL_DMA | d.drq[0] ; /* REC dma */ tmp_d.io_base = d.port[2] - 4;