[zaptel-commits] sruffell: branch 1.4 r4564 - in /branches/1.4/kernel: ./ wctc4xxp/

[SVN commits to the Zaptel project]

Author: sruffell
Date: Fri Oct 10 17:37:48 2008
New Revision: 4564

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4564
Log:
- Ensure that the source format is considered when selecting a transcoder.
- When a command is to be retried, turn off the TX_COMPLETE flag before
  resubmitting it to the hardware. This should elimate some of the warnings
  printed to the kernel log in the wctc4xxp_transmit_cmd function.

Modified:
    branches/1.4/kernel/wctc4xxp/base.c
    branches/1.4/kernel/zttranscode.c

Modified: branches/1.4/kernel/wctc4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctc4xxp/base.c?view=diff&rev=4564&r1=4563&r2=4564
==============================================================================
--- branches/1.4/kernel/wctc4xxp/base.c (original)
+++ branches/1.4/kernel/wctc4xxp/base.c Fri Oct 10 17:37:48 2008
@@ -2846,6 +2846,7 @@
 				/* Move this to the local list because we're
 				 * going to resend it once we free the locks */
 				list_move_tail(&cmd->node, &cmds_to_retry);
+				cmd->flags &= ~(TX_COMPLETE);
 			} else {
 				/* The command is still sitting on the tx
 				 * descriptor ring.  We don't want to move it

Modified: branches/1.4/kernel/zttranscode.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/zttranscode.c?view=diff&rev=4564&r1=4563&r2=4564
==============================================================================
--- branches/1.4/kernel/zttranscode.c (original)
+++ branches/1.4/kernel/zttranscode.c Fri Oct 10 17:37:48 2008
@@ -212,7 +212,7 @@
 	unsigned int match = 0;
 
 	list_for_each_entry(tc, list, node) {
-		if ((tc->dstfmts & fmts->dstfmt)) {
+		if ((tc->dstfmts & fmts->dstfmt) && (tc->srcfmts & fmts->srcfmt)) {
 			/* We found a transcoder that can handle our formats.
 			 * Now look for an available channel. */
 			match = 1;