[PATCH 08/32] staging: comedi: das08: rename DAS08_TRIG_12BIT

Ian Abbott abbotti at mev.co.uk
Fri Jun 5 17:30:11 UTC 2015


The `DAS08_TRIG_12BIT` macro contains the offset to the write-only
software trigger register for 12-bit or 16-bit analog-to-digital
conversions.  Rename the macro to `DAS08_AI_TRIG_REG` and add a comment.

Signed-off-by: Ian Abbott <abbotti at mev.co.uk>
---
 drivers/staging/comedi/drivers/das08.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c
index 1d9e6a6..fa14fa10 100644
--- a/drivers/staging/comedi/drivers/das08.c
+++ b/drivers/staging/comedi/drivers/das08.c
@@ -56,7 +56,7 @@
  */
 #define DAS08_AI_LSB_REG	0x00	/* (R) AI least significant bits */
 #define DAS08_AI_MSB_REG	0x01	/* (R) AI most significant bits */
-#define DAS08_TRIG_12BIT	1
+#define DAS08_AI_TRIG_REG	0x01	/* (W) AI software trigger */
 #define DAS08_STATUS		2
 #define   DAS08_EOC			(1<<7)
 #define   DAS08_IRQ			(1<<3)
@@ -251,7 +251,7 @@ static int das08_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
 				dev_info(dev->class_dev, "over-range\n");
 
 		/* trigger conversion */
-		outb_p(0, dev->iobase + DAS08_TRIG_12BIT);
+		outb_p(0, dev->iobase + DAS08_AI_TRIG_REG);
 
 		ret = comedi_timeout(dev, s, insn, das08_ai_eoc, 0);
 		if (ret)
-- 
2.1.4



More information about the devel mailing list