From 2523e889e8e94f94f46cf5b437373c987658e959 Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Sat, 24 May 2003 15:02:30 +0000 Subject: [PATCH] think i finnally found the problem with 611x initialization --- comedi/drivers/ni_mio_common.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c index ce730ba7..a9a5f71b 100644 --- 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; } -- 2.26.2