Big dump of newer xpp code.

For finer details and separate commits, you are advised to look into the
commit log of dahdi-{linux,tools}.

xpp.r7150

* 116x Astribanks:
 - Support for the TwinStar capability and for FXO and (BRI|PRI) on
   same device.
 - New control protocol ("MPP").
 - astribank_hextool - a low-level firmware loading tool instead of
   fpga_load .
 - astribank_tool - Other MPP activities .
 - Can still reset (but just that) through older protocol.
 - astribank_hexload is required for loading FPGA firmware for USB_FW.hex 
   rev > 6885.
 - USB_FW rev. 7071 . 
 - More modular FPGA firmware (1161 only).
 - FPGA_1161.hex rev. 7131. PIC_TYPE_* rev. 7107.
 - software-settings of some capabilities with astribank_allow .

* XPP:
  - init_card_* script are less verbose.
  - Reduced rate of "Is a DAHDI sync master" message.
  - Replace member bus_id with dev_name() and set_dev_name() for
    building with 2.6.30.
  - Conditionally remove 'owner' property of procfs was dropped in 2.6.30.
  - astribank_hook now enabled by default.
  - Has an optional hook for TwinStar.

* BRI:
  - hardhdlc support: The bri_dchan patch is no longer needed.
  - If bri_dchan patch applied: old code is used, and "dchan" is used.
  - If not: new code and "hardhdlc" is used.
  - zapconf will generate the right configuration, depending on the new
    sysfs driver attribute bri_hardhdlc, but default to "dchan" as
    before if not explicitly told.
  - Bugfix: explicitly turn off leds on startup.

* FXS:
  - Initialization and calibration fixes.
  - Notify the user just one about wrong VMWI config

* Dahdi-perl:
  - Fix detection of empty slots in wctdm.
  - Fix working with ethmf's extra file in /proc/zaptel
  - Improved detection of Rhino cards.
  - dahdi_genconf's generated text better explains files are generated.
  - /etc/xpp_order - allow specifiying an explicit order for
    Astribanks to register with Zaptel.
  - Dahdi::Xpp::Mpp - A wrapper around astribank_tool .

* dahdi.init:
  - A separate waitfor_xpds script. May now have a wait-loop in
    some cases.
  - xpp_sync needs to only be called after dahdi_cfg .
    (for the PRI module).



git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4641 5390a7c7-147a-4af0-8ec9-7488f05a26cb

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.