From: Tim Ousley <tim.ousley@ni.com>
Date: Fri, 11 May 2001 20:18:49 +0000 (+0000)
Subject: MITE does continuous AI now.  Fixed bug so MIO cards can go 1.25MS/s.  Fixed
X-Git-Tag: r0_7_59~47
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=394bd22e46e5af4087a2849795ab166ec301ccb3;p=comedi.git

MITE does continuous AI now.  Fixed bug so MIO cards can go 1.25MS/s.  Fixed
some assorted MITE bugs.
---

diff --git a/comedi/drivers/mite.c b/comedi/drivers/mite.c
index fd3b598d..cd1b498d 100644
--- a/comedi/drivers/mite.c
+++ b/comedi/drivers/mite.c
@@ -308,11 +308,10 @@ unsigned long mite_ll_from_kvmem(struct mite_struct *mite,comedi_async *async,in
 	prealloc_bufsz=async->prealloc_bufsz;
 	
 	continuous_aq = (async->cmd.stop_src == TRIG_NONE? 1:0);
-	//if(continuous_aq) {
-	//	len = prealloc_bufsz;
-	//}
+	if(continuous_aq) {
+		len = prealloc_bufsz;
+	}
 	
-	//len = min(cmd->scan_end_arg*cmd->stop_arg*sizeof(sampl_t), async->data_len);
 	if(async->data_len<len) {
 		printk("<1>Comedi Error: preallocated DMA buffer is too small to hold the samples.");
 	}
@@ -336,13 +335,13 @@ unsigned long mite_ll_from_kvmem(struct mite_struct *mite,comedi_async *async,in
 	To make a looping ring for continuous acquisition, 
 	mite->ring[i-1].next = virt_to_bus(mite->ring);
 	*/
-	mite->ring[i].count=0;
+	//mite->ring[i].count=0;
 	
-	//if (continuous_aq&&(i>0)) {
-	//	mite->ring[i-1].next = virt_to_bus(mite->ring+0); 
-	//}else {
-	//	mite->ring[i].count=0;
-	//}
+	if (continuous_aq&&(i>0)) {
+		mite->ring[i-1].next = virt_to_bus(mite->ring+0); 
+	}else {
+		mite->ring[i].count=0;
+	}
 
 	
 	MDPRINTK("i was %d, size_so_far was %d\n",i,size_so_far);
diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c
index 7bbf7c3f..2011b172 100644
--- a/comedi/drivers/ni_mio_common.c
+++ b/comedi/drivers/ni_mio_common.c
@@ -380,7 +380,14 @@ static void handle_a_interrupt(comedi_device *dev,unsigned short status)
 			rt_printk("ni_mio_common: ai error a_status=%04x\n",
 				status);
 			ni_mio_print_status_a(status);
+			
+			//TIM 5/11/01
+			win_out(AI_Error_Interrupt_Ack, Interrupt_A_Ack_Register);
+			
+			#ifndef PCIDMA
 			ni_handle_fifo_dregs(dev);
+			#endif 
+						
 			//TIM 4/17/01
 			//win_out(0x0000,Interrupt_A_Enable_Register);
 			//turn off all AI interrupts
@@ -389,6 +396,7 @@ static void handle_a_interrupt(comedi_device *dev,unsigned short status)
 				AI_START2_Interrupt_Enable| AI_START_Interrupt_Enable|
 				AI_STOP_Interrupt_Enable| AI_Error_Interrupt_Enable|
 				AI_FIFO_Interrupt_Enable,0);
+				
 			ni_ai_reset(dev,dev->subdevices);//added by tim
 			comedi_done(dev,s);
 			return;
@@ -852,7 +860,14 @@ static int ni_ai_reset(comedi_device *dev,comedi_subdevice *s)
 #else
 	win_out((0<<6)|0x0000,AI_Mode_3_Register); /* generate FIFO interrupts on non-empty */
 #endif
+	/* TIM 5/11/01 
+	0xA4A0 causes overrun errors at high speeds.  0xA420 fixes it,
+	but I haven't tested to see if it breaks something else. I don't think it would*/
+	#ifdef PCIDMA  
+	win_out(0xA420,AI_Personal_Register); 
+	#else
 	win_out(0xa4a0,AI_Personal_Register); /* ? */
+	#endif
 	win_out(0x032e,AI_Output_Control_Register);
 	win_out(0x0060,AI_Trigger_Select_Register); /* trigger source */
 
diff --git a/comedi/drivers/ni_stc.h b/comedi/drivers/ni_stc.h
index 4cdcac59..3a920ffe 100644
--- a/comedi/drivers/ni_stc.h
+++ b/comedi/drivers/ni_stc.h
@@ -79,6 +79,8 @@
 #define AI_FIFO_Request_St			0x0002
 #define Pass_Thru_0_Interrupt_St		0x0001
 
+#define AI_Status_2_Register		5
+
 #define Interrupt_B_Ack_Register	3
 #define AO_Status_1_Register		3
 #define Interrupt_B_St				_bit15