patch-2.0.21-2.1.0 linux/arch/m68k/atari/atasound.c

Next file: linux/arch/m68k/atari/config.c
Previous file: linux/arch/m68k/atari/atari.mup
Back to the patch index
Back to the overall index

diff -u --recursive --new-file lx2.0/v2.0.21/linux/arch/m68k/atari/atasound.c linux/arch/m68k/atari/atasound.c
@@ -17,17 +17,16 @@
 #include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/major.h>
-#include <linux/config.h>
 #include <linux/fcntl.h>
 #include <linux/errno.h>
 #include <linux/mm.h>
 
+#include <asm/setup.h>
 #include <asm/atarihw.h>
 #include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/pgtable.h>
 #include <asm/atariints.h>
-#include <asm/bootinfo.h>
 
 
 /*
@@ -119,10 +118,10 @@
 	}
 	else {
 
-		/* convert from PC counter value (base frequency 1.193 MHz)
+		/* convert from frequency value
 		 * to PSG period value (base frequency 125 kHz).
 		 */
-		int period = (PSG_FREQ * count + PC_FREQ/2) / PC_FREQ;
+		int period = PSG_FREQ / count;
 
 		if (period > 0xfff) period = 0xfff;
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov