From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Mon, 30 Apr 2007 18:36:18 +0000 (+0000)
Subject: Mite channels 4 and 5 verified to work with m-series 6289 boards now.
X-Git-Tag: r0_7_74~94
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=37218fda6ad5de0f1cac7508339f1f5defbf6162;p=comedi.git

Mite channels 4 and 5 verified to work with m-series 6289 boards now.
---

diff --git a/comedi/drivers/mite.h b/comedi/drivers/mite.h
index 6a2a4248..f50083d9 100644
--- a/comedi/drivers/mite.h
+++ b/comedi/drivers/mite.h
@@ -354,9 +354,8 @@ static inline int CR_REQS(int source)
 };
 static inline int CR_REQSDRQ(unsigned drq_line)
 {
-	/* m-series are supposed to have 6 dma channels, but
-	I not sure how to set the drq line on the mite when
-	using channels 4 or 5. */
+	/* This also works on m-series when
+	using channels (drq_line) 4 or 5. */
 	return CR_REQS((drq_line & 0x3) | 0x4);
 }
 static inline int CR_RL(unsigned int retry_limit)
diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c
index 54c38465..99fa2616 100644
--- a/comedi/drivers/ni_mio_common.c
+++ b/comedi/drivers/ni_mio_common.c
@@ -345,9 +345,7 @@ static inline void ni_set_ao_dma_channel(comedi_device *dev, int channel)
 static int ni_request_ai_mite_channel(comedi_device *dev)
 {
 	unsigned long flags;
-	/* really should be 5 for m-series, but I don't know how to get
-	mite dma channels 4 and 5 working */
-	static const unsigned max_dma_channel = 3;
+	static const unsigned max_dma_channel = 5;
 
 	comedi_spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
 	BUG_ON(devpriv->ai_mite_chan);
@@ -366,9 +364,7 @@ static int ni_request_ai_mite_channel(comedi_device *dev)
 static int ni_request_ao_mite_channel(comedi_device *dev)
 {
 	unsigned long flags;
-	/* really should be 5 for m-series, but I don't know how to get
-	mite dma channels 4 and 5 working */
-	static const unsigned max_dma_channel = 3;
+	static const unsigned max_dma_channel = 5;
 
 	comedi_spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
 	BUG_ON(devpriv->ao_mite_chan);
@@ -1244,7 +1240,7 @@ static int ni_ai_setup_MITE_dma(comedi_device *dev,comedi_cmd *cmd)
 
 	retval = ni_request_ai_mite_channel(dev);
 	if(retval) return retval;
-// 	rt_printk("comedi_debug: using mite channel %i for ai.\n", devpriv->ai_mite_chan->channel);
+//	rt_printk("comedi_debug: using mite channel %i for ai.\n", devpriv->ai_mite_chan->channel);
 
 	/* write alloc the entire buffer */
 	comedi_buf_write_alloc(s->async, s->async->prealloc_bufsz);
@@ -2518,7 +2514,7 @@ static int ni_ao_insn_write(comedi_device *dev,comedi_subdevice *s,
 {
 	unsigned int chan = CR_CHAN(insn->chanspec);
 	unsigned int invert;
-	
+
 	invert = ni_ao_config_chanlist(dev,s,&insn->chanspec, 1, 0);
 
 	devpriv->ao[chan] = data[0];