patch-2.4.0-test9 linux/drivers/sound/vidc.c

• Lines: 83
• Date: Wed Sep 27 13:39:23 2000
• Orig file: v2.4.0-test8/linux/drivers/sound/vidc.c
• Orig date: Fri Aug 11 08:26:44 2000

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/sound/vidc.c linux/drivers/sound/vidc.c
@@ -1,9 +1,13 @@
 /*
- * drivers/sound/vidc.c
+ *  linux/drivers/sound/vidc.c
  *
- * VIDC20 audio driver.
+ *  Copyright (C) 1997-2000 by Russell King <rmk@arm.linux.org.uk>
  *
- * Copyright (C) 1997-2000 by Russell King <rmk@arm.linux.org.uk>
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ *  VIDC20 audio driver.
  *
  * The VIDC20 sound hardware consists of the VIDC20 itself, a DAC and a DMA
  * engine.  The DMA transfers fixed-format (16-bit little-endian linear)
@@ -13,7 +17,6 @@
  * We currently support a mixer device, but it is currently non-functional.
  */
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -21,7 +24,7 @@
 #include <asm/hardware.h>
 #include <asm/dma.h>
 #include <asm/io.h>
-#include <asm/iomd.h>
+#include <asm/hardware/iomd.h>
 #include <asm/irq.h>
 #include <asm/system.h>
 
@@ -79,7 +82,6 @@
 static void	(*old_mksound)(unsigned int hz, unsigned int ticks);
 extern void	(*kd_mksound)(unsigned int hz, unsigned int ticks);
 extern void	vidc_update_filler(int bits, int channels);
-extern int	softoss_dev;
 
 static void
 vidc_mksound(unsigned int hz, unsigned int ticks)
@@ -287,10 +289,10 @@
 	struct dma_buffparms *dmap = audio_devs[dev]->dmap_out;
 	unsigned long flags;
 
-	save_flags_cli(flags);
+	local_irq_save(flags);
 	dma_start = buf - (unsigned long)dmap->raw_buf_phys + (unsigned long)dmap->raw_buf;
 	dma_count = total_count;
-	restore_flags(flags);
+	local_irq_restore(flags);
 }
 
 static void
@@ -345,7 +347,7 @@
 		if (!(adev->flags & DMA_ACTIVE)) {
 			unsigned long flags;
 
-			save_flags_cli(flags);
+			local_irq_save(flags);
 
 			/* prevent recusion */
 			adev->flags |= DMA_ACTIVE;
@@ -354,7 +356,7 @@
 			vidc_sound_dma_irq(0, NULL, NULL);
 			outb(DMA_CR_E | 0x10, IOMD_SD0CR);
 
-			restore_flags(flags);
+			local_irq_restore(flags);
 		}
 	}
 }
@@ -471,9 +473,6 @@
 	vidc_adev = adev;
 	vidc_mixer_set(SOUND_MIXER_VOLUME, (85 | 85 << 8));
 
-#if defined(CONFIG_SOUND_SOFTOSS) || defined(CONFIG_SOUND_SOFTOSS_MODULE)
-	softoss_dev = adev;
-#endif
 	return;
 
 irq_failed: