[svn-commits] mattf: branch 1.2 r2761 - in /branches/1.2: ./ wctdm24xxp/ xpp/ xpp/utils/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Jul 20 11:19:48 CDT 2007
Author: mattf
Date: Fri Jul 20 11:19:47 2007
New Revision: 2761
URL: http://svn.digium.com/view/zaptel?view=rev&rev=2761
Log:
New product support, new echo canceler and new boards
Added:
branches/1.2/wctdm24xxp/
- copied from r2760, betas/zaptel-1.2-vpm150m/wctdm24xxp/
branches/1.2/wctdm24xxp/GpakApi.c
- copied unchanged from r2760, betas/zaptel-1.2-vpm150m/wctdm24xxp/GpakApi.c
branches/1.2/wctdm24xxp/GpakApi.h
- copied unchanged from r2760, betas/zaptel-1.2-vpm150m/wctdm24xxp/GpakApi.h
branches/1.2/wctdm24xxp/GpakCust.c
- copied unchanged from r2760, betas/zaptel-1.2-vpm150m/wctdm24xxp/GpakCust.c
branches/1.2/wctdm24xxp/GpakCust.h
- copied unchanged from r2760, betas/zaptel-1.2-vpm150m/wctdm24xxp/GpakCust.h
branches/1.2/wctdm24xxp/GpakHpi.h
- copied unchanged from r2760, betas/zaptel-1.2-vpm150m/wctdm24xxp/GpakHpi.h
branches/1.2/wctdm24xxp/Makefile
- copied unchanged from r2760, betas/zaptel-1.2-vpm150m/wctdm24xxp/Makefile
branches/1.2/wctdm24xxp/Makefile.kernel26
- copied unchanged from r2760, betas/zaptel-1.2-vpm150m/wctdm24xxp/Makefile.kernel26
branches/1.2/wctdm24xxp/VPMADT032.bin
- copied unchanged from r2760, betas/zaptel-1.2-vpm150m/wctdm24xxp/VPMADT032.bin
branches/1.2/wctdm24xxp/base.c
- copied unchanged from r2760, betas/zaptel-1.2-vpm150m/wctdm24xxp/base.c
branches/1.2/wctdm24xxp/gpakErrs.h
- copied unchanged from r2760, betas/zaptel-1.2-vpm150m/wctdm24xxp/gpakErrs.h
branches/1.2/wctdm24xxp/gpakenum.h
- copied unchanged from r2760, betas/zaptel-1.2-vpm150m/wctdm24xxp/gpakenum.h
branches/1.2/wctdm24xxp/wctdm24xxp.h
- copied unchanged from r2760, betas/zaptel-1.2-vpm150m/wctdm24xxp/wctdm24xxp.h
Removed:
branches/1.2/wctdm24xxp.c
Modified:
branches/1.2/Makefile
branches/1.2/Makefile.kernel26
branches/1.2/xpp/README.Astribank
branches/1.2/xpp/utils/zapconf
branches/1.2/zaptel-base.c
Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?view=diff&rev=2761&r1=2760&r2=2761
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Fri Jul 20 11:19:47 2007
@@ -54,7 +54,7 @@
CFLAGS+=-DHOTPLUG_FIRMWARE
endif
-MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm wctdm24xxp \
+MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm \
ztdynamic ztd-eth wct1xxp wcte11xp pciradio \
ztd-loc wcte12xp # ztdummy
#MODULES+=wcfxsusb
@@ -67,7 +67,7 @@
MODULESKO:=$(MODULES:%=%.ko)
# add this later, so it doesn't become part of MODULESO/MODULESKO
-MODULES+=wct4xxp wctc4xxp
+MODULES+=wct4xxp wctc4xxp wctdm24xxp
ifeq ($(ARCH),i386)
ifneq ($(wildcard $(PWD)/hpec/hpec_x86_32.o_shipped),)
@@ -234,6 +234,9 @@
wct4xxp/wct4xxp.o:
$(MAKE) -C wct4xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
+wctdm24xxp/wctdm24xxp.o:
+ $(MAKE) -C wctdm24xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
+
devel: tor2ee
tests: patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
@@ -252,8 +255,6 @@
wcfxsusb.o: wcfxsusb.h
wctdm.o: wctdm.h
-
-wctdm24xxp.o: wctdm.h
pciradio.o: radfw.h
@@ -475,9 +476,11 @@
ifeq ($(HOTPLUG_FIRMWARE),yes)
if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \
install -m 644 wct4xxp/*.ima wctc4xxp/*.bin $(DESTDIR)/usr/lib/hotplug/firmware; \
+ install -m 644 wctdm24xxp/*.bin $(INSTALL_PREFIX)/usr/lib/hotplug/firmware; \
fi
if [ -d $(DESTDIR)/lib/firmware ]; then \
install -m 644 wct4xxp/*.ima wctc4xxp/*.bin $(DESTDIR)/lib/firmware; \
+ install -m 644 wctdm24xxp/*.bin $(INSTALL_PREFIX)/lib/firmware; \
fi
@echo "Installed firmware"
else
@@ -532,6 +535,7 @@
$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) clean
$(MAKE) -C wct4xxp clean
$(MAKE) -C wctc4xxp clean
+ $(MAKE) -C wctdm24xxp clean
rm -rf .tmp_versions
rm -f gendigits tones.h
rm -f libtonezone*
Modified: branches/1.2/Makefile.kernel26
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile.kernel26?view=diff&rev=2761&r1=2760&r2=2761
==============================================================================
--- branches/1.2/Makefile.kernel26 (original)
+++ branches/1.2/Makefile.kernel26 Fri Jul 20 11:19:47 2007
@@ -1,5 +1,5 @@
obj-m := $(MODULESO)
-obj-m += wct4xxp/ wctc4xxp/
+obj-m += wct4xxp/ wctc4xxp/ wctdm24xxp/
# Also build xpp in the subdirectory xpp/ . But only for >=2.6.8 and only
# for i386 or x86_64. On other platforms it has still not been tested well
Modified: branches/1.2/xpp/README.Astribank
URL: http://svn.digium.com/view/zaptel/branches/1.2/xpp/README.Astribank?view=diff&rev=2761&r1=2760&r2=2761
==============================================================================
--- branches/1.2/xpp/README.Astribank (original)
+++ branches/1.2/xpp/README.Astribank Fri Jul 20 11:19:47 2007
@@ -1,7 +1,7 @@
Xorcom Astribank Documentation
==============================
Xorcom Team <support at xorcom.com>
-$Revision:$, $Date:$
+$Revision$, $Date$
This file documents the Zaptel drivers for the Xorcom Channel Bank.
The drivers reside in a separate subdirectory, xpp/ .
Modified: branches/1.2/xpp/utils/zapconf
URL: http://svn.digium.com/view/zaptel/branches/1.2/xpp/utils/zapconf?view=diff&rev=2761&r1=2760&r2=2761
==============================================================================
--- branches/1.2/xpp/utils/zapconf (original)
+++ branches/1.2/xpp/utils/zapconf Fri Jul 20 11:19:47 2007
@@ -5,7 +5,7 @@
# This program is free software; you can redistribute and/or
# modify it under the same terms as Perl itself.
#
-# $Id:$
+# $Id$
#
use strict;
use File::Basename;
Modified: branches/1.2/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/zaptel-base.c?view=diff&rev=2761&r1=2760&r2=2761
==============================================================================
--- branches/1.2/zaptel-base.c (original)
+++ branches/1.2/zaptel-base.c Fri Jul 20 11:19:47 2007
@@ -1035,12 +1035,13 @@
memset(chan->conflast1, 0, sizeof(chan->conflast1));
memset(chan->conflast2, 0, sizeof(chan->conflast2));
+ if (chan->span && chan->span->dacs && oldconf)
+ chan->span->dacs(chan, NULL);
+
+ spin_unlock_irqrestore(&chan->lock, flags);
+
if (chan->span && chan->span->echocan)
chan->span->echocan(chan, 0);
- if (chan->span && chan->span->dacs && oldconf)
- chan->span->dacs(chan, NULL);
-
- spin_unlock_irqrestore(&chan->lock, flags);
if (rxgain)
kfree(rxgain);
@@ -2193,9 +2194,11 @@
chan->ringcadence[0] = chan->starttime;
chan->ringcadence[1] = ZT_RINGOFFTIME;
}
+
+ spin_unlock_irqrestore(&chan->lock, flags);
+
if (chan->span && chan->span->echocan)
chan->span->echocan(chan, 0);
- spin_unlock_irqrestore(&chan->lock, flags);
if (rxgain)
kfree(rxgain);
@@ -4166,9 +4169,10 @@
chan->txgain = defgain;
chan->gainalloc = 0;
/* Disable any native echo cancellation as well */
+ spin_unlock_irqrestore(&chan->lock, flags);
+
if (chan->span && chan->span->echocan)
chan->span->echocan(chan, 0);
- spin_unlock_irqrestore(&chan->lock, flags);
if (rxgain)
kfree(rxgain);
@@ -4272,10 +4276,13 @@
tec = chan->ec;
chan->ec = NULL;
/* Attempt hardware native echo can */
+ spin_unlock_irqrestore(&chan->lock, flags);
+
if (chan->span && chan->span->echocan)
ret = chan->span->echocan(chan, j);
else
ret = -ENOTTY;
+
if (ret) {
/* Use built-in echo can */
if ((j == 32) ||
@@ -4286,7 +4293,6 @@
} else {
j = deftaps;
}
- spin_unlock_irqrestore(&chan->lock, flags);
ec = echo_can_create(j, 0);
if (!ec)
return -ENOMEM;
@@ -4298,8 +4304,8 @@
chan->echotimer = 0;
echo_can_disable_detector_init(&chan->txecdis);
echo_can_disable_detector_init(&chan->rxecdis);
- }
- spin_unlock_irqrestore(&chan->lock, flags);
+ spin_unlock_irqrestore(&chan->lock, flags);
+ }
if (tec)
echo_can_free(tec);
} else {
@@ -4310,10 +4316,10 @@
chan->echostate = ECHO_STATE_IDLE;
chan->echolastupdate = 0;
chan->echotimer = 0;
+ spin_unlock_irqrestore(&chan->lock, flags);
/* Attempt hardware native echo can */
if (chan->span && chan->span->echocan)
chan->span->echocan(chan, 0);
- spin_unlock_irqrestore(&chan->lock, flags);
if (tec)
echo_can_free(tec);
}
More information about the svn-commits
mailing list