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

1 files changed, 18 insertions, 18 deletions

diff --git a/kernel/zaptel-base.c b/kernel/zaptel-base.c
index 2c6a22e..905b1af 100644
--- a/kernel/zaptel-base.c
+++ b/kernel/zaptel-base.c
@@ -87,7 +87,7 @@
 
 /* Get helper arithmetic */
 #include "arith.h"
-#if defined(CONFIG_ZAPTEL_MMX) || defined(ECHO_CAN_FP)
+#if defined(CONFIG_DAHDI_MMX) || defined(ECHO_CAN_FP)
 #include <asm/i387.h>
 #endif
 
@@ -316,7 +316,7 @@ static struct zt_dialparams global_dialparams = {
 
 static int zt_chan_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long data, int unit);
 
-#if defined(CONFIG_ZAPTEL_MMX) || defined(ECHO_CAN_FP)
+#if defined(CONFIG_DAHDI_MMX) || defined(ECHO_CAN_FP)
 /* XXX kernel_fpu_begin() is NOT exported properly (in 2.4), so we have to make
        a local version.  Somebody fix this! XXX */
 
@@ -3998,7 +3998,7 @@ static int zt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd
 		struct zt_versioninfo vi;
 
 		memset(&vi, 0, sizeof(vi));
-		zap_copy_string(vi.version, ZAPTEL_VERSION, sizeof(vi.version));
+		zap_copy_string(vi.version, DAHDI_VERSION, sizeof(vi.version));
 		echo_can_identify(vi.echo_canceller, sizeof(vi.echo_canceller) - 1);
 		if (copy_to_user((struct zt_versioninfo *) data, &vi, sizeof(vi)))
 			return -EFAULT;
@@ -6296,7 +6296,7 @@ static inline void __zt_ec_chunk(struct zt_chan *ss, unsigned char *rxchunk, con
 
 	/* Perform echo cancellation on a chunk if necessary */
 	if (ss->ec) {
-#if defined(CONFIG_ZAPTEL_MMX) || defined(ECHO_CAN_FP)
+#if defined(CONFIG_DAHDI_MMX) || defined(ECHO_CAN_FP)
 		zt_kernel_fpu_begin();
 #endif		
 		if (ss->echostate & __ECHO_STATE_MUTE) {
@@ -6343,7 +6343,7 @@ static inline void __zt_ec_chunk(struct zt_chan *ss, unsigned char *rxchunk, con
 				rxchunk[x] = ZT_LIN2X((int) rxlins[x], ss);
 #endif /* defined(ZT_EC_ARRAY_UPDATE) */
 		}
-#if defined(CONFIG_ZAPTEL_MMX) || defined(ECHO_CAN_FP)
+#if defined(CONFIG_DAHDI_MMX) || defined(ECHO_CAN_FP)
 		kernel_fpu_end();
 #endif		
 	}
@@ -7241,11 +7241,11 @@ static void __zt_transmit_chunk(struct zt_chan *chan, unsigned char *buf)
 	__zt_getbuf_chunk(chan, buf);
 
 	if ((chan->flags & ZT_FLAG_AUDIO) || (chan->confmode)) {
-#ifdef CONFIG_ZAPTEL_MMX
+#ifdef CONFIG_DAHDI_MMX
 		zt_kernel_fpu_begin();
 #endif
 		__zt_process_getaudio_chunk(chan, buf);
-#ifdef CONFIG_ZAPTEL_MMX
+#ifdef CONFIG_DAHDI_MMX
 		kernel_fpu_end();
 #endif
 	}
@@ -7326,11 +7326,11 @@ static void __zt_receive_chunk(struct zt_chan *chan, unsigned char *buf)
 		buf = waste;
 	}
 	if ((chan->flags & ZT_FLAG_AUDIO) || (chan->confmode)) {
-#ifdef CONFIG_ZAPTEL_MMX                         
+#ifdef CONFIG_DAHDI_MMX                         
 		zt_kernel_fpu_begin();
 #endif
 		__zt_process_putaudio_chunk(chan, buf);
-#ifdef CONFIG_ZAPTEL_MMX
+#ifdef CONFIG_DAHDI_MMX
 		kernel_fpu_end();
 #endif
 	}
@@ -7429,7 +7429,7 @@ int zt_receive(struct zt_span *span)
 	unsigned long flags, flagso;
 
 #if 1
-#ifdef CONFIG_ZAPTEL_WATCHDOG
+#ifdef CONFIG_DAHDI_WATCHDOG
 	span->watchcounter--;
 #endif	
 	for (x=0;x<span->channels;x++) {
@@ -7537,7 +7537,7 @@ int zt_receive(struct zt_span *span)
 			}
 		}
 		if (maxlinks) {
-#ifdef CONFIG_ZAPTEL_MMX
+#ifdef CONFIG_DAHDI_MMX
 			zt_kernel_fpu_begin();
 #endif			
 			  /* process all the conf links */
@@ -7548,7 +7548,7 @@ int zt_receive(struct zt_span *span)
 					ACSS(conf_sums[z], conf_sums[y]);
 				}
 			}
-#ifdef CONFIG_ZAPTEL_MMX
+#ifdef CONFIG_DAHDI_MMX
 			kernel_fpu_end();
 #endif			
 		}
@@ -7573,7 +7573,7 @@ int zt_receive(struct zt_span *span)
 				spin_unlock_irqrestore(&chans[x]->lock, flags);
 			}
 		}
-#ifdef	ZAPTEL_SYNC_TICK
+#ifdef	DAHDI_SYNC_TICK
 		for (x=0;x<maxspans;x++) {
 			struct zt_span	*s = spans[x];
 
@@ -7593,7 +7593,7 @@ MODULE_DESCRIPTION("Zapata Telephony Interface");
 MODULE_LICENSE("GPL");
 #endif
 #ifdef MODULE_VERSION
-MODULE_VERSION(ZAPTEL_VERSION);
+MODULE_VERSION(DAHDI_VERSION);
 #endif
 
 #ifdef LINUX26
@@ -7619,7 +7619,7 @@ static struct file_operations zt_fops = {
 	fasync: NULL,
 };
 
-#ifdef CONFIG_ZAPTEL_WATCHDOG
+#ifdef CONFIG_DAHDI_WATCHDOG
 static struct timer_list watchdogtimer;
 
 static void watchdog_check(unsigned long ignored)
@@ -7748,13 +7748,13 @@ static int __init zt_init(void) {
 #endif /* CONFIG_DEVFS_FS */
 
 	printk(KERN_INFO "Zapata Telephony Interface Registered on major %d\n", ZT_MAJOR);
-	printk(KERN_INFO "Zaptel Version: %s\n", ZAPTEL_VERSION);
+	printk(KERN_INFO "Zaptel Version: %s\n", DAHDI_VERSION);
 	echo_can_init();
 	zt_conv_init();
 	fasthdlc_precalc();
 	rotate_sums();
 	rwlock_init(&chan_lock);
-#ifdef CONFIG_ZAPTEL_WATCHDOG
+#ifdef CONFIG_DAHDI_WATCHDOG
 	watchdog_init();
 #endif	
 	return res;
@@ -7790,7 +7790,7 @@ static void __exit zt_cleanup(void) {
 #endif /* CONFIG_ZAP_UDEV */
 	unregister_chrdev(ZT_MAJOR, "zaptel");
 #endif
-#ifdef CONFIG_ZAPTEL_WATCHDOG
+#ifdef CONFIG_DAHDI_WATCHDOG
 	watchdog_cleanup();
 #endif