diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-06-25 08:49:37 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-06-25 08:49:37 +0000 |
| commit | bc922245d191ce645af61d6e145eb939b56aefd3 (patch) | |
| tree | b903a93a4b32c1f38942cacdafdd56f3a8a4d496 /drivers/dahdi/xpp | |
| parent | c7f232eaa52b4338875681b760f2154b4b25d143 (diff) | |
Remove some more unused XPP code:
* The compatibility zt_chan_alarm macro
* genzaptelconf.env is gone.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4459 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/xpp')
| -rw-r--r-- | drivers/dahdi/xpp/card_fxo.c | 6 | ||||
| -rwxr-xr-x | drivers/dahdi/xpp/init_card_1_30 | 4 | ||||
| -rwxr-xr-x | drivers/dahdi/xpp/init_card_2_30 | 4 | ||||
| -rw-r--r-- | drivers/dahdi/xpp/xpp.conf | 6 |
4 files changed, 5 insertions, 15 deletions
diff --git a/drivers/dahdi/xpp/card_fxo.c b/drivers/dahdi/xpp/card_fxo.c index d7e1510..5091dcf 100644 --- a/drivers/dahdi/xpp/card_fxo.c +++ b/drivers/dahdi/xpp/card_fxo.c @@ -41,12 +41,6 @@ static DEF_PARM(uint, poll_metering_interval, 500, 0644, "Poll metering interval static DEF_PARM(int, ring_debounce, 50, 0644, "Number of ticks to debounce a false RING indication"); static DEF_PARM(int, caller_id_style, 0, 0444, "Caller-Id detection style: 0 - [BELL], 1 - [BT], 2 - [PASS]"); -/* Backward compatibility plug */ -#ifndef DAHDI_GET_PARAMS_V1 -#define dahdi_alarm_channel(a,b) dahdi_qevent_lock(a,( (b)==DAHDI_ALARM_NONE )? \ - DAHDI_EVENT_NOALARM : DAHDI_EVENT_ALARM) -#endif - enum cid_style { CID_STYLE_BELL = 0, /* E.g: US (Bellcore) */ CID_STYLE_ETSI_POLREV = 1, /* E.g: UK (British Telecom) */ diff --git a/drivers/dahdi/xpp/init_card_1_30 b/drivers/dahdi/xpp/init_card_1_30 index b781d7c..f8c7fd5 100755 --- a/drivers/dahdi/xpp/init_card_1_30 +++ b/drivers/dahdi/xpp/init_card_1_30 @@ -372,11 +372,7 @@ 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) = diff --git a/drivers/dahdi/xpp/init_card_2_30 b/drivers/dahdi/xpp/init_card_2_30 index aa16280..b0a7555 100755 --- a/drivers/dahdi/xpp/init_card_2_30 +++ b/drivers/dahdi/xpp/init_card_2_30 @@ -310,11 +310,7 @@ sub opermode_verify($) { } 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_FXO'; my $var_opermode = 'opermode'; my ($default_file, %source_defaults) = diff --git a/drivers/dahdi/xpp/xpp.conf b/drivers/dahdi/xpp/xpp.conf index 0bb3097..daa0d82 100644 --- a/drivers/dahdi/xpp/xpp.conf +++ b/drivers/dahdi/xpp/xpp.conf @@ -1,4 +1,8 @@ -# A local replacement for /etc/dahdi/defaults +# /etc/dahdi/xpp.conf +# +# This file is used to configure the operation +# of init_card_* initialization scripts. +# #INIT_FXS_SKIP_CALIB=1 DEBUG_INIT_FXS=0 |