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, 22 insertions, 2 deletions

diff --git a/kernel/xpp/utils/zconf/Zaptel/Xpp/Xpd.pm b/kernel/xpp/utils/zconf/Zaptel/Xpp/Xpd.pm
index 30a0bad..80478af 100644
--- a/kernel/xpp/utils/zconf/Zaptel/Xpp/Xpd.pm
+++ b/kernel/xpp/utils/zconf/Zaptel/Xpp/Xpd.pm
@@ -85,6 +85,25 @@ sub xpd_old_getoffhook($) {
 
 my %attr_missing_warned;	# Prevent duplicate warnings
 
+sub xpd_driver_getattr($$) {
+	my $xpd = shift || die;
+	my $attr = shift || die;
+	$attr = lc($attr);
+	my ($busnum, $unitnum, $subunitnum) = ($xpd->xbus->num, $xpd->unit, $xpd->subunit);
+	my $file = sprintf "$Zaptel::Xpp::sysfs_xpds/%02d:%1d:%1d/driver/$attr",
+			$busnum, $unitnum, $subunitnum;
+	if(!defined($file)) {
+		warn "$0: xpd_driver_getattr($attr) -- Missing attribute.\n" if
+			$attr_missing_warned{$attr};
+		return undef;
+	}
+	open(F, $file) || return undef;
+	my $val = <F>;
+	close F;
+	chomp $val;
+	return $val;
+}
+
 sub xpd_getattr($$) {
 	my $xpd = shift || die;
 	my $attr = shift || die;
@@ -162,7 +181,7 @@ sub zt_registration($$) {
 }
 
 sub xpds_by_spanno() {
-	my @xbuses = Zaptel::Xpp::xbuses("SORT_CONNECTOR");
+	my @xbuses = Zaptel::Xpp::xbuses();
 	my @xpds = map { $_->xpds } @xbuses;
 	@xpds = grep { $_->spanno } @xpds;
 	@xpds = sort { $a->spanno <=> $b->spanno } @xpds;
@@ -181,7 +200,7 @@ sub new($$$$$) {
 	my $sysfsdir = shift || die;
 	my $self = {
 		XBUS		=> $xbus,
-		ID		=> "$unit$subunit",
+		ID		=> sprintf("%1d%1d", $unit, $subunit),
 		FQN		=> $xbus->name . "/" . "XPD-$unit$subunit",
 		UNIT		=> $unit,
 		SUBUNIT		=> $subunit,
@@ -198,6 +217,7 @@ sub new($$$$$) {
 	if($type =~ /BRI_(NT|TE)/) {
 		$self->{IS_BRI} = 1;
 		$self->{TERMTYPE} = $1;
+		$self->{DCHAN_HARDHDLC} = $self->xpd_driver_getattr('dchan_hardhdlc');
 	}
 	$self->{IS_PRI} = ($type =~ /[ETJ]1/);
 	$self->{IS_DIGITAL} = ( $self->{IS_BRI} || $self->{IS_PRI} );