[svn-commits] file: branch file/zaptel-firmware r2072 - in /team/file/zaptel-firmware: ./ b...

svn-commits at lists.digium.com svn-commits at lists.digium.com
Wed Jan 31 16:28:41 MST 2007


Author: file
Date: Wed Jan 31 17:28:39 2007
New Revision: 2072

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2072
Log:
Merged revisions 2039,2044,2065-2066 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r2039 | kpfleming | 2007-01-30 19:34:25 -0600 (Tue, 30 Jan 2007) | 10 lines

Merged revisions 2038 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2038 | kpfleming | 2007-01-30 19:33:25 -0600 (Tue, 30 Jan 2007) | 2 lines

final fix for non-hotplug firmware loading

........

................
r2044 | kpfleming | 2007-01-31 08:12:37 -0600 (Wed, 31 Jan 2007) | 12 lines

Merged revisions 2043 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2043 | kpfleming | 2007-01-31 08:06:34 -0600 (Wed, 31 Jan 2007) | 4 lines

fix up author email addresses
use the kernel's built-in support for module aliases instead of manually doing it in modprobe.conf or equivalent
add wctdm8xxp alias for wctdm24xxp

........

................
r2065 | tzafrir | 2007-01-31 14:07:23 -0600 (Wed, 31 Jan 2007) | 4 lines

Merging 1.2 changes of genzaptelconf:
 * -l (list) now works reliebly.
 * Cleared some leftover writes to standard output.
 * Fixed xpp spans sort order.
................
r2066 | tzafrir | 2007-01-31 14:19:05 -0600 (Wed, 31 Jan 2007) | 5 lines

r2064:  tzafrir | 2007-01-31 21:48:39 +0200

zaptel-helper deserves wider exposure. Note: it is not getting installed.
However it will probably help preven the braking of Astribank drivers
loading for those who do care.
................

Added:
    team/file/zaptel-firmware/xpp/zaptel-helper   (props changed)
      - copied unchanged from r2066, branches/1.4/xpp/zaptel-helper
Modified:
    team/file/zaptel-firmware/   (props changed)
    team/file/zaptel-firmware/Makefile
    team/file/zaptel-firmware/build_tools/genmodconf
    team/file/zaptel-firmware/makefw.c
    team/file/zaptel-firmware/pciradio.c
    team/file/zaptel-firmware/tonezone.c
    team/file/zaptel-firmware/tor2.c
    team/file/zaptel-firmware/torisa.c
    team/file/zaptel-firmware/torisatool.c
    team/file/zaptel-firmware/wcfxo.c
    team/file/zaptel-firmware/wcfxsusb.c
    team/file/zaptel-firmware/wct1xxp.c
    team/file/zaptel-firmware/wct4xxp/base.c
    team/file/zaptel-firmware/wctdm.c
    team/file/zaptel-firmware/wctdm24xxp.c
    team/file/zaptel-firmware/wcusb.c
    team/file/zaptel-firmware/xpp/utils/genzaptelconf
    team/file/zaptel-firmware/zaptel.c
    team/file/zaptel-firmware/ztcfg-dude.c
    team/file/zaptel-firmware/ztcfg.c
    team/file/zaptel-firmware/ztd-eth.c
    team/file/zaptel-firmware/ztdynamic.c
    team/file/zaptel-firmware/ztmonitor.c
    team/file/zaptel-firmware/zttool.c

Propchange: team/file/zaptel-firmware/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/file/zaptel-firmware/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/file/zaptel-firmware/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan 31 17:28:39 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-2019
+/branches/1.4:1-2071

Modified: team/file/zaptel-firmware/Makefile
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/Makefile?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/Makefile (original)
+++ team/file/zaptel-firmware/Makefile Wed Jan 31 17:28:39 2007
@@ -135,6 +135,7 @@
 endif
 MODULES:=pciradio tor2 torisa wcfxo wct1xxp wctdm wctdm24xxp wcte11xp wcusb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode
 MODULES:=$(filter-out $(MENUSELECT_MODULES),$(MODULES))
+MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
 
 MODULESO:=$(MODULES:%=%.o)
 MODULESKO:=$(MODULES:%=%.ko)
@@ -415,7 +416,7 @@
 	$(INSTALL) -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
 	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
 	[ -f $(CONFIG_FILE) ] || $(INSTALL) -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
