diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-10-18 18:21:02 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-10-18 18:21:02 +0000 |
| commit | 946d9fa846a7ef9aa681185f08add7903a1fbeda (patch) | |
| tree | 8d6de4c79de5bc1534d21b5ba3a1d7ae3824468d /xpp | |
| parent | 91f7650a0c02deff8489a37260f01b1debe32363 (diff) | |
* zaptel-perl should not panic when there is no /proc/bus/usb (Closes
#11020).
* Don't build metering by default for now.
* And this is xpp rev 4900.
* Make opermode work again.
Merged revisions 3152-3153 via svnmerge from
http://svn.digium.com/svn/zaptel/branches/1.2
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@3154 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp')
| -rw-r--r-- | xpp/.version | 2 | ||||
| -rw-r--r-- | xpp/Changelog_xpp | 3 | ||||
| -rw-r--r-- | xpp/Makefile | 1 | ||||
| -rwxr-xr-x | xpp/init_card_4_29 | 2 | ||||
| -rw-r--r-- | xpp/utils/zconf/Zaptel/Hardware/USB.pm | 2 | ||||
| -rw-r--r-- | xpp/utils/zconf/Zaptel/Xpp.pm | 2 |
6 files changed, 7 insertions, 5 deletions
diff --git a/xpp/.version b/xpp/.version index a18df72..1f850cf 100644 --- a/xpp/.version +++ b/xpp/.version @@ -1 +1 @@ -branch-rel-4816-r4892 +branch-rel-4816-r4900 diff --git a/xpp/Changelog_xpp b/xpp/Changelog_xpp index b206a53..9171bc3 100644 --- a/xpp/Changelog_xpp +++ b/xpp/Changelog_xpp @@ -1,4 +1,4 @@ -Wed Oct 16 2007 Tzafrir Cohen <tzafrir.cohen@xorcom.com> - xpp.r4892 +Wed Oct 3 2007 Tzafrir Cohen <tzafrir.cohen@xorcom.com> - xpp.r4900 * Zaptel/Hardware perl modules: - Use sysfs directly. Don't rely on lspci/lsusb. - Each device has a description and driver name. @@ -11,6 +11,7 @@ Wed Oct 16 2007 Tzafrir Cohen <tzafrir.cohen@xorcom.com> - xpp.r4892 - Hence fpga_load can now work even with drivers loaded. * Fix firmware upgrading. * Fix manual firmware loading while auto-loading. + * Fix opermode parameter for FXO initialization (broken in r4648). Wed Oct 3 2007 Oron Peled <oron@actcom.co.il> - xpp.r4786 * New firmware protocol version: 2.9 . diff --git a/xpp/Makefile b/xpp/Makefile index 9e92fd5..706b21e 100644 --- a/xpp/Makefile +++ b/xpp/Makefile @@ -9,7 +9,6 @@ EXTRA_CFLAGS = $(XPP_LOCAL_CFLAGS) \ -DDEBUG \ -DPOLL_DIGITAL_INPUTS \ -DWITH_ECHO_SUPPRESSION \ - -DWITH_METERING \ -DDEBUG_PCMTX \ -DPROTOCOL_DEBUG \ -g diff --git a/xpp/init_card_4_29 b/xpp/init_card_4_29 index 93cbf33..760e711 100755 --- a/xpp/init_card_4_29 +++ b/xpp/init_card_4_29 @@ -143,7 +143,7 @@ done # based on fxo_modes from wctdm.c . TODO: more decent calculation? reg16=00; reg26=00; reg30=00; reg31=A3; ring_osc=; ring_x=; -mode="$openmode" +mode="$opermode" if [ -r $INIT_DIR/init_fxo_modes ]; then . $INIT_DIR/init_fxo_modes fi diff --git a/xpp/utils/zconf/Zaptel/Hardware/USB.pm b/xpp/utils/zconf/Zaptel/Hardware/USB.pm index 0f2024b..4d87536 100644 --- a/xpp/utils/zconf/Zaptel/Hardware/USB.pm +++ b/xpp/utils/zconf/Zaptel/Hardware/USB.pm @@ -85,6 +85,8 @@ sub devices($) { sub scan_devices($) { my $pack = shift || die; my $usb_device_list = "/proc/bus/usb/devices"; + return unless (-r $usb_device_list); + open(F, $usb_device_list) || die "Failed to open $usb_device_list: $!"; $/ = ''; while(<F>) { diff --git a/xpp/utils/zconf/Zaptel/Xpp.pm b/xpp/utils/zconf/Zaptel/Xpp.pm index db9add6..3c4b52c 100644 --- a/xpp/utils/zconf/Zaptel/Xpp.pm +++ b/xpp/utils/zconf/Zaptel/Xpp.pm @@ -79,7 +79,7 @@ sub sync { my $newapi = 0; my $file = "$proc_base/sync"; - die "$file is missing" unless -f $file; + return '' unless -f $file; # First query open(F, "$file") or die "Failed to open $file for reading: $!"; while(<F>) { |