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, 11 insertions, 7 deletions

diff --git a/kernel/xpp/init_card_4_30 b/kernel/xpp/init_card_4_30
index 6d56398..ea04545 100755
--- a/kernel/xpp/init_card_4_30
+++ b/kernel/xpp/init_card_4_30
@@ -71,14 +71,18 @@ sub logit {
 	print STDERR "$unit_id: @_\n";
 }
 
+sub debug {
+	logit @_ if $settings{debug};
+}
+
 # Arrange for error logging
 if (-t STDERR) {
 	$unit_id = 'Interactive';
-	logit "Interactive startup";
+	debug "Interactive startup";
 } else {
 	$unit_id = "$ENV{XBUS_NAME}/UNIT-$ENV{UNIT_NUMBER}";
 	open (STDERR, "| logger -t $program -p kern.info") || die;
-	logit "Non Interactive startup";
+	debug "Non Interactive startup";
 	foreach my $k (qw(
 			XBUS_NAME
 			XBUS_NUMBER
@@ -226,7 +230,7 @@ sub write_pri_info {
 		print INFO "$pri_protocol\n" || die "Failed writing '$pri_protocol' to '$file': $!\n";
 		close INFO || die "Failed during close of '$file': $!\n";
 	} else {
-		main::logit "$xpd_name: Skip setting pri protocol -- non given";
+		main::logit "$xpd_name: pri_protocol not given. Driver will use defaults.";
 	}
 }
 
@@ -359,7 +363,7 @@ sub port_setup($) {
 
 package main;
 
-logit "Starting '$0'";
+main::debug "Starting '$0'";
 
 PRI::read_defaults;
 
@@ -367,11 +371,11 @@ sub main() {
 	my @ports;
 	my $subunit;
 
-	logit "main(): Initializing chip ($ENV{UNIT_SUBUNITS} ports)";
+	main::debug "main(): Initializing chip ($ENV{UNIT_SUBUNITS} ports)";
 	PRI::init_quad;
 	# Must initialize all 4 ports, regardless how much there are
 	for($subunit = 0; $subunit < 4; $subunit++) {
-		#logit "main(): Initializing subunit $subunit";
+		#main::debug "main(): Initializing subunit $subunit";
 		my $p = PRI::Port->new(
 				'PORT_NUM'		=> $subunit,
 				'EXIST'			=> ($subunit < $ENV{UNIT_SUBUNITS})
@@ -389,7 +393,7 @@ sub main() {
 
 main;
 
-logit "Ending '$0'";
+main::debug "Ending '$0'";
 
 close REG;
 close STDERR;