-	build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES))"
+	build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES)) $(MODULE_ALIASES)"
 	@if [ -d /etc/modutils ]; then \
 		/sbin/update-modules ; \
 	fi

Modified: team/file/zaptel-firmware/build_tools/genmodconf
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/build_tools/genmodconf?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/build_tools/genmodconf (original)
+++ team/file/zaptel-firmware/build_tools/genmodconf Wed Jan 31 17:28:39 2007
@@ -93,13 +93,6 @@
     done
 fi
 
-if ! grep -q "alias wcfxs" ${target}; then
-    echo "alias wcfxs wctdm" >> ${target};
-fi;
-if ! grep -q "alias wct2xxp" ${target}; then
-    echo "alias wct2xxp wct4xxp" >> ${target};
-fi;
-    
 if [ -z "${combined}" ]; then
     echo "***"
     echo "*** WARNING:"

Modified: team/file/zaptel-firmware/makefw.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/makefw.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/makefw.c (original)
+++ team/file/zaptel-firmware/makefw.c Wed Jan 31 17:28:39 2007
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
  *
- * Primary Author: Mark Spencer <markster at linux-support.net>
+ * Primary Author: Mark Spencer <markster at digium.com>
  *
  */
 

Modified: team/file/zaptel-firmware/pciradio.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/pciradio.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/pciradio.c (original)
+++ team/file/zaptel-firmware/pciradio.c Wed Jan 31 17:28:39 2007
@@ -2,7 +2,7 @@
  * PCI RADIO Card  Zapata Telephony PCI Quad Radio Interface driver
  *
  * Written by Jim Dixon <jim at lambdatel.com>
- * Based on previous work by Mark Spencer <markster at linux-support.net>
+ * Based on previous work by Mark Spencer <markster at digium.com>
  * Based on previous works, designs, and archetectures conceived and
  * written by Jim Dixon <jim at lambdatel.com>.
  *

Modified: team/file/zaptel-firmware/tonezone.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/tonezone.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/tonezone.c (original)
+++ team/file/zaptel-firmware/tonezone.c Wed Jan 31 17:28:39 2007
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
  *
- * Primary Author: Mark Spencer <markster at linux-support.net>
+ * Primary Author: Mark Spencer <markster at digium.com>
  *
  */
 

Modified: team/file/zaptel-firmware/tor2.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/tor2.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/tor2.c (original)
+++ team/file/zaptel-firmware/tor2.c Wed Jan 31 17:28:39 2007
@@ -1,7 +1,7 @@
 /*
  * Tormenta 2  Quad-T1 PCI Driver
  *
- * Written by Mark Spencer <markster at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
  * Based on previous works, designs, and archetectures conceived and
  * written by Jim Dixon <jim at lambdatel.com>.
  *

Modified: team/file/zaptel-firmware/torisa.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/torisa.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/torisa.c (original)
+++ team/file/zaptel-firmware/torisa.c Wed Jan 31 17:28:39 2007
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
  *
- * Modified from original tor.c by Mark Spencer <markster at linux-support.net>
+ * Modified from original tor.c by Mark Spencer <markster at digium.com>
  *                     original by Jim Dixon <jim at lambdatel.com>
  */
 
@@ -1157,7 +1157,7 @@
 		zt_unregister(&spans[1]);
 }
 
-MODULE_AUTHOR("Mark Spencer <markster at linux-support.net>");
+MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
 MODULE_DESCRIPTION("Tormenta ISA Zapata Telephony Driver");
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");

Modified: team/file/zaptel-firmware/torisatool.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/torisatool.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/torisatool.c (original)
+++ team/file/zaptel-firmware/torisatool.c Wed Jan 31 17:28:39 2007
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
  *
- * Modified from original tor.c by Mark Spencer <markster at linux-support.net>
+ * Modified from original tor.c by Mark Spencer <markster at digium.com>
  *                     original by Jim Dixon <jim at lambdatel.com>
  */
 

