Module Name: src Committed By: jmcneill Date: Wed Nov 23 23:07:37 UTC 2011
Modified Files: src/sys/arch/amiga/dev: aucc.c melody.c repulse.c toccata.c src/sys/arch/amigappc/amigappc: machdep.c src/sys/arch/arm/iomd: vidcaudio.c src/sys/arch/arm/xscale: pxa2x0_ac97.c pxa2x0_dmac.c pxa2x0_dmac.h pxa2x0_i2s.c pxa2x0_i2s.h pxa2x0_mci.c src/sys/arch/dreamcast/dev/g2: aica.c src/sys/arch/hp700/gsc: harmony.c harmonyvar.h src/sys/arch/hpcmips/dev: ucbsnd.c src/sys/arch/hpcmips/vr: vraiu.c src/sys/arch/i386/pnpbios: joy_pnpbios.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 haltwovar.h src/sys/arch/sgimips/mace: mavb.c src/sys/arch/shark/ofw: ofw.c src/sys/arch/sparc/dev: audioamd.c src/sys/arch/x68k/dev: vs.c vsvar.h src/sys/arch/zaurus/dev: zaudio.c src/sys/dev: auconv.c auconv.h audio.c audio_if.h audiovar.h aurateconv.c midi.c midi_if.h midictl.c midictl.h midisyn.c midisynvar.h midivar.h mulaw.c sequencer.c sequencervar.h src/sys/dev/acpi: joy_acpi.c mpu_acpi.c src/sys/dev/bluetooth: btsco.c src/sys/dev/ebus: cs4231_ebus.c src/sys/dev/ic: ac97.c ac97var.h ad1848.c ad1848var.h am7930.c am7930var.h attimer.c cs4231.c cs4231var.h interwave.c interwavevar.h joy.c joyvar.h mpu.c mpuvar.h msm6258.c opl.c oplvar.h tms320av110.c tms320av110var.h src/sys/dev/isa: ad1848_isa.c ad1848var.h aria.c cms.c ess.c essvar.h gus.c ics2101.c joy_ess.c joy_isa.c midi_pcppi.c mpu_isa.c mpu_sb.c mpu_ym.c opl_ess.c opl_isa.c opl_sb.c pas.c pcppi.c pcppivar.h sb.c sb_isa.c sbdsp.c sbdspvar.h wss.c ym.c ymvar.h src/sys/dev/isapnp: gus_isapnp.c joy_isapnp.c mpu_isapnp.c src/sys/dev/ofisa: joy_ofisa.c src/sys/dev/pad: pad.c padvar.h padvol.c padvol.h src/sys/dev/pci: auacer.c auich.c auixp.c auixpvar.h autri.c autrivar.h auvia.c auviavar.h azalia.c azalia.h azalia_codec.c cmpci.c cmpcivar.h cs4280.c cs4281.c cs428x.c cs428x.h eap.c eapvar.h emuxki.c emuxkivar.h esa.c esavar.h esm.c esmvar.h eso.c esovar.h fms.c fmsvar.h gcscaudio.c joy_eap.c joy_eso.c joy_pci.c mpu_cmpci.c mpu_eso.c mpu_fms.c mpu_yds.c neo.c opl_eso.c sv.c svvar.h yds.c ydsvar.h src/sys/dev/pci/hdaudio: hdafg.c hdaudio.c hdaudio_pci.c src/sys/dev/sbus: cs4231_sbus.c dbri.c dbrivar.h src/sys/dev/tc: bba.c src/sys/dev/usb: uaudio.c umidi.c umidivar.h src/sys/sys: intr.h param.h Added Files: src/sys/dev: TODO.audiomp Log Message: Merge jmcneill-audiomp3 branch, which is derived from ad-audiomp2. From the original ad-audiomp branch notes: Add MP locking to the audio drivers. Making the audio drivers MP safe is necessary before efforts can be made to make the VM system MP safe. The are two locks per device instance, an ISR lock and a character device lock. The ISR lock replaces calls to splaudio()/splx(), and will be held across calls to device methods which were called at splaudio() before (e.g. trigger_output). The character device lock is held across calls to nearly all of the methods, excluding some only used for initialization, e.g. get_locks. Welcome to 5.99.57. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/amiga/dev/aucc.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amiga/dev/melody.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amiga/dev/repulse.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amiga/dev/toccata.c cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amigappc/amigappc/machdep.c cvs rdiff -u -r1.46 -r1.47 src/sys/arch/arm/iomd/vidcaudio.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/xscale/pxa2x0_ac97.c \ src/sys/arch/arm/xscale/pxa2x0_i2s.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/xscale/pxa2x0_dmac.c \ src/sys/arch/arm/xscale/pxa2x0_mci.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/xscale/pxa2x0_dmac.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/xscale/pxa2x0_i2s.h cvs rdiff -u -r1.21 -r1.22 src/sys/arch/dreamcast/dev/g2/aica.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hp700/gsc/harmony.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hp700/gsc/harmonyvar.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcmips/dev/ucbsnd.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hpcmips/vr/vraiu.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/i386/pnpbios/joy_pnpbios.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/macppc/dev/awacs.c cvs rdiff -u -r1.36 -r1.37 src/sys/arch/macppc/dev/snapper.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/prep/isa/paud_isa.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sgimips/hpc/haltwo.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sgimips/hpc/haltwovar.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sgimips/mace/mavb.c cvs rdiff -u -r1.56 -r1.57 src/sys/arch/shark/ofw/ofw.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sparc/dev/audioamd.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/x68k/dev/vs.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x68k/dev/vsvar.h cvs rdiff -u -r1.15 -r1.16 src/sys/arch/zaurus/dev/zaudio.c cvs rdiff -u -r0 -r1.2 src/sys/dev/TODO.audiomp cvs rdiff -u -r1.24 -r1.25 src/sys/dev/auconv.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/auconv.h cvs rdiff -u -r1.253 -r1.254 src/sys/dev/audio.c cvs rdiff -u -r1.66 -r1.67 src/sys/dev/audio_if.h cvs rdiff -u -r1.45 -r1.46 src/sys/dev/audiovar.h cvs rdiff -u -r1.18 -r1.19 src/sys/dev/aurateconv.c cvs rdiff -u -r1.72 -r1.73 src/sys/dev/midi.c cvs rdiff -u -r1.22 -r1.23 src/sys/dev/midi_if.h src/sys/dev/midisyn.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/midictl.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/midictl.h cvs rdiff -u -r1.12 -r1.13 src/sys/dev/midisynvar.h cvs rdiff -u -r1.17 -r1.18 src/sys/dev/midivar.h cvs rdiff -u -r1.27 -r1.28 src/sys/dev/mulaw.c cvs rdiff -u -r1.52 -r1.53 src/sys/dev/sequencer.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/sequencervar.h cvs rdiff -u -r1.10 -r1.11 src/sys/dev/acpi/joy_acpi.c \ src/sys/dev/acpi/mpu_acpi.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/bluetooth/btsco.c cvs rdiff -u -r1.34 -r1.35 src/sys/dev/ebus/cs4231_ebus.c cvs rdiff -u -r1.91 -r1.92 src/sys/dev/ic/ac97.c cvs rdiff -u -r1.21 -r1.22 src/sys/dev/ic/ac97var.h \ src/sys/dev/ic/tms320av110.c cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ic/ad1848.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/ad1848var.h src/sys/dev/ic/joy.c \ src/sys/dev/ic/mpu.c cvs rdiff -u -r1.50 -r1.51 src/sys/dev/ic/am7930.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ic/am7930var.h cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/attimer.c src/sys/dev/ic/mpuvar.h \ src/sys/dev/ic/tms320av110var.h cvs rdiff -u -r1.26 -r1.27 src/sys/dev/ic/cs4231.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/ic/cs4231var.h cvs rdiff -u -r1.34 -r1.35 src/sys/dev/ic/interwave.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/ic/interwavevar.h \ src/sys/dev/ic/msm6258.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/joyvar.h cvs rdiff -u -r1.37 -r1.38 src/sys/dev/ic/opl.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/oplvar.h cvs rdiff -u -r1.37 -r1.38 src/sys/dev/isa/ad1848_isa.c \ src/sys/dev/isa/pcppi.c cvs rdiff -u -r1.43 -r1.44 src/sys/dev/isa/ad1848var.h cvs rdiff -u -r1.33 -r1.34 src/sys/dev/isa/aria.c cvs rdiff -u -r1.18 -r1.19 src/sys/dev/isa/cms.c src/sys/dev/isa/opl_sb.c cvs rdiff -u -r1.78 -r1.79 src/sys/dev/isa/ess.c cvs rdiff -u -r1.25 -r1.26 src/sys/dev/isa/essvar.h cvs rdiff -u -r1.106 -r1.107 src/sys/dev/isa/gus.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/isa/ics2101.c \ src/sys/dev/isa/opl_ess.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/isa/joy_ess.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/isa/joy_isa.c src/sys/dev/isa/ymvar.h cvs rdiff -u -r1.23 -r1.24 src/sys/dev/isa/midi_pcppi.c cvs rdiff -u -r1.20 -r1.21 src/sys/dev/isa/mpu_isa.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/isa/mpu_sb.c src/sys/dev/isa/mpu_ym.c cvs rdiff -u -r1.19 -r1.20 src/sys/dev/isa/opl_isa.c cvs rdiff -u -r1.68 -r1.69 src/sys/dev/isa/pas.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/isa/pcppivar.h cvs rdiff -u -r1.88 -r1.89 src/sys/dev/isa/sb.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/isa/sb_isa.c cvs rdiff -u -r1.134 -r1.135 src/sys/dev/isa/sbdsp.c cvs rdiff -u -r1.60 -r1.61 src/sys/dev/isa/sbdspvar.h cvs rdiff -u -r1.69 -r1.70 src/sys/dev/isa/wss.c cvs rdiff -u -r1.41 -r1.42 src/sys/dev/isa/ym.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/isapnp/gus_isapnp.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/isapnp/joy_isapnp.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/isapnp/mpu_isapnp.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ofisa/joy_ofisa.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pad/pad.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pad/padvar.h cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pad/padvol.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pad/padvol.h cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/auacer.c cvs rdiff -u -r1.138 -r1.139 src/sys/dev/pci/auich.c cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/auixp.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/auixpvar.h src/sys/dev/pci/svvar.h cvs rdiff -u -r1.46 -r1.47 src/sys/dev/pci/autri.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/autrivar.h cvs rdiff -u -r1.73 -r1.74 src/sys/dev/pci/auvia.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/auviavar.h \ src/sys/dev/pci/cs428x.c src/sys/dev/pci/mpu_cmpci.c \ src/sys/dev/pci/mpu_yds.c cvs rdiff -u -r1.77 -r1.78 src/sys/dev/pci/azalia.c cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/azalia.h cvs rdiff -u -r1.78 -r1.79 src/sys/dev/pci/azalia_codec.c cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/cmpci.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/cmpcivar.h \ src/sys/dev/pci/esavar.h src/sys/dev/pci/ydsvar.h cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/cs4280.c cvs rdiff -u -r1.44 -r1.45 src/sys/dev/pci/cs4281.c src/sys/dev/pci/sv.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/cs428x.h src/sys/dev/pci/joy_eso.c cvs rdiff -u -r1.92 -r1.93 src/sys/dev/pci/eap.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/eapvar.h cvs rdiff -u -r1.59 -r1.60 src/sys/dev/pci/emuxki.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/emuxkivar.h \ src/sys/dev/pci/joy_eap.c cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pci/esa.c cvs rdiff -u -r1.53 -r1.54 src/sys/dev/pci/esm.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/esmvar.h src/sys/dev/pci/joy_pci.c cvs rdiff -u -r1.57 -r1.58 src/sys/dev/pci/eso.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/esovar.h cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pci/fms.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/fmsvar.h cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/gcscaudio.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/mpu_eso.c \ src/sys/dev/pci/mpu_fms.c src/sys/dev/pci/opl_eso.c cvs rdiff -u -r1.45 -r1.46 src/sys/dev/pci/neo.c cvs rdiff -u -r1.50 -r1.51 src/sys/dev/pci/yds.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/hdaudio/hdafg.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/hdaudio/hdaudio.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/hdaudio/hdaudio_pci.c cvs rdiff -u -r1.48 -r1.49 src/sys/dev/sbus/cs4231_sbus.c cvs rdiff -u -r1.33 -r1.34 src/sys/dev/sbus/dbri.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/sbus/dbrivar.h cvs rdiff -u -r1.38 -r1.39 src/sys/dev/tc/bba.c cvs rdiff -u -r1.120 -r1.121 src/sys/dev/usb/uaudio.c cvs rdiff -u -r1.44 -r1.45 src/sys/dev/usb/umidi.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/usb/umidivar.h cvs rdiff -u -r1.9 -r1.10 src/sys/sys/intr.h cvs rdiff -u -r1.395 -r1.396 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.