diff options
Diffstat (limited to 'kernel/xpp/utils/zt_registration')
-rwxr-xr-x | kernel/xpp/utils/zt_registration | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/kernel/xpp/utils/zt_registration b/kernel/xpp/utils/zt_registration index 4ae5a66..90596b9 100755 --- a/kernel/xpp/utils/zt_registration +++ b/kernel/xpp/utils/zt_registration @@ -18,21 +18,24 @@ use Zaptel::Xpp::Xbus; use Getopt::Std; sub usage { - die "Usage: $0 [on|off|1|0]\n"; + die "Usage: $0 [-s sort_order] [on|off|1|0]\n"; } my %opts; -getopts('s:', \%opts); - -my $sort_order = $opts{s} || $ENV{XBUS_SORT} || 'SORT_CONNECTOR'; -my $sorter = Zaptel::Xpp::sorters($sort_order); - -if(!defined $sorter) { - my @sorter_names = Zaptel::Xpp::sorters; - print STDERR "Unknown sort order $sort_order. Select from:\n\t"; - print STDERR join("\n\t", @sorter_names); - print STDERR "\n"; - exit 1; +getopts('s:', \%opts) || usage; + +my $sorter; +my $sort_order = $opts{'s'}; +if(defined $sort_order) { + my $sorter = Zaptel::Xpp::sorters($sort_order); + + if(!defined $sorter) { + my @sorter_names = Zaptel::Xpp::sorters; + print STDERR "Unknown sort order $sort_order. Select from:\n\t"; + print STDERR join("\n\t", @sorter_names); + print STDERR "\n"; + exit 1; + } } @ARGV == 0 or @ARGV == 1 or usage; @@ -58,7 +61,8 @@ sub myprintf { my @spans = Zaptel::spans; foreach my $xbus (Zaptel::Xpp::xbuses($sorter)) { - myprintf "%-10s\t%s\t%s\n", $xbus->name, $xbus->label, $xbus->connector; + myprintf "%-10s\t%3s-%s\t%s\n", + $xbus->name, $xbus->xpporder, $xbus->label, $xbus->connector; next unless $xbus->status eq 'CONNECTED'; foreach my $xpd ($xbus->xpds()) { my $prev = $xpd->zt_registration($on); @@ -76,7 +80,7 @@ foreach my $xbus (Zaptel::Xpp::xbuses($sorter)) { myprintf "%3s ==> %3s\n", state2str($prev), state2str($on); } } -myprintf "# Sorted: $sort_order\n"; +myprintf "# Sorted: $sort_order\n" if defined $sort_order; __END__ @@ -118,7 +122,7 @@ The sort order to use. If the option is not used, the sort order is taken from the environment variable XBUS_SORT and failing that: the hard-coded default of -SORT_CONNECTOR. +SORT_XPPORDER. The available sorting orders are documented in Zaptel::Xpp manual. |