[svn-commits] tzafrir: linux/trunk r4459 - /linux/trunk/drivers/dahdi/xpp/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Wed Jun 25 03:49:37 2008
New Revision: 4459

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4459
Log:
Remove some more unused XPP code:
* The compatibility zt_chan_alarm macro
* genzaptelconf.env is gone.

Modified:
    linux/trunk/drivers/dahdi/xpp/card_fxo.c
    linux/trunk/drivers/dahdi/xpp/init_card_1_30
    linux/trunk/drivers/dahdi/xpp/init_card_2_30
    linux/trunk/drivers/dahdi/xpp/xpp.conf

Modified: linux/trunk/drivers/dahdi/xpp/card_fxo.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/card_fxo.c?view=diff&rev=4459&r1=4458&r2=4459
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/card_fxo.c (original)
+++ linux/trunk/drivers/dahdi/xpp/card_fxo.c Wed Jun 25 03:49:37 2008
@@ -40,12 +40,6 @@
 #endif
 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) */

Modified: linux/trunk/drivers/dahdi/xpp/init_card_1_30
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/init_card_1_30?view=diff&rev=4459&r1=4458&r2=4459
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/init_card_1_30 (original)
+++ linux/trunk/drivers/dahdi/xpp/init_card_1_30 Wed Jun 25 03:49:37 2008
@@ -372,11 +372,7 @@
 }
 
 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) =

Modified: linux/trunk/drivers/dahdi/xpp/init_card_2_30
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/init_card_2_30?view=diff&rev=4459&r1=4458&r2=4459
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/init_card_2_30 (original)
+++ linux/trunk/drivers/dahdi/xpp/init_card_2_30 Wed Jun 25 03:49:37 2008
@@ -310,11 +310,7 @@
 }
 
 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) =

Modified: linux/trunk/drivers/dahdi/xpp/xpp.conf
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/xpp.conf?view=diff&rev=4459&r1=4458&r2=4459
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xpp.conf (original)
+++ linux/trunk/drivers/dahdi/xpp/xpp.conf Wed Jun 25 03:49:37 2008
@@ -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