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

1 files changed, 15 insertions, 15 deletions

diff --git a/kernel/xpp/xbus-pcm.c b/kernel/xpp/xbus-pcm.c
index 6155f35..2bbbf5f 100644
--- a/kernel/xpp/xbus-pcm.c
+++ b/kernel/xpp/xbus-pcm.c
@@ -76,7 +76,7 @@ static struct xpp_ticker	global_ticks_series;
 #define	SYNC_ADJ_QUICK	1000
 #define	SYNC_ADJ_SLOW	10000
 
-#ifdef	ZAPTEL_SYNC_TICK
+#ifdef	DAHDI_SYNC_TICK
 static unsigned int		zaptel_tick_count = 0;
 #endif
 
@@ -431,7 +431,7 @@ static void global_tick(void)
 	xpp_ticker_step(&global_ticks_series, &now);
 }
 
-#ifdef	ZAPTEL_SYNC_TICK
+#ifdef	DAHDI_SYNC_TICK
 int zaptel_sync_tick(struct zt_span *span, int is_master)
 {
 	xpd_t		*xpd = span->pvt;
@@ -454,7 +454,7 @@ int zaptel_sync_tick(struct zt_span *span, int is_master)
 				xpd->xbus->busname);
 		}
 		if((rate_limit % 5003) == 0)
-			XPD_NOTICE(xpd, "Zaptel master: ignore ZAPTEL sync\n");
+			XPD_NOTICE(xpd, "Zaptel master: ignore DAHDI sync\n");
 		rate_limit++;
 		goto noop;
 	}
@@ -464,7 +464,7 @@ int zaptel_sync_tick(struct zt_span *span, int is_master)
 
 		if((rate_limit++ % 5003) == 0)
 			XBUS_DBG(SYNC, syncer,
-				"Already a syncer, ignore ZAPTEL sync\n");
+				"Already a syncer, ignore DAHDI sync\n");
 		goto noop;
 	}
 	/* ignore duplicate calls from all our registered spans */
@@ -489,11 +489,11 @@ noop:
 /*
  * called from elect_syncer()
  * if new_syncer is NULL, than we move all to SYNC_MODE_PLL
- * for ZAPTEL sync.
+ * for DAHDI sync.
  */
 static void update_sync_master(xbus_t *new_syncer)
 {
-	const char	*msg = (force_zaptel_sync) ? "ZAPTEL" : "NO-SYNC";
+	const char	*msg = (force_zaptel_sync) ? "DAHDI" : "NO-SYNC";
 	int		i;
 	unsigned long	flags;
 
@@ -1131,17 +1131,17 @@ static int proc_sync_read(char *page, char **start, off_t off, int count, int *e
 
 	do_gettimeofday(&now);
 	len += sprintf(page + len, "# To modify sync source write into this file:\n");
-	len += sprintf(page + len, "#     ZAPTEL      - Another zaptel device provide sync\n");
+	len += sprintf(page + len, "#     DAHDI      - Another zaptel device provide sync\n");
 	len += sprintf(page + len, "#     SYNC=nn     - XBUS-nn provide sync\n");
 	len += sprintf(page + len, "#     QUERY=nn    - Query XBUS-nn for sync information (DEBUG)\n");
 	if(!syncer) {
 		if(force_zaptel_sync)
-			len += sprintf(page + len, "ZAPTEL\n");
+			len += sprintf(page + len, "DAHDI\n");
 		else
 			len += sprintf(page + len, "NO-SYNC\n");
 	} else
 		len += sprintf(page + len, "SYNC=%02d\n", syncer->num);
-#ifdef	ZAPTEL_SYNC_TICK
+#ifdef	DAHDI_SYNC_TICK
 	if(force_zaptel_sync) {
 		len += sprintf(page + len,
 			"Zaptel Reference Sync (%d registered spans):\n",
@@ -1185,8 +1185,8 @@ static int proc_sync_write(struct file *file, const char __user *buffer, unsigne
 	if(copy_from_user(buf, buffer, count))
 		return -EFAULT;
 	buf[count] = '\0';
-	if(strncmp("ZAPTEL", buf, 6) == 0) {
-		DBG(SYNC, "ZAPTEL\n");
+	if(strncmp("DAHDI", buf, 6) == 0) {
+		DBG(SYNC, "DAHDI\n");
 		force_zaptel_sync=1;
 		update_sync_master(NULL);
 	} else if(sscanf(buf, "SYNC=%d", &xbus_num) == 1) {
@@ -1254,10 +1254,10 @@ int xbus_pcm_init(struct proc_dir_entry *toplevel)
 		INFO("FEATURE: with XPP_EC_CHUNK\n");
 	else
 		INFO("FEATURE: without XPP_EC_CHUNK\n");
-#ifdef	ZAPTEL_SYNC_TICK
-	INFO("FEATURE: with sync_tick() from ZAPTEL\n");
+#ifdef	DAHDI_SYNC_TICK
+	INFO("FEATURE: with sync_tick() from DAHDI\n");
 #else
-	INFO("FEATURE: without sync_tick() from ZAPTEL\n");
+	INFO("FEATURE: without sync_tick() from DAHDI\n");
 #endif
 	xpp_ticker_init(&global_ticks_series);
 	xpp_ticker_init(&zaptel_ticker);
@@ -1289,7 +1289,7 @@ EXPORT_SYMBOL(xbus_request_sync);
 EXPORT_SYMBOL(got_new_syncer);
 EXPORT_SYMBOL(elect_syncer);
 EXPORT_SYMBOL(xpp_echocan);
-#ifdef	ZAPTEL_SYNC_TICK
+#ifdef	DAHDI_SYNC_TICK
 EXPORT_SYMBOL(zaptel_sync_tick);
 #endif
 EXPORT_SYMBOL(__pcm_recompute);