From: Tim Ousley <tim.ousley@ni.com>
Date: Fri, 4 May 2001 16:24:30 +0000 (+0000)
Subject: fixed bug with innaccurate pulse width measurement, and GPCT_Reset() does not
X-Git-Tag: r0_7_59~76
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a6ed2d7ad4e5caf4ec1716bfe1dc27497029b94;p=comedi.git

fixed bug with innaccurate pulse width measurement, and GPCT_Reset() does not
affect the other counter now.
---

diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c
index 839083b1..8a7e1aa8 100644
--- a/comedi/drivers/ni_mio_common.c
+++ b/comedi/drivers/ni_mio_common.c
@@ -1861,9 +1861,7 @@ static int ni_E_init(comedi_device *dev,comedi_devconfig *it)
 	s->insn_config=ni_gpct_insn_config;
 	s->n_chan=1; /* XXX */
 	s->maxdata=1;
-	//gpct_setup(dev,s);
 	
-	//TIM 5/1/01 #ifdef GPCT
 	s=dev->subdevices+4;
 	s->type=COMEDI_SUBD_COUNTER;
 	s->subdev_flags=SDF_READABLE|SDF_WRITEABLE;
@@ -1872,9 +1870,9 @@ static int ni_E_init(comedi_device *dev,comedi_devconfig *it)
 	s->insn_config=ni_gpct_insn_config;
 	s->n_chan=2;
 	s->maxdata=1;
+	devpriv->an_trig_etc_reg = 0;
 	GPCT_Reset(dev,0);
 	GPCT_Reset(dev,1);
-	//TIM 5/1/01 #endif //GPCT
 	
 	/* calibration subdevice -- ai and ao */
 	s=dev->subdevices+5;
@@ -2310,7 +2308,7 @@ void GPCT_Event_Counting(comedi_device *dev,int chan) {
 	//NOTE: possible residual bits from multibit masks can corrupt
 	//If you config for several measurements between Resets, watch out!
 	
-	printk("GPCT_Event_Counting...");
+	//printk("GPCT_Event_Counting...");
 	
 	devpriv->gpct_cur_operation[chan] = GPCT_SIMPLE_EVENT;
 	
@@ -2323,7 +2321,7 @@ void GPCT_Event_Counting(comedi_device *dev,int chan) {
 	devpriv->gpct_mode[chan] |= G_Trigger_Mode_For_Edge_Gate(2);
 
 	win_out( devpriv->gpct_mode[chan],G_Mode_Register(chan));
-	printk("exit GPCT_Event_Counting\n");
+	//printk("exit GPCT_Event_Counting\n");
 }
 
 void GPCT_Period_Meas(comedi_device *dev, int chan) {
@@ -2545,12 +2543,13 @@ void GPCT_Reset(comedi_device *dev, int chan){
 			comedi_spin_unlock_irqrestore(&dev->spinlock, irqflags);
 			temp_ack_reg |= G0_Gate_Error_Confirm;
 			temp_ack_reg |= G0_TC_Error_Confirm;
-			temp_ack_reg |= G1_TC_Interrupt_Ack;
+			temp_ack_reg |= G0_TC_Interrupt_Ack;
 			temp_ack_reg |= G0_Gate_Interrupt_Ack;
 			win_out(temp_ack_reg,Interrupt_A_Ack_Register);
 		
-			win_out(GPFO_0_Output_Enable|GPFO_0_Output_Select(0),
-				Analog_Trigger_Etc_Register);
+			//problem...this interferes with the other ctr...
+			devpriv->an_trig_etc_reg |= GPFO_0_Output_Enable;
+			win_out(devpriv->an_trig_etc_reg, Analog_Trigger_Etc_Register);
 			break;
 		case 1:
 			win_out(G1_Reset,Joint_Reset_Register);
@@ -2564,7 +2563,8 @@ void GPCT_Reset(comedi_device *dev, int chan){
 			temp_ack_reg |= G1_Gate_Interrupt_Ack;
 			win_out(temp_ack_reg,Interrupt_B_Ack_Register);
 		
-			win_out(GPFO_1_Output_Enable, Analog_Trigger_Etc_Register);
+			devpriv->an_trig_etc_reg |= GPFO_1_Output_Enable;
+			win_out(devpriv->an_trig_etc_reg, Analog_Trigger_Etc_Register);
 			break;
 	};
 	
diff --git a/comedi/drivers/ni_stc.h b/comedi/drivers/ni_stc.h
index 6c6d7cd8..a4450754 100644
--- a/comedi/drivers/ni_stc.h
+++ b/comedi/drivers/ni_stc.h
@@ -618,6 +618,7 @@ static ni_board ni_boards[];
 	unsigned short gpct_command[2];			\
 	unsigned short gpct_input_select[2];			\
 	int gpct_cur_operation[2];				\
+	unsigned short an_trig_etc_reg;				\
 								\
 	unsigned short ai_xorlist[512];				\
 								\