[Xenomai-git] Alexis Berlemont : Fix various minor bugs

2009-10-25 Thread GIT version control
Module: xenomai-gch
Branch: for-head
Commit: bfd0f6fd0b6ddd4f1e9699977e551ff50347378c
URL:
http://git.xenomai.org/?p=xenomai-gch.git;a=commit;h=bfd0f6fd0b6ddd4f1e9699977e551ff50347378c

Author: Alexis Berlemont 
Date:   Tue Sep 22 00:41:49 2009 +0200

Fix various minor bugs

---

 src/utils/comedi/cmd_write.c |   44 ++---
 1 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/utils/comedi/cmd_write.c b/src/utils/comedi/cmd_write.c
index 2f4242c..ab57ee1 100644
--- a/src/utils/comedi/cmd_write.c
+++ b/src/utils/comedi/cmd_write.c
@@ -49,7 +49,7 @@
 
 static unsigned char buf[BUF_SIZE];
 static char *filename = FILENAME;
-static char *str_chans = "0,1,2,3";
+static char *str_chans = "0,1";
 static unsigned int chans[MAX_NB_CHAN];
 static int verbose = 0;
 static int real_time = 0;
@@ -59,20 +59,20 @@ static RT_TASK rt_task_desc;
 
 /* The command to send by default */
 comedi_cmd_t cmd = {
-  idx_subd:ID_SUBD,
-  flags:0,
-  start_src:TRIG_NOW,
-  start_arg:0,
-  scan_begin_src:TRIG_TIMER,
-  scan_begin_arg:200,  /* in ns */
-  convert_src:TRIG_TIMER,
-  convert_arg:50,  /* in ns */
-  scan_end_src:TRIG_COUNT,
-  scan_end_arg:0,
-  stop_src:TRIG_COUNT,
-  stop_arg:NB_SCAN,
-  nb_chan:0,
-  chan_descs:chans,
+  .idx_subd = ID_SUBD,
+  .flags = 0,
+  .start_src = TRIG_INT,
+  .start_arg = 0,
+  .scan_begin_src = TRIG_TIMER,
+  .scan_begin_arg = 200, /* in ns */
+  .convert_src = TRIG_NOW,
+  .convert_arg = 0, /* in ns */
+  .scan_end_src = TRIG_COUNT,
+  .scan_end_arg = 0,
+  .stop_src = TRIG_COUNT,
+  .stop_arg = NB_SCAN,
+  .nb_chan = 0,
+  .chan_descs = chans,
 };
 
 struct option cmd_write_opts[] = {
@@ -292,11 +292,15 @@ int main(int argc, char *argv[])
for (i = 0; i < BUF_SIZE; i++)
buf[i] = i;
 
-   ret = rt_task_set_mode(0, T_PRIMARY, NULL);
-   if (ret < 0) {
-   fprintf(stderr, "cmd_read: rt_task_set_mode failed (ret=%d)\n",
-   ret);
-   goto out_main;
+   if (real_time != 0) {
+
+   ret = rt_task_set_mode(0, T_PRIMARY, NULL);
+   if (ret < 0) {
+   fprintf(stderr, 
+   "cmd_read: rt_task_set_mode failed (ret=%d)\n",
+   ret);
+   goto out_main;
+   }
}
 
if (use_mmap == 0) {


___
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git


[Xenomai-git] Alexis Berlemont : Fix various minor bugs

2009-10-20 Thread GIT version control
Module: xenomai-head
Branch: master
Commit: bfd0f6fd0b6ddd4f1e9699977e551ff50347378c
URL:
http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=bfd0f6fd0b6ddd4f1e9699977e551ff50347378c

Author: Alexis Berlemont 
Date:   Tue Sep 22 00:41:49 2009 +0200

Fix various minor bugs

---

 src/utils/comedi/cmd_write.c |   44 ++---
 1 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/utils/comedi/cmd_write.c b/src/utils/comedi/cmd_write.c
index 2f4242c..ab57ee1 100644
--- a/src/utils/comedi/cmd_write.c
+++ b/src/utils/comedi/cmd_write.c
@@ -49,7 +49,7 @@
 
 static unsigned char buf[BUF_SIZE];
 static char *filename = FILENAME;
-static char *str_chans = "0,1,2,3";
+static char *str_chans = "0,1";
 static unsigned int chans[MAX_NB_CHAN];
 static int verbose = 0;
 static int real_time = 0;
@@ -59,20 +59,20 @@ static RT_TASK rt_task_desc;
 
 /* The command to send by default */
 comedi_cmd_t cmd = {
-  idx_subd:ID_SUBD,
-  flags:0,
-  start_src:TRIG_NOW,
-  start_arg:0,
-  scan_begin_src:TRIG_TIMER,
-  scan_begin_arg:200,  /* in ns */
-  convert_src:TRIG_TIMER,
-  convert_arg:50,  /* in ns */
-  scan_end_src:TRIG_COUNT,
-  scan_end_arg:0,
-  stop_src:TRIG_COUNT,
-  stop_arg:NB_SCAN,
-  nb_chan:0,
-  chan_descs:chans,
+  .idx_subd = ID_SUBD,
+  .flags = 0,
+  .start_src = TRIG_INT,
+  .start_arg = 0,
+  .scan_begin_src = TRIG_TIMER,
+  .scan_begin_arg = 200, /* in ns */
+  .convert_src = TRIG_NOW,
+  .convert_arg = 0, /* in ns */
+  .scan_end_src = TRIG_COUNT,
+  .scan_end_arg = 0,
+  .stop_src = TRIG_COUNT,
+  .stop_arg = NB_SCAN,
+  .nb_chan = 0,
+  .chan_descs = chans,
 };
 
 struct option cmd_write_opts[] = {
@@ -292,11 +292,15 @@ int main(int argc, char *argv[])
for (i = 0; i < BUF_SIZE; i++)
buf[i] = i;
 
-   ret = rt_task_set_mode(0, T_PRIMARY, NULL);
-   if (ret < 0) {
-   fprintf(stderr, "cmd_read: rt_task_set_mode failed (ret=%d)\n",
-   ret);
-   goto out_main;
+   if (real_time != 0) {
+
+   ret = rt_task_set_mode(0, T_PRIMARY, NULL);
+   if (ret < 0) {
+   fprintf(stderr, 
+   "cmd_read: rt_task_set_mode failed (ret=%d)\n",
+   ret);
+   goto out_main;
+   }
}
 
if (use_mmap == 0) {


___
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git


[Xenomai-git] Alexis Berlemont : Fix various minor bugs

2009-10-20 Thread GIT version control
Module: xenomai-head
Branch: master
Commit: b9f47070f5431fb43eae833d1a66faba9e6b0955
URL:
http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=b9f47070f5431fb43eae833d1a66faba9e6b0955

Author: Alexis Berlemont 
Date:   Tue Sep 22 00:41:49 2009 +0200

Fix various minor bugs

---

 src/utils/comedi/cmd_write.c |   44 ++---
 1 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/utils/comedi/cmd_write.c b/src/utils/comedi/cmd_write.c
index 2f4242c..ab57ee1 100644
--- a/src/utils/comedi/cmd_write.c
+++ b/src/utils/comedi/cmd_write.c
@@ -49,7 +49,7 @@
 
 static unsigned char buf[BUF_SIZE];
 static char *filename = FILENAME;
-static char *str_chans = "0,1,2,3";
+static char *str_chans = "0,1";
 static unsigned int chans[MAX_NB_CHAN];
 static int verbose = 0;
 static int real_time = 0;
@@ -59,20 +59,20 @@ static RT_TASK rt_task_desc;
 
 /* The command to send by default */
 comedi_cmd_t cmd = {
-  idx_subd:ID_SUBD,
-  flags:0,
-  start_src:TRIG_NOW,
-  start_arg:0,
-  scan_begin_src:TRIG_TIMER,
-  scan_begin_arg:200,  /* in ns */
-  convert_src:TRIG_TIMER,
-  convert_arg:50,  /* in ns */
-  scan_end_src:TRIG_COUNT,
-  scan_end_arg:0,
-  stop_src:TRIG_COUNT,
-  stop_arg:NB_SCAN,
-  nb_chan:0,
-  chan_descs:chans,
+  .idx_subd = ID_SUBD,
+  .flags = 0,
+  .start_src = TRIG_INT,
+  .start_arg = 0,
+  .scan_begin_src = TRIG_TIMER,
+  .scan_begin_arg = 200, /* in ns */
+  .convert_src = TRIG_NOW,
+  .convert_arg = 0, /* in ns */
+  .scan_end_src = TRIG_COUNT,
+  .scan_end_arg = 0,
+  .stop_src = TRIG_COUNT,
+  .stop_arg = NB_SCAN,
+  .nb_chan = 0,
+  .chan_descs = chans,
 };
 
 struct option cmd_write_opts[] = {
@@ -292,11 +292,15 @@ int main(int argc, char *argv[])
for (i = 0; i < BUF_SIZE; i++)
buf[i] = i;
 
-   ret = rt_task_set_mode(0, T_PRIMARY, NULL);
-   if (ret < 0) {
-   fprintf(stderr, "cmd_read: rt_task_set_mode failed (ret=%d)\n",
-   ret);
-   goto out_main;
+   if (real_time != 0) {
+
+   ret = rt_task_set_mode(0, T_PRIMARY, NULL);
+   if (ret < 0) {
+   fprintf(stderr, 
+   "cmd_read: rt_task_set_mode failed (ret=%d)\n",
+   ret);
+   goto out_main;
+   }
}
 
if (use_mmap == 0) {


___
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git


[Xenomai-git] Alexis Berlemont : Fix various minor bugs

2009-10-19 Thread GIT version control
Module: xenomai-abe
Branch: analogy
Commit: bfd0f6fd0b6ddd4f1e9699977e551ff50347378c
URL:
http://git.xenomai.org/?p=xenomai-abe.git;a=commit;h=bfd0f6fd0b6ddd4f1e9699977e551ff50347378c

Author: Alexis Berlemont 
Date:   Tue Sep 22 00:41:49 2009 +0200

Fix various minor bugs

---

 src/utils/comedi/cmd_write.c |   44 ++---
 1 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/utils/comedi/cmd_write.c b/src/utils/comedi/cmd_write.c
index 2f4242c..ab57ee1 100644
--- a/src/utils/comedi/cmd_write.c
+++ b/src/utils/comedi/cmd_write.c
@@ -49,7 +49,7 @@
 
 static unsigned char buf[BUF_SIZE];
 static char *filename = FILENAME;
-static char *str_chans = "0,1,2,3";
+static char *str_chans = "0,1";
 static unsigned int chans[MAX_NB_CHAN];
 static int verbose = 0;
 static int real_time = 0;
@@ -59,20 +59,20 @@ static RT_TASK rt_task_desc;
 
 /* The command to send by default */
 comedi_cmd_t cmd = {
-  idx_subd:ID_SUBD,
-  flags:0,
-  start_src:TRIG_NOW,
-  start_arg:0,
-  scan_begin_src:TRIG_TIMER,
-  scan_begin_arg:200,  /* in ns */
-  convert_src:TRIG_TIMER,
-  convert_arg:50,  /* in ns */
-  scan_end_src:TRIG_COUNT,
-  scan_end_arg:0,
-  stop_src:TRIG_COUNT,
-  stop_arg:NB_SCAN,
-  nb_chan:0,
-  chan_descs:chans,
+  .idx_subd = ID_SUBD,
+  .flags = 0,
+  .start_src = TRIG_INT,
+  .start_arg = 0,
+  .scan_begin_src = TRIG_TIMER,
+  .scan_begin_arg = 200, /* in ns */
+  .convert_src = TRIG_NOW,
+  .convert_arg = 0, /* in ns */
+  .scan_end_src = TRIG_COUNT,
+  .scan_end_arg = 0,
+  .stop_src = TRIG_COUNT,
+  .stop_arg = NB_SCAN,
+  .nb_chan = 0,
+  .chan_descs = chans,
 };
 
 struct option cmd_write_opts[] = {
@@ -292,11 +292,15 @@ int main(int argc, char *argv[])
for (i = 0; i < BUF_SIZE; i++)
buf[i] = i;
 
-   ret = rt_task_set_mode(0, T_PRIMARY, NULL);
-   if (ret < 0) {
-   fprintf(stderr, "cmd_read: rt_task_set_mode failed (ret=%d)\n",
-   ret);
-   goto out_main;
+   if (real_time != 0) {
+
+   ret = rt_task_set_mode(0, T_PRIMARY, NULL);
+   if (ret < 0) {
+   fprintf(stderr, 
+   "cmd_read: rt_task_set_mode failed (ret=%d)\n",
+   ret);
+   goto out_main;
+   }
}
 
if (use_mmap == 0) {


___
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git


[Xenomai-git] Alexis Berlemont : Fix various minor bugs

2009-10-01 Thread GIT version control
Module: xenomai-abe
Branch: comedi
Commit: b9f47070f5431fb43eae833d1a66faba9e6b0955
URL:
http://git.xenomai.org/?p=xenomai-abe.git;a=commit;h=b9f47070f5431fb43eae833d1a66faba9e6b0955

Author: Alexis Berlemont 
Date:   Tue Sep 22 00:41:49 2009 +0200

Fix various minor bugs

---

 src/utils/comedi/cmd_write.c |   44 ++---
 1 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/utils/comedi/cmd_write.c b/src/utils/comedi/cmd_write.c
index 2f4242c..ab57ee1 100644
--- a/src/utils/comedi/cmd_write.c
+++ b/src/utils/comedi/cmd_write.c
@@ -49,7 +49,7 @@
 
 static unsigned char buf[BUF_SIZE];
 static char *filename = FILENAME;
-static char *str_chans = "0,1,2,3";
+static char *str_chans = "0,1";
 static unsigned int chans[MAX_NB_CHAN];
 static int verbose = 0;
 static int real_time = 0;
@@ -59,20 +59,20 @@ static RT_TASK rt_task_desc;
 
 /* The command to send by default */
 comedi_cmd_t cmd = {
-  idx_subd:ID_SUBD,
-  flags:0,
-  start_src:TRIG_NOW,
-  start_arg:0,
-  scan_begin_src:TRIG_TIMER,
-  scan_begin_arg:200,  /* in ns */
-  convert_src:TRIG_TIMER,
-  convert_arg:50,  /* in ns */
-  scan_end_src:TRIG_COUNT,
-  scan_end_arg:0,
-  stop_src:TRIG_COUNT,
-  stop_arg:NB_SCAN,
-  nb_chan:0,
-  chan_descs:chans,
+  .idx_subd = ID_SUBD,
+  .flags = 0,
+  .start_src = TRIG_INT,
+  .start_arg = 0,
+  .scan_begin_src = TRIG_TIMER,
+  .scan_begin_arg = 200, /* in ns */
+  .convert_src = TRIG_NOW,
+  .convert_arg = 0, /* in ns */
+  .scan_end_src = TRIG_COUNT,
+  .scan_end_arg = 0,
+  .stop_src = TRIG_COUNT,
+  .stop_arg = NB_SCAN,
+  .nb_chan = 0,
+  .chan_descs = chans,
 };
 
 struct option cmd_write_opts[] = {
@@ -292,11 +292,15 @@ int main(int argc, char *argv[])
for (i = 0; i < BUF_SIZE; i++)
buf[i] = i;
 
-   ret = rt_task_set_mode(0, T_PRIMARY, NULL);
-   if (ret < 0) {
-   fprintf(stderr, "cmd_read: rt_task_set_mode failed (ret=%d)\n",
-   ret);
-   goto out_main;
+   if (real_time != 0) {
+
+   ret = rt_task_set_mode(0, T_PRIMARY, NULL);
+   if (ret < 0) {
+   fprintf(stderr, 
+   "cmd_read: rt_task_set_mode failed (ret=%d)\n",
+   ret);
+   goto out_main;
+   }
}
 
if (use_mmap == 0) {


___
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git


[Xenomai-git] Alexis Berlemont : Fix various minor bugs

2009-09-23 Thread GIT version control
Module: xenomai-abe
Branch: comedi
Commit: 8d2f924d570a3dfebac55f396ffbc64cb1e61214
URL:
http://git.xenomai.org/?p=xenomai-abe.git;a=commit;h=8d2f924d570a3dfebac55f396ffbc64cb1e61214

Author: Alexis Berlemont 
Date:   Tue Sep 22 00:41:49 2009 +0200

Fix various minor bugs

---

 src/utils/comedi/cmd_write.c |   44 ++---
 1 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/utils/comedi/cmd_write.c b/src/utils/comedi/cmd_write.c
index 2f4242c..ab57ee1 100644
--- a/src/utils/comedi/cmd_write.c
+++ b/src/utils/comedi/cmd_write.c
@@ -49,7 +49,7 @@
 
 static unsigned char buf[BUF_SIZE];
 static char *filename = FILENAME;
-static char *str_chans = "0,1,2,3";
+static char *str_chans = "0,1";
 static unsigned int chans[MAX_NB_CHAN];
 static int verbose = 0;
 static int real_time = 0;
@@ -59,20 +59,20 @@ static RT_TASK rt_task_desc;
 
 /* The command to send by default */
 comedi_cmd_t cmd = {
-  idx_subd:ID_SUBD,
-  flags:0,
-  start_src:TRIG_NOW,
-  start_arg:0,
-  scan_begin_src:TRIG_TIMER,
-  scan_begin_arg:200,  /* in ns */
-  convert_src:TRIG_TIMER,
-  convert_arg:50,  /* in ns */
-  scan_end_src:TRIG_COUNT,
-  scan_end_arg:0,
-  stop_src:TRIG_COUNT,
-  stop_arg:NB_SCAN,
-  nb_chan:0,
-  chan_descs:chans,
+  .idx_subd = ID_SUBD,
+  .flags = 0,
+  .start_src = TRIG_INT,
+  .start_arg = 0,
+  .scan_begin_src = TRIG_TIMER,
+  .scan_begin_arg = 200, /* in ns */
+  .convert_src = TRIG_NOW,
+  .convert_arg = 0, /* in ns */
+  .scan_end_src = TRIG_COUNT,
+  .scan_end_arg = 0,
+  .stop_src = TRIG_COUNT,
+  .stop_arg = NB_SCAN,
+  .nb_chan = 0,
+  .chan_descs = chans,
 };
 
 struct option cmd_write_opts[] = {
@@ -292,11 +292,15 @@ int main(int argc, char *argv[])
for (i = 0; i < BUF_SIZE; i++)
buf[i] = i;
 
-   ret = rt_task_set_mode(0, T_PRIMARY, NULL);
-   if (ret < 0) {
-   fprintf(stderr, "cmd_read: rt_task_set_mode failed (ret=%d)\n",
-   ret);
-   goto out_main;
+   if (real_time != 0) {
+
+   ret = rt_task_set_mode(0, T_PRIMARY, NULL);
+   if (ret < 0) {
+   fprintf(stderr, 
+   "cmd_read: rt_task_set_mode failed (ret=%d)\n",
+   ret);
+   goto out_main;
+   }
}
 
if (use_mmap == 0) {


___
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git