From 556d24b8f5a34e5edf0a135e1a34c730c6ac3f1f Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Sun, 1 Jan 2006 23:20:51 +0000 Subject: [PATCH] Fixed munging for ao commands with m-series boards. --- comedi/drivers/ni_mio_common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c index b4a56350..960493d3 100644 --- a/comedi/drivers/ni_mio_common.c +++ b/comedi/drivers/ni_mio_common.c @@ -2137,7 +2137,7 @@ static int ni_ao_insn_write(comedi_device *dev,comedi_subdevice *s, if(boardtype.reg_type == ni_reg_m_series) { - ni_writew(data[0] ^ invert, M_Offset_DAC_Direct_Data(chan)); + ni_writew(data[0], M_Offset_DAC_Direct_Data(chan)); } else ni_writew(data[0] ^ invert,(chan)? DAC1_Direct_Data : DAC0_Direct_Data); @@ -2829,7 +2829,8 @@ static int ni_E_init(comedi_device *dev,comedi_devconfig *it) s->do_cmd=ni_ao_cmd; s->do_cmdtest=ni_ao_cmdtest; s->len_chanlist = boardtype.n_aochan; - s->munge=ni_ao_munge; + if(boardtype.reg_type != ni_reg_m_series) + s->munge=ni_ao_munge; } s->cancel=ni_ao_reset; }else{ -- 2.26.2