diff options
author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2009-03-19 20:08:29 +0000 |
---|---|---|
committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2009-03-19 20:08:29 +0000 |
commit | d8562c778088ff6ab3383df5ceead41eff4bf124 (patch) | |
tree | 43e394ae225fd7183018c2ae08d3fb1e5bcb12cb /kernel/xpp/init_card_1_30 | |
parent | b6b3226735f5e3b3fb000fa92daa7a574265c817 (diff) |
xpp: a massive backport from DAHDI. From Xorcom branch-rel-6839-r6908 .
Sun Mar 1 2009 Oron Peled <oron@actcom.co.il> - xpp.r6795
* Fix cases where the command_queue overflowed during initialization.
- Also add a 'command_queue_length' parameter to xpp.ko
* More migrations to sysfs:
- Add a 'transport' attribute to our astribank devices which
points to the usb device we use. E.g:
/sys/bus/astribanks/devices/xbus-00/transport is symlinked to
../../../../../../devices/pci0000:00/0000:00:10.4/usb5/5-4
- Move /proc/xpp/XBUS-??/XPD-??/span to
/sys/bus/xpds/devices/??:?:?/span
- Migrate from /proc/xpp/sync to:
/sys/bus/astribanks/drivers/xppdrv/sync
- New 'offhook' attribute in:
/sys/bus/xpds/devices/??:?:?/offhook
* PRI: change the "timing" priority to match the convention used by
other PRI cards -- I.e: lower numbers (not 0) have higher
priority.
* FXO:
- Power denial: create two module parameters instead of hard-coded
constants (power_denial_safezone, power_denial_minlen).
For sites that get non-standard power-denial signals from central
office on offhook.
- Don't hangup on power-denial, just notify Dahdi and wait for
- Fix caller-id detection for the case central office sends it before
first ring without any indication before.
Asterisk's desicion.
Mon, Dec 8 2008 Oron Peled <oron@actcom.co.il> - xpp.r6430
* PRI:
- Match our span clocking priorities (in system.conf)
to Digium -- this is a reversal of the previous state.
Now lower numbers (greater than 0) are better.
- Synchronization fixes for PRI ports other than 0.
- Fix T1 CRC for some countries (e.g: China).
* FXS: fix bug in VMWI detection if using old asterisk
which does not provide ZT_VMWI ioctl().
* FXO:
- Improve caller_id_style module parameter. This provide a workaround
for countries that send this information without any notification
(reverse polarity, ring, etc.)
- Don't force on-hook upon power-denial. So, loopstart devices
would ignore these as expected.
* Implement a flow-control to prevent user space (init_card_* scripts)
from pressuring our command queue.
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4631 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'kernel/xpp/init_card_1_30')
-rwxr-xr-x | kernel/xpp/init_card_1_30 | 67 |
1 files changed, 42 insertions, 25 deletions
diff --git a/kernel/xpp/init_card_1_30 b/kernel/xpp/init_card_1_30 index 9b01ec8..fafd2c1 100755 --- a/kernel/xpp/init_card_1_30 +++ b/kernel/xpp/init_card_1_30 @@ -1,6 +1,9 @@ #! /usr/bin/perl -w use strict; +# Make warnings fatal +local $SIG{__WARN__} = sub { die @_ }; + # # Written by Oron Peled <oron@actcom.co.il> # Copyright (C) 2006, Xorcom @@ -44,36 +47,57 @@ use Getopt::Std; my $program = basename("$0"); my $init_dir = dirname("$0"); -BEGIN { $init_dir = dirname($0); unshift(@INC, "$init_dir", "$init_dir/zconf"); } -use Zaptel::Config::Defaults; +BEGIN { $init_dir = dirname($0); unshift(@INC, "$init_dir"); } +use XppConfig $init_dir; my $unit_id; my %opts; -$ENV{XPP_BASE} = '/proc/xpp'; getopts('o:', \%opts); -my $debug; -my $skip_calib; - -my $xpd_name = sprintf("XPD-%1d0", $ENV{UNIT_NUMBER}); -my $chipregs = "$ENV{XPP_BASE}/$ENV{XBUS_NAME}/$xpd_name/chipregs"; +my %settings; +$settings{debug} = 0; +$settings{fxs_skip_calib} = 0; +my $chipregs; sub logit { print STDERR "$unit_id: @_\n"; } sub debug { - logit @_ if $debug; + logit @_ if $settings{debug}; } # Arrange for error logging if (-t STDERR) { $unit_id = 'Interactive'; - logit "Interactive startup"; + main::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"; + main::debug "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; + } + } + $chipregs = sprintf "/sys/bus/xpds/devices/%02d:%1d:0/chipregs", + $ENV{XBUS_NUMBER}, $ENV{UNIT_NUMBER}; + if(! -f $chipregs) { + my $xpd_name = sprintf("XPD-%1d0", $ENV{UNIT_NUMBER}); + $chipregs = "/proc/xpp/$ENV{XBUS_NAME}/$xpd_name/chipregs"; + logit "OLD DRIVER: does not use /sys chipregs. Falling back to /proc" + if -f $chipregs; + } } sub set_output() { @@ -87,7 +111,7 @@ sub set_output() { } open(REG, ">$output") || die "Failed to open '$output': $!\n"; my $oldfh = select REG; - print "# Setting output\n" if $opts{o}; + main::logit "# Setting output" if $opts{o}; return $oldfh; } @@ -372,18 +396,11 @@ sub calibrate_slics() { } sub read_defaults() { - # For lab tests - my $labfile = "$init_dir/genzaptelconf.env"; - - # Source default files - $ENV{ZAPTEL_DEFAULTS} = "$labfile" if -r "$labfile"; - my $var_debug = 'DEBUG_INIT_FXS'; - my $var_skip_calib = 'INIT_FXS_SKIP_CALIB'; - my ($default_file, %source_defaults) = - Zaptel::Config::Defaults::source_vars($var_debug, $var_skip_calib); - $debug = $source_defaults{$var_debug}; - $skip_calib = $source_defaults{$var_skip_calib}; - main::logit "From $default_file: $var_debug=$debug $var_skip_calib=$skip_calib"; + if(XppConfig::read_config(\%settings)) { + main::logit "Defaults from $settings{xppconf}"; + } else { + main::logit "No defaults file, use hard-coded defaults."; + } } package main; @@ -396,7 +413,7 @@ FXS::init_indirect_registers(); main::debug "after init_indirect_registers"; FXS::init_early_direct_regs(); main::debug "after init_early_direct_regs"; -if($skip_calib) { +if($settings{fxs_skip_calib}) { main::logit "==== WARNING: SKIPPED SLIC CALIBRATION ====="; } else { FXS::calibrate_slics; |