[zaptel-commits] tzafrir: branch 1.4 r3154 - in /branches/1.4: ./ xpp/ xpp/utils/zconf/Zaptel/...

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Thu Oct 18 13:21:02 2007
New Revision: 3154

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3154
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.
* Make opermode work again.

Merged revisions 3152-3153 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

Modified:
    branches/1.4/   (props changed)
    branches/1.4/xpp/.version
    branches/1.4/xpp/Changelog_xpp
    branches/1.4/xpp/Makefile
    branches/1.4/xpp/init_card_4_29
    branches/1.4/xpp/utils/zconf/Zaptel/Hardware/USB.pm
    branches/1.4/xpp/utils/zconf/Zaptel/Xpp.pm

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

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

Modified: branches/1.4/xpp/Changelog_xpp
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/Changelog_xpp?view=diff&rev=3154&r1=3153&r2=3154
==============================================================================
--- branches/1.4/xpp/Changelog_xpp (original)
+++ branches/1.4/xpp/Changelog_xpp Thu Oct 18 13:21:02 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.4/xpp/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/Makefile?view=diff&rev=3154&r1=3153&r2=3154
==============================================================================
--- branches/1.4/xpp/Makefile (original)
+++ branches/1.4/xpp/Makefile Thu Oct 18 13:21:02 2007
@@ -9,7 +9,6 @@
 			-DDEBUG			\
 			-DPOLL_DIGITAL_INPUTS	\
 			-DWITH_ECHO_SUPPRESSION	\
-			-DWITH_METERING		\
 			-DDEBUG_PCMTX		\
 			-DPROTOCOL_DEBUG	\
 			-g

Modified: branches/1.4/xpp/init_card_4_29
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/init_card_4_29?view=diff&rev=3154&r1=3153&r2=3154
==============================================================================
--- branches/1.4/xpp/init_card_4_29 (original)
+++ branches/1.4/xpp/init_card_4_29 Thu Oct 18 13:21:02 2007
@@ -143,7 +143,7 @@
 
 # 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

Modified: branches/1.4/xpp/utils/zconf/Zaptel/Hardware/USB.pm
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/utils/zconf/Zaptel/Hardware/USB.pm?view=diff&rev=3154&r1=3153&r2=3154
==============================================================================
--- branches/1.4/xpp/utils/zconf/Zaptel/Hardware/USB.pm (original)
+++ branches/1.4/xpp/utils/zconf/Zaptel/Hardware/USB.pm Thu Oct 18 13:21:02 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.4/xpp/utils/zconf/Zaptel/Xpp.pm
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/utils/zconf/Zaptel/Xpp.pm?view=diff&rev=3154&r1=3153&r2=3154
==============================================================================
--- branches/1.4/xpp/utils/zconf/Zaptel/Xpp.pm (original)
+++ branches/1.4/xpp/utils/zconf/Zaptel/Xpp.pm Thu Oct 18 13:21:02 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>) {