[svn-commits] russell: branch 1.4 r4113 - in /branches/1.4: ./ kernel/

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Mar 31 12:27:08 2008
New Revision: 4113

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4113
Log:
Remove the ztd-ethmf driver for now.  It was not ready to be committed.

(issue #12241)

Removed:
    branches/1.4/kernel/ztd-ethmf.c
Modified:
    branches/1.4/Makefile
    branches/1.4/README
    branches/1.4/zaptel.conf.sample

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=4113&r1=4112&r2=4113
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Mon Mar 31 12:27:08 2008
@@ -404,9 +404,9 @@
 		echo "**************************************************"; \
 		exit 1; \
 	fi
-	[ -f mISDN-$(MISDNVERSION).tar.gz ] || $(DOWNLOAD) http://downloads.digium.com/pub/zaptel/b410p/mISDN-$(MISDNVERSION).tar.gz
-	tar -zxf mISDN-$(MISDNVERSION).tar.gz
-	$(MAKE) -C mISDN-$(MISDNVERSION) install
+	#[ -f mISDN-$(MISDNVERSION).tar.gz ] || $(DOWNLOAD) http://downloads.digium.com/pub/zaptel/b410p/mISDN-$(MISDNVERSION).tar.gz
+	#tar -zxf mISDN-$(MISDNVERSION).tar.gz
+	#$(MAKE) -C mISDN-$(MISDNVERSION) install
 	[ -f mISDNuser-$(MISDNUSERVERSION).tar.gz ] || $(DOWNLOAD) http://downloads.digium.com/pub/zaptel/b410p/mISDNuser-$(MISDNUSERVERSION).tar.gz
 	tar -zxf mISDNuser-$(MISDNUSERVERSION).tar.gz
 	$(MAKE) -C mISDNuser-$(MISDNUSERVERSION) install

Modified: branches/1.4/README
URL: http://svn.digium.com/view/zaptel/branches/1.4/README?view=diff&rev=4113&r1=4112&r2=4113
==============================================================================
--- branches/1.4/README (original)
+++ branches/1.4/README Mon Mar 31 12:27:08 2008
@@ -46,7 +46,6 @@
 - pciradio: Zapata Telephony PCI Quad Radio Interface
 - wctc4xxp: Digium hardware transcoder cards (also need zttranscode)
 - ztd-eth: TDM over Ethernet (TDMoE) driver. Requires ztdynamic
-- ztd-ethmf: TDMoE MultiFrame driver. Requires ztdynamic
 - ztd-loc: Mirror a local span. Requires ztdynamic
 - ztdummy: A dummy driver that only provides a zaptel timing source.
 

Modified: branches/1.4/zaptel.conf.sample
URL: http://svn.digium.com/view/zaptel/branches/1.4/zaptel.conf.sample?view=diff&rev=4113&r1=4112&r2=4113
==============================================================================
--- branches/1.4/zaptel.conf.sample (original)
+++ branches/1.4/zaptel.conf.sample Mon Mar 31 12:27:08 2008
@@ -70,16 +70,6 @@
 # if you are not using external timing.
 #
 #   dynamic=eth,eth0/00:02:b3:35:43:9c,24,0
-#
-# The mutli-frame dramer (ethmf) supports encapsulating multiple dynamic
-# spans into a single Ethernet frame. This is done by directing the spans to
-# the same destination MAC address but with a different "subaddress". For 
-# example:
-#
-#   dynamic=ethmf,eth0/00:50:c2:65:d1:d8/0,24,0
-#   dynamic=ethmf,eth0/00:50:c2:65:d1:d8/1,24,0
-#   dynamic=ethmf,eth0/00:50:c2:65:d1:d8/2,24,0
-#   dynamic=ethmf,eth0/00:50:c2:65:d1:d8/3,24,1
 #
 # If a non-zero timing value is used, as above, only the last span should
 # have the non-zero value.