xpp: MPP protocol v.1.4

* New firmware loading protocol
  - Older one (1.3) is still supported for now
* Support loading firmwares from Astribanks with a minimal firmware
  (1163)
* astribank_tool -Q: always query, regardless of verbosity level

xpp rev: up to 7559


git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@7609 a0bf4364-ded3-4de4-8d8a-66a801d63aff

2 files changed, 9 insertions, 7 deletions

diff --git a/xpp/perl_modules/Dahdi/Hardware/USB.pm b/xpp/perl_modules/Dahdi/Hardware/USB.pm
index 39f6d82..3eb9fe6 100644
--- a/xpp/perl_modules/Dahdi/Hardware/USB.pm
+++ b/xpp/perl_modules/Dahdi/Hardware/USB.pm
@@ -33,6 +33,7 @@ my %usb_ids = (
 	'e4e4:1160'	=> { DRIVER => 'xpp_usb', DESCRIPTION => 'Astribank-modular no-firmware' },
 	'e4e4:1161'	=> { DRIVER => 'xpp_usb', DESCRIPTION => 'Astribank-modular USB-firmware' },
 	'e4e4:1162'	=> { DRIVER => 'xpp_usb', DESCRIPTION => 'Astribank-modular FPGA-firmware' },
+	'e4e4:1163'	=> { DRIVER => 'xpp_usb', DESCRIPTION => 'Astribank-TwinStar monitor' },
 	
 	# Sangoma USB FXO:
 	'10c4:8461'	=> { DRIVER => 'wanpipe', DESCRIPTION => 'Sangoma WANPIPE USB-FXO Device' },
diff --git a/xpp/perl_modules/Dahdi/Xpp/Mpp.pm b/xpp/perl_modules/Dahdi/Xpp/Mpp.pm
index c95b13a..2c11a94 100644
--- a/xpp/perl_modules/Dahdi/Xpp/Mpp.pm
+++ b/xpp/perl_modules/Dahdi/Xpp/Mpp.pm
@@ -102,8 +102,9 @@ sub showinfo($$) {
 	}
 }
 
-sub astribank_tool_cmd($) {
+sub astribank_tool_cmd($@) {
 	my $dev = shift || die;
+	my @args = @_;
 	my $usb_top;
 
 	# Find USB bus toplevel
@@ -113,7 +114,7 @@ sub astribank_tool_cmd($) {
 	my $name = $dev->priv_device_name();
 	die "$0: Unkown private device name" unless defined $name;
 	my $path = "$usb_top/$name";
-	return ($astribank_tool, '-D', "$path");
+	return ($astribank_tool, '-D', "$path", @args);
 }
 
 sub new($$$) {
@@ -136,7 +137,7 @@ sub new($$$) {
 	}
 	return $mppinfo unless $product =~ /116[12]/;
 	$mppinfo->{'MPP_TALK'} = 1;
-	my @cmd = astribank_tool_cmd($dev);
+	my @cmd = astribank_tool_cmd($dev, '-Q');
 	my $name = $dev->priv_device_name();
 	my $dbg_file = "$name";
 	$dbg_file =~ s/\W/_/g;
@@ -191,9 +192,9 @@ sub mpp_setwatchdog($$) {
 	my $dev = $mppinfo->dev || die;
 	return undef unless defined $mppinfo->mpp_talk;
 	my $old = $mppinfo->tws_watchdog;
-	my @cmd = astribank_tool_cmd($dev);
+	my @cmd = astribank_tool_cmd($dev, '-w', $on);
 	print STDERR "DEBUG($on): '@cmd'\n";
-	system(@cmd, '-w', $on);
+	system(@cmd);
 	die "Running $astribank_tool failed: $?" if $?;
 }
 
@@ -204,8 +205,8 @@ sub mpp_jump($) {
 	my $port = $mppinfo->twinstar_port;
 	$port = ($port == 1) ? 0 : 1;
 	die "Unknown TwinStar port" unless defined $port;
-	my @cmd = astribank_tool_cmd($dev);
-	system(@cmd, '-p', $port);
+	my @cmd = astribank_tool_cmd($dev, '-p', $port);
+	system(@cmd);
 	die "Running $astribank_tool failed: $?" if $?;
 }