Change prototype of comedi_get_cmd_generic_timed

diff --git a/demo/cmd.c b/demo/cmd.c
index d40ff805342d95bded746e5fc86f129e1dd80e4f..b46e7f0cacb3d20ca702c348eba5e653f9ca53c0 100644 (file)
--- a/demo/cmd.c
+++ b/demo/cmd.c
@@ -186,7 +186,7 @@ int prepare_cmd_lib(comedi_t *dev,int subdevice,comedi_cmd *cmd)
        /* This comedilib function will get us a generic timed
         * command for a particular board.  If it returns -1,
         * that's bad. */
-       ret = comedi_get_cmd_generic_timed(dev,subdevice,cmd);
+       ret = comedi_get_cmd_generic_timed(dev,subdevice,cmd,1e9/freq);
        if(ret<0)return ret;
 
        /* Modify parts of the command */

diff --git a/demo/mmap.c b/demo/mmap.c
index 719befd55b81a63c38ee48328b069d8cb0c816e5..2f18cf49de8c61f331ce5f6c15eb646d0ef6e985 100644 (file)
--- a/demo/mmap.c
+++ b/demo/mmap.c
@@ -117,7 +117,7 @@ int prepare_cmd_lib(comedi_t *dev,int subdevice,comedi_cmd *cmd)
 {
        int ret;
 
-       ret = comedi_get_cmd_generic_timed(dev,subdevice,cmd);
+       ret = comedi_get_cmd_generic_timed(dev,subdevice,cmd,1e9/freq);
        if(ret<0){
                comedi_perror("comedi_get_cmd_generic_timed\n");
                return ret;

diff --git a/include/comedilib.h b/include/comedilib.h
index 095190c8a82bc1194d58d152d461d6264f016b0a..d68fcda7ad57090c69ccabadc62516015d7c683b 100644 (file)
--- a/include/comedilib.h
+++ b/include/comedilib.h
@@ -139,7 +139,7 @@ int comedi_sv_measure(comedi_sv_t *it,double *data);
 int comedi_get_cmd_src_mask(comedi_t *dev,unsigned int subdevice,
        comedi_cmd *cmd);
 int comedi_get_cmd_generic_timed(comedi_t *dev,unsigned int subdevice,
-       comedi_cmd *cmd);
+       comedi_cmd *cmd,unsigned int ns);
 int comedi_cancel(comedi_t *it,unsigned int subdevice);
 int comedi_command(comedi_t *it,comedi_cmd *cmd);
 int comedi_command_test(comedi_t *it,comedi_cmd *cmd);

diff --git a/testing/cmd_2.c b/testing/cmd_2.c
index 667050ab858f153758e10332120c24dc11d1b459..af6f20ea584b840f0a732ae16110e539638101f1 100644 (file)
--- a/testing/cmd_2.c
+++ b/testing/cmd_2.c
@@ -42,7 +42,7 @@ static int get_chunks_per_length(int length)
        int ret;
        int chunks=0;
 
-       if(comedi_get_cmd_generic_timed(device,subdevice,&cmd)<0){
+       if(comedi_get_cmd_generic_timed(device,subdevice,&cmd,1)<0){
                printf("  not supported\n");
                return 0;
        }

diff --git a/testing/cmd_3.c b/testing/cmd_3.c
index f17b54277bb8da6abda1cdb44db4938224acd5e3..eba5ea0e3216a7159152ea9410c67df7303c9e40 100644 (file)
--- a/testing/cmd_3.c
+++ b/testing/cmd_3.c
@@ -48,7 +48,7 @@ static int do_continuous(int multiplier)
        unsigned long total_secs = 0;
        struct timeval tv,start_tv;
 
-       if(comedi_get_cmd_generic_timed(device,subdevice,&cmd)<0){
+       if(comedi_get_cmd_generic_timed(device,subdevice,&cmd,1)<0){
                printf("  not supported\n");
                return 0;
        }

diff --git a/testing/inttrig.c b/testing/inttrig.c
index 8b4ab19fe1df4925c4bde743df29905b7a36d97f..869cb45463920fffa2cbc5384601442faf9caca2 100644 (file)
--- a/testing/inttrig.c
+++ b/testing/inttrig.c
@@ -57,7 +57,7 @@ int test_cmd_start_inttrig(void)
                return 0;
        }
 
-       if(comedi_get_cmd_generic_timed(device,subdevice,&cmd)<0){
+       if(comedi_get_cmd_generic_timed(device,subdevice,&cmd,1)<0){
                printf("  not supported\n");
                return 0;
        }

diff --git a/testing/mmap.c b/testing/mmap.c
index f9e8eca461027e66ffa97ffdb480a1f00c111c84..a859b8f437e22fabc8f4c1635655b579392a6a4c 100644 (file)
--- a/testing/mmap.c
+++ b/testing/mmap.c
@@ -68,7 +68,7 @@ int test_mmap(void)
                return 0;
        }
 
-       if(comedi_get_cmd_generic_timed(device,subdevice,&cmd)<0){
+       if(comedi_get_cmd_generic_timed(device,subdevice,&cmd,1)<0){
                printf("E: comedi_get_cmd_generic_timed failed\n");
                return 0;
        }

diff --git a/testing/select.c b/testing/select.c
index bd68c2078cf6eb4a28f5a826244fb53c36b98e17..55e9d2d96a730ee673841cc7e44ebbb65ff0a74c 100644 (file)
--- a/testing/select.c
+++ b/testing/select.c
@@ -33,7 +33,7 @@ int test_read_select(void)
                return 0;
        }
 
-       if(comedi_get_cmd_generic_timed(device,subdevice,&cmd)<0){
+       if(comedi_get_cmd_generic_timed(device,subdevice,&cmd,1)<0){
                printf("E: comedi_get_cmd_generic_timed failed\n");
                return 0;
        }