[Linux1394-cvslog] rev 742 - trunk

[SVN U. <dm...@li...>]

Author: dmaas
Date: 2003-01-10 20:50:20 -0500 (Fri, 10 Jan 2003)
New Revision: 742

Modified:
   trunk/ohci1394.c
Log:
ohci1394 rawiso - clear multi-channel reception mask in recv_init(), not recv_start()

Modified: trunk/ohci1394.c
==============================================================================
--- trunk/ohci1394.c	(original)
+++ trunk/ohci1394.c	2003-02-01 08:59:19.000000000 -0500
@@ -1165,6 +1165,12 @@
 	recv->CommandPtr = OHCI1394_IsoRcvCommandPtr + 32 * ctx;
 	recv->ContextMatch = OHCI1394_IsoRcvContextMatch + 32 * ctx;
 
+	if(iso->channel == -1) {
+		/* clear multi-channel selection mask */
+		reg_write(recv->ohci, OHCI1394_IRMultiChanMaskHiClear, 0xFFFFFFFF);
+		reg_write(recv->ohci, OHCI1394_IRMultiChanMaskLoClear, 0xFFFFFFFF);
+	}
+		
 	/* write the DMA program */
 	ohci_iso_recv_program(iso);
 
@@ -1324,10 +1330,6 @@
 	if(iso->channel == -1) {
 		/* enable multichannel reception */
 		reg_write(recv->ohci, recv->ContextControlSet, (1 << 28));
-
-		/* clear channel selection mask */
-		reg_write(recv->ohci, OHCI1394_IRMultiChanMaskHiClear, 0xFFFFFFFF);
-		reg_write(recv->ohci, OHCI1394_IRMultiChanMaskLoClear, 0xFFFFFFFF);
 	} else {
 		/* listen on channel */
 		contextMatch |= iso->channel;