From: Frank Mori Hess Date: Thu, 7 Sep 2006 14:44:33 +0000 (+0000) Subject: Added SDF_SOFT_CALIBRATED subdevice flag. X-Git-Tag: r0_7_74~212 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=80e370579ec290b1ed5f52bce9e5de042ab71034;p=comedi.git Added SDF_SOFT_CALIBRATED subdevice flag. --- diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c index d3ff9904..4f7456f8 100644 --- a/comedi/drivers/ni_mio_common.c +++ b/comedi/drivers/ni_mio_common.c @@ -3042,6 +3042,8 @@ static int ni_E_init(comedi_device *dev,comedi_devconfig *it) s->subdev_flags |= SDF_GROUND | SDF_COMMON | SDF_OTHER; if(boardtype.adbits > 16) s->subdev_flags |= SDF_LSAMPL; + if(boardtype.reg_type == ni_reg_m_series) + s->subdev_flags |= SDF_SOFT_CALIBRATED; s->n_chan=boardtype.n_adchan; s->len_chanlist=512; s->maxdata=(1<write_subdev=s; s->type=COMEDI_SUBD_AO; s->subdev_flags=SDF_WRITABLE|SDF_DEGLITCH|SDF_GROUND; + if(boardtype.reg_type == ni_reg_m_series) + s->subdev_flags |= SDF_SOFT_CALIBRATED; s->n_chan=boardtype.n_aochan; s->maxdata=(1<range_table = boardtype.ao_range_table; diff --git a/include/linux/comedi.h b/include/linux/comedi.h index f18d55c4..63707b5c 100644 --- a/include/linux/comedi.h +++ b/include/linux/comedi.h @@ -180,6 +180,7 @@ typedef unsigned short sampl_t; #define SDF_MODE3 0x0400 /* can do mode 3 */ #define SDF_MODE4 0x0800 /* can do mode 4 */ #define SDF_CMD 0x1000 /* can do commands */ +#define SDF_SOFT_CALIBRATED 0x2000 /* subdevice uses software calibration */ #define SDF_READABLE 0x00010000 /* subdevice can be read (e.g. analog input) */ #define SDF_WRITABLE 0x00020000 /* subdevice can be written (e.g. analog output) */ @@ -457,7 +458,7 @@ struct comedi_bufinfo_struct{ // X2 encoding #define GPCT_X2 0x02 // X3 encoding -#define GPCT_X4 0x04 +#define GPCT_X4 0x04 // When to take into account the indexpulse: #define GPCT_IndexPhaseHighHigh 0 #define GPCT_IndexPhaseLowHigh 1