Modified: team/file/zaptel-firmware/wcfxo.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/wcfxo.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/wcfxo.c (original)
+++ team/file/zaptel-firmware/wcfxo.c Wed Jan 31 17:28:39 2007
@@ -1,8 +1,8 @@
 /*
  * Wilcard X100P FXO Interface Driver for Zapata Telephony interface
  *
- * Written by Mark Spencer <markster at linux-support.net>
- *            Matthew Fredrickson <creslin at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
+ *            Matthew Fredrickson <creslin at digium.com>
  *
  * Copyright (C) 2001, Linux Support Services, Inc.
  *
@@ -1029,7 +1029,7 @@
 MODULE_PARM(opermode, "i");
 #endif
 MODULE_DESCRIPTION("Wildcard X100P Zaptel Driver");
-MODULE_AUTHOR("Mark Spencer <markster at linux-support.net>");
+MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
 #endif

Modified: team/file/zaptel-firmware/wcfxsusb.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/wcfxsusb.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/wcfxsusb.c (original)
+++ team/file/zaptel-firmware/wcfxsusb.c Wed Jan 31 17:28:39 2007
@@ -1,8 +1,8 @@
 /*
  * Wildcard S100U USB FXS Interface Zapata Telephony Driver
  *
- * Written by Mark Spencer <markster at linux-support.net>
- *            Matthew Fredrickson <creslin at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
+ *            Matthew Fredrickson <creslin at digium.com>
  *
  * Copyright (C) 2001, Linux Support Services, Inc.
  *
@@ -1513,7 +1513,7 @@
 	usb_deregister(&wc_usb_driver);
 }
 
-MODULE_AUTHOR("Mark Spencer <markster at linux-support.net>");
+MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
 MODULE_DESCRIPTION("Wildcard USB FXS Interface driver");
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");

Modified: team/file/zaptel-firmware/wct1xxp.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/wct1xxp.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/wct1xxp.c (original)
+++ team/file/zaptel-firmware/wct1xxp.c Wed Jan 31 17:28:39 2007
@@ -1,9 +1,9 @@
 /*
  * Linux Support Services, Inc.  Wildcard T100P T1/PRI card Driver
  *
- * Written by Mark Spencer <markster at linux-support.net>
- *            Matthew Fredrickson <creslin at linux-support.net>
- *            William Meadows <wmeadows at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
+ *            Matthew Fredrickson <creslin at digium.com>
+ *            William Meadows <wmeadows at digium.com>
  *
  * Copyright (C) 2001, Linux Support Services, Inc.
  *
@@ -1403,7 +1403,7 @@
 MODULE_PARM(debug, "i");
 #endif
 MODULE_DESCRIPTION("Wildcard T100P/E100P Zaptel Driver");
-MODULE_AUTHOR("Mark Spencer <markster at linux-support.net>");
+MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
 #endif

Modified: team/file/zaptel-firmware/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/wct4xxp/base.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/wct4xxp/base.c (original)
+++ team/file/zaptel-firmware/wct4xxp/base.c Wed Jan 31 17:28:39 2007
@@ -3102,8 +3102,8 @@
 	struct firmware embedded_firmware;
 	const struct firmware *firmware = &embedded_firmware;
 #if !defined(HOTPLUG_FIRMWARE)
-	extern void *_binary_zaptel_fw_octasic_064_bin_size;
-	extern void *_binary_zaptel_fw_octasic_128_bin_size;
+	extern void _binary_zaptel_fw_octasic_064_bin_size;
+	extern void _binary_zaptel_fw_octasic_128_bin_size;
 	extern u8 _binary_zaptel_fw_octasic_064_bin_start[];
 	extern u8 _binary_zaptel_fw_octasic_128_bin_start[];
 #endif
@@ -3142,14 +3142,13 @@
 		}
 #else
 		embedded_firmware.data = _binary_zaptel_fw_octasic_064_bin_start;
-		embedded_firmware.size = _binary_zaptel_fw_octasic_064_bin_size;
 		/* Yes... this is weird. objcopy gives us a symbol containing
 		   the size of the firmware, not a pointer a variable containing
 		   the size. The only way we can get the value of the symbol
 		   is to take its address, so we define it as a pointer and
 		   then cast that value to the proper type.
 		*/
-		embedded_firmware.size = (size_t) _binary_zaptel_fw_octasic_064_size;
+		embedded_firmware.size = (size_t) &_binary_zaptel_fw_octasic_064_size;
 #endif
 		break;
 	case 128:
