[dahdi-commits] tzafrir: linux/trunk r4458 - in /linux/trunk/drivers/dahdi: ./ xpp/

Wed Jun 25 03:44:18 CDT 2008

Author: tzafrir
Date: Wed Jun 25 03:44:17 2008
New Revision: 4458

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4458
Log:
String fixes: dahdi.conf -> /etc/dahdi/system.conf .

Modified:
    linux/trunk/drivers/dahdi/dahdi-base.c
    linux/trunk/drivers/dahdi/xpp/README.Astribank
    linux/trunk/drivers/dahdi/xpp/card_bri.c
    linux/trunk/drivers/dahdi/xpp/card_pri.c

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=4458&r1=4457&r2=4458
==============================================================================

--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Wed Jun 25 03:44:17 2008
@@ -1214,7 +1214,7 @@
 		static int __warnonce = 1;
 		if (__warnonce) {
 			__warnonce = 0;
-			/* The tonezones are loaded by ztcfg based on /etc/dahdi.conf. */
+			/* The tonezones are loaded by dahdi_cfg based on /etc/dahdi/system.conf. */
 			module_printk(KERN_WARNING, "DAHDI: Cannot start tones until tone zone is loaded.\n");
 		}
 		/* Note that no tone zone exists at the moment */
@@ -2844,7 +2844,7 @@
 		static int __warnonce = 1;
 		if (__warnonce) {
 			__warnonce = 0;
-			/* The tonezones are loaded by ztcfg based on /etc/dahdi.conf. */
+			/* The tonezones are loaded by dahdi_cfg based on /etc/dahdi/system.conf. */
 			module_printk(KERN_WARNING, "Cannot get dtmf tone until tone zone is loaded.\n");
 		}
 		return NULL;
@@ -4049,7 +4049,7 @@
 	spin_lock_irqsave(&chan->lock, flags);
 	if (!chan->curzone) {
 		spin_unlock_irqrestore(&chan->lock, flags);
-		/* The tone zones are loaded by ztcfg from /etc/dahdi.conf */
+		/* The tone zones are loaded by dahdi_cfg from /etc/dahdi/system.conf */
 		module_printk(KERN_WARNING, "Cannot dial until a tone zone is loaded.\n");
 		return -ENODATA;
 	}

Modified: linux/trunk/drivers/dahdi/xpp/README.Astribank
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/README.Astribank?view=diff&rev=4458&r1=4457&r2=4458
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/README.Astribank (original)
+++ linux/trunk/drivers/dahdi/xpp/README.Astribank Wed Jun 25 03:44:17 2008
@@ -79,7 +79,7 @@
 #	'
 -----------------------------------------------------------
 
-/etc/dahdi.conf
+/etc/dahdi/system.conf
 ~~~~~~~~~~~~~~~~
 
 Astribank 8
@@ -433,15 +433,15 @@
   output if you have more than 10 spans, and also make the output listing
   looks a little bit nicer.
 - You can see if your Dahdi spans and channels were loaded, if
-  they were configured by ztcfg and if they are in use (typically by
+  they were configured by dahdi_cfg and if they are in use (typically by
   Asterisk).
   For example:
   Not configured Astribank FXS channel will be displayed as:
 
      42 FXS
 
-- When a channel has been configured with *ztcfg* (that applies
-  /etc/dahdi.conf), you will see an extra column for the signalling
+- When a channel has been configured with *dahdi_cfg* (that applies
+  /etc/dahdi/system.conf), you will see an extra column for the signalling
   type of the channel. The same channel after it has been configured:
 
     42 FXS        FXOKS
@@ -695,7 +695,7 @@
 The Astribank xpp driver uses that information for correct hardware
 initialization that is performed before the Dahdi span registration
 process takes place. Because of that, xpp driver can't use the 
-information from file dahdi.conf.
+information from file /etc/dahdi/system.conf.
 
 Another parameter that also can be defined in the Dahdi Init
 Configuration File is the function group TE (CPE) or NT (Network). This
@@ -793,7 +793,7 @@
 Dahdi breaks the channels it knows about to logical units called
 "spans". A port in a E1/T1/ISDN card is usually a span. An whole
 analog card is also a "span". You can see the list of spans as the list
-of files under /proc/dahdi directory or in output of the zttool
+of files under /proc/dahdi directory or in output of the dahdi_tool
 utility.
 
 XBUS:
@@ -1047,7 +1047,7 @@
 Dahdi And Above
 ^^^^^^^^^^^^^^^^
 From here you get a standard Dahdi span. It still needs to be
-configured by ztcfg and used by a program such as Asterisk like any
+configured by dahdi_cfg and used by a program such as Asterisk like any
 other Dahdi device. In order for you to get a dial-tone in a phone
 connected to the FXS port or a fully synchronized BRI port (layer 2
 activated, as signalled by a more steady blink) you will actually need

Modified: linux/trunk/drivers/dahdi/xpp/card_bri.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/card_bri.c?view=diff&rev=4458&r1=4457&r2=4458
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/card_bri.c (original)
+++ linux/trunk/drivers/dahdi/xpp/card_bri.c Wed Jun 25 03:44:17 2008
@@ -956,7 +956,7 @@
 }
 
 /*
- * Called only for 'span' keyword in /etc/dahdi.conf
+ * Called only for 'span' keyword in /etc/dahdi/system.conf
  */
 static int bri_spanconfig(struct dahdi_span *span, struct dahdi_lineconfig *lc)
 {
@@ -1012,7 +1012,7 @@
 }
 
 /*
- * Called only for 'span' keyword in /etc/dahdi.conf
+ * Called only for 'span' keyword in /etc/dahdi/system.conf
  */
 static int bri_startup(struct dahdi_span *span)
 {
@@ -1046,7 +1046,7 @@
 }
 
 /*
- * Called only for 'span' keyword in /etc/dahdi.conf
+ * Called only for 'span' keyword in /etc/dahdi/system.conf
  */
 static int bri_shutdown(struct dahdi_span *span)
 {

Modified: linux/trunk/drivers/dahdi/xpp/card_pri.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/card_pri.c?view=diff&rev=4458&r1=4457&r2=4458
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/card_pri.c (original)
+++ linux/trunk/drivers/dahdi/xpp/card_pri.c Wed Jun 25 03:44:17 2008
@@ -567,7 +567,7 @@
 }
 
 /*
- * Normally set by the timing parameter in dahdi.conf
+ * Normally set by the timing parameter in /etc/dahdi/system.conf
  * If this is called by ztcfg, than it's too late to change
  * dahdi sync priority (we are already registered)
  * There are two workarounds to mitigate this problem:
@@ -779,7 +779,7 @@
 }
 
 /*
- * Called only for 'span' keyword in /etc/dahdi.conf
+ * Called only for 'span' keyword in /etc/dahdi/system.conf
  */
 
 static int pri_spanconfig(struct dahdi_span *span, struct dahdi_lineconfig *lc)
@@ -1124,7 +1124,7 @@
 }
 
 /*
- * Called only for 'span' keyword in /etc/dahdi.conf
+ * Called only for 'span' keyword in /etc/dahdi/system.conf
  */
 static int pri_startup(struct dahdi_span *span)
 {
@@ -1145,7 +1145,7 @@
 }
 
 /*
- * Called only for 'span' keyword in /etc/dahdi.conf
+ * Called only for 'span' keyword in /etc/dahdi/system.conf
  */
 static int pri_shutdown(struct dahdi_span *span)
 {


