[svn-commits] tzafrir: branch 1.2 r3153 - in /branches/1.2/xpp: ./ utils/zconf/Zaptel/ util...

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Thu Oct 18 13:04:12 2007
New Revision: 3153

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3153
Log:
 * 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.

Modified:
    branches/1.2/xpp/.version
    branches/1.2/xpp/Changelog_xpp
    branches/1.2/xpp/Makefile
    branches/1.2/xpp/utils/zconf/Zaptel/Hardware/USB.pm
    branches/1.2/xpp/utils/zconf/Zaptel/Xpp.pm

Modified: branches/1.2/xpp/.version
URL: http://svn.digium.com/view/zaptel/branches/1.2/xpp/.version?view=diff&rev=3153&r1=3152&r2=3153
==============================================================================
--- branches/1.2/xpp/.version (original)
+++ branches/1.2/xpp/.version Thu Oct 18 13:04:12 2007
@@ -1,1 +1,1 @@
-branch-rel-4816-r4892
+branch-rel-4816-r4900

Modified: branches/1.2/xpp/Changelog_xpp
URL: http://svn.digium.com/view/zaptel/branches/1.2/xpp/Changelog_xpp?view=diff&rev=3153&r1=3152&r2=3153
==============================================================================
--- branches/1.2/xpp/Changelog_xpp (original)
+++ branches/1.2/xpp/Changelog_xpp Thu Oct 18 13:04:12 2007
@@ -1,4 +1,4 @@
-Wed Oct 16 2007 Tzafrir Cohen <tzafrir.cohen at xorcom.com> - xpp.r4892
+Wed Oct  3 2007 Tzafrir Cohen <tzafrir.cohen at 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 @@
     - 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 at actcom.co.il> - xpp.r4786
   * New firmware protocol version: 2.9 .

Modified: branches/1.2/xpp/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/xpp/Makefile?view=diff&rev=3153&r1=3152&r2=3153
==============================================================================
--- branches/1.2/xpp/Makefile (original)
+++ branches/1.2/xpp/Makefile Thu Oct 18 13:04:12 2007
@@ -9,7 +9,6 @@
 			-DDEBUG			\
 			-DPOLL_DIGITAL_INPUTS	\
 			-DWITH_ECHO_SUPPRESSION	\
-			-DWITH_METERING		\
 			-DDEBUG_PCMTX		\
 			-DPROTOCOL_DEBUG	\
 			-g

Modified: branches/1.2/xpp/utils/zconf/Zaptel/Hardware/USB.pm
URL: http://svn.digium.com/view/zaptel/branches/1.2/xpp/utils/zconf/Zaptel/Hardware/USB.pm?view=diff&rev=3153&r1=3152&r2=3153
==============================================================================
--- branches/1.2/xpp/utils/zconf/Zaptel/Hardware/USB.pm (original)
+++ branches/1.2/xpp/utils/zconf/Zaptel/Hardware/USB.pm Thu Oct 18 13:04:12 2007
@@ -85,6 +85,8 @@
 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>) {

Modified: branches/1.2/xpp/utils/zconf/Zaptel/Xpp.pm
URL: http://svn.digium.com/view/zaptel/branches/1.2/xpp/utils/zconf/Zaptel/Xpp.pm?view=diff&rev=3153&r1=3152&r2=3153
==============================================================================
--- branches/1.2/xpp/utils/zconf/Zaptel/Xpp.pm (original)
+++ branches/1.2/xpp/utils/zconf/Zaptel/Xpp.pm Thu Oct 18 13:04:12 2007
@@ -79,7 +79,7 @@
 	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>) {