diff options
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 6 | ||||
| -rw-r--r-- | drivers/dahdi/xpp/README.Astribank | 14 | ||||
| -rw-r--r-- | drivers/dahdi/xpp/card_bri.c | 6 | ||||
| -rw-r--r-- | drivers/dahdi/xpp/card_pri.c | 8 |
4 files changed, 17 insertions, 17 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index c597c2b..ed59d26 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -1214,7 +1214,7 @@ static int start_tone(struct dahdi_chan *chan, int tone) 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 @@ struct dahdi_tone *dahdi_mf_tone(const struct dahdi_chan *chan, char digit, int 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 @@ static int ioctl_dahdi_dial(struct dahdi_chan *chan, unsigned long data) 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; } diff --git a/drivers/dahdi/xpp/README.Astribank b/drivers/dahdi/xpp/README.Astribank index 0104dea..2f9e99d 100644 --- a/drivers/dahdi/xpp/README.Astribank +++ b/drivers/dahdi/xpp/README.Astribank @@ -79,7 +79,7 @@ that may be defined there: # ' ----------------------------------------------------------- -/etc/dahdi.conf +/etc/dahdi/system.conf ~~~~~~~~~~~~~~~~ Astribank 8 @@ -433,15 +433,15 @@ following commands: 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 @@ Configuration File. 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 @@ span: 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 @@ parameter zap_autoreg in the modprobe configuration file (A file under 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 diff --git a/drivers/dahdi/xpp/card_bri.c b/drivers/dahdi/xpp/card_bri.c index 150e754..a00d0a7 100644 --- a/drivers/dahdi/xpp/card_bri.c +++ b/drivers/dahdi/xpp/card_bri.c @@ -956,7 +956,7 @@ static int BRI_card_close(xpd_t *xpd, lineno_t pos) } /* - * 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 @@ static int bri_chanconfig(struct dahdi_chan *chan, int sigtype) } /* - * 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 @@ static int bri_startup(struct dahdi_span *span) } /* - * 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) { diff --git a/drivers/dahdi/xpp/card_pri.c b/drivers/dahdi/xpp/card_pri.c index e1670a0..509d83e 100644 --- a/drivers/dahdi/xpp/card_pri.c +++ b/drivers/dahdi/xpp/card_pri.c @@ -567,7 +567,7 @@ static void set_clocking(xpd_t *xpd) } /* - * 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 @@ bad_lineconfig: } /* - * 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 @@ static int PRI_card_close(xpd_t *xpd, lineno_t pos) } /* - * 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 @@ static int pri_startup(struct dahdi_span *span) } /* - * 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) { |