From e0dd5f3a93aa3ea93fc59a2d2d133a69f6971202 Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Tue, 6 Apr 2004 00:03:43 +0000 Subject: [PATCH] figured out how i broke dma, and removed useless barrier --- comedi/drivers/mite.c | 2 +- comedi/drivers/ni_mio_common.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/comedi/drivers/mite.c b/comedi/drivers/mite.c index 34f385d4..463b923c 100644 --- a/comedi/drivers/mite.c +++ b/comedi/drivers/mite.c @@ -321,7 +321,7 @@ void mite_prep_dma( struct mite_struct *mite, unsigned int channel, writel(0, mite->mite_io_addr + MITE_DAR(channel)); /* the link is 32bits */ - lkcr = CR_RL(64) | CR_ASEQUP | CR_PSIZE16; + lkcr = CR_RL(64) | CR_ASEQUP | CR_PSIZE32; writel(lkcr, mite->mite_io_addr + MITE_LKCR(channel)); /* starting address for link chaining */ diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c index acca2498..a76be0f6 100644 --- a/comedi/drivers/ni_mio_common.c +++ b/comedi/drivers/ni_mio_common.c @@ -427,7 +427,6 @@ static void ni_sync_ai_dma(struct mite_struct *mite, comedi_device *dev) * conservative value returned by mite_bytes_transferred */ return; } - mb(); comedi_buf_write_free(async, count); async->scan_progress += count; @@ -1127,11 +1126,11 @@ static int ni_ai_reset(comedi_device *dev,comedi_subdevice *s) static int ni_ai_poll(comedi_device *dev,comedi_subdevice *s) { - unsigned long flags; + unsigned long flags = 0; int count; // lock to avoid race with interrupt handler - if(in_interrupt() == 0) + if(in_interrupt() == 0) comedi_spin_lock_irqsave(&dev->spinlock, flags); #ifndef PCIDMA ni_handle_fifo_dregs(dev); -- 2.26.2