[LV-kern-commit] CVS: kernel-2.4/drivers/net/hamradio/soundmodem gentbl.c,1.1.1.1,1.2 sm.c,1.1.1.1,1.2 sm.h,1.1.1.1,1.2 sm_wss.c,1.1.1.1,1.2

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/net/hamradio/soundmodem
In directory usw-pr-cvs1:/tmp/cvs-serv30336/net/hamradio/soundmodem

Modified Files:
	gentbl.c sm.c sm.h sm_wss.c 
Log Message:
synch 2.4.15 commit 50


Index: gentbl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/hamradio/soundmodem/gentbl.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- gentbl.c	14 Jan 2001 17:39:39 -0000	1.1.1.1
+++ gentbl.c	11 Apr 2002 12:37:48 -0000	1.2
@@ -26,6 +26,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <math.h>
 #include <string.h>
 

Index: sm.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/hamradio/soundmodem/sm.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- sm.c	14 Jan 2001 17:39:42 -0000	1.1.1.1
+++ sm.c	11 Apr 2002 12:37:48 -0000	1.2
@@ -728,7 +728,7 @@
 
 static int __init sm_setup(char *str)
 {
-	static unsigned nr_dev = 0;
+	static unsigned nr_dev;
 	int ints[8];
 
 	if (nr_dev >= NR_PORTS)

Index: sm.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/hamradio/soundmodem/sm.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- sm.h	14 Jan 2001 17:39:48 -0000	1.1.1.1
+++ sm.h	11 Apr 2002 12:37:48 -0000	1.2
@@ -150,11 +150,6 @@
 
 /* --------------------------------------------------------------------- */
 
-#define min(a, b) (((a) < (b)) ? (a) : (b))
-#define max(a, b) (((a) > (b)) ? (a) : (b))
-
-/* --------------------------------------------------------------------- */
-
 extern const char sm_drvname[];
 extern const char sm_drvinfo[];
 
@@ -299,6 +294,8 @@
 
 #ifdef __i386__
 
+#include <asm/msr.h>
+
 /*
  * only do 32bit cycle counter arithmetic; we hope we won't overflow.
  * in fact, overflowing modems would require over 2THz CPU clock speeds :-)
@@ -307,10 +304,10 @@
 #define time_exec(var,cmd)                                              \
 ({                                                                      \
 	if (cpu_has_tsc) {                                              \
-		unsigned int cnt1, cnt2, cnt3;                          \
-		__asm__(".byte 0x0f,0x31" : "=a" (cnt1), "=d" (cnt3));  \
+		unsigned int cnt1, cnt2;                                \
+		rdtscl(cnt1);                                           \
 		cmd;                                                    \
-		__asm__(".byte 0x0f,0x31" : "=a" (cnt2), "=d" (cnt3));  \
+		rdtscl(cnt2);                                           \
 		var = cnt2-cnt1;                                        \
 	} else {                                                        \
 		cmd;                                                    \

Index: sm_wss.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/hamradio/soundmodem/sm_wss.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- sm_wss.c	14 Jan 2001 17:39:57 -0000	1.1.1.1
+++ sm_wss.c	11 Apr 2002 12:37:48 -0000	1.2
@@ -172,8 +172,10 @@
 		/* MCE and interface config reg */
 		write_codec(dev, 0x49, fdx ? 0x8 : 0xc);
 	outb(0xb, WSS_CODEC_IA(dev->base_addr)); /* leave MCE */
-	if (SCSTATE->crystal && !fullcalib)
+	if (SCSTATE->crystal && !fullcalib) {
+		restore_flags(flags);
 		return 0;
+	}
 	/*
 	 * wait for ACI start
 	 */