From a060c999386abcaee4ad7d6ece0936914fc30c51 Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Wed, 3 Apr 2002 17:06:34 +0000 Subject: [PATCH] I think we found the correct fifo register for 4020 now --- comedi/drivers/cb_pcidas64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/comedi/drivers/cb_pcidas64.c b/comedi/drivers/cb_pcidas64.c index a998ae0b..ab54fc4d 100644 --- a/comedi/drivers/cb_pcidas64.c +++ b/comedi/drivers/cb_pcidas64.c @@ -921,7 +921,7 @@ found: { private(dev)->dma_desc[index].pci_start_addr = private(dev)->ai_buffer_phys_addr[index]; if(board(dev)->layout == LAYOUT_4020) - private(dev)->dma_desc[index].local_start_addr = private(dev)->local1_iobase; + private(dev)->dma_desc[index].local_start_addr = private(dev)->local1_iobase + ADC_FIFO_REG; else private(dev)->dma_desc[index].local_start_addr = private(dev)->local0_iobase + ADC_FIFO_REG; private(dev)->dma_desc[index].transfer_size = DMA_TRANSFER_SIZE; @@ -1631,7 +1631,7 @@ static void pio_drain_ai_fifo_32(comedi_device *dev, unsigned int num_samples) for(i = 0; i < num_samples / 2; i++) { - fifo_data = readl(private(dev)->dio_counter_iobase); + fifo_data = readl(private(dev)->dio_counter_iobase + ADC_FIFO_REG); comedi_buf_put(async, fifo_data & 0xffff); comedi_buf_put(async, (fifo_data >> 16) & 0xffff); } -- 2.26.2