From 021d7b6fa5c63f0b2ec02404bb3106d33edf3596 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Thu, 21 Nov 2002 07:56:24 +0000 Subject: [PATCH] Fix subdevice flags not having AREF capability --- comedi/drivers/amplc_pci230.c | 2 +- comedi/drivers/cb_das16_cs.c | 2 +- comedi/drivers/cb_pcimdas.c | 2 +- comedi/drivers/comedi_rt_timer.c | 2 +- comedi/drivers/daqboard2000.c | 2 +- comedi/drivers/das6402.c | 2 +- comedi/drivers/dt2801.c | 2 +- comedi/drivers/dt2811.c | 2 +- comedi/drivers/dt2814.c | 2 +- comedi/drivers/dt3000.c | 2 +- comedi/drivers/fl512.c | 2 +- comedi/drivers/multiq3.c | 2 +- comedi/drivers/ni_atmio16d.c | 2 +- comedi/drivers/pcl711.c | 2 +- comedi/drivers/pcmad.c | 2 +- comedi/drivers/quatech_daqp_cs.c | 2 +- comedi/drivers/rtd520.c | 2 +- comedi/drivers/rti800.c | 2 +- comedi/drivers/serial2002.c | 2 +- comedi/drivers/skel.c | 3 ++- 20 files changed, 21 insertions(+), 20 deletions(-) diff --git a/comedi/drivers/amplc_pci230.c b/comedi/drivers/amplc_pci230.c index be2b66c5..f3ba44a4 100644 --- a/comedi/drivers/amplc_pci230.c +++ b/comedi/drivers/amplc_pci230.c @@ -380,7 +380,7 @@ static int pci230_attach(comedi_device *dev,comedi_devconfig *it) s=dev->subdevices+0; /* analog input subdevice */ s->type=COMEDI_SUBD_AI; - s->subdev_flags=SDF_READABLE; + s->subdev_flags=SDF_READABLE|SDF_DIFF|SDF_GROUND; s->n_chan=thisboard->ai_chans; s->maxdata=(1<ai_bits)-1; s->range_table=&pci230_ai_range; diff --git a/comedi/drivers/cb_das16_cs.c b/comedi/drivers/cb_das16_cs.c index eacb804c..8a974dca 100644 --- a/comedi/drivers/cb_das16_cs.c +++ b/comedi/drivers/cb_das16_cs.c @@ -206,7 +206,7 @@ static int das16cs_attach(comedi_device *dev,comedi_devconfig *it) dev->read_subdev=s; /* analog input subdevice */ s->type=COMEDI_SUBD_AI; - s->subdev_flags=SDF_READABLE; + s->subdev_flags=SDF_READABLE|SDF_GROUND|SDF_DIFF; s->n_chan=16; s->maxdata=0xffff; s->range_table=&das16cs_ai_range; diff --git a/comedi/drivers/cb_pcimdas.c b/comedi/drivers/cb_pcimdas.c index bfe416ca..ede9f2dc 100644 --- a/comedi/drivers/cb_pcimdas.c +++ b/comedi/drivers/cb_pcimdas.c @@ -360,7 +360,7 @@ found: //dev->read_subdev=s; // analog input subdevice s->type=COMEDI_SUBD_AI; - s->subdev_flags=SDF_READABLE; + s->subdev_flags=SDF_READABLE|SDF_GROUND; s->n_chan=thisboard->ai_se_chans; s->maxdata=(1<ai_bits)-1; s->range_table=&range_unknown; diff --git a/comedi/drivers/comedi_rt_timer.c b/comedi/drivers/comedi_rt_timer.c index d221edab..a3279513 100644 --- a/comedi/drivers/comedi_rt_timer.c +++ b/comedi/drivers/comedi_rt_timer.c @@ -617,7 +617,7 @@ static int timer_attach(comedi_device *dev,comedi_devconfig *it) // input or output subdevice s=dev->subdevices+0; s->type=emul_s->type; - s->subdev_flags = emul_s->subdev_flags; + s->subdev_flags = emul_s->subdev_flags; /* SDF_GROUND (to fool check_driver) */ s->n_chan=emul_s->n_chan; s->len_chanlist=1024; s->do_cmd=timer_cmd; diff --git a/comedi/drivers/daqboard2000.c b/comedi/drivers/daqboard2000.c index 9828e28b..ca8841b2 100644 --- a/comedi/drivers/daqboard2000.c +++ b/comedi/drivers/daqboard2000.c @@ -788,7 +788,7 @@ static int daqboard2000_attach(comedi_device *dev, comedi_devconfig *it) s = dev->subdevices + 0; /* ai subdevice */ s->type = COMEDI_SUBD_AI; - s->subdev_flags = SDF_READABLE; + s->subdev_flags = SDF_READABLE|SDF_GROUND; s->n_chan = 24; s->maxdata = 0xffff; s->insn_read = daqboard2000_ai_insn_read; diff --git a/comedi/drivers/das6402.c b/comedi/drivers/das6402.c index 6dd70607..90a20549 100644 --- a/comedi/drivers/das6402.c +++ b/comedi/drivers/das6402.c @@ -338,7 +338,7 @@ static int das6402_attach(comedi_device *dev,comedi_devconfig *it) /* ai subdevice */ s=dev->subdevices+0; s->type=COMEDI_SUBD_AI; - s->subdev_flags=SDF_READABLE; + s->subdev_flags=SDF_READABLE|SDF_GROUND; s->n_chan=8; //s->trig[2]=das6402_ai_mode2; s->cancel=das6402_ai_cancel; diff --git a/comedi/drivers/dt2801.c b/comedi/drivers/dt2801.c index be3ca4c0..9cef9222 100644 --- a/comedi/drivers/dt2801.c +++ b/comedi/drivers/dt2801.c @@ -533,7 +533,7 @@ havetype: s=dev->subdevices+0; /* ai subdevice */ s->type=COMEDI_SUBD_AI; - s->subdev_flags=SDF_READABLE; + s->subdev_flags=SDF_READABLE|SDF_GROUND; #if 1 s->n_chan=n_ai_chans; #else diff --git a/comedi/drivers/dt2811.c b/comedi/drivers/dt2811.c index 948dca77..9fbd65c8 100644 --- a/comedi/drivers/dt2811.c +++ b/comedi/drivers/dt2811.c @@ -386,7 +386,7 @@ static int dt2811_attach(comedi_device * dev, comedi_devconfig * it) s = dev->subdevices + 0; /* initialize the ADC subdevice */ s->type = COMEDI_SUBD_AI; - s->subdev_flags = SDF_READABLE; + s->subdev_flags = SDF_READABLE|SDF_GROUND; s->n_chan = devpriv->adc_mux == adc_diff ? 8 : 16; s->insn_read = dt2811_ai_insn; s->maxdata = 0xfff; diff --git a/comedi/drivers/dt2814.c b/comedi/drivers/dt2814.c index c7ef753a..c9bc55d4 100644 --- a/comedi/drivers/dt2814.c +++ b/comedi/drivers/dt2814.c @@ -299,7 +299,7 @@ static int dt2814_attach(comedi_device *dev,comedi_devconfig *it) s=dev->subdevices+0; dev->read_subdev = s; s->type=COMEDI_SUBD_AI; - s->subdev_flags=SDF_READABLE; + s->subdev_flags=SDF_READABLE|SDF_GROUND; s->n_chan=16; /* XXX */ s->len_chanlist=1; s->insn_read = dt2814_ai_insn_read; diff --git a/comedi/drivers/dt3000.c b/comedi/drivers/dt3000.c index 06e64b31..9b0c2c21 100644 --- a/comedi/drivers/dt3000.c +++ b/comedi/drivers/dt3000.c @@ -789,7 +789,7 @@ static int dt3000_attach(comedi_device *dev,comedi_devconfig *it) /* ai subdevice */ s->type=COMEDI_SUBD_AI; - s->subdev_flags=SDF_READABLE; + s->subdev_flags=SDF_READABLE|SDF_GROUND|SDF_DIFF; s->n_chan=this_board->adchan; s->insn_read=dt3k_ai_insn; s->maxdata=(1<adbits)-1; diff --git a/comedi/drivers/fl512.c b/comedi/drivers/fl512.c index 7c9e356d..aa7a4748 100644 --- a/comedi/drivers/fl512.c +++ b/comedi/drivers/fl512.c @@ -165,7 +165,7 @@ static int fl512_attach(comedi_device *dev,comedi_devconfig *it) /* Analog indput */ s = dev->subdevices+0; s->type = COMEDI_SUBD_AI; /* define subdevice as Analog In */ - s->subdev_flags = SDF_READABLE; /* you can read it from userspace */ + s->subdev_flags = SDF_READABLE|SDF_GROUND;/* you can read it from userspace */ s->n_chan = 16; /* Number of Analog input channels */ s->maxdata = 0x0fff; /* accept only 12 bits of data */ s->range_table = &range_fl512; /* device use one of the ranges */ diff --git a/comedi/drivers/multiq3.c b/comedi/drivers/multiq3.c index 362db58b..79925ffd 100644 --- a/comedi/drivers/multiq3.c +++ b/comedi/drivers/multiq3.c @@ -260,7 +260,7 @@ static int multiq3_attach(comedi_device * dev, comedi_devconfig * it) s = dev->subdevices + 0; /* ai subdevice */ s->type = COMEDI_SUBD_AI; - s->subdev_flags = SDF_READABLE; + s->subdev_flags = SDF_READABLE|SDF_GROUND; s->n_chan = 8; s->insn_read = multiq3_ai_insn_read; s->maxdata = 0x1fff; diff --git a/comedi/drivers/ni_atmio16d.c b/comedi/drivers/ni_atmio16d.c index bb0ec276..68df12d0 100644 --- a/comedi/drivers/ni_atmio16d.c +++ b/comedi/drivers/ni_atmio16d.c @@ -758,7 +758,7 @@ static int atmio16d_attach(comedi_device * dev, comedi_devconfig * it) dev->read_subdev = s; /* ai subdevice */ s->type=COMEDI_SUBD_AI; - s->subdev_flags=SDF_READABLE; + s->subdev_flags=SDF_READABLE|SDF_GROUND; s->n_chan=(devpriv->adc_mux? 16 : 8); s->len_chanlist=16; s->insn_read = atmio16d_ai_insn_read; diff --git a/comedi/drivers/pcl711.c b/comedi/drivers/pcl711.c index 9c934736..baca557f 100644 --- a/comedi/drivers/pcl711.c +++ b/comedi/drivers/pcl711.c @@ -535,7 +535,7 @@ static int pcl711_attach(comedi_device * dev, comedi_devconfig * it) s = dev->subdevices + 0; /* AI subdevice */ s->type = COMEDI_SUBD_AI; - s->subdev_flags = SDF_READABLE; + s->subdev_flags = SDF_READABLE|SDF_GROUND; s->n_chan = this_board->n_aichan; s->maxdata = 0xfff; s->len_chanlist = 1; diff --git a/comedi/drivers/pcmad.c b/comedi/drivers/pcmad.c index abe5b6ca..2dfe3242 100644 --- a/comedi/drivers/pcmad.c +++ b/comedi/drivers/pcmad.c @@ -152,7 +152,7 @@ static int pcmad_attach(comedi_device *dev,comedi_devconfig *it) s=dev->subdevices+0; s->type=COMEDI_SUBD_AI; - s->subdev_flags=SDF_READABLE; + s->subdev_flags=SDF_READABLE|AREF_GROUND; s->n_chan=16; /* XXX */ s->len_chanlist=1; s->insn_read=pcmad_ai_insn_read; diff --git a/comedi/drivers/quatech_daqp_cs.c b/comedi/drivers/quatech_daqp_cs.c index 556df5af..4be6d06b 100644 --- a/comedi/drivers/quatech_daqp_cs.c +++ b/comedi/drivers/quatech_daqp_cs.c @@ -393,7 +393,7 @@ static int daqp_attach(comedi_device *dev, comedi_devconfig *it) s=dev->subdevices+0; s->type=COMEDI_SUBD_AI; - s->subdev_flags=SDF_READABLE; + s->subdev_flags=SDF_READABLE|AREF_GROUND|AREF_DIFF; s->n_chan=8; s->maxdata=0xffff; s->range_table=&range_daqp_ai; diff --git a/comedi/drivers/rtd520.c b/comedi/drivers/rtd520.c index df315404..26ff9f3e 100644 --- a/comedi/drivers/rtd520.c +++ b/comedi/drivers/rtd520.c @@ -875,7 +875,7 @@ static int rtd_attach ( dev->read_subdev=s; /* analog input subdevice */ s->type=COMEDI_SUBD_AI; - s->subdev_flags=SDF_READABLE; + s->subdev_flags=SDF_READABLE|SDF_GROUND|SDF_COMMON|SDF_DIFF; s->n_chan=thisboard->aiChans; s->maxdata=(1<aiBits)-1; if (thisboard->aiMaxGain <= 32) { diff --git a/comedi/drivers/rti800.c b/comedi/drivers/rti800.c index 6db09403..a00bf534 100644 --- a/comedi/drivers/rti800.c +++ b/comedi/drivers/rti800.c @@ -345,7 +345,7 @@ static int rti800_attach(comedi_device * dev, comedi_devconfig * it) s=dev->subdevices+0; /* ai subdevice */ s->type=COMEDI_SUBD_AI; - s->subdev_flags=SDF_READABLE; + s->subdev_flags=SDF_READABLE|SDF_GROUND; s->n_chan=(devpriv->adc_mux? 16 : 8); s->insn_read=rti800_ai_insn_read; s->maxdata=0xfff; diff --git a/comedi/drivers/serial2002.c b/comedi/drivers/serial2002.c index b1ec5eb7..92aa7d9c 100644 --- a/comedi/drivers/serial2002.c +++ b/comedi/drivers/serial2002.c @@ -574,7 +574,7 @@ static int serial2002_attach(comedi_device *dev,comedi_devconfig *it) /* analog input subdevice */ s=dev->subdevices+2; s->type = COMEDI_SUBD_AI; - s->subdev_flags = SDF_READABLE; + s->subdev_flags = SDF_READABLE|SDF_GROUND; s->n_chan = 0; s->maxdata = 1; s->range_table = 0; diff --git a/comedi/drivers/skel.c b/comedi/drivers/skel.c index c0458a4f..272fc5a1 100644 --- a/comedi/drivers/skel.c +++ b/comedi/drivers/skel.c @@ -237,7 +237,8 @@ static int skel_attach(comedi_device *dev,comedi_devconfig *it) //dev->read_subdev=s; /* analog input subdevice */ s->type=COMEDI_SUBD_AI; - s->subdev_flags=SDF_READABLE; + /* we support single-ended (ground) and differential */ + s->subdev_flags=SDF_READABLE|SDF_GROUND|SDF_DIFF; s->n_chan=thisboard->ai_chans; s->maxdata=(1<ai_bits)-1; s->range_table=&range_bipolar10; -- 2.26.2