projects
/
comedi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
969baa4
)
think i finnally found the problem with 611x initialization
author
Frank Mori Hess
<fmhess@speakeasy.net>
Sat, 24 May 2003 15:02:30 +0000
(15:02 +0000)
committer
Frank Mori Hess
<fmhess@speakeasy.net>
Sat, 24 May 2003 15:02:30 +0000
(15:02 +0000)
comedi/drivers/ni_mio_common.c
patch
|
blob
|
history
diff --git
a/comedi/drivers/ni_mio_common.c
b/comedi/drivers/ni_mio_common.c
index ce730ba75a5f114013cb7ba21dad6fae89870616..a9a5f71be5fdfcd581fa87c0cb3daf5ddf122abc 100644
(file)
--- a/
comedi/drivers/ni_mio_common.c
+++ b/
comedi/drivers/ni_mio_common.c
@@
-1650,8
+1650,11
@@
static int ni_ai_cmd(comedi_device *dev,comedi_subdevice *s)
switch(cmd->convert_src){
case TRIG_TIMER:
- if( cmd->convert_arg == 0 ) break;
- timer=ni_ns_to_timer(&cmd->convert_arg, TRIG_ROUND_NEAREST);
+ case TRIG_NOW:
+ if( cmd->convert_arg == 0 || cmd->convert_src == TRIG_NOW )
+ timer = 1;
+ else
+ timer=ni_ns_to_timer(&cmd->convert_arg, TRIG_ROUND_NEAREST);
win_out(1,AI_SI2_Load_A_Register); /* 0,0 does not work. */
win_out(timer,AI_SI2_Load_B_Register);
@@
-1679,8
+1682,6
@@
static int ni_ai_cmd(comedi_device *dev,comedi_subdevice *s)
win_out(mode2, AI_Mode_2_Register);
- break;
- case TRIG_NOW:
break;
}