diff options
Diffstat (limited to 'sys/dev/sound')
-rw-r--r-- | sys/dev/sound/isa/ad1816.c | 8 | ||||
-rw-r--r-- | sys/dev/sound/isa/ad1816.h | 2 | ||||
-rw-r--r-- | sys/dev/sound/pci/atiixp.c | 2 | ||||
-rw-r--r-- | sys/dev/sound/pci/emu10kx.c | 2 | ||||
-rw-r--r-- | sys/dev/sound/pci/envy24.c | 2 | ||||
-rw-r--r-- | sys/dev/sound/pci/envy24ht.c | 2 | ||||
-rw-r--r-- | sys/dev/sound/sbus/cs4231.c | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c index d3ece80..4c5ecab 100644 --- a/sys/dev/sound/isa/ad1816.c +++ b/sys/dev/sound/isa/ad1816.c @@ -128,22 +128,22 @@ ad1816_intr(void *arg) unsigned char c, served = 0; ad1816_lock(ad1816); - /* get interupt status */ + /* get interrupt status */ c = io_rd(ad1816, AD1816_INT); - /* check for stray interupts */ + /* check for stray interrupts */ if (c & ~(AD1816_INTRCI | AD1816_INTRPI)) { printf("pcm: stray int (%x)\n", c); c &= AD1816_INTRCI | AD1816_INTRPI; } - /* check for capture interupt */ + /* check for capture interrupt */ if (sndbuf_runsz(ad1816->rch.buffer) && (c & AD1816_INTRCI)) { ad1816_unlock(ad1816); chn_intr(ad1816->rch.channel); ad1816_lock(ad1816); served |= AD1816_INTRCI; /* cp served */ } - /* check for playback interupt */ + /* check for playback interrupt */ if (sndbuf_runsz(ad1816->pch.buffer) && (c & AD1816_INTRPI)) { ad1816_unlock(ad1816); chn_intr(ad1816->pch.channel); diff --git a/sys/dev/sound/isa/ad1816.h b/sys/dev/sound/isa/ad1816.h index e09f40d..b21d3cd 100644 --- a/sys/dev/sound/isa/ad1816.h +++ b/sys/dev/sound/isa/ad1816.h @@ -34,7 +34,7 @@ /* AD1816 register macros */ #define AD1816_ALE 0 /* indirect reg access */ -#define AD1816_INT 1 /* interupt status */ +#define AD1816_INT 1 /* interrupt status */ #define AD1816_LOW 2 /* indirect low byte */ #define AD1816_HIGH 3 /* indirect high byte */ diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c index 777e1b1..d1d01d7 100644 --- a/sys/dev/sound/pci/atiixp.c +++ b/sys/dev/sound/pci/atiixp.c @@ -902,7 +902,7 @@ atiixp_intr(void *p) detected_codecs = status & CODEC_CHECK_BITS; sc->codec_not_ready_bits |= detected_codecs; - /* disable detected interupt sources */ + /* disable detected interrupt sources */ enable = atiixp_rd(sc, ATI_REG_IER); enable &= ~detected_codecs; atiixp_wr(sc, ATI_REG_IER, enable); diff --git a/sys/dev/sound/pci/emu10kx.c b/sys/dev/sound/pci/emu10kx.c index 35af8aa..c2a8249 100644 --- a/sys/dev/sound/pci/emu10kx.c +++ b/sys/dev/sound/pci/emu10kx.c @@ -950,7 +950,7 @@ emu_intr_unregister(struct emu_sc_info *sc, int hnumber) sc->ihandler[hnumber].softc = NULL; sc->ihandler[hnumber].irq_func = NULL; - /* other interupt handlers may use this INTE value */ + /* other interrupt handlers may use this INTE value */ for (i = 0; i < EMU_MAX_IRQ_CONSUMERS; i++) if (sc->ihandler[i].inte_mask != 0) x |= sc->ihandler[i].inte_mask; diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c index 136477b..e35b456 100644 --- a/sys/dev/sound/pci/envy24.c +++ b/sys/dev/sound/pci/envy24.c @@ -2461,7 +2461,7 @@ envy24_alloc_resource(struct sc_info *sc) pci_read_config(sc->dev, PCIR_MT, 4)); #endif - /* allocate interupt resource */ + /* allocate interrupt resource */ sc->irqid = 0; sc->irq = bus_alloc_resource(sc->dev, SYS_RES_IRQ, &sc->irqid, 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE); diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c index 4b08c0c..a3e4f36 100644 --- a/sys/dev/sound/pci/envy24ht.c +++ b/sys/dev/sound/pci/envy24ht.c @@ -2416,7 +2416,7 @@ envy24ht_alloc_resource(struct sc_info *sc) pci_read_config(sc->dev, PCIR_MT, 4)); #endif - /* allocate interupt resource */ + /* allocate interrupt resource */ sc->irqid = 0; sc->irq = bus_alloc_resource(sc->dev, SYS_RES_IRQ, &sc->irqid, 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE); diff --git a/sys/dev/sound/sbus/cs4231.c b/sys/dev/sound/sbus/cs4231.c index 26e9301..a785f96 100644 --- a/sys/dev/sound/sbus/cs4231.c +++ b/sys/dev/sound/sbus/cs4231.c @@ -622,7 +622,7 @@ cs4231_power_reset(struct cs4231_softc *sc, int how) /* turn on cs4231 mode */ cs4231_write(sc, CS_MISC_INFO, cs4231_read(sc, CS_MISC_INFO) | CS_MODE2); - /* enable interupts & clear CSR */ + /* enable interrupts & clear CSR */ cs4231_write(sc, CS_PIN_CONTROL, cs4231_read(sc, CS_PIN_CONTROL) | INTERRUPT_ENABLE); CS_WRITE(sc, CS4231_STATUS, 0); |