Module Name: src
Committed By: mrg
Date: Thu Nov 24 03:35:59 UTC 2011
Modified Files:
src/sys/arch/amigappc/amigappc: machdep.c
src/sys/arch/arm/iomd: vidcaudio.c
src/sys/arch/arm/xscale: pxa2x0_ac97.c
src/sys/arch/hp700/gsc: harmony.c
src/sys/arch/hpcmips/vr: vraiu.c
src/sys/arch/macppc/dev: awacs.c snapper.c
src/sys/arch/prep/isa: paud_isa.c
src/sys/arch/sgimips/hpc: haltwo.c
src/sys/dev/acpi: mpu_acpi.c
src/sys/dev/ic: interwave.c
src/sys/dev/isa: aria.c ess.c gus.c mpu_isa.c pas.c sb_isa.c wss.c ym.c
src/sys/dev/isapnp: mpu_isapnp.c
src/sys/dev/pci: auacer.c auich.c auixp.c autri.c auvia.c azalia.c
cmpci.c cs4280.c cs4281.c eap.c emuxki.c esa.c esm.c eso.c fms.c
gcscaudio.c neo.c sv.c yds.c
src/sys/dev/pci/hdaudio: hdaudio.c hdaudio_pci.c
src/sys/sys: intr.h
Log Message:
put back IPL_AUDIO and splaudio(), at the request of rmind. they are
aliases and now we can easily revert audio to IPL_VM if necessary,
without having to revert the whole branch.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/amigappc/amigappc/machdep.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/arm/iomd/vidcaudio.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/xscale/pxa2x0_ac97.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hp700/gsc/harmony.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hpcmips/vr/vraiu.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/macppc/dev/awacs.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/macppc/dev/snapper.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/prep/isa/paud_isa.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sgimips/hpc/haltwo.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/acpi/mpu_acpi.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/ic/interwave.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/isa/aria.c
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/isa/ess.c
cvs rdiff -u -r1.107 -r1.108 src/sys/dev/isa/gus.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/isa/mpu_isa.c
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/isa/pas.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/isa/sb_isa.c
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/isa/wss.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/isa/ym.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/isapnp/mpu_isapnp.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pci/auacer.c
cvs rdiff -u -r1.139 -r1.140 src/sys/dev/pci/auich.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pci/auixp.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/pci/autri.c
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/pci/auvia.c
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/pci/azalia.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/pci/cmpci.c
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/pci/cs4280.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/pci/cs4281.c src/sys/dev/pci/sv.c
cvs rdiff -u -r1.93 -r1.94 src/sys/dev/pci/eap.c
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/emuxki.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pci/esa.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pci/esm.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/eso.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/pci/fms.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/gcscaudio.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/pci/neo.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pci/yds.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/hdaudio/hdaudio.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/hdaudio/hdaudio_pci.c
cvs rdiff -u -r1.10 -r1.11 src/sys/sys/intr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amigappc/amigappc/machdep.c
diff -u src/sys/arch/amigappc/amigappc/machdep.c:1.49 src/sys/arch/amigappc/amigappc/machdep.c:1.50
--- src/sys/arch/amigappc/amigappc/machdep.c:1.49 Wed Nov 23 23:07:28 2011
+++ src/sys/arch/amigappc/amigappc/machdep.c Thu Nov 24 03:35:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.49 2011/11/23 23:07:28 jmcneill Exp $ */
+/* $NetBSD: machdep.c,v 1.50 2011/11/24 03:35:56 mrg Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.49 2011/11/23 23:07:28 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2011/11/24 03:35:56 mrg Exp $");
#include <sys/param.h>
#include <sys/mount.h>
@@ -241,7 +241,7 @@ amigappc_install_handlers(void)
intr_establish(1, IST_LEVEL, IPL_BIO, lev1_intr, NULL);
intr_establish(2, IST_LEVEL, IPL_BIO, ports_intr, &isr_ports);
intr_establish(3, IST_LEVEL, IPL_TTY, lev3_intr, NULL);
- intr_establish(4, IST_LEVEL, IPL_SCHED, lev4_intr, NULL);
+ intr_establish(4, IST_LEVEL, IPL_AUDIO, lev4_intr, NULL);
intr_establish(5, IST_LEVEL, IPL_SERIAL, lev5_intr, NULL);
intr_establish(6, IST_LEVEL, IPL_SERIAL, exter_intr, &isr_exter);
}
Index: src/sys/arch/arm/iomd/vidcaudio.c
diff -u src/sys/arch/arm/iomd/vidcaudio.c:1.47 src/sys/arch/arm/iomd/vidcaudio.c:1.48
--- src/sys/arch/arm/iomd/vidcaudio.c:1.47 Wed Nov 23 23:07:28 2011
+++ src/sys/arch/arm/iomd/vidcaudio.c Thu Nov 24 03:35:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vidcaudio.c,v 1.47 2011/11/23 23:07:28 jmcneill Exp $ */
+/* $NetBSD: vidcaudio.c,v 1.48 2011/11/24 03:35:56 mrg Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson
@@ -65,7 +65,7 @@
#include <sys/param.h> /* proc.h */
-__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.47 2011/11/23 23:07:28 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.48 2011/11/24 03:35:56 mrg Exp $");
#include <sys/audioio.h>
#include <sys/conf.h> /* autoconfig functions */
@@ -247,12 +247,12 @@ vidcaudio_attach(struct device *parent,
aprint_normal(": 8-bit internal DAC\n");
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
/* Install the irq handler for the DMA interrupt */
sc->sc_ih.ih_func = vidcaudio_intr;
sc->sc_ih.ih_arg = sc;
- sc->sc_ih.ih_level = IPL_SCHED;
+ sc->sc_ih.ih_level = IPL_AUDIO;
sc->sc_ih.ih_name = self->dv_xname;
if (irq_claim(sc->sc_dma_intr, &sc->sc_ih) != 0) {
Index: src/sys/arch/arm/xscale/pxa2x0_ac97.c
diff -u src/sys/arch/arm/xscale/pxa2x0_ac97.c:1.10 src/sys/arch/arm/xscale/pxa2x0_ac97.c:1.11
--- src/sys/arch/arm/xscale/pxa2x0_ac97.c:1.10 Wed Nov 23 23:07:29 2011
+++ src/sys/arch/arm/xscale/pxa2x0_ac97.c Thu Nov 24 03:35:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_ac97.c,v 1.10 2011/11/23 23:07:29 jmcneill Exp $ */
+/* $NetBSD: pxa2x0_ac97.c,v 1.11 2011/11/24 03:35:56 mrg Exp $ */
/*
* Copyright (c) 2003, 2005 Wasabi Systems, Inc.
@@ -281,7 +281,7 @@ pxaacu_attach(device_t parent, device_t
return;
}
- sc->sc_irqcookie = pxa2x0_intr_establish(pxa->pxa_intr, IPL_SCHED,
+ sc->sc_irqcookie = pxa2x0_intr_establish(pxa->pxa_intr, IPL_AUDIO,
acu_intr, sc);
KASSERT(sc->sc_irqcookie != NULL);
Index: src/sys/arch/hp700/gsc/harmony.c
diff -u src/sys/arch/hp700/gsc/harmony.c:1.24 src/sys/arch/hp700/gsc/harmony.c:1.25
--- src/sys/arch/hp700/gsc/harmony.c:1.24 Wed Nov 23 23:07:29 2011
+++ src/sys/arch/hp700/gsc/harmony.c Thu Nov 24 03:35:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: harmony.c,v 1.24 2011/11/23 23:07:29 jmcneill Exp $ */
+/* $NetBSD: harmony.c,v 1.25 2011/11/24 03:35:56 mrg Exp $ */
/* $OpenBSD: harmony.c,v 1.23 2004/02/13 21:28:19 mickey Exp $ */
@@ -213,7 +213,7 @@ harmony_attach(device_t parent, device_t
sc->sc_dmat = ga->ga_dmatag;
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
if (bus_space_map(sc->sc_bt, ga->ga_hpa, HARMONY_NREGS, 0,
&sc->sc_bh) != 0) {
@@ -289,7 +289,7 @@ harmony_attach(device_t parent, device_t
offsetof(struct harmony_empty, playback[0][0]),
PLAYBACK_EMPTYS * HARMONY_BUFSIZE, BUS_DMASYNC_PREWRITE);
- (void) hp700_intr_establish(IPL_SCHED, harmony_intr, sc, ga->ga_ir,
+ (void) hp700_intr_establish(IPL_AUDIO, harmony_intr, sc, ga->ga_ir,
ga->ga_irq);
/* set defaults */
Index: src/sys/arch/hpcmips/vr/vraiu.c
diff -u src/sys/arch/hpcmips/vr/vraiu.c:1.13 src/sys/arch/hpcmips/vr/vraiu.c:1.14
--- src/sys/arch/hpcmips/vr/vraiu.c:1.13 Wed Nov 23 23:07:29 2011
+++ src/sys/arch/hpcmips/vr/vraiu.c Thu Nov 24 03:35:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vraiu.c,v 1.13 2011/11/23 23:07:29 jmcneill Exp $ */
+/* $NetBSD: vraiu.c,v 1.14 2011/11/24 03:35:56 mrg Exp $ */
/*
* Copyright (c) 2001 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vraiu.c,v 1.13 2011/11/23 23:07:29 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vraiu.c,v 1.14 2011/11/24 03:35:56 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -194,7 +194,7 @@ vraiu_attach(struct device *parent, stru
sc->sc_dmat = &vrdcu_bus_dma_tag;
sc->sc_volume = 127;
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
if (!sc->sc_cc) {
printf(" not configured: cmu not found\n");
@@ -216,7 +216,7 @@ vraiu_attach(struct device *parent, stru
/* install interrupt handler and enable interrupt */
if (!(sc->sc_handler = vrip_intr_establish(va->va_vc, va->va_unit,
- 0, IPL_SCHED, vraiu_intr, sc))) {
+ 0, IPL_AUDIO, vraiu_intr, sc))) {
printf(": can't map interrupt line.\n");
return;
}
Index: src/sys/arch/macppc/dev/awacs.c
diff -u src/sys/arch/macppc/dev/awacs.c:1.41 src/sys/arch/macppc/dev/awacs.c:1.42
--- src/sys/arch/macppc/dev/awacs.c:1.41 Wed Nov 23 23:07:29 2011
+++ src/sys/arch/macppc/dev/awacs.c Thu Nov 24 03:35:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: awacs.c,v 1.41 2011/11/23 23:07:29 jmcneill Exp $ */
+/* $NetBSD: awacs.c,v 1.42 2011/11/24 03:35:57 mrg Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awacs.c,v 1.41 2011/11/23 23:07:29 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awacs.c,v 1.42 2011/11/24 03:35:57 mrg Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -380,11 +380,11 @@ awacs_attach(device_t parent, device_t s
}
intr_establish(cirq, cirq_type, IPL_BIO, awacs_status_intr, sc);
- intr_establish(oirq, oirq_type, IPL_SCHED, awacs_intr, sc);
- intr_establish(iirq, iirq_type, IPL_SCHED, awacs_intr, sc);
+ intr_establish(oirq, oirq_type, IPL_AUDIO, awacs_intr, sc);
+ intr_establish(iirq, iirq_type, IPL_AUDIO, awacs_intr, sc);
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
cv_init(&sc->sc_event, "awacs_wait");
Index: src/sys/arch/macppc/dev/snapper.c
diff -u src/sys/arch/macppc/dev/snapper.c:1.37 src/sys/arch/macppc/dev/snapper.c:1.38
--- src/sys/arch/macppc/dev/snapper.c:1.37 Wed Nov 23 23:07:30 2011
+++ src/sys/arch/macppc/dev/snapper.c Thu Nov 24 03:35:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: snapper.c,v 1.37 2011/11/23 23:07:30 jmcneill Exp $ */
+/* $NetBSD: snapper.c,v 1.38 2011/11/24 03:35:57 mrg Exp $ */
/* Id: snapper.c,v 1.11 2002/10/31 17:42:13 tsubai Exp */
/* Id: i2s.c,v 1.12 2005/01/15 14:32:35 tsubai Exp */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.37 2011/11/23 23:07:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.38 2011/11/24 03:35:57 mrg Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -786,14 +786,14 @@ snapper_attach(device_t parent, device_t
oirq_type = intr[3] ? IST_LEVEL : IST_EDGE;
iirq_type = intr[5] ? IST_LEVEL : IST_EDGE;
- /* intr_establish(cirq, cirq_type, IPL_BIO, snapper_intr, sc); */
- intr_establish(oirq, oirq_type, IPL_SCHED, snapper_intr, sc);
- intr_establish(iirq, iirq_type, IPL_SCHED, snapper_intr, sc);
+ /* intr_establish(cirq, cirq_type, IPL_AUDIO, snapper_intr, sc); */
+ intr_establish(oirq, oirq_type, IPL_AUDIO, snapper_intr, sc);
+ intr_establish(iirq, iirq_type, IPL_AUDIO, snapper_intr, sc);
aprint_normal(": irq %d,%d,%d\n", cirq, oirq, iirq);
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
/* PMF event handler */
pmf_device_register(sc->sc_dev, NULL, NULL);
@@ -2115,7 +2115,7 @@ snapper_init(struct snapper_softc *sc, i
DPRINTF(" audio-hw-reset %p\n", audio_hw_reset);
if (headphone_detect_intr != -1)
- intr_establish(headphone_detect_intr, IST_EDGE, IPL_SCHED,
+ intr_establish(headphone_detect_intr, IST_EDGE, IPL_AUDIO,
snapper_cint, sc);
sc->sc_rate = 44100; /* default rate */
Index: src/sys/arch/prep/isa/paud_isa.c
diff -u src/sys/arch/prep/isa/paud_isa.c:1.15 src/sys/arch/prep/isa/paud_isa.c:1.16
--- src/sys/arch/prep/isa/paud_isa.c:1.15 Wed Nov 23 23:07:30 2011
+++ src/sys/arch/prep/isa/paud_isa.c Thu Nov 24 03:35:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: paud_isa.c,v 1.15 2011/11/23 23:07:30 jmcneill Exp $ */
+/* $NetBSD: paud_isa.c,v 1.16 2011/11/24 03:35:57 mrg Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: paud_isa.c,v 1.15 2011/11/23 23:07:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: paud_isa.c,v 1.16 2011/11/24 03:35:57 mrg Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -161,7 +161,7 @@ paud_attach_isa(device_t parent, device_
sc->sc_ic = ia->ia_ic;
mutex_init(&sc->sc_ad1848.sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_ad1848.sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_ad1848.sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
if (ad1848_isa_mapprobe(sc, ia->ia_io[0].ir_addr) == 0) {
aprint_error(": attach failed\n");
@@ -170,7 +170,7 @@ paud_attach_isa(device_t parent, device_
sc->sc_playdrq = ia->ia_drq[0].ir_drq;
sc->sc_recdrq = ia->ia_drq[1].ir_drq;
sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq[0].ir_irq,
- IST_EDGE, IPL_SCHED, paud_intr, sc);
+ IST_EDGE, IPL_AUDIO, paud_intr, sc);
ad1848_isa_attach(sc);
aprint_normal("\n");
audio_attach_mi(&paud_hw_if, &sc->sc_ad1848, self);
Index: src/sys/arch/sgimips/hpc/haltwo.c
diff -u src/sys/arch/sgimips/hpc/haltwo.c:1.21 src/sys/arch/sgimips/hpc/haltwo.c:1.22
--- src/sys/arch/sgimips/hpc/haltwo.c:1.21 Wed Nov 23 23:07:30 2011
+++ src/sys/arch/sgimips/hpc/haltwo.c Thu Nov 24 03:35:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: haltwo.c,v 1.21 2011/11/23 23:07:30 jmcneill Exp $ */
+/* $NetBSD: haltwo.c,v 1.22 2011/11/24 03:35:57 mrg Exp $ */
/*
* Copyright (c) 2003 Ilpo Ruotsalainen
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: haltwo.c,v 1.21 2011/11/23 23:07:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: haltwo.c,v 1.22 2011/11/24 03:35:57 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -303,7 +303,7 @@ haltwo_attach(device_t parent, device_t
sc->sc_dma_tag = haa->ha_dmat;
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
if (bus_space_subregion(haa->ha_st, haa->ha_sh, haa->ha_devoff,
HPC3_PBUS_CH0_DEVREGS_SIZE, &sc->sc_ctl_sh)) {
@@ -330,7 +330,7 @@ haltwo_attach(device_t parent, device_t
rev = haltwo_read(sc, ctl, HAL2_REG_CTL_REV);
- if (cpu_intr_establish(haa->ha_irq, IPL_SCHED, haltwo_intr, sc)
+ if (cpu_intr_establish(haa->ha_irq, IPL_AUDIO, haltwo_intr, sc)
== NULL) {
aprint_error(": unable to establish interrupt\n");
return;
Index: src/sys/dev/acpi/mpu_acpi.c
diff -u src/sys/dev/acpi/mpu_acpi.c:1.11 src/sys/dev/acpi/mpu_acpi.c:1.12
--- src/sys/dev/acpi/mpu_acpi.c:1.11 Wed Nov 23 23:07:31 2011
+++ src/sys/dev/acpi/mpu_acpi.c Thu Nov 24 03:35:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_acpi.c,v 1.11 2011/11/23 23:07:31 jmcneill Exp $ */
+/* $NetBSD: mpu_acpi.c,v 1.12 2011/11/24 03:35:57 mrg Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <[email protected]>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.11 2011/11/23 23:07:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.12 2011/11/24 03:35:57 mrg Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -122,7 +122,7 @@ mpu_acpi_attach(device_t parent, device_
sc->arg = isa_intr_establish(aa->aa_ic, irq->ar_irq,
(irq->ar_type == ACPI_EDGE_SENSITIVE) ? IST_EDGE : IST_LEVEL,
- IPL_SCHED, mpu_intr, sc);
+ IPL_AUDIO, mpu_intr, sc);
out:
acpi_resource_cleanup(&res);
Index: src/sys/dev/ic/interwave.c
diff -u src/sys/dev/ic/interwave.c:1.35 src/sys/dev/ic/interwave.c:1.36
--- src/sys/dev/ic/interwave.c:1.35 Wed Nov 23 23:07:32 2011
+++ src/sys/dev/ic/interwave.c Thu Nov 24 03:35:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: interwave.c,v 1.35 2011/11/23 23:07:32 jmcneill Exp $ */
+/* $NetBSD: interwave.c,v 1.36 2011/11/24 03:35:57 mrg Exp $ */
/*
* Copyright (c) 1997, 1999, 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interwave.c,v 1.35 2011/11/23 23:07:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interwave.c,v 1.36 2011/11/24 03:35:57 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -192,7 +192,7 @@ iwattach(struct iw_softc *sc)
sc->sc_dma_flags = 0;
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
/*
* We can only use a few selected irqs, see if we got one from pnp
@@ -201,7 +201,7 @@ iwattach(struct iw_softc *sc)
if (sc->sc_irq > 0) {
sc->sc_ih = isa_intr_establish(sc->sc_p2xr_ic,
- sc->sc_irq, IST_EDGE, IPL_SCHED, iwintr, sc);
+ sc->sc_irq, IST_EDGE, IPL_AUDIO, iwintr, sc);
got_irq = 1;
}
if (!got_irq) {
Index: src/sys/dev/isa/aria.c
diff -u src/sys/dev/isa/aria.c:1.34 src/sys/dev/isa/aria.c:1.35
--- src/sys/dev/isa/aria.c:1.34 Wed Nov 23 23:07:32 2011
+++ src/sys/dev/isa/aria.c Thu Nov 24 03:35:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aria.c,v 1.34 2011/11/23 23:07:32 jmcneill Exp $ */
+/* $NetBSD: aria.c,v 1.35 2011/11/24 03:35:57 mrg Exp $ */
/*-
* Copyright (c) 1995, 1996, 1998 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.34 2011/11/23 23:07:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.35 2011/11/24 03:35:57 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -414,10 +414,10 @@ ariaattach(device_t parent, device_t sel
sc->sc_ic = ia->ia_ic;
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq[0].ir_irq,
- IST_EDGE, IPL_SCHED, aria_intr, sc);
+ IST_EDGE, IPL_AUDIO, aria_intr, sc);
DPRINTF(("isa_intr_establish() returns (%p)\n", sc->sc_ih));
Index: src/sys/dev/isa/ess.c
diff -u src/sys/dev/isa/ess.c:1.79 src/sys/dev/isa/ess.c:1.80
--- src/sys/dev/isa/ess.c:1.79 Wed Nov 23 23:07:32 2011
+++ src/sys/dev/isa/ess.c Thu Nov 24 03:35:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ess.c,v 1.79 2011/11/23 23:07:32 jmcneill Exp $ */
+/* $NetBSD: ess.c,v 1.80 2011/11/24 03:35:57 mrg Exp $ */
/*
* Copyright 1997
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.79 2011/11/23 23:07:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.80 2011/11/24 03:35:57 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -926,12 +926,12 @@ essattach(struct ess_softc *sc, int enab
callout_init(&sc->sc_poll1_ch, CALLOUT_MPSAFE);
callout_init(&sc->sc_poll2_ch, CALLOUT_MPSAFE);
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
sc->sc_audio1.polled = sc->sc_audio1.irq == -1;
if (!sc->sc_audio1.polled) {
sc->sc_audio1.ih = isa_intr_establish(sc->sc_ic,
- sc->sc_audio1.irq, sc->sc_audio1.ist, IPL_SCHED,
+ sc->sc_audio1.irq, sc->sc_audio1.ist, IPL_AUDIO,
ess_audio1_intr, sc);
aprint_normal_dev(sc->sc_dev,
"audio1 interrupting at irq %d\n", sc->sc_audio1.irq);
@@ -956,7 +956,7 @@ essattach(struct ess_softc *sc, int enab
sc->sc_audio2.polled = sc->sc_audio2.irq == -1;
if (!sc->sc_audio2.polled) {
sc->sc_audio2.ih = isa_intr_establish(sc->sc_ic,
- sc->sc_audio2.irq, sc->sc_audio2.ist, IPL_SCHED,
+ sc->sc_audio2.irq, sc->sc_audio2.ist, IPL_AUDIO,
ess_audio2_intr, sc);
aprint_normal_dev(sc->sc_dev,
"audio2 interrupting at irq %d\n",
Index: src/sys/dev/isa/gus.c
diff -u src/sys/dev/isa/gus.c:1.107 src/sys/dev/isa/gus.c:1.108
--- src/sys/dev/isa/gus.c:1.107 Wed Nov 23 23:07:32 2011
+++ src/sys/dev/isa/gus.c Thu Nov 24 03:35:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gus.c,v 1.107 2011/11/23 23:07:32 jmcneill Exp $ */
+/* $NetBSD: gus.c,v 1.108 2011/11/24 03:35:57 mrg Exp $ */
/*-
* Copyright (c) 1996, 1999, 2008 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.107 2011/11/23 23:07:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.108 2011/11/24 03:35:57 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -820,7 +820,7 @@ gusattach(device_t parent, device_t self
sc = (void *) self;
ia = aux;
callout_init(&sc->sc_dmaout_ch, CALLOUT_MPSAFE);
- ad1848_init_locks(&sc->sc_codec.sc_ad1848, IPL_SCHED);
+ ad1848_init_locks(&sc->sc_codec.sc_ad1848, IPL_AUDIO);
sc->sc_iot = iot = ia->ia_iot;
sc->sc_ic = ia->ia_ic;
@@ -1036,7 +1036,7 @@ gusattach(device_t parent, device_t self
*/
sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq[0].ir_irq,
- IST_EDGE, IPL_SCHED, gusintr, sc /* sc->sc_gusdsp */);
+ IST_EDGE, IPL_AUDIO, gusintr, sc /* sc->sc_gusdsp */);
/*
* Set some default values
Index: src/sys/dev/isa/mpu_isa.c
diff -u src/sys/dev/isa/mpu_isa.c:1.21 src/sys/dev/isa/mpu_isa.c:1.22
--- src/sys/dev/isa/mpu_isa.c:1.21 Wed Nov 23 23:07:32 2011
+++ src/sys/dev/isa/mpu_isa.c Thu Nov 24 03:35:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_isa.c,v 1.21 2011/11/23 23:07:32 jmcneill Exp $ */
+/* $NetBSD: mpu_isa.c,v 1.22 2011/11/24 03:35:58 mrg Exp $ */
/*-
* Copyright (c) 1999, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_isa.c,v 1.21 2011/11/23 23:07:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_isa.c,v 1.22 2011/11/24 03:35:58 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -115,11 +115,11 @@ mpu_isa_attach(device_t parent, device_t
}
sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq[0].ir_irq,
- IST_EDGE, IPL_SCHED, mpu_intr, &sc->sc_mpu);
+ IST_EDGE, IPL_AUDIO, mpu_intr, &sc->sc_mpu);
sc->sc_mpu.model = "Roland MPU-401 MIDI UART";
sc->sc_dev = self;
sc->sc_mpu.lock = &sc->sc_lock;
- mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_AUDIO);
mpu_attach(&sc->sc_mpu);
}
Index: src/sys/dev/isa/pas.c
diff -u src/sys/dev/isa/pas.c:1.69 src/sys/dev/isa/pas.c:1.70
--- src/sys/dev/isa/pas.c:1.69 Wed Nov 23 23:07:32 2011
+++ src/sys/dev/isa/pas.c Thu Nov 24 03:35:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pas.c,v 1.69 2011/11/23 23:07:32 jmcneill Exp $ */
+/* $NetBSD: pas.c,v 1.70 2011/11/24 03:35:58 mrg Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.69 2011/11/23 23:07:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.70 2011/11/24 03:35:58 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -473,12 +473,12 @@ pasattach(device_t parent, device_t self
}
mutex_init(&sc->sc_sbdsp.sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_sbdsp.sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_sbdsp.sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
sc->sc_sbdsp.sc_ic = ia->ia_ic;
sc->sc_sbdsp.sc_iobase = iobase;
sc->sc_sbdsp.sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq[0].ir_irq,
- IST_EDGE, IPL_SCHED, sbdsp_intr, &sc->sc_sbdsp);
+ IST_EDGE, IPL_AUDIO, sbdsp_intr, &sc->sc_sbdsp);
aprint_normal(" ProAudio Spectrum %s [rev %d] ", pasnames[sc->model],
sc->rev);
Index: src/sys/dev/isa/sb_isa.c
diff -u src/sys/dev/isa/sb_isa.c:1.37 src/sys/dev/isa/sb_isa.c:1.38
--- src/sys/dev/isa/sb_isa.c:1.37 Wed Nov 23 23:07:32 2011
+++ src/sys/dev/isa/sb_isa.c Thu Nov 24 03:35:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_isa.c,v 1.37 2011/11/23 23:07:32 jmcneill Exp $ */
+/* $NetBSD: sb_isa.c,v 1.38 2011/11/24 03:35:58 mrg Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb_isa.c,v 1.37 2011/11/23 23:07:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_isa.c,v 1.38 2011/11/24 03:35:58 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -172,10 +172,10 @@ sb_isa_attach(device_t parent, device_t
}
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq[0].ir_irq,
- IST_EDGE, IPL_SCHED, sbdsp_intr, sc);
+ IST_EDGE, IPL_AUDIO, sbdsp_intr, sc);
sbattach(sc);
}
Index: src/sys/dev/isa/wss.c
diff -u src/sys/dev/isa/wss.c:1.70 src/sys/dev/isa/wss.c:1.71
--- src/sys/dev/isa/wss.c:1.70 Wed Nov 23 23:07:33 2011
+++ src/sys/dev/isa/wss.c Thu Nov 24 03:35:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wss.c,v 1.70 2011/11/23 23:07:33 jmcneill Exp $ */
+/* $NetBSD: wss.c,v 1.71 2011/11/24 03:35:58 mrg Exp $ */
/*
* Copyright (c) 1994 John Brezak
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.70 2011/11/23 23:07:33 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.71 2011/11/24 03:35:58 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -129,12 +129,12 @@ wssattach(struct wss_softc *sc)
ac = &sc->sc_ad1848.sc_ad1848;
- ad1848_init_locks(ac, IPL_SCHED);
+ ad1848_init_locks(ac, IPL_AUDIO);
madattach(sc);
sc->sc_ad1848.sc_ih = isa_intr_establish(sc->wss_ic, sc->wss_irq,
- IST_EDGE, IPL_SCHED, wss_intr, &sc->sc_ad1848);
+ IST_EDGE, IPL_AUDIO, wss_intr, &sc->sc_ad1848);
ad1848_isa_attach(&sc->sc_ad1848);
Index: src/sys/dev/isa/ym.c
diff -u src/sys/dev/isa/ym.c:1.42 src/sys/dev/isa/ym.c:1.43
--- src/sys/dev/isa/ym.c:1.42 Wed Nov 23 23:07:33 2011
+++ src/sys/dev/isa/ym.c Thu Nov 24 03:35:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ym.c,v 1.42 2011/11/23 23:07:33 jmcneill Exp $ */
+/* $NetBSD: ym.c,v 1.43 2011/11/24 03:35:58 mrg Exp $ */
/*-
* Copyright (c) 1999-2002, 2008 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.42 2011/11/23 23:07:33 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.43 2011/11/24 03:35:58 mrg Exp $");
#include "mpu_ym.h"
#include "opt_ym.h"
@@ -214,7 +214,7 @@ ym_attach(struct ym_softc *sc)
ac = &sc->sc_ad1848.sc_ad1848;
callout_init(&sc->sc_powerdown_ch, CALLOUT_MPSAFE);
cv_init(&sc->sc_cv, "ym");
- ad1848_init_locks(ac, IPL_SCHED);
+ ad1848_init_locks(ac, IPL_AUDIO);
/* Mute the output to reduce noise during initialization. */
ym_mute(sc, SA3_VOL_L, 1);
@@ -224,7 +224,7 @@ ym_attach(struct ym_softc *sc)
ac->chip_name = YM_IS_SA3(sc) ? "OPL3-SA3" : "OPL3-SA2";
sc->sc_ad1848.sc_ih = isa_intr_establish(sc->sc_ic, sc->ym_irq,
- IST_EDGE, IPL_SCHED, ym_intr, sc);
+ IST_EDGE, IPL_AUDIO, ym_intr, sc);
#ifndef AUDIO_NO_POWER_CTL
sc->sc_ad1848.powerctl = ym_codec_power_ctl;
Index: src/sys/dev/isapnp/mpu_isapnp.c
diff -u src/sys/dev/isapnp/mpu_isapnp.c:1.18 src/sys/dev/isapnp/mpu_isapnp.c:1.19
--- src/sys/dev/isapnp/mpu_isapnp.c:1.18 Wed Nov 23 23:07:33 2011
+++ src/sys/dev/isapnp/mpu_isapnp.c Thu Nov 24 03:35:58 2011
@@ -1,7 +1,7 @@
-/* $NetBSD: mpu_isapnp.c,v 1.18 2011/11/23 23:07:33 jmcneill Exp $ */
+/* $NetBSD: mpu_isapnp.c,v 1.19 2011/11/24 03:35:58 mrg Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c,v 1.18 2011/11/23 23:07:33 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c,v 1.19 2011/11/24 03:35:58 mrg Exp $");
#include "midi.h"
@@ -65,7 +65,7 @@ mpu_isapnp_attach(device_t parent, devic
return;
}
- mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_AUDIO);
sc->sc_mpu.iot = ipa->ipa_iot;
sc->sc_mpu.ioh = ipa->ipa_io[0].h;
@@ -85,5 +85,5 @@ mpu_isapnp_attach(device_t parent, devic
midi_attach_mi(&mpu_midi_hw_if, &sc->sc_mpu, self);
sc->sc_ih = isa_intr_establish(ipa->ipa_ic, ipa->ipa_irq[0].num,
- ipa->ipa_irq[0].type, IPL_SCHED, mpu_intr, &sc->sc_mpu);
+ ipa->ipa_irq[0].type, IPL_AUDIO, mpu_intr, &sc->sc_mpu);
}
Index: src/sys/dev/pci/auacer.c
diff -u src/sys/dev/pci/auacer.c:1.29 src/sys/dev/pci/auacer.c:1.30
--- src/sys/dev/pci/auacer.c:1.29 Wed Nov 23 23:07:33 2011
+++ src/sys/dev/pci/auacer.c Thu Nov 24 03:35:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: auacer.c,v 1.29 2011/11/23 23:07:33 jmcneill Exp $ */
+/* $NetBSD: auacer.c,v 1.30 2011/11/24 03:35:58 mrg Exp $ */
/*-
* Copyright (c) 2004, 2008 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.29 2011/11/23 23:07:33 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.30 2011/11/24 03:35:58 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -276,7 +276,7 @@ auacer_attach(device_t parent, device_t
sc->sc_dmamap_flags = BUS_DMA_COHERENT; /* XXX remove */
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
/* enable bus mastering */
v = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
@@ -291,7 +291,7 @@ auacer_attach(device_t parent, device_t
return;
}
intrstr = pci_intr_string(pa->pa_pc, ih);
- sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_SCHED,
+ sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO,
auacer_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(&sc->sc_dev, "can't establish interrupt");
Index: src/sys/dev/pci/auich.c
diff -u src/sys/dev/pci/auich.c:1.139 src/sys/dev/pci/auich.c:1.140
--- src/sys/dev/pci/auich.c:1.139 Wed Nov 23 23:07:34 2011
+++ src/sys/dev/pci/auich.c Thu Nov 24 03:35:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: auich.c,v 1.139 2011/11/23 23:07:34 jmcneill Exp $ */
+/* $NetBSD: auich.c,v 1.140 2011/11/24 03:35:58 mrg Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2008 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.139 2011/11/23 23:07:34 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.140 2011/11/24 03:35:58 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -526,7 +526,7 @@ map_done:
v | PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_BACKTOBACK_ENABLE);
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
/* Map and establish the interrupt. */
if (pci_intr_map(pa, &sc->intrh)) {
@@ -534,7 +534,7 @@ map_done:
return;
}
intrstr = pci_intr_string(pa->pa_pc, sc->intrh);
- sc->sc_ih = pci_intr_establish(pa->pa_pc, sc->intrh, IPL_SCHED,
+ sc->sc_ih = pci_intr_establish(pa->pa_pc, sc->intrh, IPL_AUDIO,
auich_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "can't establish interrupt");
Index: src/sys/dev/pci/auixp.c
diff -u src/sys/dev/pci/auixp.c:1.35 src/sys/dev/pci/auixp.c:1.36
--- src/sys/dev/pci/auixp.c:1.35 Wed Nov 23 23:07:34 2011
+++ src/sys/dev/pci/auixp.c Thu Nov 24 03:35:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: auixp.c,v 1.35 2011/11/23 23:07:34 jmcneill Exp $ */
+/* $NetBSD: auixp.c,v 1.36 2011/11/24 03:35:58 mrg Exp $ */
/*
* Copyright (c) 2004, 2005 Reinoud Zandijk <[email protected]>
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.35 2011/11/23 23:07:34 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.36 2011/11/24 03:35:58 mrg Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -1169,10 +1169,10 @@ auixp_attach(device_t parent, device_t s
intrstr = pci_intr_string(pc, ih);
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
- /* establish interrupt routine hookup at IPL_SCHED level */
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_SCHED, auixp_intr, self);
+ /* establish interrupt routine hookup at IPL_AUDIO level */
+ sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, auixp_intr, self);
if (sc->sc_ih == NULL) {
aprint_error_dev(&sc->sc_dev, "can't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/autri.c
diff -u src/sys/dev/pci/autri.c:1.47 src/sys/dev/pci/autri.c:1.48
--- src/sys/dev/pci/autri.c:1.47 Wed Nov 23 23:07:34 2011
+++ src/sys/dev/pci/autri.c Thu Nov 24 03:35:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autri.c,v 1.47 2011/11/23 23:07:34 jmcneill Exp $ */
+/* $NetBSD: autri.c,v 1.48 2011/11/24 03:35:58 mrg Exp $ */
/*
* Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.47 2011/11/23 23:07:34 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.48 2011/11/24 03:35:58 mrg Exp $");
#include "midi.h"
@@ -544,7 +544,7 @@ autri_attach(device_t parent, device_t s
}
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
/* map and establish the interrupt */
if (pci_intr_map(pa, &ih)) {
@@ -552,7 +552,7 @@ autri_attach(device_t parent, device_t s
return;
}
intrstr = pci_intr_string(pc, ih);
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_SCHED, autri_intr, sc);
+ sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, autri_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(&sc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/auvia.c
diff -u src/sys/dev/pci/auvia.c:1.74 src/sys/dev/pci/auvia.c:1.75
--- src/sys/dev/pci/auvia.c:1.74 Wed Nov 23 23:07:34 2011
+++ src/sys/dev/pci/auvia.c Thu Nov 24 03:35:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: auvia.c,v 1.74 2011/11/23 23:07:34 jmcneill Exp $ */
+/* $NetBSD: auvia.c,v 1.75 2011/11/24 03:35:58 mrg Exp $ */
/*-
* Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.74 2011/11/23 23:07:34 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.75 2011/11/24 03:35:58 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -426,9 +426,9 @@ auvia_attach(device_t parent, device_t s
intrstr = pci_intr_string(pc, ih);
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_SCHED, auvia_intr, sc);
+ sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, auvia_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/azalia.c
diff -u src/sys/dev/pci/azalia.c:1.78 src/sys/dev/pci/azalia.c:1.79
--- src/sys/dev/pci/azalia.c:1.78 Wed Nov 23 23:07:34 2011
+++ src/sys/dev/pci/azalia.c Thu Nov 24 03:35:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: azalia.c,v 1.78 2011/11/23 23:07:34 jmcneill Exp $ */
+/* $NetBSD: azalia.c,v 1.79 2011/11/24 03:35:58 mrg Exp $ */
/*-
* Copyright (c) 2005, 2008 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.78 2011/11/23 23:07:34 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.79 2011/11/24 03:35:58 mrg Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -331,12 +331,12 @@ azalia_pci_attach(device_t parent, devic
}
mutex_init(&sc->lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
sc->pc = pa->pa_pc;
sc->tag = pa->pa_tag;
intrrupt_str = pci_intr_string(pa->pa_pc, ih);
- sc->ih = pci_intr_establish(pa->pa_pc, ih, IPL_SCHED, azalia_intr, sc);
+ sc->ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO, azalia_intr, sc);
if (sc->ih == NULL) {
aprint_error_dev(self, "can't establish interrupt");
if (intrrupt_str != NULL)
Index: src/sys/dev/pci/cmpci.c
diff -u src/sys/dev/pci/cmpci.c:1.43 src/sys/dev/pci/cmpci.c:1.44
--- src/sys/dev/pci/cmpci.c:1.43 Wed Nov 23 23:07:35 2011
+++ src/sys/dev/pci/cmpci.c Thu Nov 24 03:35:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cmpci.c,v 1.43 2011/11/23 23:07:35 jmcneill Exp $ */
+/* $NetBSD: cmpci.c,v 1.44 2011/11/24 03:35:58 mrg Exp $ */
/*
* Copyright (c) 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.43 2011/11/23 23:07:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.44 2011/11/24 03:35:58 mrg Exp $");
#if defined(AUDIO_DEBUG) || defined(DEBUG)
#define DPRINTF(x) if (cmpcidebug) printf x
@@ -414,7 +414,7 @@ cmpci_attach(device_t parent, device_t s
}
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
/* interrupt */
if (pci_intr_map(pa, &ih)) {
@@ -422,7 +422,7 @@ cmpci_attach(device_t parent, device_t s
return;
}
strintr = pci_intr_string(pa->pa_pc, ih);
- sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_SCHED, cmpci_intr,
+ sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO, cmpci_intr,
sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(&sc->sc_dev, "failed to establish interrupt");
Index: src/sys/dev/pci/cs4280.c
diff -u src/sys/dev/pci/cs4280.c:1.62 src/sys/dev/pci/cs4280.c:1.63
--- src/sys/dev/pci/cs4280.c:1.62 Wed Nov 23 23:07:35 2011
+++ src/sys/dev/pci/cs4280.c Thu Nov 24 03:35:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4280.c,v 1.62 2011/11/23 23:07:35 jmcneill Exp $ */
+/* $NetBSD: cs4280.c,v 1.63 2011/11/24 03:35:58 mrg Exp $ */
/*
* Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.62 2011/11/23 23:07:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.63 2011/11/24 03:35:58 mrg Exp $");
#include "midi.h"
@@ -326,9 +326,9 @@ cs4280_attach(device_t parent, device_t
intrstr = pci_intr_string(pc, sc->intrh);
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
- sc->sc_ih = pci_intr_establish(sc->sc_pc, sc->intrh, IPL_SCHED,
+ sc->sc_ih = pci_intr_establish(sc->sc_pc, sc->intrh, IPL_AUDIO,
cs4280_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(&sc->sc_dev, "couldn't establish interrupt");
Index: src/sys/dev/pci/cs4281.c
diff -u src/sys/dev/pci/cs4281.c:1.45 src/sys/dev/pci/cs4281.c:1.46
--- src/sys/dev/pci/cs4281.c:1.45 Wed Nov 23 23:07:35 2011
+++ src/sys/dev/pci/cs4281.c Thu Nov 24 03:35:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4281.c,v 1.45 2011/11/23 23:07:35 jmcneill Exp $ */
+/* $NetBSD: cs4281.c,v 1.46 2011/11/24 03:35:58 mrg Exp $ */
/*
* Copyright (c) 2000 Tatoku Ogaito. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.45 2011/11/23 23:07:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.46 2011/11/24 03:35:58 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -250,9 +250,9 @@ cs4281_attach(device_t parent, device_t
intrstr = pci_intr_string(pc, sc->intrh);
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
- sc->sc_ih = pci_intr_establish(sc->sc_pc, sc->intrh, IPL_SCHED,
+ sc->sc_ih = pci_intr_establish(sc->sc_pc, sc->intrh, IPL_AUDIO,
cs4281_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(&sc->sc_dev, "couldn't establish interrupt");
Index: src/sys/dev/pci/sv.c
diff -u src/sys/dev/pci/sv.c:1.45 src/sys/dev/pci/sv.c:1.46
--- src/sys/dev/pci/sv.c:1.45 Wed Nov 23 23:07:36 2011
+++ src/sys/dev/pci/sv.c Thu Nov 24 03:35:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sv.c,v 1.45 2011/11/23 23:07:36 jmcneill Exp $ */
+/* $NetBSD: sv.c,v 1.46 2011/11/24 03:35:58 mrg Exp $ */
/* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */
/*
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.45 2011/11/23 23:07:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.46 2011/11/24 03:35:58 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -427,10 +427,10 @@ sv_attach(device_t parent, device_t self
}
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
intrstr = pci_intr_string(pc, ih);
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_SCHED, sv_intr, sc);
+ sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, sv_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(&sc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/eap.c
diff -u src/sys/dev/pci/eap.c:1.93 src/sys/dev/pci/eap.c:1.94
--- src/sys/dev/pci/eap.c:1.93 Wed Nov 23 23:07:35 2011
+++ src/sys/dev/pci/eap.c Thu Nov 24 03:35:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: eap.c,v 1.93 2011/11/23 23:07:35 jmcneill Exp $ */
+/* $NetBSD: eap.c,v 1.94 2011/11/24 03:35:58 mrg Exp $ */
/* $OpenBSD: eap.c,v 1.6 1999/10/05 19:24:42 csapuntz Exp $ */
/*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.93 2011/11/23 23:07:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.94 2011/11/24 03:35:58 mrg Exp $");
#include "midi.h"
#include "joy_eap.h"
@@ -542,7 +542,7 @@ eap_attach(device_t parent, device_t sel
aprint_naive(": Audio controller\n");
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
/* Stash this away for detach */
sc->sc_pc = pc;
@@ -600,7 +600,7 @@ eap_attach(device_t parent, device_t sel
return;
}
intrstr = pci_intr_string(pc, ih);
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_SCHED, eap_intr, sc);
+ sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, eap_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/emuxki.c
diff -u src/sys/dev/pci/emuxki.c:1.60 src/sys/dev/pci/emuxki.c:1.61
--- src/sys/dev/pci/emuxki.c:1.60 Wed Nov 23 23:07:35 2011
+++ src/sys/dev/pci/emuxki.c Thu Nov 24 03:35:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: emuxki.c,v 1.60 2011/11/23 23:07:35 jmcneill Exp $ */
+/* $NetBSD: emuxki.c,v 1.61 2011/11/24 03:35:58 mrg Exp $ */
/*-
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.60 2011/11/23 23:07:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.61 2011/11/24 03:35:58 mrg Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -414,9 +414,9 @@ emuxki_attach(device_t parent, device_t
aprint_naive(": Audio controller\n");
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
- mutex_init(&sc->sc_index_lock, MUTEX_DEFAULT, IPL_SCHED);
- mutex_init(&sc->sc_ac97_index_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
+ mutex_init(&sc->sc_index_lock, MUTEX_DEFAULT, IPL_AUDIO);
+ mutex_init(&sc->sc_ac97_index_lock, MUTEX_DEFAULT, IPL_AUDIO);
if (pci_mapreg_map(pa, EMU_PCI_CBIO, PCI_MAPREG_TYPE_IO, 0,
&(sc->sc_iot), &(sc->sc_ioh), &(sc->sc_iob),
@@ -440,7 +440,7 @@ emuxki_attach(device_t parent, device_t
}
intrstr = pci_intr_string(pa->pa_pc, ih);
- sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_SCHED, emuxki_intr,
+ sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO, emuxki_intr,
sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
Index: src/sys/dev/pci/esa.c
diff -u src/sys/dev/pci/esa.c:1.55 src/sys/dev/pci/esa.c:1.56
--- src/sys/dev/pci/esa.c:1.55 Wed Nov 23 23:07:35 2011
+++ src/sys/dev/pci/esa.c Thu Nov 24 03:35:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: esa.c,v 1.55 2011/11/23 23:07:35 jmcneill Exp $ */
+/* $NetBSD: esa.c,v 1.56 2011/11/24 03:35:59 mrg Exp $ */
/*
* Copyright (c) 2001-2008 Jared D. McNeill <[email protected]>
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.55 2011/11/23 23:07:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.56 2011/11/24 03:35:59 mrg Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -1049,7 +1049,7 @@ esa_attach(device_t parent, device_t sel
sc->sc_dmat = pa->pa_dmat;
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
/* Map and establish an interrupt */
if (pci_intr_map(pa, &ih)) {
@@ -1059,7 +1059,7 @@ esa_attach(device_t parent, device_t sel
return;
}
intrstr = pci_intr_string(pc, ih);
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_SCHED, esa_intr, sc);
+ sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, esa_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "can't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/esm.c
diff -u src/sys/dev/pci/esm.c:1.54 src/sys/dev/pci/esm.c:1.55
--- src/sys/dev/pci/esm.c:1.54 Wed Nov 23 23:07:35 2011
+++ src/sys/dev/pci/esm.c Thu Nov 24 03:35:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: esm.c,v 1.54 2011/11/23 23:07:35 jmcneill Exp $ */
+/* $NetBSD: esm.c,v 1.55 2011/11/24 03:35:59 mrg Exp $ */
/*-
* Copyright (c) 2002, 2003 Matt Fredette
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.54 2011/11/23 23:07:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.55 2011/11/24 03:35:59 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1613,7 +1613,7 @@ esm_attach(device_t parent, device_t sel
aprint_normal(": %s (rev. 0x%02x)\n", devinfo, revision);
mutex_init(&ess->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&ess->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&ess->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
/* Enable the device. */
csr = pci_conf_read(pc, tag, PCI_COMMAND_STATUS_REG);
@@ -1650,7 +1650,7 @@ esm_attach(device_t parent, device_t sel
return;
}
intrstr = pci_intr_string(pc, ih);
- ess->ih = pci_intr_establish(pc, ih, IPL_SCHED, esm_intr, self);
+ ess->ih = pci_intr_establish(pc, ih, IPL_AUDIO, esm_intr, self);
if (ess->ih == NULL) {
aprint_error_dev(ess->sc_dev, "can't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/eso.c
diff -u src/sys/dev/pci/eso.c:1.58 src/sys/dev/pci/eso.c:1.59
--- src/sys/dev/pci/eso.c:1.58 Wed Nov 23 23:07:35 2011
+++ src/sys/dev/pci/eso.c Thu Nov 24 03:35:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: eso.c,v 1.58 2011/11/23 23:07:35 jmcneill Exp $ */
+/* $NetBSD: eso.c,v 1.59 2011/11/24 03:35:59 mrg Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.58 2011/11/23 23:07:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.59 2011/11/24 03:35:59 mrg Exp $");
#include "mpu.h"
@@ -382,10 +382,10 @@ eso_attach(device_t parent, device_t sel
}
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
intrstring = pci_intr_string(pa->pa_pc, ih);
- sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_SCHED, eso_intr, sc);
+ sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO, eso_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(&sc->sc_dev, "couldn't establish interrupt");
if (intrstring != NULL)
Index: src/sys/dev/pci/fms.c
diff -u src/sys/dev/pci/fms.c:1.39 src/sys/dev/pci/fms.c:1.40
--- src/sys/dev/pci/fms.c:1.39 Wed Nov 23 23:07:35 2011
+++ src/sys/dev/pci/fms.c Thu Nov 24 03:35:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fms.c,v 1.39 2011/11/23 23:07:35 jmcneill Exp $ */
+/* $NetBSD: fms.c,v 1.40 2011/11/24 03:35:59 mrg Exp $ */
/*-
* Copyright (c) 1999, 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.39 2011/11/23 23:07:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.40 2011/11/24 03:35:59 mrg Exp $");
#include "mpu.h"
@@ -260,9 +260,9 @@ fms_attach(device_t parent, device_t sel
intrstr = pci_intr_string(pc, ih);
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_SCHED, fms_intr, sc);
+ sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, fms_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(&sc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/gcscaudio.c
diff -u src/sys/dev/pci/gcscaudio.c:1.8 src/sys/dev/pci/gcscaudio.c:1.9
--- src/sys/dev/pci/gcscaudio.c:1.8 Wed Nov 23 23:07:35 2011
+++ src/sys/dev/pci/gcscaudio.c Thu Nov 24 03:35:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscaudio.c,v 1.8 2011/11/23 23:07:35 jmcneill Exp $ */
+/* $NetBSD: gcscaudio.c,v 1.9 2011/11/24 03:35:59 mrg Exp $ */
/*-
* Copyright (c) 2008 SHIMIZU Ryo <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.8 2011/11/23 23:07:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.9 2011/11/24 03:35:59 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -275,7 +275,7 @@ gcscaudio_attach(device_t parent, device
LIST_INIT(&sc->sc_dmalist);
sc->sc_mch_split_buf = NULL;
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
aprint_normal(": AMD Geode CS5536 Audio\n");
@@ -291,7 +291,7 @@ gcscaudio_attach(device_t parent, device
}
intrstr = pci_intr_string(sc->sc_pc, ih);
- sc->sc_ih = pci_intr_establish(sc->sc_pc, ih, IPL_SCHED,
+ sc->sc_ih = pci_intr_establish(sc->sc_pc, ih, IPL_AUDIO,
gcscaudio_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(&sc->sc_dev, "couldn't establish interrupt");
Index: src/sys/dev/pci/neo.c
diff -u src/sys/dev/pci/neo.c:1.46 src/sys/dev/pci/neo.c:1.47
--- src/sys/dev/pci/neo.c:1.46 Wed Nov 23 23:07:36 2011
+++ src/sys/dev/pci/neo.c Thu Nov 24 03:35:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: neo.c,v 1.46 2011/11/23 23:07:36 jmcneill Exp $ */
+/* $NetBSD: neo.c,v 1.47 2011/11/24 03:35:59 mrg Exp $ */
/*
* Copyright (c) 1999 Cameron Grant <[email protected]>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.46 2011/11/23 23:07:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.47 2011/11/24 03:35:59 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -606,10 +606,10 @@ neo_attach(device_t parent, device_t sel
}
mutex_init(&sc->lock, MUTEX_DEFAULT, IPL_NONE);
- mutex_init(&sc->intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
intrstr = pci_intr_string(pc, ih);
- sc->ih = pci_intr_establish(pc, ih, IPL_SCHED, neo_intr, sc);
+ sc->ih = pci_intr_establish(pc, ih, IPL_AUDIO, neo_intr, sc);
if (sc->ih == NULL) {
aprint_error_dev(&sc->dev, "couldn't establish interrupt");
Index: src/sys/dev/pci/yds.c
diff -u src/sys/dev/pci/yds.c:1.51 src/sys/dev/pci/yds.c:1.52
--- src/sys/dev/pci/yds.c:1.51 Wed Nov 23 23:07:36 2011
+++ src/sys/dev/pci/yds.c Thu Nov 24 03:35:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: yds.c,v 1.51 2011/11/23 23:07:36 jmcneill Exp $ */
+/* $NetBSD: yds.c,v 1.52 2011/11/24 03:35:59 mrg Exp $ */
/*
* Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.51 2011/11/23 23:07:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.52 2011/11/24 03:35:59 mrg Exp $");
#include "mpu.h"
@@ -766,11 +766,11 @@ yds_attach(device_t parent, device_t sel
return;
}
- mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SCHED);
- mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_AUDIO); /* XXX IPL_NONE? */
+ mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
intrstr = pci_intr_string(pc, ih);
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_SCHED, yds_intr, sc);
+ sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, yds_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/hdaudio/hdaudio.c
diff -u src/sys/dev/pci/hdaudio/hdaudio.c:1.17 src/sys/dev/pci/hdaudio/hdaudio.c:1.18
--- src/sys/dev/pci/hdaudio/hdaudio.c:1.17 Wed Nov 23 23:07:36 2011
+++ src/sys/dev/pci/hdaudio/hdaudio.c Thu Nov 24 03:35:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio.c,v 1.17 2011/11/23 23:07:36 jmcneill Exp $ */
+/* $NetBSD: hdaudio.c,v 1.18 2011/11/24 03:35:59 mrg Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd <[email protected]>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.17 2011/11/23 23:07:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.18 2011/11/24 03:35:59 mrg Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -778,8 +778,8 @@ hdaudio_attach(device_t dev, struct hdau
KASSERT(sc->sc_memvalid == true);
sc->sc_dev = dev;
- mutex_init(&sc->sc_corb_mtx, MUTEX_DEFAULT, IPL_SCHED);
- mutex_init(&sc->sc_stream_mtx, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&sc->sc_corb_mtx, MUTEX_DEFAULT, IPL_AUDIO);
+ mutex_init(&sc->sc_stream_mtx, MUTEX_DEFAULT, IPL_AUDIO);
hdaudio_init(sc);
Index: src/sys/dev/pci/hdaudio/hdaudio_pci.c
diff -u src/sys/dev/pci/hdaudio/hdaudio_pci.c:1.9 src/sys/dev/pci/hdaudio/hdaudio_pci.c:1.10
--- src/sys/dev/pci/hdaudio/hdaudio_pci.c:1.9 Wed Nov 23 23:07:36 2011
+++ src/sys/dev/pci/hdaudio/hdaudio_pci.c Thu Nov 24 03:35:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio_pci.c,v 1.9 2011/11/23 23:07:36 jmcneill Exp $ */
+/* $NetBSD: hdaudio_pci.c,v 1.10 2011/11/24 03:35:59 mrg Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd <[email protected]>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.9 2011/11/23 23:07:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.10 2011/11/24 03:35:59 mrg Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -141,7 +141,7 @@ hdaudio_pci_attach(device_t parent, devi
return;
}
intrstr = pci_intr_string(pa->pa_pc, ih);
- sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_SCHED,
+ sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO,
hdaudio_pci_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
Index: src/sys/sys/intr.h
diff -u src/sys/sys/intr.h:1.10 src/sys/sys/intr.h:1.11
--- src/sys/sys/intr.h:1.10 Wed Nov 23 23:07:36 2011
+++ src/sys/sys/intr.h Thu Nov 24 03:35:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.10 2011/11/23 23:07:36 jmcneill Exp $ */
+/* $NetBSD: intr.h,v 1.11 2011/11/24 03:35:59 mrg Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -78,12 +78,14 @@ extern int safepri;
#define IPL_BIO IPL_VM
#define IPL_NET IPL_VM
#define IPL_TTY IPL_VM
+#define IPL_AUDIO IPL_SCHED
#define IPL_CLOCK IPL_SCHED
#define IPL_SERIAL IPL_HIGH
#define splbio() splvm()
#define splnet() splvm()
#define spltty() splvm()
+#define splaudio() splsched()
#define splclock() splsched()
#define splserial() splhigh()
