Don't require i387 on fixed point mec3

git-svn-id: http://svn.digium.com/svn/zaptel/trunk@205 5390a7c7-147a-4af0-8ec9-7488f05a26cb

3 files changed, 7 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 28af362..9c2177d 100755
--- a/Makefile
+++ b/Makefile
@@ -40,8 +40,8 @@ KFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-msoft-float -fsigned-char
 #KFLAGS+=-DECHO_CAN_STEVE
 #KFLAGS+=-DECHO_CAN_STEVE2
 #KFLAGS+=-DECHO_CAN_MARK
-KFLAGS+=-DECHO_CAN_MARK2
-#KFLAGS+=-DECHO_CAN_MARK3
+#KFLAGS+=-DECHO_CAN_MARK2
+KFLAGS+=-DECHO_CAN_MARK3
 #
 # Uncomment for aggressive residual echo supression under 
 # MARK2 echo canceller
diff --git a/mec3-float.h b/mec3-float.h
index 6f42824..12c40b4 100755
--- a/mec3-float.h
+++ b/mec3-float.h
@@ -15,7 +15,7 @@
 #ifndef _MARK3_ECHO_H
 #define _MARK3_ECHO_H
 
-
+#define ECHO_CAN_FP
 
 #ifdef __KERNEL__
 #include <linux/kernel.h>
diff --git a/zaptel.c b/zaptel.c
index 6a5c2e7..27e429e 100755
--- a/zaptel.c
+++ b/zaptel.c
@@ -65,7 +65,7 @@
 
 /* Get helper arithmetic */
 #include "arith.h"
-#if defined(CONFIG_ZAPTEL_MMX) || defined(ECHO_CAN_MARK3)
+#if defined(CONFIG_ZAPTEL_MMX) || defined(ECHO_CAN_FP)
 #include <asm/i387.h>
 #endif
 
@@ -237,7 +237,7 @@ of the next sample chunk's data (next time around the world).
 
 #include "digits.h"
 
-#if defined(CONFIG_ZAPTEL_MMX) || defined(ECHO_CAN_MARK3)
+#if defined(CONFIG_ZAPTEL_MMX) || defined(ECHO_CAN_FP)
 /* XXX kernel_fpu_begin() is NOT exported properly, so we have to make
        a local version.  Somebody fix this! XXX */
 
@@ -4679,7 +4679,7 @@ void zt_ec_chunk(struct zt_chan *ss, unsigned char *rxchunk, const unsigned char
 	spin_lock_irqsave(&ss->lock, flags);
 	/* Perform echo cancellation on a chunk if necessary */
 	if (ss->ec) {
-#if defined(CONFIG_ZAPTEL_MMX) || defined(ECHO_CAN_MARK3)
+#if defined(CONFIG_ZAPTEL_MMX) || defined(ECHO_CAN_FP)
 		zt_kernel_fpu_begin();
 #endif		
 		for (x=0;x<ZT_CHUNKSIZE;x++) {
@@ -4687,7 +4687,7 @@ void zt_ec_chunk(struct zt_chan *ss, unsigned char *rxchunk, const unsigned char
 			rxlin = echo_can_update(ss->ec, ZT_XLAW(txchunk[x], ss), rxlin);
 			rxchunk[x] = ZT_LIN2X((int)rxlin, ss);
 		}
-#if defined(CONFIG_ZAPTEL_MMX) || defined(ECHO_CAN_MARK3)
+#if defined(CONFIG_ZAPTEL_MMX) || defined(ECHO_CAN_FP)
 		kernel_fpu_end();
 #endif		
 	}