Compare commits
30 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
a3c6a63fac | ||
|
|
e317af6462 | ||
|
|
de6acc97e6 | ||
|
|
fbcb8ad7e9 | ||
|
|
a565ac9110 | ||
|
|
3789406d35 | ||
|
|
366c4a6421 | ||
|
|
ffa5227c8c | ||
|
|
0335e03276 | ||
|
|
616d4b6e8d | ||
|
|
372849294b | ||
|
|
b5fe8efa26 | ||
|
|
7f216ab67e | ||
|
|
b52b304a89 | ||
|
|
0c45aaa1dd | ||
|
|
3c635e65c8 | ||
|
|
aee4846135 | ||
|
|
c87951ab5f | ||
|
|
6189813aa8 | ||
|
|
c2395b44ec | ||
|
|
0e700f80c5 | ||
|
|
3940110c35 | ||
|
|
47111ff7a5 | ||
|
|
c7a957e14e | ||
|
|
842130f99d | ||
|
|
41143e105f | ||
|
|
44289a813d | ||
|
|
07d9024623 | ||
|
|
2b3b134c11 | ||
|
|
08605ea73b |
@@ -3,6 +3,12 @@
|
||||
/* Define if your system has the DAHDI headers. */
|
||||
#undef HAVE_DAHDI
|
||||
|
||||
/* Define if your system has the DAHDI23 headers. */
|
||||
#undef HAVE_DAHDI23
|
||||
|
||||
/* Define DAHDI23 headers version */
|
||||
#undef HAVE_DAHDI23_VERSION
|
||||
|
||||
/* Define DAHDI headers version */
|
||||
#undef HAVE_DAHDI_VERSION
|
||||
|
||||
@@ -21,6 +27,9 @@
|
||||
/* Define to indicate the ${NEWT_DESCRIP} library version */
|
||||
#undef HAVE_NEWT_VERSION
|
||||
|
||||
/* Define to 1 if you have the `semtimedop' function. */
|
||||
#undef HAVE_SEMTIMEDOP
|
||||
|
||||
/* Define to 1 if you have the <stdint.h> header file. */
|
||||
#undef HAVE_STDINT_H
|
||||
|
||||
@@ -63,6 +72,9 @@
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#undef PACKAGE_TARNAME
|
||||
|
||||
/* Define to the home page for this package. */
|
||||
#undef PACKAGE_URL
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#undef PACKAGE_VERSION
|
||||
|
||||
|
||||
@@ -99,6 +99,8 @@ AST_C_DEFINE_CHECK([DAHDI23], [DAHDI_CONFIG_NTTE], [dahdi/user.h])
|
||||
AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])
|
||||
AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h])
|
||||
|
||||
AC_CHECK_FUNCS([semtimedop])
|
||||
|
||||
PBX_HDLC=0
|
||||
AC_MSG_CHECKING([for GENERIC_HDLC_VERSION version 4 in linux/hdlc.h])
|
||||
AC_COMPILE_IFELSE(
|
||||
|
||||
82
dahdi-tools-2.4.1-summary.html
Normal file
82
dahdi-tools-2.4.1-summary.html
Normal file
@@ -0,0 +1,82 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>Release Summary - dahdi-tools-2.4.1</title></head>
|
||||
<body>
|
||||
<h1 align="center"><a name="top">Release Summary</a></h1>
|
||||
<h3 align="center">dahdi-tools-2.4.1</h3>
|
||||
<h3 align="center">Date: 2011-03-03</h3>
|
||||
<h3 align="center"><asteriskteam@digium.com></h3>
|
||||
<hr/>
|
||||
<h2 align="center">Table of Contents</h2>
|
||||
<ol>
|
||||
<li><a href="#summary">Summary</a></li>
|
||||
<li><a href="#contributors">Contributors</a></li>
|
||||
<li><a href="#issues">Closed Issues</a></li>
|
||||
<li><a href="#commits">Other Changes</a></li>
|
||||
<li><a href="#diffstat">Diffstat</a></li>
|
||||
</ol>
|
||||
<hr/>
|
||||
<a name="summary"><h2 align="center">Summary</h2></a>
|
||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This release includes only bug fixes. The changes included were made only to address problems that have been identified in this release series. Users should be able to safely upgrade to this version if this release series is already in use. Users considering upgrading from a previous release series are strongly encouraged to review the UPGRADE.txt document as well as the CHANGES document for information about upgrading to this release series.</p>
|
||||
<p>The data in this summary reflects changes that have been made since the previous release, dahdi-tools-2.4.0.</p>
|
||||
<hr/>
|
||||
<a name="contributors"><h2 align="center">Contributors</h2></a>
|
||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release. For coders, the number is how many of their patches (of any size) were committed into this release. For testers, the number is the number of times their name was listed as assisting with testing a patch. Finally, for reporters, the number is the number of issues that they reported that were closed by commits that went into this release.</p>
|
||||
<table width="100%" border="0">
|
||||
<tr>
|
||||
<td width="33%"><h3>Coders</h3></td>
|
||||
<td width="33%"><h3>Testers</h3></td>
|
||||
<td width="33%"><h3>Reporters</h3></td>
|
||||
</tr>
|
||||
<tr valign="top">
|
||||
<td>
|
||||
11 tzafrir<br/>
|
||||
1 alfredtang<br/>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
<td>
|
||||
1 abelbeck<br/>
|
||||
1 alfredtang<br/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<hr/>
|
||||
<a name="issues"><h2 align="center">Closed Issues</h2></a>
|
||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all issues from the issue tracker that were closed by changes that went into this release.</p>
|
||||
<h3>Category: General</h3><br/>
|
||||
<a href="https://issues.asterisk.org/view.php?id=16783">#16783</a>: [patch] DAHDI 2.2.1, XPP and astribank_is_starting.c uses semtimedop() which is not supported in our uClibc.<br/>
|
||||
Revision: <a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9736">9736</a><br/>
|
||||
Reporter: abelbeck<br/>
|
||||
Coders: tzafrir<br/>
|
||||
<br/>
|
||||
<h3>Category: NewFeature</h3><br/>
|
||||
<a href="https://issues.asterisk.org/view.php?id=17744">#17744</a>: [patch] add macao to tone zone data<br/>
|
||||
Revision: <a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9735">9735</a><br/>
|
||||
Reporter: alfredtang<br/>
|
||||
Coders: alfredtang<br/>
|
||||
<br/>
|
||||
<hr/>
|
||||
<a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a>
|
||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all changes that went into this release that did not directly close an issue from the issue tracker. The commits may have been marked as being related to an issue. If that is the case, the issue numbers are listed here, as well.</p>
|
||||
<table width="100%" border="1">
|
||||
<tr><td><b>Revision</b></td><td><b>Author</b></td><td><b>Summary</b></td><td><b>Issues Referenced</b></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9733">9733</a></td><td>tzafrir</td><td>Branch dahdi-tools 2.4</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9734">9734</a></td><td>tzafrir</td><td>svnmerge stuff</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9737">9737</a></td><td>tzafrir</td><td>Dahdi::Hardware: Support beroNet BN4S0e PCI Express card</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9738">9738</a></td><td>tzafrir</td><td>Fixed up the loss of crc4-multiframe alignment logic</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9739">9739</a></td><td>tzafrir</td><td>dahdi_scan: Show CAS framing on the framing line.</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9740">9740</a></td><td>tzafrir</td><td>xpp_fxloader: Don't try to load FPGA firmware twice</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9741">9741</a></td><td>tzafrir</td><td>dahdi_genconf: Don't generate configurations that use channel 16 on E1 CAS</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9742">9742</a></td><td>tzafrir</td><td>dahdi-perl: left-over $span->xpd</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9743">9743</a></td><td>tzafrir</td><td>dahdi-perl: fix xpp driver in dahdi_hardware</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9744">9744</a></td><td>tzafrir</td><td>dahdi-perl: more left-over $span->xpd</td>
|
||||
<td></td></tr></table>
|
||||
<hr/>
|
||||
<a name="diffstat"><h2 align="center">Diffstat Results</h2></a>
|
||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p>
|
||||
<pre>
|
||||
0 files changed
|
||||
</pre><br/>
|
||||
<hr/>
|
||||
</body>
|
||||
</html>
|
||||
162
dahdi-tools-2.4.1-summary.txt
Normal file
162
dahdi-tools-2.4.1-summary.txt
Normal file
@@ -0,0 +1,162 @@
|
||||
Release Summary
|
||||
|
||||
dahdi-tools-2.4.1
|
||||
|
||||
Date: 2011-03-03
|
||||
|
||||
<asteriskteam@digium.com>
|
||||
|
||||
--------------------------------------------------------------------------
|
||||
|
||||
Table of Contents
|
||||
|
||||
1. [1]Summary
|
||||
2. [2]Contributors
|
||||
3. [3]Closed Issues
|
||||
4. [4]Other Changes
|
||||
5. [5]Diffstat
|
||||
|
||||
--------------------------------------------------------------------------
|
||||
|
||||
Summary
|
||||
|
||||
[6][Back to Top]
|
||||
|
||||
This release includes only bug fixes. The changes included were made only
|
||||
to address problems that have been identified in this release series.
|
||||
Users should be able to safely upgrade to this version if this release
|
||||
series is already in use. Users considering upgrading from a previous
|
||||
release series are strongly encouraged to review the UPGRADE.txt document
|
||||
as well as the CHANGES document for information about upgrading to this
|
||||
release series.
|
||||
|
||||
The data in this summary reflects changes that have been made since the
|
||||
previous release, dahdi-tools-2.4.0.
|
||||
|
||||
--------------------------------------------------------------------------
|
||||
|
||||
Contributors
|
||||
|
||||
[7][Back to Top]
|
||||
|
||||
This table lists the people who have submitted code, those that have
|
||||
tested patches, as well as those that reported issues on the issue tracker
|
||||
that were resolved in this release. For coders, the number is how many of
|
||||
their patches (of any size) were committed into this release. For testers,
|
||||
the number is the number of times their name was listed as assisting with
|
||||
testing a patch. Finally, for reporters, the number is the number of
|
||||
issues that they reported that were closed by commits that went into this
|
||||
release.
|
||||
|
||||
Coders Testers Reporters
|
||||
11 tzafrir 1 abelbeck
|
||||
1 alfredtang 1 alfredtang
|
||||
|
||||
--------------------------------------------------------------------------
|
||||
|
||||
Closed Issues
|
||||
|
||||
[8][Back to Top]
|
||||
|
||||
This is a list of all issues from the issue tracker that were closed by
|
||||
changes that went into this release.
|
||||
|
||||
Category: General
|
||||
|
||||
[9]#16783: [patch] DAHDI 2.2.1, XPP and astribank_is_starting.c uses
|
||||
semtimedop() which is not supported in our uClibc.
|
||||
Revision: [10]9736
|
||||
Reporter: abelbeck
|
||||
Coders: tzafrir
|
||||
|
||||
Category: NewFeature
|
||||
|
||||
[11]#17744: [patch] add macao to tone zone data
|
||||
Revision: [12]9735
|
||||
Reporter: alfredtang
|
||||
Coders: alfredtang
|
||||
|
||||
--------------------------------------------------------------------------
|
||||
|
||||
Commits Not Associated with an Issue
|
||||
|
||||
[13][Back to Top]
|
||||
|
||||
This is a list of all changes that went into this release that did not
|
||||
directly close an issue from the issue tracker. The commits may have been
|
||||
marked as being related to an issue. If that is the case, the issue
|
||||
numbers are listed here, as well.
|
||||
|
||||
+------------------------------------------------------------------------+
|
||||
| Revision | Author | Summary | Issues |
|
||||
| | | | Referenced |
|
||||
|----------+---------+--------------------------------------+------------|
|
||||
| [14]9733 | tzafrir | Branch dahdi-tools 2.4 | |
|
||||
|----------+---------+--------------------------------------+------------|
|
||||
| [15]9734 | tzafrir | svnmerge stuff | |
|
||||
|----------+---------+--------------------------------------+------------|
|
||||
| [16]9737 | tzafrir | Dahdi::Hardware: Support beroNet | |
|
||||
| | | BN4S0e PCI Express card | |
|
||||
|----------+---------+--------------------------------------+------------|
|
||||
| [17]9738 | tzafrir | Fixed up the loss of crc4-multiframe | |
|
||||
| | | alignment logic | |
|
||||
|----------+---------+--------------------------------------+------------|
|
||||
| [18]9739 | tzafrir | dahdi_scan: Show CAS framing on the | |
|
||||
| | | framing line. | |
|
||||
|----------+---------+--------------------------------------+------------|
|
||||
| [19]9740 | tzafrir | xpp_fxloader: Don't try to load FPGA | |
|
||||
| | | firmware twice | |
|
||||
|----------+---------+--------------------------------------+------------|
|
||||
| | | dahdi_genconf: Don't generate | |
|
||||
| [20]9741 | tzafrir | configurations that use channel 16 | |
|
||||
| | | on E1 CAS | |
|
||||
|----------+---------+--------------------------------------+------------|
|
||||
| [21]9742 | tzafrir | dahdi-perl: left-over $span->xpd | |
|
||||
|----------+---------+--------------------------------------+------------|
|
||||
| [22]9743 | tzafrir | dahdi-perl: fix xpp driver in | |
|
||||
| | | dahdi_hardware | |
|
||||
|----------+---------+--------------------------------------+------------|
|
||||
| [23]9744 | tzafrir | dahdi-perl: more left-over | |
|
||||
| | | $span->xpd | |
|
||||
+------------------------------------------------------------------------+
|
||||
|
||||
--------------------------------------------------------------------------
|
||||
|
||||
Diffstat Results
|
||||
|
||||
[24][Back to Top]
|
||||
|
||||
This is a summary of the changes to the source code that went into this
|
||||
release that was generated using the diffstat utility.
|
||||
|
||||
0 files changed
|
||||
|
||||
--------------------------------------------------------------------------
|
||||
|
||||
References
|
||||
|
||||
Visible links
|
||||
1. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#summary
|
||||
2. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#contributors
|
||||
3. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#issues
|
||||
4. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#commits
|
||||
5. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#diffstat
|
||||
6. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#top
|
||||
7. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#top
|
||||
8. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#top
|
||||
9. https://issues.asterisk.org/view.php?id=16783
|
||||
10. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9736
|
||||
11. https://issues.asterisk.org/view.php?id=17744
|
||||
12. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9735
|
||||
13. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#top
|
||||
14. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9733
|
||||
15. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9734
|
||||
16. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9737
|
||||
17. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9738
|
||||
18. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9739
|
||||
19. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9740
|
||||
20. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9741
|
||||
21. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9742
|
||||
22. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9743
|
||||
23. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9744
|
||||
24. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#top
|
||||
40
dahdi_scan.c
40
dahdi_scan.c
@@ -95,11 +95,13 @@ int main(int argc, char *argv[])
|
||||
strcat(alarms, "YEL/");
|
||||
if (s.alarms & DAHDI_ALARM_RED) {
|
||||
strcat(alarms, "RED/");
|
||||
|
||||
/* Extended alarm feature test. Allows compilation with
|
||||
* versions of dahdi-linux prior to 2.4
|
||||
*/
|
||||
#ifdef DAHDI_ALARM_LFA
|
||||
if (s.alarms & DAHDI_ALARM_LFA)
|
||||
strcat(alarms, "LFA/");
|
||||
if (s.alarms & DAHDI_ALARM_LMFA)
|
||||
strcat(alarms, "LMFA/");
|
||||
#endif /* ifdef DAHDI_ALARM_LFA */
|
||||
}
|
||||
if (s.alarms & DAHDI_ALARM_LOOPBACK)
|
||||
@@ -115,10 +117,35 @@ int main(int argc, char *argv[])
|
||||
alarms[strlen(alarms)-1]='\0';
|
||||
}
|
||||
} else {
|
||||
if (s.numchans)
|
||||
strcpy(alarms, "OK");
|
||||
else
|
||||
if (s.numchans) {
|
||||
#ifdef DAHDI_ALARM_LFA
|
||||
/* If we continuously receive framing errors
|
||||
* but our span is still in service, and we
|
||||
* are configured for E1 & crc4. We've lost
|
||||
* crc4-multiframe alignment
|
||||
*/
|
||||
if ((s.linecompat & DAHDI_CONFIG_CRC4) &&
|
||||
(s.fecount > 0)) {
|
||||
struct dahdi_spaninfo t;
|
||||
memset(&t, 0, sizeof(t));
|
||||
t.spanno = x;
|
||||
sleep(1);
|
||||
if (ioctl(ctl, DAHDI_SPANSTAT, &t))
|
||||
continue;
|
||||
|
||||
/* Test fecount at two separate time
|
||||
* intervals, if they differ, throw LMFA
|
||||
*/
|
||||
if ((t.fecount > s.fecount) &&
|
||||
!t.alarms) {
|
||||
strcat(alarms, "LMFA/");
|
||||
}
|
||||
}
|
||||
#endif /* ifdef DAHDI_ALARM_LFA */
|
||||
strcat(alarms, "OK");
|
||||
} else {
|
||||
strcpy(alarms, "UNCONFIGURED");
|
||||
}
|
||||
}
|
||||
|
||||
fprintf(stdout, "[%d]\n", x);
|
||||
@@ -169,7 +196,8 @@ int main(int argc, char *argv[])
|
||||
if (s.lineconfig & DAHDI_CONFIG_ESF) fprintf(stdout, "ESF");
|
||||
else if (s.lineconfig & DAHDI_CONFIG_D4) fprintf(stdout, "D4");
|
||||
else if (s.lineconfig & DAHDI_CONFIG_CCS) fprintf(stdout, "CCS");
|
||||
else if (s.lineconfig & DAHDI_CONFIG_CRC4) fprintf(stdout, "/CRC4");
|
||||
else fprintf(stdout, "CAS");
|
||||
if (s.lineconfig & DAHDI_CONFIG_CRC4) fprintf(stdout, "/CRC4");
|
||||
fprintf(stdout, "\n");
|
||||
} else {
|
||||
/* this is an analog span */
|
||||
|
||||
@@ -15,6 +15,10 @@ static int debug;
|
||||
static int verbose;
|
||||
static int timeout_seconds = 60;
|
||||
|
||||
/* If libc provides no timeout variant: try to do without it: */
|
||||
#ifndef HAVE_SEMTIMEDEOP
|
||||
#define semtimedop(sem, ops, n, timeout) semop(sem, ops, n)
|
||||
#endif
|
||||
|
||||
static void usage(void)
|
||||
{
|
||||
|
||||
@@ -229,7 +229,7 @@ sub battery($) {
|
||||
return undef unless defined $self->type && $self->type eq 'FXO';
|
||||
return $self->{BATTERY} if defined $self->{BATTERY};
|
||||
|
||||
my $xpd = $span->xpd;
|
||||
my $xpd = Dahdi::Xpp::xpd_of_span($span);
|
||||
my $index = $self->index;
|
||||
return undef if !$xpd;
|
||||
|
||||
@@ -251,7 +251,7 @@ sub blink($$) {
|
||||
my $on = shift;
|
||||
my $span = $self->span or die;
|
||||
|
||||
my $xpd = $span->xpd;
|
||||
my $xpd = Dahdi::Xpp::xpd_of_span($span);
|
||||
my $index = $self->index;
|
||||
return undef if !$xpd;
|
||||
|
||||
|
||||
@@ -77,7 +77,6 @@ sub gen_t1_cas($$) {
|
||||
my $idle_bits = $gconfig->{'r2_idle_bits'};
|
||||
$chan_range = Dahdi::Config::Gen::bchan_range($span);
|
||||
printf "cas=%s:$idle_bits\n", $chan_range;
|
||||
printf "dchan=%d\n", $span->dchan()->num();
|
||||
} elsif ($pri_connection_type eq 'CAS' ) {
|
||||
my $type = ($termtype eq 'TE') ? 'FXO' : 'FXS';
|
||||
my $sig = $gconfig->{'dahdi_signalling'}{$type};
|
||||
@@ -138,7 +137,7 @@ sub gen_digital($$$) {
|
||||
if ($span->is_bri()) {
|
||||
my $use_bristuff = 0;
|
||||
my $cfg_hardhdlc = $gconfig->{'bri_hardhdlc'};
|
||||
my $xpd = $span->xpd();
|
||||
my $xpd = Dahdi::Xpp::xpd_of_span($span);
|
||||
if(!defined($cfg_hardhdlc) || $cfg_hardhdlc =~ /AUTO/i) {
|
||||
# Autodetect
|
||||
if(defined($xpd)) {
|
||||
|
||||
@@ -119,6 +119,7 @@ my %pci_ids = (
|
||||
'1397:16b8/1397:e998' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'OpenVox B800P' },
|
||||
'1397:08b4/1397:b566' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'BeroNet BN2S0' },
|
||||
'1397:08b4/1397:b560' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'BeroNet BN4S0' },
|
||||
'1397:08b4/1397:b762' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'BeroNet BN4S0 PCI-E card' },
|
||||
'1397:16b8/1397:b562' => { DRIVER => 'wcb4xxp', DESCRIPTION => 'BeroNet BN8S0' },
|
||||
'1397:08b4' => { DRIVER => 'qozap', DESCRIPTION => 'Generic Cologne ISDN card' },
|
||||
'1397:16b8' => { DRIVER => 'qozap', DESCRIPTION => 'Generic OctoBRI ISDN card' },
|
||||
|
||||
@@ -140,8 +140,9 @@ sub scan_devices_sysfs($) {
|
||||
|
||||
# Older kernels, e.g. 2.6.9, don't have the attribute
|
||||
# busnum:
|
||||
m|/(\d+)-[\d.]+$|;
|
||||
my $busnum = $1 || next;
|
||||
m|/((\d+)-[\d.]+)$|;
|
||||
my $busnum = $2 || next;
|
||||
my $dev_sys_name = $1;
|
||||
my $vendor = _get_attr("$_/idVendor");
|
||||
my $product = _get_attr("$_/idProduct");
|
||||
my $model = $usb_ids{"$vendor:$product"};
|
||||
@@ -149,6 +150,12 @@ sub scan_devices_sysfs($) {
|
||||
my $devnum = _get_attr("$_/devnum");
|
||||
my $serial = _get_attr_optional("$_/serial", '');
|
||||
my $devname = sprintf("%03d/%03d", $busnum, $devnum);
|
||||
# Get driver for first interface of the device:
|
||||
my $iface = "$_/$dev_sys_name:1.0";
|
||||
my $loaded = readlink("$iface/driver");
|
||||
if (defined $loaded) {
|
||||
$loaded =~ s|.*/||;
|
||||
}
|
||||
my $d = Dahdi::Hardware::USB->new(
|
||||
IS_ASTRIBANK => ($model->{DRIVER} eq 'xpp_usb')?1:0,
|
||||
PRIV_DEVICE_NAME => $devname,
|
||||
@@ -157,6 +164,7 @@ sub scan_devices_sysfs($) {
|
||||
SERIAL => $serial,
|
||||
DESCRIPTION => $model->{DESCRIPTION},
|
||||
DRIVER => $model->{DRIVER},
|
||||
LOADED => $loaded,
|
||||
);
|
||||
push(@devices, $d);
|
||||
}
|
||||
|
||||
@@ -323,7 +323,7 @@ sub pri_set_fromconfig($$) {
|
||||
}
|
||||
push(@pri_specs , 'SPAN/* TE'); # Default
|
||||
my @patlist = ( "SPAN/" . $span->num );
|
||||
my $xpd = $span->{XPD};
|
||||
my $xpd = Dahdi::Xpp::xpd_of_span($span);
|
||||
if(defined $xpd) {
|
||||
my $xbus = $xpd->xbus;
|
||||
my $xbus_name = $xbus->name;
|
||||
|
||||
@@ -349,6 +349,9 @@ udev_delayed_load() {
|
||||
run_fxload -D "$DEVICE" -I "$FIRM_USB"
|
||||
;;
|
||||
e4e4/11[3456]1/*)
|
||||
# There are potentially two separate udev events, for
|
||||
# each of the two endpoints. Ignore the first interface:
|
||||
case "$DEVPATH" in *.0) exit 0;; esac
|
||||
if [ "$prod_id" = 1131 ]; then
|
||||
FIRM_FPGA="FPGA_FXS.hex" # Legacy
|
||||
else
|
||||
|
||||
23
zonedata.c
23
zonedata.c
@@ -979,5 +979,28 @@ struct tone_zone builtin_zones[] =
|
||||
.mfr1_level = -7,
|
||||
.mfr2_level = -8,
|
||||
},
|
||||
{
|
||||
.zone = 43,
|
||||
.country = "mo",
|
||||
.description = "Macao,China",
|
||||
.ringcadence = { 1000, 4000 },
|
||||
.tones = {
|
||||
/* References: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf */
|
||||
{ DAHDI_TONE_DIALTONE, "425" },
|
||||
{ DAHDI_TONE_BUSY, "425/500,0/500" },
|
||||
{ DAHDI_TONE_RINGTONE, "425/1000,0/4000" },
|
||||
{ DAHDI_TONE_CONGESTION, "425/250,0/250" },
|
||||
{ DAHDI_TONE_CALLWAIT, "425/200,0/600" },
|
||||
/* RECORD TONE - not specified */
|
||||
{ DAHDI_TONE_RECORDTONE, "1400/400,0/15000" },
|
||||
{ DAHDI_TONE_INFO, "950/333,1400/333,1800/333,0/1000" },
|
||||
/* STUTTER TONE - not specified */
|
||||
{ DAHDI_TONE_STUTTER, "!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425" },
|
||||
},
|
||||
.dtmf_high_level = -10,
|
||||
.dtmf_low_level = -10,
|
||||
.mfr1_level = -10,
|
||||
.mfr2_level = -8,
|
||||
},
|
||||
{ .zone = -1 }
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user