@@ -3167,7 +3166,7 @@
 		   is to take its address, so we define it as a pointer and
 		   then cast that value to the proper type.
 		*/
-		embedded_firmware.size = (size_t) _binary_zaptel_fw_octasic_128_size;
+		embedded_firmware.size = (size_t) &_binary_zaptel_fw_octasic_128_size;
 #endif
 		break;
 	default:
@@ -3830,6 +3829,9 @@
 
 MODULE_AUTHOR("Mark Spencer");
 MODULE_DESCRIPTION("Unified TE4XXP-TE2XXP PCI Driver");
+#if defined(MODULE_ALIAS)
+MODULE_ALIAS("wct2xxp");
+#endif
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
 #endif

Modified: team/file/zaptel-firmware/wctdm.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/wctdm.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/wctdm.c (original)
+++ team/file/zaptel-firmware/wctdm.c Wed Jan 31 17:28:39 2007
@@ -1,8 +1,8 @@
 /*
  * Wilcard TDM400P TDM FXS/FXO Interface Driver for Zapata Telephony interface
  *
- * Written by Mark Spencer <markster at linux-support.net>
- *            Matthew Fredrickson <creslin at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
+ *            Matthew Fredrickson <creslin at digium.com>
  *
  * Copyright (C) 2001, Linux Support Services, Inc.
  *
@@ -2512,6 +2512,9 @@
 #endif
 MODULE_DESCRIPTION("Wildcard TDM400P Zaptel Driver");
 MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
+#if defined(MODULE_ALIAS)
+MODULE_ALIAS("wcfxs");
+#endif
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
 #endif

Modified: team/file/zaptel-firmware/wctdm24xxp.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/wctdm24xxp.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/wctdm24xxp.c (original)
+++ team/file/zaptel-firmware/wctdm24xxp.c Wed Jan 31 17:28:39 2007
@@ -3577,12 +3577,12 @@
 #endif
 MODULE_DESCRIPTION("Wildcard TDM2400P/TDM800P Zaptel Driver");
 MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
+#if defined(MODULE_ALIAS)
+MODULE_ALIAS("wctdm8xxp");
+#endif
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
 #endif
 
 module_init(wctdm_init);
 module_exit(wctdm_cleanup);
-
-
-

Modified: team/file/zaptel-firmware/wcusb.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/wcusb.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/wcusb.c (original)
+++ team/file/zaptel-firmware/wcusb.c Wed Jan 31 17:28:39 2007
@@ -1,8 +1,8 @@
 /*
  * Wildcard S100U USB FXS Interface Zapata Telephony Driver
  *
- * Written by Mark Spencer <markster at linux-support.net>
- *            Matthew Fredrickson <creslin at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
+ *            Matthew Fredrickson <creslin at digium.com>
  *
  * Copyright (C) 2001, Linux Support Services, Inc.
  *
@@ -1475,7 +1475,7 @@
 	usb_deregister(&wc_usb_driver);
 }
 
-MODULE_AUTHOR("Matthew Fredrickson <creslin at linux-support.net>");
+MODULE_AUTHOR("Matthew Fredrickson <creslin at digium.com>");
 MODULE_DESCRIPTION("Wildcard USB FXS Interface driver");
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");

Modified: team/file/zaptel-firmware/xpp/utils/genzaptelconf
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/xpp/utils/genzaptelconf?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/xpp/utils/genzaptelconf (original)
+++ team/file/zaptel-firmware/xpp/utils/genzaptelconf Wed Jan 31 17:28:39 2007
@@ -215,7 +215,9 @@
 	# Get a list of connected Astribank devices, sorted by the name of
 	# the USB connector. That order is rather arbitrary, but will not
 	# change without changes to the cabling.
-	xbusses=`sort -k 2 /proc/xpp/xbuses | awk -F: '/STATUS=connected/ {print $1}'`
+	xbusses=`sed -e '/STATUS=connected/!d' -e 's/ *STATUS=.*//' -e 's/ *CONNECTOR=//' /proc/xpp/xbuses | sort -t: -k 2 | cut -d: -f1`
+	say "Zaptel registration order:"
+	say "$xbusses"
 
 	# get a list of XPDs that were not yet registered as zaptel spans.
 	# this will be the case if you set the parameter zap_autoreg=0 to
