diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-07-10 21:57:55 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-07-10 21:57:55 +0000 |
| commit | 688dc17a1a1c60d574968dd915d559f560349e0c (patch) | |
| tree | e0f0c7da429c86413fd390e2d394e8e9cf7c73d0 /xpp/utils | |
| parent | fe2707b2a0c39c3e36f24bdd77c1cca07970abb0 (diff) | |
* Fix currents handling in driver.
* genzaptelconf: A simpler wait_for_xpp using new proc wait_for_xpds
* genzaptelconf: fixed confusion between framing and coding for E1/{il/nl}
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1215 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp/utils')
| -rwxr-xr-x | xpp/utils/genzaptelconf | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/xpp/utils/genzaptelconf b/xpp/utils/genzaptelconf index 1763427..62bea1d 100755 --- a/xpp/utils/genzaptelconf +++ b/xpp/utils/genzaptelconf @@ -37,6 +37,8 @@ # * Fixed timeout for Astribank load # * Delete unsuccessfully-probe modules # * Pass callerid from trunks +# * A simpler wait_for_xpp using new proc wait_for_xpds +# * fixed confusion between framing and coding for E1/{il/nl} # 0.5.2: # * Now it should detect most PRI cards and even wcusb # 0.5.1: @@ -485,21 +487,8 @@ wait_for_xpp() { [ "`cat /sys/module/xpp/parameters/zap_autoreg`" = 'Y' ] then # wait for the XPDs to register: - # TODO: replace this loop with 'cat /proc/xpp/XBUS-*/waitfor_xpds - success=0 - for i in `seq 30`; do - if ! grep -q 0 /proc/xpp/*/*/zt_registration 2>/dev/null - then - # There are either no XPDs or all of them are - # registered. Nothing to do - success=1 - break - fi - sleep 1 - done - if [ "$success" = 0 ]; then - echo 1>&2 "$0: WARNING: some XPD's are not registered yet (timeout)" - fi + # TODO: improve error reporting and produce a messagee here + cat /proc/xpp/XBUS-*/wait_for_xpds 2>/dev/null >/dev/null || true fi } @@ -723,15 +712,15 @@ EOF case "$lc_country" in nl) # (Just an example for per-country info) - echo 'ami' >$tmp_dir/span_framing - echo 'ccs' >$tmp_dir/span_coding + echo 'ccs' >$tmp_dir/span_framing + echo 'ami' >$tmp_dir/span_coding #echo 'crc4' >$tmp_dir/span_yellow #echo 'euroisdn' >$tmp_dir/span_switchtype #echo 'pri_cpe' >$tmp_dir/span_signalling ;; il) - echo 'hdb3' >$tmp_dir/span_framing - echo 'ccs' >$tmp_dir/span_coding + echo 'ccs' >$tmp_dir/span_framing + echo 'hdb3' >$tmp_dir/span_coding echo 'crc4' >$tmp_dir/span_yellow echo 'euroisdn' >$tmp_dir/span_switchtype esac |