[zaptel-commits] tzafrir: branch 1.4 r3233 - in /branches/1.4: ./ xpp/ xpp/utils/

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Wed Nov 14 09:22:59 2007
New Revision: 3233

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3233
Log:
xpp r5010:
* Fix a deadlock spotted on some SMP installations.
* Improve (reduce) signal attenuation on FXO ports.
* Increase FXS ring detect debounce interval.

Merged revisions 3229-3232 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

Modified:
    branches/1.4/   (props changed)
    branches/1.4/xpp/.version
    branches/1.4/xpp/Changelog_xpp
    branches/1.4/xpp/init_card_3_29
    branches/1.4/xpp/init_card_4_29
    branches/1.4/xpp/utils/print_modes.c
    branches/1.4/xpp/xpp_zap.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/xpp/.version
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/.version?view=diff&rev=3233&r1=3232&r2=3233
==============================================================================
--- branches/1.4/xpp/.version (original)
+++ branches/1.4/xpp/.version Wed Nov 14 09:22:59 2007
@@ -1,1 +1,1 @@
-branch-rel-4816-r4900
+branch-rel-4816-r5010

Modified: branches/1.4/xpp/Changelog_xpp
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/Changelog_xpp?view=diff&rev=3233&r1=3232&r2=3233
==============================================================================
--- branches/1.4/xpp/Changelog_xpp (original)
+++ branches/1.4/xpp/Changelog_xpp Wed Nov 14 09:22:59 2007
@@ -1,3 +1,9 @@
+Wed Nov 14 2007 Tzafrir Cohen <tzafrir.cohen at xorcom.com> - xpp.r5010
+  * Fix a deadlock spotted on some SMP installations.
+  * increase FXS ring detect debounce interval.
+  * Improve (reduce) signal attenuation on FXO ports.
+  * zaptel-perl: further fixes to handling of empty slots.
+
 Wed Oct  3 2007 Tzafrir Cohen <tzafrir.cohen at xorcom.com> - xpp.r4900
   * Zaptel/Hardware perl modules: 
     - Use sysfs directly. Don't rely on lspci/lsusb.

Modified: branches/1.4/xpp/init_card_3_29
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/init_card_3_29?view=diff&rev=3233&r1=3232&r2=3233
==============================================================================
--- branches/1.4/xpp/init_card_3_29 (original)
+++ branches/1.4/xpp/init_card_3_29 Wed Nov 14 09:22:59 2007
@@ -143,7 +143,7 @@
 31	WD	45 0A
 
 # Ring Detect Debounce Interval
-31	WD	46 0B
+31	WD	46 47
 
 # Battery Feed Control: Battery low (DCSW low)
 31	WD	42 00

Modified: branches/1.4/xpp/init_card_4_29
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/init_card_4_29?view=diff&rev=3233&r1=3232&r2=3233
==============================================================================
--- branches/1.4/xpp/init_card_4_29 (original)
+++ branches/1.4/xpp/init_card_4_29 Wed Nov 14 09:22:59 2007
@@ -141,8 +141,8 @@
 	echo "$i WD 20 A0"
 done
 
-# based on fxo_modes from wctdm.c . TODO: more decent calculation?
-reg16=00; reg26=00; reg30=00; reg31=A3; ring_osc=; ring_x=;
+# based on fxo_modes from wctdm.c . 
+reg16=00; reg26=00; reg30=00; reg31=20; ring_osc=; ring_x=;
 mode="$opermode"
 if [ -r $INIT_DIR/init_fxo_modes ]; then
 	. $INIT_DIR/init_fxo_modes

Modified: branches/1.4/xpp/utils/print_modes.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/utils/print_modes.c?view=diff&rev=3233&r1=3232&r2=3233
==============================================================================
--- branches/1.4/xpp/utils/print_modes.c (original)
+++ branches/1.4/xpp/utils/print_modes.c Wed Nov 14 09:22:59 2007
@@ -8,7 +8,7 @@
 	printf("case \"$mode\" in\n");
 	for (i=0; i<(sizeof(fxo_modes)/sizeof(struct fxo_mode)); i++) {
 		if (fxo_modes[i].name == NULL) break;
-		int reg16=0, reg26=0, reg30=0, reg31=0xa3;
+		int reg16=0, reg26=0, reg30=0, reg31=0x20;
 		char ring_osc[BUFSIZ]="", ring_x[BUFSIZ] = "";
 		
 		reg16 |= (fxo_modes[i].ohs << 6);

Modified: branches/1.4/xpp/xpp_zap.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/xpp_zap.c?view=diff&rev=3233&r1=3232&r2=3233
==============================================================================
--- branches/1.4/xpp/xpp_zap.c (original)
+++ branches/1.4/xpp/xpp_zap.c Wed Nov 14 09:22:59 2007
@@ -1364,7 +1364,7 @@
 	struct zt_chan	*chans = xpd->span.chans;
 	int		i;
 
-#if WITH_ECHO_SUPPRESSION
+#ifdef WITH_ECHO_SUPPRESSION
 	/* FIXME: need to Echo cancel double buffered data */
 	for (i = 0;i < xpd->span.channels; i++) {
 		if(unlikely(IS_SET(xpd->digital_signalling, i)))	/* Don't echo cancel PRI/BRI D-chans */
@@ -1419,12 +1419,12 @@
 			memset(chans[i].readchunk, 0x7F, ZT_CHUNKSIZE);	// SILENCE
 		}
 	}
-	do_ec(xpd);
 	spin_unlock_irqrestore(&xpd->lock, flags);
 	/*
 	 * This should be out of spinlocks, as it may call back our hook setting
 	 * methods
 	 */
+	do_ec(xpd);
 	zt_receive(&xpd->span);
 }
 
@@ -1775,7 +1775,7 @@
 
 	INFO("revision %s MAX_XPDS=%d (%d*%d)\n", XPP_VERSION,
 			MAX_XPDS, MAX_UNIT, MAX_SUBUNIT);
-#if	WITH_ECHO_SUPPRESSION
+#ifdef	WITH_ECHO_SUPPRESSION
 	INFO("FEATURE: with ECHO_SUPPRESSION\n");
 #else
 	INFO("FEATURE: without ECHO_SUPPRESSION\n");