@@ -290,7 +292,12 @@
 		;;
 	esac
 	case "$mode" in
-	list) echo $chan $sig $astbanktype;;
+	list)
+		case "$sig" in
+		fxs) sig_name=FXO;;
+		fxo) sig_name=FXS;;
+		esac
+		echo $chan $sig_name $astbank_type;;
 	files)
 		# sadly, both input ports and output ports go into the same span as 
 		# the FXS ports. Thus we need to separate between them. See also 
@@ -670,10 +677,15 @@
 		# the second line is empty
 		title=`head -n 1 $procfile`
 		# stuff that needs to be remembered accross lines (for PRI/BRI support)
-		echo ""         >>$zaptel_file
-		echo "# $title" >>$zaptel_file
-		echo ""         >>$zapata_file
-		echo "; $title" >>$zapata_file
+		case "$mode" in
+		list) echo "### $title";;
+		files)
+		  echo ""         >>$zaptel_file
+		  echo "# $title" >>$zaptel_file
+		  echo ""         >>$zapata_file
+		  echo "; $title" >>$zapata_file
+			;;
+		esac
 		echo '-1'  >$tmp_dir/span_begin
 		echo '-1'  >$tmp_dir/span_end
 		echo '0'   >$tmp_dir/span_timing
@@ -890,7 +902,7 @@
 							echo "context=$context_phones" >> $zapata_file
 						fi
 					else # we have may have set it. So reset it:
-						echo "callerid=asreceived"
+						echo "callerid=asreceived"       >> $zapata_file
 						reset_values="$reset_values callerid"
 						#echo "mailbox="
 						if [ "$group_manual" != "yes" ]
@@ -911,7 +923,10 @@
 				reset_zapata_entry $zapata_file $reset_values
 				;;
 			list)
-				echo BRI/PRI: chans: $bchans, control: $dchan
+				echo "### BRI/PRI: $span_termtype" 
+				echo "$bchans Data"
+				echo "$dchan Control"
+				#echo BRI/PRI: chans: $bchans, control: $dchan
 				;;
 			esac
 		fi
@@ -928,12 +943,12 @@
 EOF
 	fi
 	
-	mv ${ZAPCONF_FILE} ${ZAPCONF_FILE}.bak
-	mv $zaptel_file ${ZAPCONF_FILE}
-	mv ${ZAPATA_FILE} ${ZAPATA_FILE}.bak
-	mv $zapata_file ${ZAPATA_FILE}
-	# cleaning up the temp dir
-	if [ -d "$tmp_dir" ]; then rm -rf "$tmp_dir"; fi
+	if [ "$mode" = 'files' ]; then
+		mv ${ZAPCONF_FILE} ${ZAPCONF_FILE}.bak
+		mv $zaptel_file ${ZAPCONF_FILE}
+		mv ${ZAPATA_FILE} ${ZAPATA_FILE}.bak
+		mv $zapata_file ${ZAPATA_FILE}
+	fi
 }
 
 while getopts 'c:de:Fhlm:MRsuv' arg

Propchange: team/file/zaptel-firmware/xpp/zaptel-helper
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/file/zaptel-firmware/xpp/zaptel-helper
------------------------------------------------------------------------------
    svn:executable = *

Propchange: team/file/zaptel-firmware/xpp/zaptel-helper
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/file/zaptel-firmware/xpp/zaptel-helper
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: team/file/zaptel-firmware/zaptel.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/zaptel.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/zaptel.c (original)
+++ team/file/zaptel-firmware/zaptel.c Wed Jan 31 17:28:39 2007
@@ -1,7 +1,7 @@
 /*
  * Zapata Telephony Interface Driver
  *
- * Written by Mark Spencer <markster at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
  * Based on previous works, designs, and architectures conceived and
  * written by Jim Dixon <jim at lambdatel.com>.
  * 
@@ -6853,7 +6853,7 @@
 	return 0;
 }
 
-MODULE_AUTHOR("Mark Spencer <markster at linux-support.net>");
+MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
 MODULE_DESCRIPTION("Zapata Telephony Interface");
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");

Modified: team/file/zaptel-firmware/ztcfg-dude.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/ztcfg-dude.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/ztcfg-dude.c (original)
+++ team/file/zaptel-firmware/ztcfg-dude.c Wed Jan 31 17:28:39 2007
@@ -1,7 +1,7 @@
 /*
  * Configuration program for Zapata Telephony Interface
  *
- * Written by Mark Spencer <markster at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
  * Based on previous works, designs, and architectures conceived and
  * written by Jim Dixon <jim at lambdatel.com>.
  *
@@ -24,7 +24,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
  *
- * Primary Author: Mark Spencer <markster at linux-support.net>
+ * Primary Author: Mark Spencer <markster at digium.com>
  *
  */
 

