Compare commits
3 Commits
v2.5.0.2
...
v2.5.0-rc2
| Author | SHA1 | Date | |
|---|---|---|---|
|
a18878fbe8 | ||
|
|
c7e93f4d1f | ||
|
|
d14276d2d8 |
68
ChangeLog
68
ChangeLog
@@ -1,71 +1,3 @@
|
||||
2011-10-21 Shaun Ruffell <sruffell@digium.com>
|
||||
|
||||
* dahdi-tools version 2.5.0.2 released.
|
||||
|
||||
2011-10-21 22:12 +0000 [r10255-10256] Shaun Ruffell <sruffell@digium.com>
|
||||
|
||||
* xpp/perl_modules/Dahdi/Span.pm: dahdi_genconf: Use 'dahdi_scan'
|
||||
to determine span_type for B410P cards. The wcb4xxp driver does
|
||||
not put enough information in the proc filesystem to determine if
|
||||
the ports are in TE or NT mode. Previously the ports would always
|
||||
just setup the dahdi-channels.conf file in TE mode. After this
|
||||
change the dahdi_scan utility is used to detect if the ports are
|
||||
in TE or NT mode and setup dahdi-channels.conf appropriately.
|
||||
Internal-Issue-ID: DAHTOOL-54 Signed-off-by: Shaun Ruffell
|
||||
<sruffell@digium.com> Origin:
|
||||
http://svnview.digium.com/svn/dahdi?view=rev&rev=10214
|
||||
|
||||
* xpp/perl_modules/Dahdi/Span.pm: dahdi_genconf: Assume spans with
|
||||
unknown term types are software selectable. Resolves a regression
|
||||
on the 2.5 branch that would result in: $ dahdi_genconf
|
||||
dahdi_genconf: missing default group (termtype=UNKNOWN) E1 / T1
|
||||
spans use software configuration to set CPE / NET mode. This
|
||||
patch will just assume that a termtype is software selectable if
|
||||
it was "UNKNOWN" when first scanning the span. Internal-Issue-ID:
|
||||
DAHTOOL-55 Signed-off-by: Shaun Ruffell <sruffell@digium.com>
|
||||
Tested-by: David Purdue <support@noojee.com.au> Origin:
|
||||
http://svnview.digium.com/svn/dahdi?view=rev&rev=10213
|
||||
|
||||
2011-09-07 07:11 +0000 [r10188] Tzafrir Cohen <tzafrir.cohen@xorcom.com>
|
||||
|
||||
* xpp/waitfor_xpds: xpp: waitfor_xpds: higher and configurable
|
||||
timeout On several pathological cases we may need to wait more
|
||||
than 40 seconds. Make that timeout configurable.
|
||||
|
||||
2011-09-07 Shaun Ruffell <sruffell@digium.com>
|
||||
|
||||
* dahdi-tools version 2.5.0.1 released.
|
||||
|
||||
2011-09-07 07:11 +0000 [r10185-10188] Tzafrir Cohen <tzafrir.cohen@xorcom.com>
|
||||
|
||||
* xpp/waitfor_xpds: xpp: waitfor_xpds: higher and configurable
|
||||
timeout On several pathological cases we may need to wait more
|
||||
than 40 seconds. Make that timeout configurable.
|
||||
|
||||
* xpp/README.Astribank: README.Astribank: HWEC and build
|
||||
instructions Signed-off-by: Tzafrir Cohen
|
||||
<tzafrir.cohen@xorcom.com>
|
||||
|
||||
* xpp/perl_modules/Dahdi/Span.pm: xpp: pri_termtype: match complete
|
||||
SPAN patterns Match complete span patterns, to avoid pattern
|
||||
'SPAN/1' from matching e.g. span 12 (SPAN/12). Signed-off-by:
|
||||
Tzafrir Cohen <tzafrir.cohen@xorcom.com>
|
||||
|
||||
* README: Extra README fixes: 'th' and ztcfg Signed-off-by: Tzafrir
|
||||
Cohen <tzafrir.cohen@xorcom.com>
|
||||
|
||||
2011-08-05 Shaun Ruffell <sruffell@digium.com>
|
||||
|
||||
* dahdi-tools version 2.5.0 released.
|
||||
|
||||
2011-08-02 17:28 +0000 [r10085-10087] Tzafrir Cohen <tzafrir.cohen@xorcom.com>
|
||||
|
||||
* README: Extra README fixes: 'th' and ztcfg Signed-off-by: Tzafrir
|
||||
Cohen <tzafrir.cohen@xorcom.com>
|
||||
|
||||
* README: spelling: ocnfig.status and such Signed-off-by: Tzafrir
|
||||
Cohen <tzafrir.cohen@xorcom.com>
|
||||
|
||||
2011-07-21 Shaun Ruffell <sruffell@digium.com>
|
||||
|
||||
* dahdi-tools version 2.5.0-rc2 released.
|
||||
|
||||
30
README
30
README
@@ -4,7 +4,7 @@ Asterisk Development Team <asteriskteam@digium.com>
|
||||
$Revision$, $Date$
|
||||
|
||||
DAHDI stands for Digium Asterisk Hardware Device Interface. This
|
||||
package contains the user-space tools to configure the kernel modules
|
||||
package contains the userspace tools to configure the kernel modules
|
||||
included in the package dahdi-linux.
|
||||
|
||||
Build Requirements
|
||||
@@ -14,7 +14,7 @@ dahdi-linux before building dahdi-tools.
|
||||
|
||||
Build System
|
||||
~~~~~~~~~~~~
|
||||
GCC and friends. Generally you will need to install the package gcc.
|
||||
gcc and friends. Generally you will need to install the package gcc.
|
||||
There may be cases where you will need a specific version of gcc to build
|
||||
kernel modules.
|
||||
|
||||
@@ -51,7 +51,7 @@ There are some make targets that are provided to build or install just
|
||||
parts of DAHDI:
|
||||
|
||||
. Build targets:
|
||||
- make: Build DAHDI user-space programs. partial
|
||||
- make: Build DAHDI userspace programs. partial
|
||||
targets of it:
|
||||
* make 'utilname': builds 'utilname' alone (e.g: `make dahdi_diag`)
|
||||
* make utils: Build libtonezone.
|
||||
@@ -66,7 +66,7 @@ Installation to a Subtree
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
The following may be useful when testing the package or when preparing a
|
||||
package for a binary distribution (such as an rpm package) installing
|
||||
onto a subtree rather than on the real system.
|
||||
onto a subtree rather than on th real system.
|
||||
|
||||
make install DESTDIR=targetdir
|
||||
|
||||
@@ -89,7 +89,7 @@ run, use:
|
||||
To re-run ./configure with the same parameters it was run with last
|
||||
time, use:
|
||||
|
||||
./config.status --recheck
|
||||
./ocnfig.status --recheck
|
||||
|
||||
|
||||
Configuration
|
||||
@@ -138,7 +138,7 @@ include::genconf_parameters.asciidoc[]
|
||||
Tonezones
|
||||
~~~~~~~~~
|
||||
The file zonedata.c contains the information about the tone zones used
|
||||
in libtonezone (and hence also in dahdi_cfg). Here is a list of those zones:
|
||||
in libtonezone (and hence also in ztcfg). Here is a list of those zones:
|
||||
|
||||
include::tonezones.txt[]
|
||||
|
||||
@@ -146,14 +146,14 @@ include::tonezones.txt[]
|
||||
DAHDI PERL modules
|
||||
~~~~~~~~~~~~~~~~~~
|
||||
The directory xpp has, in addition to helper utilities for the
|
||||
Xorcom Astribank, a collection of PERL modules to provide information
|
||||
related to DAHDI. The PERL modules themselves are under xpp/perl_modules/ .
|
||||
Xorcom Astribank, a collection of perl modules to provide information
|
||||
related to DAHDI. The perl modules themselves are under xpp/perl_modules/ .
|
||||
In xpp/ there are several utilities that use those modules:
|
||||
- xpp-specific: dahdi_registration, xpp_sync, xpp_blink .
|
||||
- General: lsdahdi, dahdi_genconf, dahdi_hardware, dahdi_drivers
|
||||
|
||||
The DAHDI PERL modules will currently only be automatically installed if you
|
||||
happen to install the xpp directory. Those utilities require the PERL modules
|
||||
The DAHDI perl modules will currently only be automatically installed if you
|
||||
happen to install the xpp directory. Those utilities require the perl modules
|
||||
to be installed, however they will also look for them in the directory
|
||||
perl_modules, and thus can be run directly from the DAHDI source tree. For
|
||||
example:
|
||||
@@ -167,7 +167,7 @@ instance:
|
||||
perldoc ./xpp/lsdahdi
|
||||
|
||||
Some of them are specific for the Xorcom Astribank and described in its
|
||||
documentation. the others are:
|
||||
docuemntation. the others are:
|
||||
|
||||
lsdahdi::
|
||||
A somewhat glorified `cat /proc/dahdi/*`.
|
||||
@@ -176,9 +176,9 @@ dahdi_genconf::
|
||||
/etc/dahdi/genconf_parameters (replaces genzaptelconf as well).
|
||||
dahdi_drivers::
|
||||
A two-liner script (not installed by default) that simply returns the
|
||||
modules that should be modprobe-d on this system.
|
||||
modules that should be modprobed on this system.
|
||||
dahdi_hardware::
|
||||
Uses the information from SysFS and its own knowledge to show
|
||||
Uses the information from sysfs and its own knowledge to show
|
||||
what PCI/USB DAHDI hardware is connected and if it is currently used
|
||||
by a driver. Shows also some more information for Astribanks from
|
||||
/proc/xpp .
|
||||
@@ -186,8 +186,8 @@ dahdi_hardware::
|
||||
|
||||
PPP Support
|
||||
~~~~~~~~~~~
|
||||
DAHDI digital cards can provide data channels through PPP as
|
||||
point-to-point connections. This requires a plug-in to the PPP daemon
|
||||
DAHDI digital cards can provide data channels through ppp as
|
||||
point-to-point connections. This requires a plugin to the ppp daemon
|
||||
that is included in the ppp/ subdirectory. To install it:
|
||||
|
||||
1. Make sure you have the PPP source / headers installed. On Debian:
|
||||
|
||||
@@ -43,42 +43,27 @@ an FXO module of two ports.
|
||||
|
||||
Building and Installation
|
||||
-------------------------
|
||||
Apart from the standard DAHDI build requirements, you also need:
|
||||
Apart from the standard DAHDI build requirements, you also need libusb
|
||||
development headers to build the fpga_load firmware loader. This is
|
||||
typically the package libusb-dev on Debian (and derivatives like Ubuntu)
|
||||
or libusb-devel on RedHat (and derivatives like CentOS/Trixbox).
|
||||
|
||||
* *libusb development headers* to build the fpga_load firmware loader.
|
||||
This is typically the package libusb-dev on Debian (and derivatives
|
||||
like Ubuntu) or libusb-devel on RedHat (and derivatives like
|
||||
CentOS/Trixbox).
|
||||
* *Echo Canceller Module firmware*: If you have an Astribank with an
|
||||
echo canceller module, see the following section.
|
||||
Patch for BRI
|
||||
~~~~~~~~~~~~~
|
||||
(As of DAHDI 2.2 this patch is no longer needed. Furthermore, it does
|
||||
not apply. The same directory has a newer patch that applies. This
|
||||
section is kept in the document for the time being for the benefit of
|
||||
those with older versions)
|
||||
|
||||
Follow the build instructions of DAHDI-linux and DAHDI-tools. But
|
||||
Basically, in dahdi-linux run:
|
||||
In order for the BRI module (xpd_bri.ko) to build, you still need an
|
||||
external patch:
|
||||
|
||||
make
|
||||
make install # as root
|
||||
http://updates.xorcom.com/astribank/bristuff/dahdi_bri_dchan.diff[]
|
||||
|
||||
And later in dahdi-tools:
|
||||
You need to apply it to the dahdi-linux tarball before building:
|
||||
|
||||
./configure
|
||||
make
|
||||
make install # as root
|
||||
|
||||
|
||||
Echo Canceller Firmware
|
||||
~~~~~~~~~~~~~~~~~~~~~~~
|
||||
If you install from source, you should copy OCT6104E-256D.ima to the
|
||||
source tree (before running make install:
|
||||
|
||||
wget http://updates.xorcom.com/astribank/hwec/OCT6104E-256D.ima
|
||||
mv OCT6104E-256D.ima drivers/dahdi/xpp/firmwares/
|
||||
|
||||
Alternatively, if you have already installed DAHDI-linux (e.g. from a
|
||||
binary package that does not include the firmware) you can just copy
|
||||
it directly to the target directory, /usr/share/dahdi using:
|
||||
|
||||
cd /usr/share/dahdi
|
||||
wget http://updates.xorcom.com/astribank/hwec/OCT6104E-256D.ima
|
||||
wget http://updates.xorcom.com/astribank/bristuff/dahdi_bri_dchan.diff
|
||||
patch -p1 <dahdi_bri_dchan.diff
|
||||
|
||||
|
||||
Installation Scenarios
|
||||
|
||||
@@ -131,7 +131,7 @@ my @bri_strings = (
|
||||
'(?:quad|octo)BRI PCI ISDN Card.* \[(NT|TE)\]',
|
||||
'octoBRI \[(NT|TE)\] ',
|
||||
'HFC-S PCI A ISDN.* \[(NT|TE)\] ',
|
||||
'(B4XXP) \(PCI\) Card', # Use dahdi_scan to determine TE/NT mode
|
||||
'(B4XXP) \(PCI\) Card', # Does not expose NT/TE type
|
||||
'(WCBRI)', # has selectable NT/TE modes via dahdi_cfg
|
||||
);
|
||||
|
||||
@@ -177,28 +177,6 @@ sub init_proto($$) {
|
||||
$self->{TYPE} = "${proto}_$self->{TERMTYPE}";
|
||||
}
|
||||
|
||||
sub get_digital_spantype {
|
||||
my $span_no = shift;
|
||||
my @lines = split /\n/, `dahdi_scan`;
|
||||
my $found_span = 0;
|
||||
foreach my $line (@lines) {
|
||||
if (! $found_span) {
|
||||
if ($line =~ m/\[$span_no\]/) {
|
||||
$found_span = 1;
|
||||
}
|
||||
} else {
|
||||
if ($line !~ m/^\[/) {
|
||||
if ($line =~ m/digital-(TE|NT)/ ){
|
||||
return $1;
|
||||
}
|
||||
} else {
|
||||
$found_span = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
die "Cannot determine digital spantype";
|
||||
}
|
||||
|
||||
sub new($$) {
|
||||
my $pack = shift or die "Wasn't called as a class method\n";
|
||||
my $proc_file = shift or die "Missing a proc file parameter\n";
|
||||
@@ -213,16 +191,10 @@ sub new($$) {
|
||||
$self->{IS_DIGITAL} = 0;
|
||||
$self->{IS_BRI} = 0;
|
||||
$self->{IS_PRI} = 0;
|
||||
$self->{TERMTYPE} = "UNKNOWN";
|
||||
foreach my $cardtype (@bri_strings) {
|
||||
if($head =~ m/$cardtype/) {
|
||||
my $termtype = $1;
|
||||
if ($1 eq 'B4XXP') {
|
||||
$termtype = get_digital_spantype($num);
|
||||
}
|
||||
if ($1 eq 'WCBRI') {
|
||||
$termtype = 'TE';
|
||||
}
|
||||
$termtype = 'TE' if ( $1 eq 'B4XXP' or $1 eq 'WCBRI' );
|
||||
$self->{IS_DIGITAL} = 1;
|
||||
$self->{IS_BRI} = 1;
|
||||
$self->{TERMTYPE} = $termtype;
|
||||
@@ -258,11 +230,6 @@ sub new($$) {
|
||||
last;
|
||||
}
|
||||
}
|
||||
|
||||
if (($self->is_soft_term_type == 0) and ($self->termtype eq "UNKNOWN")) {
|
||||
$self->{IS_SOFT_TERM_TYPE} = 1;
|
||||
}
|
||||
|
||||
($self->{NAME}, $self->{DESCRIPTION}) = (split(/\s+/, $head, 4))[2, 3];
|
||||
$self->{IS_DAHDI_SYNC_MASTER} =
|
||||
($self->{DESCRIPTION} =~ /\(MASTER\)/) ? 1 : 0;
|
||||
@@ -401,7 +368,7 @@ SPEC:
|
||||
#print STDERR "match: $match\n";
|
||||
foreach my $pattern (@patlist) {
|
||||
#print STDERR "testmatch: $pattern =~ $match\n";
|
||||
if($pattern =~ /^$match$/) {
|
||||
if($pattern =~ $match) {
|
||||
#print STDERR "MATCH '$pattern' ~ '$match' termtype=$termtype\n";
|
||||
$match_termtype = $termtype;
|
||||
last SPEC;
|
||||
|
||||
@@ -29,7 +29,6 @@ set -e
|
||||
# For lab testing
|
||||
mydir=`dirname $0`
|
||||
PATH="${mydir}:${PATH}"
|
||||
XPP_WAIT_AB_TIMEOUT=80
|
||||
|
||||
[ -r /etc/dahdi/init.conf ] && . /etc/dahdi/init.conf
|
||||
|
||||
@@ -57,7 +56,7 @@ fi
|
||||
|
||||
# Wait for driver and first device
|
||||
echo -n 1>&2 "Astribanks detection "
|
||||
tries="$XPP_WAIT_AB_TIMEOUT"
|
||||
tries=40
|
||||
while [ ! -e "/sys/bus/astribanks/devices/xbus-00" ]
|
||||
do
|
||||
if [ "$tries" -le 0 ]; then
|
||||
|
||||
Reference in New Issue
Block a user