Commit ecaf4c41 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: addi_apci_3120: define the AI FIFO register 



Define the offset for the analog input FIFO register.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4646364c

drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c

+1 −3
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY 
#define APCI3120_START			1

#define APCI3120_STOP			0



#define APCI3120_RD_FIFO		0x00



/* software trigger dummy register */

#define APCI3120_START_CONVERSION	0x02
@@ -408,7 +406,7 @@ static irqreturn_t apci3120_interrupt(int irq, void *d) 
		int i;



		for (i = 0; i < cmd->chanlist_len; i++) {

			val = inw(dev->iobase + 0);

			val = inw(dev->iobase + APCI3120_AI_FIFO_REG);

			comedi_buf_write_samples(s, &val, 1);

		}

drivers/staging/comedi/drivers/addi_apci_3120.c

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
/*

 * PCI BAR 1 register map (dev->iobase)

 */

#define APCI3120_AI_FIFO_REG			0x00

#define APCI3120_CTRL_REG			0x00

#define APCI3120_CTRL_EXT_TRIG			(1 << 15)

#define APCI3120_CTRL_GATE(x)			(1 << (12 + (x)))
@@ -370,7 +371,7 @@ static int apci3120_ai_insn_read(struct comedi_device *dev, 
		if (ret)

			return ret;



		data[i] = inw(dev->iobase + 0);

		data[i] = inw(dev->iobase + APCI3120_AI_FIFO_REG);

	}



	return insn->n;