Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d14ac8a authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: das08: rename and rewrite DAS08_IP 



The `DAS08_IP()` macro takes a value read from the status register and
returns the state of the three digital input channels (except on "JR"
boards).  Rename it to `DAS08_STATUS_DI()` and add a comment.  Also
re-arrange the expression used to extract the state of the digital
inputs for consistency with other register macros.

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

drivers/staging/comedi/drivers/das08.c

+3 −2
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ 
 * setting the INTE control bit to 0.  Not present on "JR" boards.

 */

#define DAS08_STATUS_IRQ	BIT(3)	/* latched interrupt input */

#define   DAS08_IP(x)			(((x)>>4)&0x7)

/* digital inputs (not "JR" boards) */

#define DAS08_STATUS_DI(x)	(((x) & 0x70) >> 4)

#define DAS08_CONTROL		2

#define   DAS08_MUX_MASK	0x7

#define   DAS08_MUX(x)		((x) & DAS08_MUX_MASK)
@@ -287,7 +288,7 @@ static int das08_di_rbits(struct comedi_device *dev, struct comedi_subdevice *s, 
			  struct comedi_insn *insn, unsigned int *data)

{

	data[0] = 0;

	data[1] = DAS08_IP(inb(dev->iobase + DAS08_STATUS_REG));

	data[1] = DAS08_STATUS_DI(inb(dev->iobase + DAS08_STATUS_REG));



	return insn->n;

}