patch-2.3.99-pre6 linux/drivers/sound/dmasound/dmasound_paula.c

• Lines: 91
• Date: Tue Apr 25 17:58:46 2000
• Orig file: v2.3.99-pre5/linux/drivers/sound/dmasound/dmasound_paula.c
• Orig date: Tue Apr 11 15:09:19 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/drivers/sound/dmasound/dmasound_paula.c linux/drivers/sound/dmasound/dmasound_paula.c
@@ -1,14 +1,15 @@
 
 /*
- *  linux/drivers/sound/dmasound_paula.c
+ *  linux/drivers/sound/dmasound/dmasound_paula.c
  *
- *  Amiga DMA Sound Driver
+ *  Amiga `Paula' DMA Sound Driver
  *
- *  See linux/drivers/sound/dmasound_core.c for copyright and credits
+ *  See linux/drivers/sound/dmasound/dmasound_core.c for copyright and credits
  */
 
 
 #include <linux/module.h>
+#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
@@ -18,6 +19,7 @@
 #include <asm/setup.h>
 #include <asm/amigahw.h>
 #include <asm/amigaints.h>
+#include <asm/machdep.h>
 
 #include "dmasound.h"
 
@@ -76,6 +78,38 @@
 static void AmiPlay(void);
 static void AmiInterrupt(int irq, void *dummy, struct pt_regs *fp);
 
+#ifdef CONFIG_HEARTBEAT
+
+    /*
+     *  Heartbeat interferes with sound since the 7 kHz low-pass filter and the
+     *  power LED are controlled by the same line.
+     */
+
+#ifdef CONFIG_APUS
+#define mach_heartbeat	ppc_md.heartbeat
+#endif
+
+static void (*saved_heartbeat)(int) = NULL;
+
+static inline void disable_heartbeat(void)
+{
+	if (mach_heartbeat) {
+	    saved_heartbeat = mach_heartbeat;
+	    mach_heartbeat = NULL;
+	}
+	AmiSetTreble(dmasound.treble);
+}
+
+static inline void enable_heartbeat(void)
+{
+	if (saved_heartbeat)
+	    mach_heartbeat = saved_heartbeat;
+}
+#else /* !CONFIG_HEARTBEAT */
+#define disable_heartbeat()	do { } while (0)
+#define enable_heartbeat()	do { } while (0)
+#endif /* !CONFIG_HEARTBEAT */
+
 
 /*** Mid level stuff *********************************************************/
 
@@ -285,6 +319,7 @@
 	custom.aud[0].audvol = custom.aud[1].audvol = 0;
 	custom.aud[2].audvol = custom.aud[3].audvol = 0;
 	custom.dmacon = AMI_AUDIO_OFF;
+	enable_heartbeat();
 }
 
 static void *AmiAlloc(unsigned int size, int flags)
@@ -350,8 +385,6 @@
 	for (i = 0; i < 4; i++)
 		custom.aud[i].audper = period;
 	amiga_audio_period = period;
-
-	AmiSetTreble(50);  /* recommended for newer amiga models */
 }
 
 
@@ -453,6 +486,7 @@
 		ch1 = start;
 	}
 
+	disable_heartbeat();
 	custom.aud[0].audvol = dmasound.volume_left;
 	custom.aud[1].audvol = dmasound.volume_right;
 	if (dmasound.hard.size == 8) {