Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys put back IPL_AUDIO and splaudio(), at the request of rmi...
details: https://anonhg.NetBSD.org/src/rev/44fdb9be50bb
branches: trunk
changeset: 771527:44fdb9be50bb
user: mrg <mrg%NetBSD.org@localhost>
date: Thu Nov 24 03:35:56 2011 +0000
description:
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.
diffstat:
sys/arch/amigappc/amigappc/machdep.c | 6 +++---
sys/arch/arm/iomd/vidcaudio.c | 8 ++++----
sys/arch/arm/xscale/pxa2x0_ac97.c | 4 ++--
sys/arch/hp700/gsc/harmony.c | 6 +++---
sys/arch/hpcmips/vr/vraiu.c | 8 ++++----
sys/arch/macppc/dev/awacs.c | 10 +++++-----
sys/arch/macppc/dev/snapper.c | 14 +++++++-------
sys/arch/prep/isa/paud_isa.c | 8 ++++----
sys/arch/sgimips/hpc/haltwo.c | 8 ++++----
sys/dev/acpi/mpu_acpi.c | 6 +++---
sys/dev/ic/interwave.c | 8 ++++----
sys/dev/isa/aria.c | 8 ++++----
sys/dev/isa/ess.c | 10 +++++-----
sys/dev/isa/gus.c | 8 ++++----
sys/dev/isa/mpu_isa.c | 8 ++++----
sys/dev/isa/pas.c | 8 ++++----
sys/dev/isa/sb_isa.c | 8 ++++----
sys/dev/isa/wss.c | 8 ++++----
sys/dev/isa/ym.c | 8 ++++----
sys/dev/isapnp/mpu_isapnp.c | 8 ++++----
sys/dev/pci/auacer.c | 8 ++++----
sys/dev/pci/auich.c | 8 ++++----
sys/dev/pci/auixp.c | 10 +++++-----
sys/dev/pci/autri.c | 8 ++++----
sys/dev/pci/auvia.c | 8 ++++----
sys/dev/pci/azalia.c | 8 ++++----
sys/dev/pci/cmpci.c | 8 ++++----
sys/dev/pci/cs4280.c | 8 ++++----
sys/dev/pci/cs4281.c | 8 ++++----
sys/dev/pci/eap.c | 8 ++++----
sys/dev/pci/emuxki.c | 12 ++++++------
sys/dev/pci/esa.c | 8 ++++----
sys/dev/pci/esm.c | 8 ++++----
sys/dev/pci/eso.c | 8 ++++----
sys/dev/pci/fms.c | 8 ++++----
sys/dev/pci/gcscaudio.c | 8 ++++----
sys/dev/pci/hdaudio/hdaudio.c | 8 ++++----
sys/dev/pci/hdaudio/hdaudio_pci.c | 6 +++---
sys/dev/pci/neo.c | 8 ++++----
sys/dev/pci/sv.c | 8 ++++----
sys/dev/pci/yds.c | 10 +++++-----
sys/sys/intr.h | 4 +++-
42 files changed, 170 insertions(+), 168 deletions(-)
diffs (truncated from 1377 to 300 lines):
diff -r 60b2ba3531b1 -r 44fdb9be50bb sys/arch/amigappc/amigappc/machdep.c
--- a/sys/arch/amigappc/amigappc/machdep.c Thu Nov 24 03:23:08 2011 +0000
+++ b/sys/arch/amigappc/amigappc/machdep.c Thu Nov 24 03:35:56 2011 +0000
@@ -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 @@
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);
}
diff -r 60b2ba3531b1 -r 44fdb9be50bb sys/arch/arm/iomd/vidcaudio.c
--- a/sys/arch/arm/iomd/vidcaudio.c Thu Nov 24 03:23:08 2011 +0000
+++ b/sys/arch/arm/iomd/vidcaudio.c Thu Nov 24 03:35:56 2011 +0000
@@ -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 @@
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) {
diff -r 60b2ba3531b1 -r 44fdb9be50bb sys/arch/arm/xscale/pxa2x0_ac97.c
--- a/sys/arch/arm/xscale/pxa2x0_ac97.c Thu Nov 24 03:23:08 2011 +0000
+++ b/sys/arch/arm/xscale/pxa2x0_ac97.c Thu Nov 24 03:35:56 2011 +0000
@@ -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 @@
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);
diff -r 60b2ba3531b1 -r 44fdb9be50bb sys/arch/hp700/gsc/harmony.c
--- a/sys/arch/hp700/gsc/harmony.c Thu Nov 24 03:23:08 2011 +0000
+++ b/sys/arch/hp700/gsc/harmony.c Thu Nov 24 03:35:56 2011 +0000
@@ -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 @@
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 @@
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 */
diff -r 60b2ba3531b1 -r 44fdb9be50bb sys/arch/hpcmips/vr/vraiu.c
--- a/sys/arch/hpcmips/vr/vraiu.c Thu Nov 24 03:23:08 2011 +0000
+++ b/sys/arch/hpcmips/vr/vraiu.c Thu Nov 24 03:35:56 2011 +0000
@@ -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 @@
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 @@
/* 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;
}
diff -r 60b2ba3531b1 -r 44fdb9be50bb sys/arch/macppc/dev/awacs.c
--- a/sys/arch/macppc/dev/awacs.c Thu Nov 24 03:23:08 2011 +0000
+++ b/sys/arch/macppc/dev/awacs.c Thu Nov 24 03:35:56 2011 +0000
@@ -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 @@
}
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");
diff -r 60b2ba3531b1 -r 44fdb9be50bb sys/arch/macppc/dev/snapper.c
--- a/sys/arch/macppc/dev/snapper.c Thu Nov 24 03:23:08 2011 +0000
+++ b/sys/arch/macppc/dev/snapper.c Thu Nov 24 03:35:56 2011 +0000
@@ -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 @@
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 @@
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 */
diff -r 60b2ba3531b1 -r 44fdb9be50bb sys/arch/prep/isa/paud_isa.c
--- a/sys/arch/prep/isa/paud_isa.c Thu Nov 24 03:23:08 2011 +0000
+++ b/sys/arch/prep/isa/paud_isa.c Thu Nov 24 03:35:56 2011 +0000
@@ -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 @@
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 @@
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);
diff -r 60b2ba3531b1 -r 44fdb9be50bb sys/arch/sgimips/hpc/haltwo.c
--- a/sys/arch/sgimips/hpc/haltwo.c Thu Nov 24 03:23:08 2011 +0000
+++ b/sys/arch/sgimips/hpc/haltwo.c Thu Nov 24 03:35:56 2011 +0000
@@ -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 @@
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 @@
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;
diff -r 60b2ba3531b1 -r 44fdb9be50bb sys/dev/acpi/mpu_acpi.c
--- a/sys/dev/acpi/mpu_acpi.c Thu Nov 24 03:23:08 2011 +0000
+++ b/sys/dev/acpi/mpu_acpi.c Thu Nov 24 03:35:56 2011 +0000
@@ -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 $ */
/*
Home |
Main Index |
Thread Index |
Old Index