xpp: start migration from procfs to sysfs.

* Sysfs representation for XPDs:
  /sys/bus/xpds/devices/<bus>:<unit>:<subunit>
* Astribanks sysfs directories now include the XPDs as subdirectories:
  e.g. /sys/bus/astribanks/devices/xbus-00/00:3:0
* procfs control interface deprecated: conditioned by OLD_PROC
  (defaults to off). Control functionality moved to sysfs:
* xbus attributes: cls connector label status timing waitfor_xpds xbus_state
* XPDs can have driver-specific attributes. Common attriubtes:
  blink chipregs span
* PRI-specific attributes:
  pri_clocking pri_dchan pri_cas pri_alarms pri_layer1 pri_localloop pri_protocol
* The Astribank attribute "xbus_state" is read/write. Reading it shows
  the current state of the Astribank. Writing "start" or "stop" allows a
  software equivalent of connect or disconnect respectively.
* When an Astribank is ready it sends an "online" event. Whenever its
  not ready (e.g. at the time of disconnect) it sends an "offline" event.
  Use astribank_hook.sample to handle those.



git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@5097 a0bf4364-ded3-4de4-8d8a-66a801d63aff

1 files changed, 26 insertions, 3 deletions

diff --git a/drivers/dahdi/xpp/init_card_3_30 b/drivers/dahdi/xpp/init_card_3_30
index 474b44e..c06e885 100755
--- a/drivers/dahdi/xpp/init_card_3_30
+++ b/drivers/dahdi/xpp/init_card_3_30
@@ -1,6 +1,9 @@
 #! /usr/bin/perl -w
 use strict;
 
+# Make warnings fatal
+local $SIG{__WARN__} = sub { die @_ };
+
 #
 # $Id$
 #
@@ -61,7 +64,6 @@ BEGIN { $init_dir = dirname($0); unshift(@INC, "$init_dir", "$init_dir/zconf");
 use XppConfig $init_dir;
 my $unit_id;
 my %opts;
-$ENV{XPP_BASE} = '/proc/xpp';
 
 getopts('o:', \%opts);
 
@@ -77,6 +79,21 @@ if (-t STDERR) {
 	$unit_id = "$ENV{XBUS_NAME}/UNIT-$ENV{UNIT_NUMBER}";
 	open (STDERR, "| logger -t $program -p kern.info") || die;
 	logit "Non Interactive startup";
+	foreach my $k (qw(
+			XBUS_NAME
+			XBUS_NUMBER
+			UNIT_NUMBER
+			UNIT_TYPE
+			UNIT_SUBUNITS
+			UNIT_SUBUNITS_DIR
+			XBUS_REVISION
+			XBUS_CONNECTOR
+			XBUS_LABEL)) {
+		unless(defined $ENV{$k}) {
+			logit "Missing ENV{$k}\n";
+			die;
+		}
+	}
 }
 
 sub select_subunit($) {
@@ -87,8 +104,14 @@ sub select_subunit($) {
 	if($opts{o}) {
 		$output = $opts{o};
 	} else {
-		my $xpd_name = sprintf("XPD-%1d%1d", $ENV{UNIT_NUMBER}, $subunit);
-		$output = "$ENV{XPP_BASE}/$ENV{XBUS_NAME}/$xpd_name/chipregs";
+		$output = sprintf "/sys/bus/xpds/devices/%02d:%1d:%1d/chipregs",
+				$ENV{XBUS_NUMBER}, $ENV{UNIT_NUMBER}, $subunit;
+		if(! -f $output) {
+			my $xpd_name = sprintf("XPD-%1d%1d", $ENV{UNIT_NUMBER}, $subunit);
+			$output = "/proc/xpp/$ENV{XBUS_NAME}/$xpd_name/chipregs";
+			logit "OLD DRIVER: does not use /sys chipregs. Falling back to /proc"
+				if -f $output;
+		}
 	}
 	open(REG, ">$output") || die "Failed to open '$output': $!\n";
 	my $oldfh = select REG;