From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Thu, 5 Jun 2003 19:52:56 +0000 (+0000)
Subject: make single-scan code work for 611x too
X-Git-Tag: r0_7_67x~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a8e5d7b3603400d356fdc605d81e639c9d72fcf9;p=comedi.git

make single-scan code work for 611x too
---

diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c
index 579efd2f..ecb5c774 100644
--- a/comedi/drivers/ni_mio_common.c
+++ b/comedi/drivers/ni_mio_common.c
@@ -597,7 +597,7 @@ static void handle_a_interrupt(comedi_device *dev,unsigned short status,
 #endif
 		}
 		/* handle special case of single scan using AI_End_On_End_Of_Scan */
-		if( s->async->cmd.stop_src == TRIG_COUNT && s->async->cmd.stop_arg == 1 ){
+		if( ( devpriv->ai_cmd2 & AI_End_On_End_Of_Scan ) ){
 			shutdown_ai_command( dev );
 		}
 
diff --git a/comedi/drivers/ni_stc.h b/comedi/drivers/ni_stc.h
index 6377b6d2..7ad85e72 100644
--- a/comedi/drivers/ni_stc.h
+++ b/comedi/drivers/ni_stc.h
@@ -746,7 +746,7 @@ static ni_board ni_boards[];
 	unsigned short ao[2];					\
 	unsigned short caldacs[MAX_N_CALDACS];				\
 								\
-	unsigned short ai_cmd2;	\
+	volatile unsigned short ai_cmd2;	\
 								\
 	unsigned short ao_conf[2];				\
 	unsigned short ao_mode1;				\