added check on conversion timing

diff --git a/comedi/drivers/comedi_rt_timer.c b/comedi/drivers/comedi_rt_timer.c
index aeeaafc9145f20b3be8d9c9ab28a1739fe96719d..e7553b389edd6fe072c21f0be58992c3b2301470 100644 (file)
--- a/comedi/drivers/comedi_rt_timer.c
+++ b/comedi/drivers/comedi_rt_timer.c
@@ -163,8 +163,10 @@ static inline int buf_remove(comedi_device *dev,comedi_subdevice *s)
        return data;
 }
 
-// checks for timing error
-inline static int check_timing(comedi_device *dev, unsigned long long scan){
+// checks for scan timing error
+inline static int check_scan_timing(comedi_device *dev,
+       unsigned long long scan)
+{
        RTIME now, timing_error;
 
        now = rt_get_time();
@@ -178,6 +180,23 @@ inline static int check_timing(comedi_device *dev, unsigned long long scan){
        return 0;
 }
 
+// checks for conversion timing error
+inline static int check_conversion_timing(comedi_device *dev,
+       RTIME scan_start, unsigned int conversion)
+{
+       RTIME now, timing_error;
+
+       now = rt_get_time();
+       timing_error = now - (scan_start + conversion * devpriv->convert_period);
+       if(timing_error > devpriv->convert_period){
+               comedi_error(dev, "timing error");
+               rt_printk("conversion started %i ns late\n", timing_error * 838);
+               return -1;
+       }
+
+       return 0;
+}
+
 // performs input scans
 static void input_scan_task_func(int d)
 {
@@ -187,6 +206,7 @@ static void input_scan_task_func(int d)
        int i, ret;
        unsigned long long n;
        lsampl_t data;
+       RTIME scan_start;
 
        // every comedi_cmd causes one execution of while loop
        while(1){
@@ -206,16 +226,22 @@ static void input_scan_task_func(int d)
                        // check if done flag was set (by timer_cancel())
                        if(devpriv->done)
                                goto cleanup;
-                       ret = check_timing(dev, n);
+                       ret = check_scan_timing(dev, n);
                        if(ret < 0){
                                comedi_error_done(dev,s);
                                goto cleanup;
                        }
+                       scan_start = rt_get_time();
                        for(i = 0; i < cmd->scan_end_arg; i++){
                                // conversion timing
                                if(cmd->convert_src == TRIG_TIMER && i){
                                        rt_task_wait_period();
                                }
+                               ret = check_conversion_timing(dev, scan_start, i);
+                               if(ret < 0){
+                                       comedi_error_done(dev,s);
+                                       goto cleanup;
+                               }
                                ret = comedi_data_read(devpriv->device,devpriv->subd,
                                        CR_CHAN(cmd->chanlist[i]),
                                        CR_RANGE(cmd->chanlist[i]),
@@ -252,6 +278,7 @@ static void output_scan_task_func(int d)
        int i, ret;
        unsigned long long n;
        int data;
+       RTIME scan_start;
 
        // every comedi_cmd causes one execution of while loop
        while(1){
@@ -271,16 +298,22 @@ static void output_scan_task_func(int d)
                        // check if done flag was set (by timer_cancel())
                        if(devpriv->done)
                                goto cleanup;
-                       ret = check_timing(dev, n);
+                       ret = check_scan_timing(dev, n);
                        if(ret < 0){
                                comedi_error_done(dev,s);
                                goto cleanup;
                        }
+                       scan_start = rt_get_time();
                        for(i = 0; i < cmd->scan_end_arg; i++){
                                // conversion timing
                                if(cmd->convert_src == TRIG_TIMER && i){
                                        rt_task_wait_period();
                                }
+                               ret = check_conversion_timing(dev, scan_start, i);
+                               if(ret < 0){
+                                       comedi_error_done(dev,s);
+                                       goto cleanup;
+                               }
                                data = buf_remove(dev, s);
                                if(data < 0) {
                                        comedi_error(dev, "buffer underrun");
@@ -321,7 +354,6 @@ static void timer_task_func(int d)
 
        // every comedi_cmd causes one execution of while loop
        while(1){
-               devpriv->done = 0;
                devpriv->start = rt_get_time();
 
                for(n = 0; 1; n++){
@@ -495,6 +527,8 @@ static int timer_cmd(comedi_device *dev,comedi_subdevice *s)
        start_rt_timer(1);
 #endif
 
+       devpriv->done = 0;
+
        now=rt_get_time();
        ret = rt_task_make_periodic(&devpriv->rt_task, now
                + delay, devpriv->scan_period);