Messages in this thread Patch in this message |  | | Date | Thu, 29 Aug 2002 21:56:27 +0200 | Subject | [PATCH] 6/10 sound/oss/dmasound/dmasound_atari.c | From | pwaechtler@mac ... |
| |
--- vanilla-2.5.33/sound/oss/dmasound/dmasound_atari.c Sat Aug 10 00:03:13 2002 +++ linux-2.5-cli-oss/sound/oss/dmasound/dmasound_atari.c Mon Sep 9 01:30:08 2002 @@ -19,7 +19,7 @@ #include <linux/init.h> #include <linux/soundcard.h> #include <linux/mm.h> - +#include <linux/spinlock.h> #include <asm/pgalloc.h> #include <asm/uaccess.h> #include <asm/atariints.h> @@ -1262,7 +1262,7 @@ return; } #endif - + spin_lock(&dmasound.lock); if (write_sq_ignore_int && is_falcon) { /* ++TeSche: Falcon only: ignore first irq because it comes * immediately after starting a frame. after that, irqs come @@ -1314,6 +1314,7 @@ /* We are not playing after AtaPlay(), so there is nothing to play any more. Wake up a process waiting for audio output to drain. */ + spin_unlock(&dmasound.lock); } @@ -1349,14 +1350,15 @@ static int AtaMixerIoctl(u_int cmd, u_long arg) { int data; + unsigned long flags; switch (cmd) { case SOUND_MIXER_READ_SPEAKER: if (is_falcon || MACH_IS_TT) { int porta; - cli(); + spin_lock_irqsave(&dmasound.lock, flags); sound_ym.rd_data_reg_sel = 14; porta = sound_ym.rd_data_reg_sel; - sti(); + spin_unlock_irqrestore(&dmasound.lock, flags); return IOCTL_OUT(arg, porta & 0x40 ? 0 : 100); } break; @@ -1367,12 +1369,12 @@ if (is_falcon || MACH_IS_TT) { int porta; IOCTL_IN(arg, data); - cli(); + spin_lock_irqsave(&dmasound.lock, flags); sound_ym.rd_data_reg_sel = 14; porta = (sound_ym.rd_data_reg_sel & ~0x40) | (data < 50 ? 0x40 : 0); sound_ym.wd_data = porta; - sti(); + spin_unlock_irqrestore(&dmasound.lock, flags); return IOCTL_OUT(arg, porta & 0x40 ? 0 : 100); } } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|  |