From: David Schleef Date: Tue, 15 Feb 2000 08:00:49 +0000 (+0000) Subject: range changes, command support, ai_speed addition, device additions X-Git-Tag: r0_7_40~45 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=61f6f890861cab795d53d257b143f58c141fa370;p=comedi.git range changes, command support, ai_speed addition, device additions to pci_mio.c --- diff --git a/comedi/drivers/ni_atmio.c b/comedi/drivers/ni_atmio.c index 46a339e7..c6f249a3 100644 --- a/comedi/drivers/ni_atmio.c +++ b/comedi/drivers/ni_atmio.c @@ -93,6 +93,7 @@ static ni_board ni_boards[]={ ai_fifo_depth: 8192, alwaysdither: 0, gainlkup: ai_gain_16, + ai_speed: 800, n_aochan: 2, aobits: 12, ao_fifo_depth: 2048, @@ -107,6 +108,7 @@ static ni_board ni_boards[]={ ai_fifo_depth: 2048, alwaysdither: 0, gainlkup: ai_gain_16, + ai_speed: 2000, n_aochan: 2, aobits: 12, ao_fifo_depth: 2048, @@ -121,6 +123,7 @@ static ni_board ni_boards[]={ ai_fifo_depth: 512, alwaysdither: 0, gainlkup: ai_gain_16, + ai_speed: 10000, n_aochan: 2, aobits: 12, ao_fifo_depth: 0, @@ -135,6 +138,7 @@ static ni_board ni_boards[]={ ai_fifo_depth: 512, alwaysdither: 0, gainlkup: ai_gain_16, + ai_speed: 10000, n_aochan: 2, aobits: 12, ao_fifo_depth: 0, @@ -149,6 +153,7 @@ static ni_board ni_boards[]={ ai_fifo_depth: 2048, alwaysdither: 0, gainlkup: ai_gain_16, + ai_speed: 2000, n_aochan: 2, aobits: 12, ao_fifo_depth: 2048, @@ -163,6 +168,7 @@ static ni_board ni_boards[]={ ai_fifo_depth: 512, alwaysdither: 1, gainlkup: ai_gain_8, + ai_speed: 50000, n_aochan: 2, aobits: 12, ao_fifo_depth: 0, @@ -177,6 +183,7 @@ static ni_board ni_boards[]={ ai_fifo_depth: 512, alwaysdither: 1, /* unknown */ gainlkup: ai_gain_8, /* unknown */ + ai_speed: 10000, n_aochan: 2, aobits: 12, ao_fifo_depth: 0, /* unknown */ @@ -191,6 +198,7 @@ static ni_board ni_boards[]={ ai_fifo_depth: 512, alwaysdither: 1, /* unknown */ gainlkup: ai_gain_8, + ai_speed: 10000, n_aochan: 0, aobits: 0, ao_fifo_depth: 0, diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c index 75092741..b7b3c6e4 100644 --- a/comedi/drivers/ni_mio_common.c +++ b/comedi/drivers/ni_mio_common.c @@ -65,76 +65,80 @@ static int ni_gainlkup[][16]={ { 0, 1, 4, 7, 8, 9, 12, 15, 0, 0, 0, 0, 0, 0, 0, 0 } }; -static int ni_range_lkup[]={ - RANGE_ni_E_ai, - RANGE_ni_E_ai_limited, - RANGE_ni_E_ai_limited14, - RANGE_ni_E_ai_limited_602x +static comedi_lrange range_ni_E_ai={ 16, { + RANGE( -10, 10 ), + RANGE( -5, 5 ), + RANGE( -2.5, 2.5 ), + RANGE( -1, 1 ), + RANGE( -0.5, 0.5 ), + RANGE( -0.25, 0.25 ), + RANGE( -0.1, 0.1 ), + RANGE( -0.05, 0.05 ), + RANGE( 0, 20 ), + RANGE( 0, 10 ), + RANGE( 0, 5 ), + RANGE( 0, 2 ), + RANGE( 0, 1 ), + RANGE( 0, 0.5 ), + RANGE( 0, 0.2 ), + RANGE( 0, 0.1 ), +}}; +static comedi_lrange range_ni_E_ai_limited={ 8, { + RANGE( -10, 10 ), + RANGE( -5, 5 ), + RANGE( -1, 1 ), + RANGE( -0.1, 0.1 ), + RANGE( 0, 20 ), + RANGE( 0, 10 ), + RANGE( 0, 2 ), + RANGE( 0, 0.2 ), +}}; +static comedi_lrange range_ni_E_ai_limited14={ 14, { + RANGE( -5, 5 ), + RANGE( -2.5, 2.5 ), + RANGE( -1, 1 ), + RANGE( -0.5, 0.5 ), + RANGE( -0.25, 0.25 ), + RANGE( -0.1, 0.1 ), + RANGE( -0.05, 0.05 ), + RANGE( 0, 5 ), + RANGE( 0, 2.5 ), + RANGE( 0, 1 ), + RANGE( 0, 0.5 ), + RANGE( 0, 0.25 ), + RANGE( 0, 0.1 ), + RANGE( 0, 0.05 ), +}}; +static comedi_lrange range_ni_E_ai_limited_602x={ 8, { + RANGE( -10, 10 ), + RANGE( -5, 5 ), + RANGE( -0.5, 0.5 ), + RANGE( -0.05, 0.05 ), + RANGE( 0, 20 ), + RANGE( 0, 10 ), + RANGE( 0, 1 ), + RANGE( 0, 0.1 ), +}}; +#if 0 +static comedi_lrange range_ni_E_ao = { 2, { + RANGE( -10, 10 ), + RANGE( 0, 10 ), +}}; +#endif +static comedi_lrange range_ni_E_ao_ext = { 4, { + RANGE( -10, 10 ), + RANGE( 0, 10 ), + RANGE_ext( -1, 1 ), + RANGE_ext( 0, 1 ), +}}; + +static comedi_lrange *ni_range_lkup[]={ + &range_ni_E_ai, + &range_ni_E_ai_limited, + &range_ni_E_ai_limited14, + &range_ni_E_ai_limited_602x }; -/* ---BEGIN-RANGE-DEFS-- -RANGE_ni_E_ai - -10 10 - -5 5 - -2.5 2.5 - -1 1 - -0.5 0.5 - -0.25 0.25 - -0.1 0.1 - -0.05 0.05 - 0 20 - 0 10 - 0 5 - 0 2 - 0 1 - 0 0.5 - 0 0.2 - 0 0.1 -RANGE_ni_E_ai_limited - -10 10 - -5 5 - -1 1 - -0.1 0.1 - 0 10 - 0 5 - 0 1 - 0 0.1 -RANGE_ni_E_ai_limited14 - -5 5 - -2.5 2.5 - -1 1 - -0.5 0.5 - -0.25 0.25 - -0.1 0.1 - -0.05 0.05 - 0 10 - 0 5 - 0 2 - 0 1 - 0 0.5 - 0 0.2 - 0 0.1 -RANGE_ni_E_ai_limited_602x - -10 10 - -5 5 - -0.5 0.5 - -0.05 0.05 - 0 20 - 0 10 - 0 1 - 0 0.1 -RANGE_ni_E_ao - -10 10 - 0 10 -RANGE_ni_E_ao_ext - -10 10 - 0 10 - -1 1 ext - 0 1 ext ----END-RANGE-DEFS--- -*/ - static int ni_dio(comedi_device *dev,comedi_subdevice *s,comedi_trig *it); @@ -549,6 +553,140 @@ static void ni_load_channelgain_list(comedi_device *dev,unsigned int n_chan,unsi rt_printk("ni_E: timeout 1\n"); } +#ifdef CONFIG_COMEDI_VER08 +static int ni_ns_to_timer(int *nanosec,int round_mode) +{ + int divider,base; + + base=50; /* 20 Mhz base */ + + switch(round_mode){ + case TRIG_ROUND_NEAREST: + default: + divider=(*nanosec+base/2)/base; + break; + case TRIG_ROUND_DOWN: + divider=(*nanosec)/base; + break; + case TRIG_ROUND_UP: + divider=(*nanosec+base-1)/base; + break; + } + + *nanosec=base*divider; + return divider; +} + +static int ni_ai_cmdtest(comedi_device *dev,comedi_subdevice *s,comedi_cmd *cmd) +{ + int err=0; + int tmp; + + /* step 1: make sure trigger sources are trivially valid */ + + tmp=cmd->start_src; + cmd->start_src &= TRIG_NOW; + if(!cmd->start_src && tmp!=cmd->start_src)err++; + + tmp=cmd->scan_begin_src; + cmd->scan_begin_src &= TRIG_TIMER|TRIG_EXT; + if(!cmd->scan_begin_src && tmp!=cmd->scan_begin_src)err++; + + tmp=cmd->convert_src; + cmd->convert_src &= TRIG_TIMER; + if(!cmd->convert_src && tmp!=cmd->convert_src)err++; + + tmp=cmd->scan_end_src; + cmd->scan_end_src &= TRIG_COUNT; + if(!cmd->scan_end_src && tmp!=cmd->scan_end_src)err++; + + tmp=cmd->stop_src; + cmd->stop_src &= TRIG_COUNT; + if(!cmd->stop_src && tmp!=cmd->stop_src)err++; + + if(err)return 1; + + /* step 2: make sure trigger sources are unique and mutually compatible */ + + /* note that mutual compatiblity is not an issue here */ + if(cmd->scan_begin_src!=TRIG_TIMER && + cmd->scan_begin_src!=TRIG_EXT)err++; + + if(err)return 2; + + /* step 3: make sure arguments are trivially compatible */ + + if(cmd->start_arg!=0){ + cmd->start_arg=0; + err++; + } + if(cmd->scan_begin_src==TRIG_TIMER){ + if(cmd->scan_begin_argscan_begin_arg=boardtype.ai_speed; + err++; + } + if(cmd->scan_begin_arg>1000000000){ /* XXX */ + cmd->scan_begin_arg=1000000000; + err++; + } + }else{ + /* external trigger */ + /* should be level/edge, hi/lo specification here */ + /* should specify multiple external triggers */ + if(cmd->scan_begin_arg!=0){ + cmd->scan_begin_arg=0; + err++; + } + } + if(cmd->scan_begin_argscan_begin_arg=boardtype.ai_speed; + err++; + } + if(cmd->scan_begin_arg>1000000000){ /* XXX */ + cmd->scan_begin_arg=1000000000; + err++; + } + + if(cmd->scan_end_arg!=cmd->chanlist_len){ + cmd->scan_end_arg=cmd->chanlist_len; + err++; + } + if(cmd->stop_src==TRIG_COUNT){ + if(cmd->stop_arg>0x00ffffff){ + cmd->stop_arg=0x00ffffff; + err++; + } + }else{ + /* TRIG_NONE */ + if(cmd->stop_arg!=0){ + cmd->stop_arg=0; + err++; + } + } + + if(err)return 3; + + /* step 4: fix up any arguments */ + + if(cmd->scan_begin_src==TRIG_TIMER){ + tmp=cmd->scan_begin_arg; + ni_ns_to_timer(&cmd->scan_begin_arg,cmd->flags&TRIG_ROUND_MASK); + if(tmp!=cmd->scan_begin_arg)err++; + } + tmp=cmd->convert_arg; + ni_ns_to_timer(&cmd->convert_arg,cmd->flags&TRIG_ROUND_MASK); + if(tmp!=cmd->convert_arg)err++; + if(cmd->scan_begin_src==TRIG_TIMER && + cmd->convert_argscan_begin_arg*cmd->scan_end_arg){ + cmd->convert_arg=cmd->scan_begin_arg*cmd->scan_end_arg; + err++; + } + + if(err)return 4; + + return 0; +} + static int ni_ai_cmd(comedi_device *dev,comedi_subdevice *s) { int wsave; @@ -561,6 +699,7 @@ static int ni_ai_cmd(comedi_device *dev,comedi_subdevice *s) return 0; } +#endif /* mode 2 is timed, multi-channel @@ -1115,10 +1254,14 @@ static int ni_E_init(comedi_device *dev,comedi_devconfig *it) s->len_chanlist=512; /* XXX is this the same for PCI-MIO ? */ s->maxdata=(1<timer_type=TIMER_atmio; - s->range_type=ni_range_lkup[boardtype.gainlkup]; + s->range_table=ni_range_lkup[boardtype.gainlkup]; s->trig[0]=ni_ai_mode0; s->trig[2]=ni_ai_mode2; s->trig[4]=ni_ai_mode4; +#ifdef CONFIG_COMEDI_VER08 + s->do_cmdtest=ni_ai_cmdtest; + s->do_cmd=ni_ai_cmd; +#endif s->cancel=ni_ai_reset; s->do_lock=ni_ai_lock; s->do_unlock=ni_ai_unlock; @@ -1133,7 +1276,7 @@ static int ni_E_init(comedi_device *dev,comedi_devconfig *it) s->n_chan=boardtype.n_aochan; s->maxdata=(1<timer_type=TIMER_atmio; - s->range_type=RANGE_ni_E_ao_ext; /* XXX wrong for some boards */ + s->range_table=&range_ni_E_ao_ext; /* XXX wrong for some boards */ s->trig[0]=ni_ao_mode0; if(boardtype.ao_fifo_depth) s->trig[2]=ni_ao_mode2; @@ -1148,7 +1291,7 @@ static int ni_E_init(comedi_device *dev,comedi_devconfig *it) s->subdev_flags=SDF_WRITEABLE|SDF_READABLE|SDF_RT; s->n_chan=8; s->maxdata=1; - s->range_type=RANGE_digital; + s->range_table=&range_digital; s->io_bits=0; /* all bits input */ s->trig[0]=ni_dio; diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c index 12f1c56c..b733cd96 100644 --- a/comedi/drivers/ni_pcimio.c +++ b/comedi/drivers/ni_pcimio.c @@ -97,6 +97,7 @@ static ni_board ni_boards[]={ ai_fifo_depth: 2048, alwaysdither: 1, gainlkup: ai_gain_8, + ai_speed: 50000, n_aochan: 2, aobits: 12, ao_fifo_depth: 0, @@ -111,6 +112,7 @@ static ni_board ni_boards[]={ ai_fifo_depth: 512, alwaysdither: 1, gainlkup: ai_gain_14, + ai_speed: 10000, n_aochan: 2, aobits: 16, ao_fifo_depth: 2048, @@ -125,6 +127,7 @@ static ni_board ni_boards[]={ ai_fifo_depth: 512, alwaysdither: 0, gainlkup: ai_gain_16, + ai_speed: 800, n_aochan: 2, aobits: 12, ao_fifo_depth: 2048, @@ -139,6 +142,7 @@ static ni_board ni_boards[]={ ai_fifo_depth: 512, alwaysdither: 0, gainlkup: ai_gain_16, + ai_speed: 500, n_aochan: 2, aobits: 12, ao_fifo_depth: 512, @@ -153,6 +157,7 @@ static ni_board ni_boards[]={ ai_fifo_depth: 512, alwaysdither: 1, gainlkup: ai_gain_14, + ai_speed: 10000, n_aochan: 2, aobits: 16, ao_fifo_depth: 2048, @@ -168,6 +173,7 @@ static ni_board ni_boards[]={ ai_fifo_depth: 512, alwaysdither: 1, gainlkup: ai_gain_14, + ai_speed: 10000, n_aochan: 0, aobits: 0, ao_fifo_depth: 0, @@ -184,6 +190,7 @@ static ni_board ni_boards[]={ ai_fifo_depth: 512, alwaysdither: 1, gainlkup: ai_gain_14, + ai_speed: 10000, n_aochan: 0, aobits: 0, ao_fifo_depth: 0, @@ -199,6 +206,7 @@ static ni_board ni_boards[]={ ai_fifo_depth: 512, alwaysdither: 1, gainlkup: ai_gain_16, + ai_speed: 800, n_aochan: 2, aobits: 12, ao_fifo_depth: 2048, @@ -212,10 +220,11 @@ static ni_board ni_boards[]={ adbits: 12, ai_fifo_depth: 512, alwaysdither: 0, + gainlkup: ai_gain_8_602x, + ai_speed: 5000, n_aochan: 0, aobits: 0, ao_unipolar: 0, - gainlkup: ai_gain_8_602x, caldac: type3, has_8255: 0, }, @@ -225,11 +234,12 @@ static ni_board ni_boards[]={ adbits: 12, ai_fifo_depth: 512, alwaysdither: 0, + gainlkup: ai_gain_8_602x, + ai_speed: 5000, n_aochan: 2, aobits: 12, ao_fifo_depth: 0, ao_unipolar: 1, - gainlkup: ai_gain_8_602x, caldac: type3, has_8255: 0, }, @@ -240,6 +250,8 @@ static ni_board ni_boards[]={ adbits: 12, ai_fifo_depth: 512, alwaysdither: 0, + gainlkup: 0, /* XXX */ + ai_speed: 5000, n_aochan: 2, aobits: 12, ao_fifo_depth: 0, @@ -254,23 +266,66 @@ static ni_board ni_boards[]={ adbits: 16, ai_fifo_depth: 512, alwaysdither: 1, + gainlkup: ai_gain_16, + ai_speed: 3000, aobits: 16, ao_unipolar: 1, ao_fifo_depth: 2048, caldac: type4, - gainlkup: ai_gain_16, }, { device_id: 0x0000, /* unknown */ name: "pci-6110e", + n_adchan: 4, + adbits: 12, + ai_fifo_depth: 512, + alwaysdither: 0, + gainlkup: ai_gain_14, /* wrong */ + ai_speed: 200, + aobits: 12, + ao_unipolar: 0, + ao_fifo_depth: 2048, + caldac: type4, /* XXX */ }, { device_id: 0x0000, /* unknown */ name: "pci-6111e", + n_adchan: 2, + adbits: 12, + ai_fifo_depth: 512, + alwaysdither: 0, + gainlkup: ai_gain_14, + ai_speed: 200, + aobits: 12, + ao_unipolar: 0, + ao_fifo_depth: 2048, + caldac: type4, /* XXX */ }, { device_id: 0x0000, /* unknown */ name: "pci-6040e", + ai_speed: 800, }, { device_id: 0x0000, /* unknown */ name: "pci-6041e", + ai_speed: 800, + }, + { device_id: 0x0000, /* unknown */ + name: "pci-6034e", + ai_speed: 5000, + }, + { device_id: 0x0000, /* unknown */ + name: "pci-6035e", + ai_speed: 5000, + }, + { device_id: 0x0000, /* unknown */ + name: "pci-1200", + ai_speed: 10000, + }, + { device_id: 0x0000, /* unknown */ + name: "ni-5911 for PCI", + ai_speed: 10000, + }, + { device_id: 0x0000, /* unknown */ + name: "ni-5102 for PCI", + ai_speed: 10000, }, #endif };