[zaptel-commits] mattf: trunk r2168 - in /trunk: ./ wctdm24xxp.c

[zaptel-commits at lists.digium.com]

Author: mattf
Date: Fri Feb 16 16:20:33 2007
New Revision: 2168

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2168
Log:
Merged revisions 2167 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r2167 | mattf | 2007-02-16 16:18:41 -0600 (Fri, 16 Feb 2007) | 10 lines

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

........
r2166 | mattf | 2007-02-16 16:14:48 -0600 (Fri, 16 Feb 2007) | 2 lines

Fix detection of second single port modules so it actually works now.

........

................

Modified:
    trunk/   (props changed)
    trunk/wctdm24xxp.c

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

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

Modified: trunk/wctdm24xxp.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm24xxp.c?view=diff&rev=2168&r1=2167&r2=2168
==============================================================================
--- trunk/wctdm24xxp.c (original)
+++ trunk/wctdm24xxp.c Fri Feb 16 16:20:33 2007
@@ -696,11 +696,12 @@
 
 	for (x=0;x<ZT_CHUNKSIZE;x++) {
 		/* Send a sample, as a 32-bit word */
-		for (y=0;y < wc->type;y++) {
+		for (y=0;y < wc->cards;y++) {
 			if (!x)
 				cmd_checkisr(wc, y);
 
-			writechunk[y] = wc->chans[y].writechunk[x];
+			if (y < wc->type)
+				writechunk[y] = wc->chans[y].writechunk[x];
 			cmd_dequeue(wc, writechunk, y, x);
 		}
 #ifdef VPM_SUPPORT
@@ -962,8 +963,9 @@
 				cmd_retransmit(wc);
 			}
 		}
-		for (y=0;y < wc->type;y++) {
-			wc->chans[y].readchunk[x] = readchunk[y];
+		for (y=0;y < wc->cards;y++) {
+			if (y < wc->type)
+				wc->chans[y].readchunk[x] = readchunk[y];
 			cmd_decifer(wc, readchunk, y);
 		}
 #ifdef VPM_SUPPORT