Modified: team/file/zaptel-firmware/ztcfg.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/ztcfg.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/ztcfg.c (original)
+++ team/file/zaptel-firmware/ztcfg.c Wed Jan 31 17:28:39 2007
@@ -1,7 +1,7 @@
 /*
  * Configuration program for Zapata Telephony Interface
  *
- * Written by Mark Spencer <markster at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
  * Based on previous works, designs, and architectures conceived and
  * written by Jim Dixon <jim at lambdatel.com>.
  *
@@ -24,7 +24,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
  *
- * Primary Author: Mark Spencer <markster at linux-support.net>
+ * Primary Author: Mark Spencer <markster at digium.com>
  * Radio Support by Jim Dixon <jim at lambdatel.com>
  */
 

Modified: team/file/zaptel-firmware/ztd-eth.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/ztd-eth.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/ztd-eth.c (original)
+++ team/file/zaptel-firmware/ztd-eth.c Wed Jan 31 17:28:39 2007
@@ -1,7 +1,7 @@
 /*
  * Dynamic Span Interface for Zaptel (Ethernet Interface)
  *
- * Written by Mark Spencer <markster at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
  *
  * Copyright (C) 2001, Linux Support Services, Inc.
  *
@@ -426,7 +426,7 @@
 }
 
 MODULE_DESCRIPTION("Zaptel Dynamic TDMoE Support");
-MODULE_AUTHOR("Mark Spencer <markster at linux-support.net>");
+MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
 #endif

Modified: team/file/zaptel-firmware/ztdynamic.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/ztdynamic.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/ztdynamic.c (original)
+++ team/file/zaptel-firmware/ztdynamic.c Wed Jan 31 17:28:39 2007
@@ -1,7 +1,7 @@
 /*
  * Dynamic Span Interface for Zaptel
  *
- * Written by Mark Spencer <markster at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
  *
  * Copyright (C) 2001, Linux Support Services, Inc.
  *
@@ -859,7 +859,7 @@
 MODULE_PARM(debug, "i");
 #endif
 MODULE_DESCRIPTION("Zaptel Dynamic Span Support");
-MODULE_AUTHOR("Mark Spencer <markster at linux-support.net>");
+MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
 #endif

Modified: team/file/zaptel-firmware/ztmonitor.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/ztmonitor.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/ztmonitor.c (original)
+++ team/file/zaptel-firmware/ztmonitor.c Wed Jan 31 17:28:39 2007
@@ -1,7 +1,7 @@
 /*
  * Monitor a Zaptel Channel
  *
- * Written by Mark Spencer <markster at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
  * Based on previous works, designs, and architectures conceived and
  * written by Jim Dixon <jim at lambdatel.com>.
  *
@@ -24,7 +24,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
  *
- * Primary Author: Mark Spencer <markster at linux-support.net>
+ * Primary Author: Mark Spencer <markster at digium.com>
  *
  */
 

Modified: team/file/zaptel-firmware/zttool.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/zttool.c?view=diff&rev=2072&r1=2071&r2=2072
==============================================================================
--- team/file/zaptel-firmware/zttool.c (original)
+++ team/file/zaptel-firmware/zttool.c Wed Jan 31 17:28:39 2007
@@ -1,7 +1,7 @@
 /*
  * Configuration program for Zapata Telephony Interface
  *
- * Written by Mark Spencer <markster at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
  * Based on previous works, designs, and architectures conceived and
  * written by Jim Dixon <jim at lambdatel.com>.
  *
@@ -24,7 +24,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
  *
- * Primary Author: Mark Spencer <markster at linux-support.net>
+ * Primary Author: Mark Spencer <markster at digium.com>
  *
  */
 



More information about the svn-commits mailing list