diff options
author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-04-02 20:56:42 +0000 |
---|---|---|
committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-04-02 20:56:42 +0000 |
commit | cb01267f42eba7bc5a572235e5d2571cc9b60303 (patch) | |
tree | 421d7509698c604a76499fdc95432642f323d9ad /xpp/dahdi_hardware | |
parent | 8c29f87f0fe6465a171644f1d916481d0d2def4f (diff) |
Support for Astribanks 116x: tools part
* New USB firmware loading mechanism.
- Incompatible with previous one: upgrade using fxload or hard reset
- astribank_hexload is the new low-level loading tool
- fpga_load remains for backward compatibility.
- xpp/astribank_upgrade: automate upgrading using fxload
* Much enhanced control protocol ("MPP")
- astribank_tool is the low-level tool for that.
* Support for the TwinStar (dual USB port)
- Managed through astribank_tool
- Wrapper perl modules and scripts provided
* Allow explicit ordering of Astribanks
- /etc/dahdi/xpp_order - explicit order of Astribanks on the system
- The default sorter is now to use those and fall back to connectors
(previous default).
- An option to dahdi_registration to change sorting.
git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@6313 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'xpp/dahdi_hardware')
-rwxr-xr-x | xpp/dahdi_hardware | 50 |
1 files changed, 41 insertions, 9 deletions
diff --git a/xpp/dahdi_hardware b/xpp/dahdi_hardware index 68b2345..2528fb7 100755 --- a/xpp/dahdi_hardware +++ b/xpp/dahdi_hardware @@ -17,16 +17,16 @@ use Dahdi::Span; use Dahdi::Xpp; use Dahdi::Xpp::Xbus; use Dahdi::Hardware; +use Dahdi::Xpp::Mpp; sub usage { - die "Usage: $0 [-v][-x]\n"; + die "Usage: $0 [-v][-x][-t]\n"; } -our ($opt_v, $opt_x); -getopts('vx') || usage; +my %opts; +getopts('vxt', \%opts) || usage; @ARGV == 0 or usage; -my $hardware = Dahdi::Hardware->scan; my @spans = Dahdi::spans; sub show_xbus($) { @@ -59,37 +59,69 @@ sub show_disconnected(%) { my %seen = @_; my $notified_lost = 0; - foreach my $xbus (Dahdi::Xpp::xbuses('SORT_CONNECTOR')) { + foreach my $xbus (Dahdi::Xpp::xbuses) { if(!$seen{$xbus->name}) { print "----------- XPP Spans with disconnected hardware -----------\n" unless $notified_lost++; printf($format, $xbus->name, '', '', '', "NO HARDWARE"); - show_xbus($xbus) if $opt_v; + show_xbus($xbus) if $opts{'v'}; } } } -foreach my $dev ($hardware->device_list) { +# FIXME: For verbose display we also need to see the XPP devices. +# If no spans are registered, this won't happen. A brute-force +# methood for making it happe: +Dahdi::Xpp::xbuses if ($opts{'v'}); + +my @devices = Dahdi::Hardware->device_list; +Dahdi::Xpp::Mpp->set_astribank_tool('./astribank_tool'); +foreach my $dev (@devices) { my $driver = $dev->driver || ""; my $xbus; my $loaded; + my $tws_port; + my $tws_power; + my $tws_watchdog; + my $mppinfo; if($dev->is_astribank) { $xbus = $dev->xbus; + if($opts{'v'} || $opts{'t'}) { + Dahdi::Xpp::Mpp->mpp_addinfo($dev); + $mppinfo = $dev->mppinfo; + if(defined $mppinfo) { + $tws_port = $mppinfo->{TWINSTAR_PORT}; + $tws_power = $mppinfo->{TWINSTAR_POWER}; + $tws_watchdog = $mppinfo->{TWINSTAR_WATCHDOG}; + } + } } $loaded = $dev->loaded; warn "driver should be '$driver' but is actually '$loaded'\n" if defined($loaded) && $driver ne $loaded; $driver = "$driver" . (($loaded) ? "+" : "-"); + if(defined $tws_power && defined $tws_watchdog) { + my $tws_active = $tws_watchdog && $tws_power->[0] && $tws_power->[1]; + $driver .= "[T]" if $tws_active; + } my $description = $dev->description || ""; printf $format, $dev->hardware_name, $driver, $dev->vendor, $dev->product, $description; + if($opts{'v'} && defined $mppinfo) { + printf " MPP: TWINSTAR_PORT=$tws_port\n" if defined $tws_port; + printf " MPP: TWINSTAR_WATCHDOG=$tws_watchdog\n"; + for(my $i = 0; $i < 2; $i++) { + printf " MPP: TWINSTAR_POWER[%d]=%d\n", + $i, $tws_power->[$i] if defined $tws_power; + } + } if(!defined $xbus || !$xbus) { next; } $seen{$xbus->name} = 1; - show_xbus($xbus) if $opt_v; + show_xbus($xbus) if $opts{'v'}; } -show_disconnected(%seen) if $opt_x; +show_disconnected(%seen) if $opts{'x'}; __END__ |